Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2015-06-10 13:59:18 -0400
committerJoakim Erdfelt2015-06-10 13:59:18 -0400
commit916efd6aa7e338d642be7028f677717d7adcb21b (patch)
treeee3a200b70d36f20311d763a85a40a5968175207
parent8bbbb2ff54956f15b64a8f417b368ad4ea5cf935 (diff)
downloadorg.eclipse.jetty.project-916efd6aa7e338d642be7028f677717d7adcb21b.tar.gz
org.eclipse.jetty.project-916efd6aa7e338d642be7028f677717d7adcb21b.tar.xz
org.eclipse.jetty.project-916efd6aa7e338d642be7028f677717d7adcb21b.zip
469860 - Add module metadata versioning to support backwards compat
+ Adding [version] section to all existing jetty 9.3 distro modules + Updating testcases in jetty-start with new [version] sections too + Adding extra testcases for versioned modules
-rw-r--r--apache-jsp/src/main/config/modules/apache-jsp.mod3
-rw-r--r--apache-jstl/src/main/config/modules/apache-jstl.mod4
-rw-r--r--jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_40.mod3
-rw-r--r--jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_45.mod3
-rw-r--r--jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_51.mod3
-rw-r--r--jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_55.mod3
-rw-r--r--jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_60.mod3
-rw-r--r--jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_65.mod3
-rw-r--r--jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_67.mod3
-rw-r--r--jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_71.mod3
-rw-r--r--jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_72.mod3
-rw-r--r--jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_75.mod3
-rw-r--r--jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_76.mod3
-rw-r--r--jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_79.mod3
-rw-r--r--jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_80.mod3
-rw-r--r--jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0.mod3
-rw-r--r--jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_05.mod3
-rw-r--r--jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_11.mod3
-rw-r--r--jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_20.mod3
-rw-r--r--jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_25.mod3
-rw-r--r--jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_31.mod3
-rw-r--r--jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_40.mod3
-rw-r--r--jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_45.mod3
-rw-r--r--jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod3
-rw-r--r--jetty-annotations/src/main/config/modules/annotations.mod3
-rw-r--r--jetty-cdi/cdi-servlet/src/main/config/modules/cdi.mod3
-rw-r--r--jetty-client/src/main/config/modules/client.mod3
-rw-r--r--jetty-deploy/src/main/config/modules/deploy.mod3
-rw-r--r--jetty-distribution/src/main/resources/modules/hawtio.mod3
-rw-r--r--jetty-distribution/src/main/resources/modules/jamon.mod3
-rw-r--r--jetty-distribution/src/main/resources/modules/jminix.mod3
-rw-r--r--jetty-distribution/src/main/resources/modules/jolokia.mod3
-rw-r--r--jetty-distribution/src/main/resources/modules/jsp.mod3
-rw-r--r--jetty-distribution/src/main/resources/modules/jstl.mod3
-rw-r--r--jetty-distribution/src/main/resources/modules/setuid.mod3
-rw-r--r--jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod3
-rw-r--r--jetty-http2/http2-server/src/main/config/modules/http2.mod3
-rw-r--r--jetty-http2/http2-server/src/main/config/modules/http2c.mod3
-rw-r--r--jetty-infinispan/src/main/config/modules/infinispan.mod3
-rw-r--r--jetty-jaas/src/main/config/modules/jaas.mod3
-rw-r--r--jetty-jaspi/src/main/config/modules/jaspi.mod3
-rw-r--r--jetty-jmx/src/main/config/modules/jmx-remote.mod3
-rw-r--r--jetty-jmx/src/main/config/modules/jmx.mod3
-rw-r--r--jetty-jndi/src/main/config/modules/jndi.mod3
-rw-r--r--jetty-monitor/src/main/config/modules/monitor.mod3
-rw-r--r--jetty-nosql/src/main/config/modules/nosql.mod3
-rw-r--r--jetty-overlay-deployer/src/main/config/modules/overlay.mod3
-rw-r--r--jetty-plus/src/main/config/modules/plus.mod3
-rw-r--r--jetty-proxy/src/main/config/modules/proxy.mod3
-rw-r--r--jetty-quickstart/src/main/config/modules/quickstart.mod3
-rw-r--r--jetty-rewrite/src/main/config/modules/rewrite.mod2
-rw-r--r--jetty-security/src/main/config/modules/security.mod3
-rw-r--r--jetty-server/src/main/config/modules/continuation.mod3
-rw-r--r--jetty-server/src/main/config/modules/debuglog.mod3
-rw-r--r--jetty-server/src/main/config/modules/ext.mod3
-rw-r--r--jetty-server/src/main/config/modules/gzip.mod3
-rw-r--r--jetty-server/src/main/config/modules/home-base-warning.mod3
-rw-r--r--jetty-server/src/main/config/modules/http.mod3
-rw-r--r--jetty-server/src/main/config/modules/https.mod3
-rw-r--r--jetty-server/src/main/config/modules/ipaccess.mod3
-rw-r--r--jetty-server/src/main/config/modules/jdbc-sessions.mod3
-rw-r--r--jetty-server/src/main/config/modules/jvm.mod3
-rw-r--r--jetty-server/src/main/config/modules/lowresources.mod3
-rw-r--r--jetty-server/src/main/config/modules/requestlog.mod3
-rw-r--r--jetty-server/src/main/config/modules/resources.mod3
-rw-r--r--jetty-server/src/main/config/modules/server.mod3
-rw-r--r--jetty-server/src/main/config/modules/ssl.mod3
-rw-r--r--jetty-server/src/main/config/modules/stats.mod3
-rw-r--r--jetty-servlet/src/main/config/modules/servlet.mod3
-rw-r--r--jetty-servlets/src/main/config/modules/servlets.mod3
-rw-r--r--jetty-spring/src/main/config/modules/spring.mod3
-rw-r--r--jetty-start/src/test/resources/assert-home-with-http2.txt1
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_40.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_45.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_51.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_55.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_60.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_65.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_67.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_71.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_72.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_75.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_76.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_79.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_80.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_05.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_11.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_20.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_25.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_31.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_40.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_45.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/annotations.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/apache-jsp.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/apache-jstl.mod4
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/cdi.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/client.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/continuation.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/debuglog.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/deploy.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/ext.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/fcgi.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/gzip.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/hawtio.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/home-base-warning.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/http.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/http2.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/http2c.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/https.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/infinispan.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/ipaccess.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/jaas.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/jamon.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/jaspi.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/jdbc-sessions.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/jminix.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/jmx-remote.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/jmx.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/jndi.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/jolokia.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/jsp.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/jstl.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/jvm.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/logging.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/lowresources.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/monitor.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/nosql.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/plus.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/proxy.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/quickstart.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/requestlog.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/resources.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/rewrite.mod2
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/security.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/server.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/servlet.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/servlets.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/setuid.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/spring.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/ssl.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/stats.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/webapp.mod3
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/websocket.mod3
-rw-r--r--jetty-start/src/test/resources/usecases/http2.assert.txt1
-rw-r--r--jetty-start/src/test/resources/usecases/versioned-modules.assert.txt2
-rw-r--r--jetty-start/src/test/resources/usecases/versioned-modules/modules/http3.mod12
-rw-r--r--jetty-start/src/test/resources/usecases/versioned-modules/modules/new.mod10
-rw-r--r--jetty-start/src/test/resources/usecases/versioned-modules/modules/old.mod7
-rw-r--r--jetty-start/src/test/resources/usecases/versioned-modules/start.ini2
-rw-r--r--jetty-util/src/main/config/modules/logging.mod3
-rw-r--r--jetty-webapp/src/main/config/modules/webapp.mod3
-rw-r--r--jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod3
154 files changed, 462 insertions, 14 deletions
diff --git a/apache-jsp/src/main/config/modules/apache-jsp.mod b/apache-jsp/src/main/config/modules/apache-jsp.mod
index 5123670cb0..8d5e1b6359 100644
--- a/apache-jsp/src/main/config/modules/apache-jsp.mod
+++ b/apache-jsp/src/main/config/modules/apache-jsp.mod
@@ -2,6 +2,9 @@
# Apache JSP Module
#
+[version]
+9.3
+
[name]
apache-jsp
diff --git a/apache-jstl/src/main/config/modules/apache-jstl.mod b/apache-jstl/src/main/config/modules/apache-jstl.mod
index 5d607520df..ed7104c4ce 100644
--- a/apache-jstl/src/main/config/modules/apache-jstl.mod
+++ b/apache-jstl/src/main/config/modules/apache-jstl.mod
@@ -1,6 +1,10 @@
#
# Apache JSTL
#
+
+[version]
+9.3
+
[name]
apache-jstl
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_40.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_40.mod
index a1002a48cc..1e677eef4d 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_40.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_40.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_45.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_45.mod
index a1002a48cc..1e677eef4d 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_45.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_45.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_51.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_51.mod
index a1002a48cc..1e677eef4d 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_51.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_51.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_55.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_55.mod
index a1002a48cc..1e677eef4d 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_55.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_55.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_60.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_60.mod
index a1002a48cc..1e677eef4d 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_60.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_60.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_65.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_65.mod
index a1002a48cc..1e677eef4d 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_65.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_65.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_67.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_67.mod
index a1002a48cc..1e677eef4d 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_67.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_67.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_71.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_71.mod
index a554324494..796c3cf0ec 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_71.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_71.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_72.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_72.mod
index a554324494..796c3cf0ec 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_72.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_72.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_75.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_75.mod
index 3f6f912c6d..86a2608896 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_75.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_75.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_76.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_76.mod
index 3f6f912c6d..86a2608896 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_76.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_76.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_79.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_79.mod
index ac315d6df7..0a96751397 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_79.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_79.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
protonego-boot
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_80.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_80.mod
index ac315d6df7..0a96751397 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_80.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_80.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
protonego-boot
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0.mod
index cb91b4c2fd..975761c779 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_05.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_05.mod
index cb91b4c2fd..975761c779 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_05.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_05.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_11.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_11.mod
index cb91b4c2fd..975761c779 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_11.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_11.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_20.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_20.mod
index cb91b4c2fd..975761c779 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_20.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_20.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_25.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_25.mod
index 6d6d75efa4..11a9c0e9d8 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_25.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_25.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_31.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_31.mod
index e52bd23c1c..11bad4792c 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_31.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_31.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_40.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_40.mod
index 4114979319..ad3a02f7dc 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_40.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_40.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
protonego-boot
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_45.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_45.mod
index 4114979319..ad3a02f7dc 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_45.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_45.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
protonego-boot
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod
index cc3d6862b9..a7d084d654 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod
@@ -16,6 +16,9 @@
# All versions of alpn-boot can be found at
# http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/
+[version]
+9.3
+
[name]
alpn
diff --git a/jetty-annotations/src/main/config/modules/annotations.mod b/jetty-annotations/src/main/config/modules/annotations.mod
index 65e4654127..25488f48ac 100644
--- a/jetty-annotations/src/main/config/modules/annotations.mod
+++ b/jetty-annotations/src/main/config/modules/annotations.mod
@@ -2,6 +2,9 @@
# Jetty Annotation Scanning Module
#
+[version]
+9.3
+
[depend]
# Annotations needs plus, and jndi features
plus
diff --git a/jetty-cdi/cdi-servlet/src/main/config/modules/cdi.mod b/jetty-cdi/cdi-servlet/src/main/config/modules/cdi.mod
index 3ae7de0961..0c09808ac9 100644
--- a/jetty-cdi/cdi-servlet/src/main/config/modules/cdi.mod
+++ b/jetty-cdi/cdi-servlet/src/main/config/modules/cdi.mod
@@ -2,6 +2,9 @@
# CDI / Weld Jetty module
#
+[version]
+9.3
+
[depend]
deploy
annotations
diff --git a/jetty-client/src/main/config/modules/client.mod b/jetty-client/src/main/config/modules/client.mod
index 39b58d4e69..fd0529e51b 100644
--- a/jetty-client/src/main/config/modules/client.mod
+++ b/jetty-client/src/main/config/modules/client.mod
@@ -2,5 +2,8 @@
# Client Feature
#
+[version]
+9.3
+
[lib]
lib/jetty-client-${jetty.version}.jar
diff --git a/jetty-deploy/src/main/config/modules/deploy.mod b/jetty-deploy/src/main/config/modules/deploy.mod
index f567a2090f..ad62936a10 100644
--- a/jetty-deploy/src/main/config/modules/deploy.mod
+++ b/jetty-deploy/src/main/config/modules/deploy.mod
@@ -2,6 +2,9 @@
# Deploy Feature
#
+[version]
+9.3
+
[depend]
webapp
diff --git a/jetty-distribution/src/main/resources/modules/hawtio.mod b/jetty-distribution/src/main/resources/modules/hawtio.mod
index 2dfb31b150..5a98ab8dc8 100644
--- a/jetty-distribution/src/main/resources/modules/hawtio.mod
+++ b/jetty-distribution/src/main/resources/modules/hawtio.mod
@@ -2,6 +2,9 @@
# Hawtio x module
#
+[version]
+9.3
+
[depend]
stats
deploy
diff --git a/jetty-distribution/src/main/resources/modules/jamon.mod b/jetty-distribution/src/main/resources/modules/jamon.mod
index 965b8db634..93589a3569 100644
--- a/jetty-distribution/src/main/resources/modules/jamon.mod
+++ b/jetty-distribution/src/main/resources/modules/jamon.mod
@@ -2,6 +2,9 @@
# JAMon Jetty module
#
+[version]
+9.3
+
[depend]
stats
deploy
diff --git a/jetty-distribution/src/main/resources/modules/jminix.mod b/jetty-distribution/src/main/resources/modules/jminix.mod
index 9df4e26e2c..785537c51e 100644
--- a/jetty-distribution/src/main/resources/modules/jminix.mod
+++ b/jetty-distribution/src/main/resources/modules/jminix.mod
@@ -2,6 +2,9 @@
# JaMON Jetty module
#
+[version]
+9.3
+
[depend]
stats
jmx
diff --git a/jetty-distribution/src/main/resources/modules/jolokia.mod b/jetty-distribution/src/main/resources/modules/jolokia.mod
index da8ac8f8c2..0b1f664bee 100644
--- a/jetty-distribution/src/main/resources/modules/jolokia.mod
+++ b/jetty-distribution/src/main/resources/modules/jolokia.mod
@@ -2,6 +2,9 @@
# Jolokia Jetty module
#
+[version]
+9.3
+
[depend]
stats
deploy
diff --git a/jetty-distribution/src/main/resources/modules/jsp.mod b/jetty-distribution/src/main/resources/modules/jsp.mod
index a16cc93dc9..07b43b610c 100644
--- a/jetty-distribution/src/main/resources/modules/jsp.mod
+++ b/jetty-distribution/src/main/resources/modules/jsp.mod
@@ -2,6 +2,9 @@
# Jetty JSP Module
#
+[version]
+9.3
+
[depend]
servlet
annotations
diff --git a/jetty-distribution/src/main/resources/modules/jstl.mod b/jetty-distribution/src/main/resources/modules/jstl.mod
index efc310af6e..3a02136109 100644
--- a/jetty-distribution/src/main/resources/modules/jstl.mod
+++ b/jetty-distribution/src/main/resources/modules/jstl.mod
@@ -2,6 +2,9 @@
# Jetty JSTL Module
#
+[version]
+9.3
+
[depend]
jsp
apache-jstl
diff --git a/jetty-distribution/src/main/resources/modules/setuid.mod b/jetty-distribution/src/main/resources/modules/setuid.mod
index 41ef757e82..54fab8f262 100644
--- a/jetty-distribution/src/main/resources/modules/setuid.mod
+++ b/jetty-distribution/src/main/resources/modules/setuid.mod
@@ -2,6 +2,9 @@
# Set UID Feature
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod b/jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod
index 14152d5f2b..026bd2702d 100644
--- a/jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod
+++ b/jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod
@@ -2,6 +2,9 @@
# FastCGI Module
#
+[version]
+9.3
+
[depend]
servlet
client
diff --git a/jetty-http2/http2-server/src/main/config/modules/http2.mod b/jetty-http2/http2-server/src/main/config/modules/http2.mod
index 585c1fa5ee..d541aef0ab 100644
--- a/jetty-http2/http2-server/src/main/config/modules/http2.mod
+++ b/jetty-http2/http2-server/src/main/config/modules/http2.mod
@@ -2,6 +2,9 @@
# HTTP2 Support Module
#
+[version]
+9.3
+
[depend]
ssl
alpn
diff --git a/jetty-http2/http2-server/src/main/config/modules/http2c.mod b/jetty-http2/http2-server/src/main/config/modules/http2c.mod
index 15883cab2c..a165dfdb84 100644
--- a/jetty-http2/http2-server/src/main/config/modules/http2c.mod
+++ b/jetty-http2/http2-server/src/main/config/modules/http2c.mod
@@ -5,6 +5,9 @@
# The resulting connector will accept both HTTP/1 and HTTP/2 connections.
#
+[version]
+9.3
+
[depend]
http
diff --git a/jetty-infinispan/src/main/config/modules/infinispan.mod b/jetty-infinispan/src/main/config/modules/infinispan.mod
index a1cea31f43..2f04d18257 100644
--- a/jetty-infinispan/src/main/config/modules/infinispan.mod
+++ b/jetty-infinispan/src/main/config/modules/infinispan.mod
@@ -2,6 +2,9 @@
# Jetty Infinispan module
#
+[version]
+9.3
+
[depend]
annotations
webapp
diff --git a/jetty-jaas/src/main/config/modules/jaas.mod b/jetty-jaas/src/main/config/modules/jaas.mod
index fee3f59d87..483aa6515b 100644
--- a/jetty-jaas/src/main/config/modules/jaas.mod
+++ b/jetty-jaas/src/main/config/modules/jaas.mod
@@ -2,6 +2,9 @@
# JAAS Module
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-jaspi/src/main/config/modules/jaspi.mod b/jetty-jaspi/src/main/config/modules/jaspi.mod
index e7019ae1b6..ab30b7dcd4 100644
--- a/jetty-jaspi/src/main/config/modules/jaspi.mod
+++ b/jetty-jaspi/src/main/config/modules/jaspi.mod
@@ -2,6 +2,9 @@
# Jetty JASPI Module
#
+[version]
+9.3
+
[depend]
security
diff --git a/jetty-jmx/src/main/config/modules/jmx-remote.mod b/jetty-jmx/src/main/config/modules/jmx-remote.mod
index f8a5111d8f..aeb2e16cb3 100644
--- a/jetty-jmx/src/main/config/modules/jmx-remote.mod
+++ b/jetty-jmx/src/main/config/modules/jmx-remote.mod
@@ -2,6 +2,9 @@
# JMX Remote Module
#
+[version]
+9.3
+
[depend]
jmx
diff --git a/jetty-jmx/src/main/config/modules/jmx.mod b/jetty-jmx/src/main/config/modules/jmx.mod
index ee091c706a..21228e67a2 100644
--- a/jetty-jmx/src/main/config/modules/jmx.mod
+++ b/jetty-jmx/src/main/config/modules/jmx.mod
@@ -2,6 +2,9 @@
# JMX Module
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-jndi/src/main/config/modules/jndi.mod b/jetty-jndi/src/main/config/modules/jndi.mod
index 33c077ce68..4e3603130d 100644
--- a/jetty-jndi/src/main/config/modules/jndi.mod
+++ b/jetty-jndi/src/main/config/modules/jndi.mod
@@ -2,6 +2,9 @@
# JNDI Support
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-monitor/src/main/config/modules/monitor.mod b/jetty-monitor/src/main/config/modules/monitor.mod
index 09132c7b2c..d573e5908c 100644
--- a/jetty-monitor/src/main/config/modules/monitor.mod
+++ b/jetty-monitor/src/main/config/modules/monitor.mod
@@ -2,6 +2,9 @@
# Jetty Monitor module
#
+[version]
+9.3
+
[depend]
server
client
diff --git a/jetty-nosql/src/main/config/modules/nosql.mod b/jetty-nosql/src/main/config/modules/nosql.mod
index 264699cc7f..bbefc7f4d1 100644
--- a/jetty-nosql/src/main/config/modules/nosql.mod
+++ b/jetty-nosql/src/main/config/modules/nosql.mod
@@ -2,6 +2,9 @@
# Jetty NoSql module
#
+[version]
+9.3
+
[depend]
webapp
diff --git a/jetty-overlay-deployer/src/main/config/modules/overlay.mod b/jetty-overlay-deployer/src/main/config/modules/overlay.mod
index 87bf9e1722..289987b3fc 100644
--- a/jetty-overlay-deployer/src/main/config/modules/overlay.mod
+++ b/jetty-overlay-deployer/src/main/config/modules/overlay.mod
@@ -2,6 +2,9 @@
# Jetty Overlay module
#
+[version]
+9.3
+
[depend]
deploy
diff --git a/jetty-plus/src/main/config/modules/plus.mod b/jetty-plus/src/main/config/modules/plus.mod
index aac0f8f3ec..4b5cdd5d0c 100644
--- a/jetty-plus/src/main/config/modules/plus.mod
+++ b/jetty-plus/src/main/config/modules/plus.mod
@@ -2,6 +2,9 @@
# Jetty Plus module
#
+[version]
+9.3
+
[depend]
server
security
diff --git a/jetty-proxy/src/main/config/modules/proxy.mod b/jetty-proxy/src/main/config/modules/proxy.mod
index 6b91f68914..9e48d54994 100644
--- a/jetty-proxy/src/main/config/modules/proxy.mod
+++ b/jetty-proxy/src/main/config/modules/proxy.mod
@@ -2,6 +2,9 @@
# Jetty Proxy module
#
+[version]
+9.3
+
[depend]
servlet
client
diff --git a/jetty-quickstart/src/main/config/modules/quickstart.mod b/jetty-quickstart/src/main/config/modules/quickstart.mod
index 89db9fd4fe..6e5eee0957 100644
--- a/jetty-quickstart/src/main/config/modules/quickstart.mod
+++ b/jetty-quickstart/src/main/config/modules/quickstart.mod
@@ -2,6 +2,9 @@
# Jetty Quickstart module
#
+[version]
+9.3
+
[depend]
server
plus
diff --git a/jetty-rewrite/src/main/config/modules/rewrite.mod b/jetty-rewrite/src/main/config/modules/rewrite.mod
index c8a1750618..cd55a1c459 100644
--- a/jetty-rewrite/src/main/config/modules/rewrite.mod
+++ b/jetty-rewrite/src/main/config/modules/rewrite.mod
@@ -1,6 +1,8 @@
#
# Jetty Rewrite module
#
+[version]
+9.3
[depend]
server
diff --git a/jetty-security/src/main/config/modules/security.mod b/jetty-security/src/main/config/modules/security.mod
index ba3163275f..c9f9431603 100644
--- a/jetty-security/src/main/config/modules/security.mod
+++ b/jetty-security/src/main/config/modules/security.mod
@@ -2,6 +2,9 @@
# Jetty Security Module
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-server/src/main/config/modules/continuation.mod b/jetty-server/src/main/config/modules/continuation.mod
index 231c09d0f3..48241fcfbf 100644
--- a/jetty-server/src/main/config/modules/continuation.mod
+++ b/jetty-server/src/main/config/modules/continuation.mod
@@ -2,5 +2,8 @@
# Classic Jetty Continuation Support Module
#
+[version]
+9.3
+
[lib]
lib/jetty-continuation-${jetty.version}.jar
diff --git a/jetty-server/src/main/config/modules/debuglog.mod b/jetty-server/src/main/config/modules/debuglog.mod
index ba8b60a727..175523aa40 100644
--- a/jetty-server/src/main/config/modules/debuglog.mod
+++ b/jetty-server/src/main/config/modules/debuglog.mod
@@ -2,6 +2,9 @@
# Debug module
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-server/src/main/config/modules/ext.mod b/jetty-server/src/main/config/modules/ext.mod
index 56b10f7ea4..defe073e62 100644
--- a/jetty-server/src/main/config/modules/ext.mod
+++ b/jetty-server/src/main/config/modules/ext.mod
@@ -2,6 +2,9 @@
# Module to add all lib/ext/**.jar files to classpath
#
+[version]
+9.3
+
[lib]
lib/ext/**.jar
diff --git a/jetty-server/src/main/config/modules/gzip.mod b/jetty-server/src/main/config/modules/gzip.mod
index 1efc834648..3f318c4ea6 100644
--- a/jetty-server/src/main/config/modules/gzip.mod
+++ b/jetty-server/src/main/config/modules/gzip.mod
@@ -3,6 +3,9 @@
# Applies GzipHandler to entire server
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-server/src/main/config/modules/home-base-warning.mod b/jetty-server/src/main/config/modules/home-base-warning.mod
index 28e5757e81..c84dbdcf42 100644
--- a/jetty-server/src/main/config/modules/home-base-warning.mod
+++ b/jetty-server/src/main/config/modules/home-base-warning.mod
@@ -2,6 +2,9 @@
# Home and Base Warning
#
+[version]
+9.3
+
[xml]
etc/home-base-warning.xml
diff --git a/jetty-server/src/main/config/modules/http.mod b/jetty-server/src/main/config/modules/http.mod
index 896a3884fe..d8d10f75a2 100644
--- a/jetty-server/src/main/config/modules/http.mod
+++ b/jetty-server/src/main/config/modules/http.mod
@@ -2,6 +2,9 @@
# Jetty HTTP Connector
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-server/src/main/config/modules/https.mod b/jetty-server/src/main/config/modules/https.mod
index 092e0d70c7..88e7c08f6e 100644
--- a/jetty-server/src/main/config/modules/https.mod
+++ b/jetty-server/src/main/config/modules/https.mod
@@ -2,6 +2,9 @@
# Jetty HTTPS Connector
#
+[version]
+9.3
+
[depend]
ssl
diff --git a/jetty-server/src/main/config/modules/ipaccess.mod b/jetty-server/src/main/config/modules/ipaccess.mod
index 956ea0f2e3..caafa4c5ef 100644
--- a/jetty-server/src/main/config/modules/ipaccess.mod
+++ b/jetty-server/src/main/config/modules/ipaccess.mod
@@ -2,6 +2,9 @@
# IPAccess module
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-server/src/main/config/modules/jdbc-sessions.mod b/jetty-server/src/main/config/modules/jdbc-sessions.mod
index cc00e4a166..b59787884d 100644
--- a/jetty-server/src/main/config/modules/jdbc-sessions.mod
+++ b/jetty-server/src/main/config/modules/jdbc-sessions.mod
@@ -2,6 +2,9 @@
# Jetty JDBC Session module
#
+[version]
+9.3
+
[depend]
annotations
webapp
diff --git a/jetty-server/src/main/config/modules/jvm.mod b/jetty-server/src/main/config/modules/jvm.mod
index 195521c57f..6aa8c442b4 100644
--- a/jetty-server/src/main/config/modules/jvm.mod
+++ b/jetty-server/src/main/config/modules/jvm.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[ini-template]
## JVM Configuration
## If JVM args are include in an ini file then --exec is needed
diff --git a/jetty-server/src/main/config/modules/lowresources.mod b/jetty-server/src/main/config/modules/lowresources.mod
index 2f765d9af2..72bf652feb 100644
--- a/jetty-server/src/main/config/modules/lowresources.mod
+++ b/jetty-server/src/main/config/modules/lowresources.mod
@@ -2,6 +2,9 @@
# Low Resources module
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-server/src/main/config/modules/requestlog.mod b/jetty-server/src/main/config/modules/requestlog.mod
index 37ed3440c8..a3afc062ea 100644
--- a/jetty-server/src/main/config/modules/requestlog.mod
+++ b/jetty-server/src/main/config/modules/requestlog.mod
@@ -2,6 +2,9 @@
# Request Log module
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-server/src/main/config/modules/resources.mod b/jetty-server/src/main/config/modules/resources.mod
index 8647d81325..91eed41bfd 100644
--- a/jetty-server/src/main/config/modules/resources.mod
+++ b/jetty-server/src/main/config/modules/resources.mod
@@ -2,6 +2,9 @@
# Module to add resources directory to classpath
#
+[version]
+9.3
+
[lib]
resources/
diff --git a/jetty-server/src/main/config/modules/server.mod b/jetty-server/src/main/config/modules/server.mod
index 6b5dbe95ba..524017f46d 100644
--- a/jetty-server/src/main/config/modules/server.mod
+++ b/jetty-server/src/main/config/modules/server.mod
@@ -2,6 +2,9 @@
# Base Server Module
#
+[version]
+9.3
+
[optional]
jvm
ext
diff --git a/jetty-server/src/main/config/modules/ssl.mod b/jetty-server/src/main/config/modules/ssl.mod
index 9123ea22b0..d491f18e64 100644
--- a/jetty-server/src/main/config/modules/ssl.mod
+++ b/jetty-server/src/main/config/modules/ssl.mod
@@ -1,6 +1,9 @@
#
# SSL Keystore module
#
+[version]
+9.3
+
[name]
ssl
diff --git a/jetty-server/src/main/config/modules/stats.mod b/jetty-server/src/main/config/modules/stats.mod
index 0922469cdf..0212f87879 100644
--- a/jetty-server/src/main/config/modules/stats.mod
+++ b/jetty-server/src/main/config/modules/stats.mod
@@ -2,6 +2,9 @@
# Stats module
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-servlet/src/main/config/modules/servlet.mod b/jetty-servlet/src/main/config/modules/servlet.mod
index fdb65c57a1..65bf86f5c5 100644
--- a/jetty-servlet/src/main/config/modules/servlet.mod
+++ b/jetty-servlet/src/main/config/modules/servlet.mod
@@ -2,6 +2,9 @@
# Jetty Servlet Module
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-servlets/src/main/config/modules/servlets.mod b/jetty-servlets/src/main/config/modules/servlets.mod
index e8724b87d7..453a9380fa 100644
--- a/jetty-servlets/src/main/config/modules/servlets.mod
+++ b/jetty-servlets/src/main/config/modules/servlets.mod
@@ -2,6 +2,9 @@
# Jetty Servlets Module
#
+[version]
+9.3
+
[depend]
servlet
diff --git a/jetty-spring/src/main/config/modules/spring.mod b/jetty-spring/src/main/config/modules/spring.mod
index 444afb2f93..0e11358cfc 100644
--- a/jetty-spring/src/main/config/modules/spring.mod
+++ b/jetty-spring/src/main/config/modules/spring.mod
@@ -1,6 +1,9 @@
#
# Spring
#
+[version]
+9.3
+
[name]
spring
diff --git a/jetty-start/src/test/resources/assert-home-with-http2.txt b/jetty-start/src/test/resources/assert-home-with-http2.txt
index 4f62cdc0c9..bf92c388e2 100644
--- a/jetty-start/src/test/resources/assert-home-with-http2.txt
+++ b/jetty-start/src/test/resources/assert-home-with-http2.txt
@@ -55,7 +55,6 @@ LIB|${jetty.base}/lib/jetty-jndi-9.3.jar
# (these are the properties we actually set in the configuration)
PROP|java.version=1.7.0_60
PROP|jetty.http.port=8080
-PROP|jetty.ssl.port=8443
PROP|jetty.httpConfig.delayDispatchUntilContent=false
PROP|jetty.server.dumpAfterStart=false
PROP|jetty.server.dumpBeforeStop=false
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_40.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_40.mod
index a1002a48cc..1e677eef4d 100644
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_40.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_40.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_45.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_45.mod
index a1002a48cc..1e677eef4d 100644
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_45.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_45.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_51.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_51.mod
index a1002a48cc..1e677eef4d 100644
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_51.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_51.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_55.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_55.mod
index a1002a48cc..1e677eef4d 100644
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_55.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_55.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_60.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_60.mod
index a1002a48cc..1e677eef4d 100644
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_60.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_60.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_65.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_65.mod
index a1002a48cc..1e677eef4d 100644
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_65.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_65.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_67.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_67.mod
index a1002a48cc..1e677eef4d 100644
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_67.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_67.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_71.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_71.mod
index a554324494..796c3cf0ec 100644
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_71.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_71.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_72.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_72.mod
index a554324494..796c3cf0ec 100644
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_72.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_72.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_75.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_75.mod
index 3f6f912c6d..86a2608896 100644
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_75.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_75.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_76.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_76.mod
index 3f6f912c6d..86a2608896 100644
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_76.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_76.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_79.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_79.mod
index ac315d6df7..0a96751397 100644
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_79.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_79.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
protonego-boot
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_80.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_80.mod
index ac315d6df7..0a96751397 100644
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_80.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_80.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
protonego-boot
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0.mod
index cb91b4c2fd..975761c779 100644
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_05.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_05.mod
index cb91b4c2fd..975761c779 100644
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_05.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_05.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_11.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_11.mod
index cb91b4c2fd..975761c779 100644
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_11.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_11.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_20.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_20.mod
index cb91b4c2fd..975761c779 100644
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_20.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_20.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_25.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_25.mod
index 6d6d75efa4..11a9c0e9d8 100644
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_25.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_25.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_31.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_31.mod
index e52bd23c1c..11bad4792c 100644
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_31.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_31.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
alpn-boot
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_40.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_40.mod
index 4114979319..ad3a02f7dc 100644
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_40.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_40.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
protonego-boot
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_45.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_45.mod
index 4114979319..ad3a02f7dc 100644
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_45.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_45.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[name]
protonego-boot
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn.mod b/jetty-start/src/test/resources/dist-home/modules/alpn.mod
index cc3d6862b9..a7d084d654 100644
--- a/jetty-start/src/test/resources/dist-home/modules/alpn.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn.mod
@@ -16,6 +16,9 @@
# All versions of alpn-boot can be found at
# http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/
+[version]
+9.3
+
[name]
alpn
diff --git a/jetty-start/src/test/resources/dist-home/modules/annotations.mod b/jetty-start/src/test/resources/dist-home/modules/annotations.mod
index 65e4654127..25488f48ac 100644
--- a/jetty-start/src/test/resources/dist-home/modules/annotations.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/annotations.mod
@@ -2,6 +2,9 @@
# Jetty Annotation Scanning Module
#
+[version]
+9.3
+
[depend]
# Annotations needs plus, and jndi features
plus
diff --git a/jetty-start/src/test/resources/dist-home/modules/apache-jsp.mod b/jetty-start/src/test/resources/dist-home/modules/apache-jsp.mod
index 5123670cb0..8d5e1b6359 100644
--- a/jetty-start/src/test/resources/dist-home/modules/apache-jsp.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/apache-jsp.mod
@@ -2,6 +2,9 @@
# Apache JSP Module
#
+[version]
+9.3
+
[name]
apache-jsp
diff --git a/jetty-start/src/test/resources/dist-home/modules/apache-jstl.mod b/jetty-start/src/test/resources/dist-home/modules/apache-jstl.mod
index 5d607520df..ed7104c4ce 100644
--- a/jetty-start/src/test/resources/dist-home/modules/apache-jstl.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/apache-jstl.mod
@@ -1,6 +1,10 @@
#
# Apache JSTL
#
+
+[version]
+9.3
+
[name]
apache-jstl
diff --git a/jetty-start/src/test/resources/dist-home/modules/cdi.mod b/jetty-start/src/test/resources/dist-home/modules/cdi.mod
index 3ae7de0961..0c09808ac9 100644
--- a/jetty-start/src/test/resources/dist-home/modules/cdi.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/cdi.mod
@@ -2,6 +2,9 @@
# CDI / Weld Jetty module
#
+[version]
+9.3
+
[depend]
deploy
annotations
diff --git a/jetty-start/src/test/resources/dist-home/modules/client.mod b/jetty-start/src/test/resources/dist-home/modules/client.mod
index 39b58d4e69..fd0529e51b 100644
--- a/jetty-start/src/test/resources/dist-home/modules/client.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/client.mod
@@ -2,5 +2,8 @@
# Client Feature
#
+[version]
+9.3
+
[lib]
lib/jetty-client-${jetty.version}.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/continuation.mod b/jetty-start/src/test/resources/dist-home/modules/continuation.mod
index 231c09d0f3..48241fcfbf 100644
--- a/jetty-start/src/test/resources/dist-home/modules/continuation.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/continuation.mod
@@ -2,5 +2,8 @@
# Classic Jetty Continuation Support Module
#
+[version]
+9.3
+
[lib]
lib/jetty-continuation-${jetty.version}.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/debuglog.mod b/jetty-start/src/test/resources/dist-home/modules/debuglog.mod
index ba8b60a727..175523aa40 100644
--- a/jetty-start/src/test/resources/dist-home/modules/debuglog.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/debuglog.mod
@@ -2,6 +2,9 @@
# Debug module
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-start/src/test/resources/dist-home/modules/deploy.mod b/jetty-start/src/test/resources/dist-home/modules/deploy.mod
index f567a2090f..ad62936a10 100644
--- a/jetty-start/src/test/resources/dist-home/modules/deploy.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/deploy.mod
@@ -2,6 +2,9 @@
# Deploy Feature
#
+[version]
+9.3
+
[depend]
webapp
diff --git a/jetty-start/src/test/resources/dist-home/modules/ext.mod b/jetty-start/src/test/resources/dist-home/modules/ext.mod
index 56b10f7ea4..defe073e62 100644
--- a/jetty-start/src/test/resources/dist-home/modules/ext.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/ext.mod
@@ -2,6 +2,9 @@
# Module to add all lib/ext/**.jar files to classpath
#
+[version]
+9.3
+
[lib]
lib/ext/**.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/fcgi.mod b/jetty-start/src/test/resources/dist-home/modules/fcgi.mod
index 14152d5f2b..026bd2702d 100644
--- a/jetty-start/src/test/resources/dist-home/modules/fcgi.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/fcgi.mod
@@ -2,6 +2,9 @@
# FastCGI Module
#
+[version]
+9.3
+
[depend]
servlet
client
diff --git a/jetty-start/src/test/resources/dist-home/modules/gzip.mod b/jetty-start/src/test/resources/dist-home/modules/gzip.mod
index 1efc834648..3f318c4ea6 100644
--- a/jetty-start/src/test/resources/dist-home/modules/gzip.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/gzip.mod
@@ -3,6 +3,9 @@
# Applies GzipHandler to entire server
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-start/src/test/resources/dist-home/modules/hawtio.mod b/jetty-start/src/test/resources/dist-home/modules/hawtio.mod
index 2dfb31b150..5a98ab8dc8 100644
--- a/jetty-start/src/test/resources/dist-home/modules/hawtio.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/hawtio.mod
@@ -2,6 +2,9 @@
# Hawtio x module
#
+[version]
+9.3
+
[depend]
stats
deploy
diff --git a/jetty-start/src/test/resources/dist-home/modules/home-base-warning.mod b/jetty-start/src/test/resources/dist-home/modules/home-base-warning.mod
index 28e5757e81..c84dbdcf42 100644
--- a/jetty-start/src/test/resources/dist-home/modules/home-base-warning.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/home-base-warning.mod
@@ -2,6 +2,9 @@
# Home and Base Warning
#
+[version]
+9.3
+
[xml]
etc/home-base-warning.xml
diff --git a/jetty-start/src/test/resources/dist-home/modules/http.mod b/jetty-start/src/test/resources/dist-home/modules/http.mod
index 896a3884fe..d8d10f75a2 100644
--- a/jetty-start/src/test/resources/dist-home/modules/http.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/http.mod
@@ -2,6 +2,9 @@
# Jetty HTTP Connector
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-start/src/test/resources/dist-home/modules/http2.mod b/jetty-start/src/test/resources/dist-home/modules/http2.mod
index 585c1fa5ee..d541aef0ab 100644
--- a/jetty-start/src/test/resources/dist-home/modules/http2.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/http2.mod
@@ -2,6 +2,9 @@
# HTTP2 Support Module
#
+[version]
+9.3
+
[depend]
ssl
alpn
diff --git a/jetty-start/src/test/resources/dist-home/modules/http2c.mod b/jetty-start/src/test/resources/dist-home/modules/http2c.mod
index 15883cab2c..a165dfdb84 100644
--- a/jetty-start/src/test/resources/dist-home/modules/http2c.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/http2c.mod
@@ -5,6 +5,9 @@
# The resulting connector will accept both HTTP/1 and HTTP/2 connections.
#
+[version]
+9.3
+
[depend]
http
diff --git a/jetty-start/src/test/resources/dist-home/modules/https.mod b/jetty-start/src/test/resources/dist-home/modules/https.mod
index 092e0d70c7..88e7c08f6e 100644
--- a/jetty-start/src/test/resources/dist-home/modules/https.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/https.mod
@@ -2,6 +2,9 @@
# Jetty HTTPS Connector
#
+[version]
+9.3
+
[depend]
ssl
diff --git a/jetty-start/src/test/resources/dist-home/modules/infinispan.mod b/jetty-start/src/test/resources/dist-home/modules/infinispan.mod
index a1cea31f43..2f04d18257 100644
--- a/jetty-start/src/test/resources/dist-home/modules/infinispan.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/infinispan.mod
@@ -2,6 +2,9 @@
# Jetty Infinispan module
#
+[version]
+9.3
+
[depend]
annotations
webapp
diff --git a/jetty-start/src/test/resources/dist-home/modules/ipaccess.mod b/jetty-start/src/test/resources/dist-home/modules/ipaccess.mod
index 956ea0f2e3..caafa4c5ef 100644
--- a/jetty-start/src/test/resources/dist-home/modules/ipaccess.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/ipaccess.mod
@@ -2,6 +2,9 @@
# IPAccess module
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-start/src/test/resources/dist-home/modules/jaas.mod b/jetty-start/src/test/resources/dist-home/modules/jaas.mod
index fee3f59d87..483aa6515b 100644
--- a/jetty-start/src/test/resources/dist-home/modules/jaas.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/jaas.mod
@@ -2,6 +2,9 @@
# JAAS Module
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-start/src/test/resources/dist-home/modules/jamon.mod b/jetty-start/src/test/resources/dist-home/modules/jamon.mod
index 965b8db634..93589a3569 100644
--- a/jetty-start/src/test/resources/dist-home/modules/jamon.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/jamon.mod
@@ -2,6 +2,9 @@
# JAMon Jetty module
#
+[version]
+9.3
+
[depend]
stats
deploy
diff --git a/jetty-start/src/test/resources/dist-home/modules/jaspi.mod b/jetty-start/src/test/resources/dist-home/modules/jaspi.mod
index e7019ae1b6..ab30b7dcd4 100644
--- a/jetty-start/src/test/resources/dist-home/modules/jaspi.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/jaspi.mod
@@ -2,6 +2,9 @@
# Jetty JASPI Module
#
+[version]
+9.3
+
[depend]
security
diff --git a/jetty-start/src/test/resources/dist-home/modules/jdbc-sessions.mod b/jetty-start/src/test/resources/dist-home/modules/jdbc-sessions.mod
index cc00e4a166..b59787884d 100644
--- a/jetty-start/src/test/resources/dist-home/modules/jdbc-sessions.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/jdbc-sessions.mod
@@ -2,6 +2,9 @@
# Jetty JDBC Session module
#
+[version]
+9.3
+
[depend]
annotations
webapp
diff --git a/jetty-start/src/test/resources/dist-home/modules/jminix.mod b/jetty-start/src/test/resources/dist-home/modules/jminix.mod
index 9df4e26e2c..785537c51e 100644
--- a/jetty-start/src/test/resources/dist-home/modules/jminix.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/jminix.mod
@@ -2,6 +2,9 @@
# JaMON Jetty module
#
+[version]
+9.3
+
[depend]
stats
jmx
diff --git a/jetty-start/src/test/resources/dist-home/modules/jmx-remote.mod b/jetty-start/src/test/resources/dist-home/modules/jmx-remote.mod
index f8a5111d8f..aeb2e16cb3 100644
--- a/jetty-start/src/test/resources/dist-home/modules/jmx-remote.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/jmx-remote.mod
@@ -2,6 +2,9 @@
# JMX Remote Module
#
+[version]
+9.3
+
[depend]
jmx
diff --git a/jetty-start/src/test/resources/dist-home/modules/jmx.mod b/jetty-start/src/test/resources/dist-home/modules/jmx.mod
index ee091c706a..21228e67a2 100644
--- a/jetty-start/src/test/resources/dist-home/modules/jmx.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/jmx.mod
@@ -2,6 +2,9 @@
# JMX Module
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-start/src/test/resources/dist-home/modules/jndi.mod b/jetty-start/src/test/resources/dist-home/modules/jndi.mod
index 33c077ce68..4e3603130d 100644
--- a/jetty-start/src/test/resources/dist-home/modules/jndi.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/jndi.mod
@@ -2,6 +2,9 @@
# JNDI Support
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-start/src/test/resources/dist-home/modules/jolokia.mod b/jetty-start/src/test/resources/dist-home/modules/jolokia.mod
index da8ac8f8c2..0b1f664bee 100644
--- a/jetty-start/src/test/resources/dist-home/modules/jolokia.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/jolokia.mod
@@ -2,6 +2,9 @@
# Jolokia Jetty module
#
+[version]
+9.3
+
[depend]
stats
deploy
diff --git a/jetty-start/src/test/resources/dist-home/modules/jsp.mod b/jetty-start/src/test/resources/dist-home/modules/jsp.mod
index a16cc93dc9..07b43b610c 100644
--- a/jetty-start/src/test/resources/dist-home/modules/jsp.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/jsp.mod
@@ -2,6 +2,9 @@
# Jetty JSP Module
#
+[version]
+9.3
+
[depend]
servlet
annotations
diff --git a/jetty-start/src/test/resources/dist-home/modules/jstl.mod b/jetty-start/src/test/resources/dist-home/modules/jstl.mod
index efc310af6e..3a02136109 100644
--- a/jetty-start/src/test/resources/dist-home/modules/jstl.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/jstl.mod
@@ -2,6 +2,9 @@
# Jetty JSTL Module
#
+[version]
+9.3
+
[depend]
jsp
apache-jstl
diff --git a/jetty-start/src/test/resources/dist-home/modules/jvm.mod b/jetty-start/src/test/resources/dist-home/modules/jvm.mod
index 195521c57f..6aa8c442b4 100644
--- a/jetty-start/src/test/resources/dist-home/modules/jvm.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/jvm.mod
@@ -1,3 +1,6 @@
+[version]
+9.3
+
[ini-template]
## JVM Configuration
## If JVM args are include in an ini file then --exec is needed
diff --git a/jetty-start/src/test/resources/dist-home/modules/logging.mod b/jetty-start/src/test/resources/dist-home/modules/logging.mod
index 15c2f2f2b3..2a17a5892e 100644
--- a/jetty-start/src/test/resources/dist-home/modules/logging.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/logging.mod
@@ -2,6 +2,9 @@
# Jetty std err/out logging
#
+[version]
+9.3
+
[xml]
etc/jetty-logging.xml
diff --git a/jetty-start/src/test/resources/dist-home/modules/lowresources.mod b/jetty-start/src/test/resources/dist-home/modules/lowresources.mod
index 2f765d9af2..72bf652feb 100644
--- a/jetty-start/src/test/resources/dist-home/modules/lowresources.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/lowresources.mod
@@ -2,6 +2,9 @@
# Low Resources module
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-start/src/test/resources/dist-home/modules/monitor.mod b/jetty-start/src/test/resources/dist-home/modules/monitor.mod
index 09132c7b2c..d573e5908c 100644
--- a/jetty-start/src/test/resources/dist-home/modules/monitor.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/monitor.mod
@@ -2,6 +2,9 @@
# Jetty Monitor module
#
+[version]
+9.3
+
[depend]
server
client
diff --git a/jetty-start/src/test/resources/dist-home/modules/nosql.mod b/jetty-start/src/test/resources/dist-home/modules/nosql.mod
index 264699cc7f..bbefc7f4d1 100644
--- a/jetty-start/src/test/resources/dist-home/modules/nosql.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/nosql.mod
@@ -2,6 +2,9 @@
# Jetty NoSql module
#
+[version]
+9.3
+
[depend]
webapp
diff --git a/jetty-start/src/test/resources/dist-home/modules/plus.mod b/jetty-start/src/test/resources/dist-home/modules/plus.mod
index aac0f8f3ec..4b5cdd5d0c 100644
--- a/jetty-start/src/test/resources/dist-home/modules/plus.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/plus.mod
@@ -2,6 +2,9 @@
# Jetty Plus module
#
+[version]
+9.3
+
[depend]
server
security
diff --git a/jetty-start/src/test/resources/dist-home/modules/proxy.mod b/jetty-start/src/test/resources/dist-home/modules/proxy.mod
index 6b91f68914..9e48d54994 100644
--- a/jetty-start/src/test/resources/dist-home/modules/proxy.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/proxy.mod
@@ -2,6 +2,9 @@
# Jetty Proxy module
#
+[version]
+9.3
+
[depend]
servlet
client
diff --git a/jetty-start/src/test/resources/dist-home/modules/quickstart.mod b/jetty-start/src/test/resources/dist-home/modules/quickstart.mod
index 89db9fd4fe..6e5eee0957 100644
--- a/jetty-start/src/test/resources/dist-home/modules/quickstart.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/quickstart.mod
@@ -2,6 +2,9 @@
# Jetty Quickstart module
#
+[version]
+9.3
+
[depend]
server
plus
diff --git a/jetty-start/src/test/resources/dist-home/modules/requestlog.mod b/jetty-start/src/test/resources/dist-home/modules/requestlog.mod
index 37ed3440c8..a3afc062ea 100644
--- a/jetty-start/src/test/resources/dist-home/modules/requestlog.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/requestlog.mod
@@ -2,6 +2,9 @@
# Request Log module
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-start/src/test/resources/dist-home/modules/resources.mod b/jetty-start/src/test/resources/dist-home/modules/resources.mod
index 8647d81325..91eed41bfd 100644
--- a/jetty-start/src/test/resources/dist-home/modules/resources.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/resources.mod
@@ -2,6 +2,9 @@
# Module to add resources directory to classpath
#
+[version]
+9.3
+
[lib]
resources/
diff --git a/jetty-start/src/test/resources/dist-home/modules/rewrite.mod b/jetty-start/src/test/resources/dist-home/modules/rewrite.mod
index c8a1750618..cd55a1c459 100644
--- a/jetty-start/src/test/resources/dist-home/modules/rewrite.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/rewrite.mod
@@ -1,6 +1,8 @@
#
# Jetty Rewrite module
#
+[version]
+9.3
[depend]
server
diff --git a/jetty-start/src/test/resources/dist-home/modules/security.mod b/jetty-start/src/test/resources/dist-home/modules/security.mod
index ba3163275f..c9f9431603 100644
--- a/jetty-start/src/test/resources/dist-home/modules/security.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/security.mod
@@ -2,6 +2,9 @@
# Jetty Security Module
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-start/src/test/resources/dist-home/modules/server.mod b/jetty-start/src/test/resources/dist-home/modules/server.mod
index 6b5dbe95ba..524017f46d 100644
--- a/jetty-start/src/test/resources/dist-home/modules/server.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/server.mod
@@ -2,6 +2,9 @@
# Base Server Module
#
+[version]
+9.3
+
[optional]
jvm
ext
diff --git a/jetty-start/src/test/resources/dist-home/modules/servlet.mod b/jetty-start/src/test/resources/dist-home/modules/servlet.mod
index fdb65c57a1..65bf86f5c5 100644
--- a/jetty-start/src/test/resources/dist-home/modules/servlet.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/servlet.mod
@@ -2,6 +2,9 @@
# Jetty Servlet Module
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-start/src/test/resources/dist-home/modules/servlets.mod b/jetty-start/src/test/resources/dist-home/modules/servlets.mod
index e8724b87d7..453a9380fa 100644
--- a/jetty-start/src/test/resources/dist-home/modules/servlets.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/servlets.mod
@@ -2,6 +2,9 @@
# Jetty Servlets Module
#
+[version]
+9.3
+
[depend]
servlet
diff --git a/jetty-start/src/test/resources/dist-home/modules/setuid.mod b/jetty-start/src/test/resources/dist-home/modules/setuid.mod
index 41ef757e82..54fab8f262 100644
--- a/jetty-start/src/test/resources/dist-home/modules/setuid.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/setuid.mod
@@ -2,6 +2,9 @@
# Set UID Feature
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-start/src/test/resources/dist-home/modules/spring.mod b/jetty-start/src/test/resources/dist-home/modules/spring.mod
index 444afb2f93..0e11358cfc 100644
--- a/jetty-start/src/test/resources/dist-home/modules/spring.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/spring.mod
@@ -1,6 +1,9 @@
#
# Spring
#
+[version]
+9.3
+
[name]
spring
diff --git a/jetty-start/src/test/resources/dist-home/modules/ssl.mod b/jetty-start/src/test/resources/dist-home/modules/ssl.mod
index 9123ea22b0..d491f18e64 100644
--- a/jetty-start/src/test/resources/dist-home/modules/ssl.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/ssl.mod
@@ -1,6 +1,9 @@
#
# SSL Keystore module
#
+[version]
+9.3
+
[name]
ssl
diff --git a/jetty-start/src/test/resources/dist-home/modules/stats.mod b/jetty-start/src/test/resources/dist-home/modules/stats.mod
index 0922469cdf..0212f87879 100644
--- a/jetty-start/src/test/resources/dist-home/modules/stats.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/stats.mod
@@ -2,6 +2,9 @@
# Stats module
#
+[version]
+9.3
+
[depend]
server
diff --git a/jetty-start/src/test/resources/dist-home/modules/webapp.mod b/jetty-start/src/test/resources/dist-home/modules/webapp.mod
index 6bb37ef2ef..3f889b6a95 100644
--- a/jetty-start/src/test/resources/dist-home/modules/webapp.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/webapp.mod
@@ -2,6 +2,9 @@
# WebApp Support Module
#
+[version]
+9.3
+
[depend]
servlet
security
diff --git a/jetty-start/src/test/resources/dist-home/modules/websocket.mod b/jetty-start/src/test/resources/dist-home/modules/websocket.mod
index e866b17989..768bcc8e7f 100644
--- a/jetty-start/src/test/resources/dist-home/modules/websocket.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/websocket.mod
@@ -2,6 +2,9 @@
# WebSocket Module
#
+[version]
+9.3
+
[depend]
# javax.websocket needs annotations
annotations
diff --git a/jetty-start/src/test/resources/usecases/http2.assert.txt b/jetty-start/src/test/resources/usecases/http2.assert.txt
index 359b08f0ed..574c4d08bb 100644
--- a/jetty-start/src/test/resources/usecases/http2.assert.txt
+++ b/jetty-start/src/test/resources/usecases/http2.assert.txt
@@ -25,7 +25,6 @@ LIB|${jetty.home}/lib/http2/http2-server-9.3.jar
# The Properties we expect (order is irrelevant)
# (this is the property we actually set in jetty.base)
PROP|jetty.http.port=9090
-PROP|jetty.ssl.port=8443
PROP|java.version=1.7.0_60
PROP|jetty.sslContext.keyStorePath=etc/keystore
PROP|jetty.sslContext.keyStorePassword=friendly
diff --git a/jetty-start/src/test/resources/usecases/versioned-modules.assert.txt b/jetty-start/src/test/resources/usecases/versioned-modules.assert.txt
index 6de9e84b8a..f1b8108929 100644
--- a/jetty-start/src/test/resources/usecases/versioned-modules.assert.txt
+++ b/jetty-start/src/test/resources/usecases/versioned-modules.assert.txt
@@ -14,3 +14,5 @@ LIB|${jetty.home}/lib/servlet-api-3.1.jar
# The Properties we expect (order is irrelevant)
# (this is the property we actually set in jetty.base)
PROP|jetty.http.port=9090
+PROP|from-module=old
+PROP|the-future=is-new
diff --git a/jetty-start/src/test/resources/usecases/versioned-modules/modules/http3.mod b/jetty-start/src/test/resources/usecases/versioned-modules/modules/http3.mod
deleted file mode 100644
index bc88f69f3b..0000000000
--- a/jetty-start/src/test/resources/usecases/versioned-modules/modules/http3.mod
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Fake Jetty HTTP/3 Connector
-#
-
-[version]
-10.0
-
-[depend]
-server
-
-[xml]
-etc/jetty-http3.xml
diff --git a/jetty-start/src/test/resources/usecases/versioned-modules/modules/new.mod b/jetty-start/src/test/resources/usecases/versioned-modules/modules/new.mod
new file mode 100644
index 0000000000..c300d21ab0
--- /dev/null
+++ b/jetty-start/src/test/resources/usecases/versioned-modules/modules/new.mod
@@ -0,0 +1,10 @@
+#
+# New Module (testing module based defaults)
+#
+
+[version]
+9.3
+
+[defaults]
+the-future=is-new
+
diff --git a/jetty-start/src/test/resources/usecases/versioned-modules/modules/old.mod b/jetty-start/src/test/resources/usecases/versioned-modules/modules/old.mod
new file mode 100644
index 0000000000..79fcfcb81d
--- /dev/null
+++ b/jetty-start/src/test/resources/usecases/versioned-modules/modules/old.mod
@@ -0,0 +1,7 @@
+#
+# Old Module (backward compat test with 9.2 modules)
+#
+
+[ini-template]
+from-module=old
+
diff --git a/jetty-start/src/test/resources/usecases/versioned-modules/start.ini b/jetty-start/src/test/resources/usecases/versioned-modules/start.ini
index a3d92b9524..c306053048 100644
--- a/jetty-start/src/test/resources/usecases/versioned-modules/start.ini
+++ b/jetty-start/src/test/resources/usecases/versioned-modules/start.ini
@@ -1,5 +1,7 @@
--module=server
--module=http
+--module=old
+--module=new
jetty.http.port=9090
diff --git a/jetty-util/src/main/config/modules/logging.mod b/jetty-util/src/main/config/modules/logging.mod
index 15c2f2f2b3..2a17a5892e 100644
--- a/jetty-util/src/main/config/modules/logging.mod
+++ b/jetty-util/src/main/config/modules/logging.mod
@@ -2,6 +2,9 @@
# Jetty std err/out logging
#
+[version]
+9.3
+
[xml]
etc/jetty-logging.xml
diff --git a/jetty-webapp/src/main/config/modules/webapp.mod b/jetty-webapp/src/main/config/modules/webapp.mod
index 6bb37ef2ef..3f889b6a95 100644
--- a/jetty-webapp/src/main/config/modules/webapp.mod
+++ b/jetty-webapp/src/main/config/modules/webapp.mod
@@ -2,6 +2,9 @@
# WebApp Support Module
#
+[version]
+9.3
+
[depend]
servlet
security
diff --git a/jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod b/jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod
index e866b17989..768bcc8e7f 100644
--- a/jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod
+++ b/jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod
@@ -2,6 +2,9 @@
# WebSocket Module
#
+[version]
+9.3
+
[depend]
# javax.websocket needs annotations
annotations

Back to the top