From 7c737a587b5c1f3706ccf6a42a6ff4f549880e24 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Fri, 12 Jun 2015 09:14:34 -0700
Subject: [PATCH 1/4] Removing [version] sections in modules

---
 apache-jsp/src/main/config/modules/apache-jsp.mod |  3 ---
 .../src/main/config/modules/apache-jstl.mod       |  3 ---
 .../config/modules/alpn-impl/alpn-1.7.0_40.mod    |  3 ---
 .../config/modules/alpn-impl/alpn-1.7.0_45.mod    |  3 ---
 .../config/modules/alpn-impl/alpn-1.7.0_51.mod    |  3 ---
 .../config/modules/alpn-impl/alpn-1.7.0_55.mod    |  3 ---
 .../config/modules/alpn-impl/alpn-1.7.0_60.mod    |  3 ---
 .../config/modules/alpn-impl/alpn-1.7.0_65.mod    |  3 ---
 .../config/modules/alpn-impl/alpn-1.7.0_67.mod    |  3 ---
 .../config/modules/alpn-impl/alpn-1.7.0_71.mod    |  3 ---
 .../config/modules/alpn-impl/alpn-1.7.0_72.mod    |  3 ---
 .../config/modules/alpn-impl/alpn-1.7.0_75.mod    |  3 ---
 .../config/modules/alpn-impl/alpn-1.7.0_76.mod    |  3 ---
 .../config/modules/alpn-impl/alpn-1.7.0_79.mod    |  3 ---
 .../config/modules/alpn-impl/alpn-1.7.0_80.mod    |  3 ---
 .../main/config/modules/alpn-impl/alpn-1.8.0.mod  |  3 ---
 .../config/modules/alpn-impl/alpn-1.8.0_05.mod    |  3 ---
 .../config/modules/alpn-impl/alpn-1.8.0_11.mod    |  3 ---
 .../config/modules/alpn-impl/alpn-1.8.0_20.mod    |  3 ---
 .../config/modules/alpn-impl/alpn-1.8.0_25.mod    |  3 ---
 .../config/modules/alpn-impl/alpn-1.8.0_31.mod    |  3 ---
 .../config/modules/alpn-impl/alpn-1.8.0_40.mod    |  3 ---
 .../config/modules/alpn-impl/alpn-1.8.0_45.mod    |  3 ---
 .../src/main/config/modules/alpn.mod              | 13 +++++--------
 .../src/main/config/modules/annotations.mod       |  3 ---
 .../cdi-servlet/src/main/config/modules/cdi.mod   |  5 +----
 jetty-client/src/main/config/modules/client.mod   |  3 ---
 jetty-deploy/src/main/config/modules/deploy.mod   |  3 ---
 .../src/main/resources/modules/hawtio.mod         |  5 +----
 .../src/main/resources/modules/jamon.mod          |  6 ++----
 .../src/main/resources/modules/jminix.mod         |  5 +----
 .../src/main/resources/modules/jolokia.mod        |  3 ---
 .../src/main/resources/modules/jsp.mod            |  3 ---
 .../src/main/resources/modules/jstl.mod           |  3 ---
 .../src/main/resources/modules/setuid.mod         |  3 ---
 .../fcgi-server/src/main/config/modules/fcgi.mod  |  3 ---
 .../src/main/config/modules/http2.mod             |  3 ---
 .../src/main/config/modules/http2c.mod            |  3 ---
 .../src/main/config/modules/infinispan.mod        |  7 +------
 jetty-jaas/src/main/config/modules/jaas.mod       |  3 ---
 jetty-jaspi/src/main/config/modules/jaspi.mod     |  3 ---
 jetty-jmx/src/main/config/modules/jmx-remote.mod  |  3 ---
 jetty-jmx/src/main/config/modules/jmx.mod         |  3 ---
 jetty-jndi/src/main/config/modules/jndi.mod       |  3 ---
 jetty-monitor/src/main/config/modules/monitor.mod |  3 ---
 jetty-nosql/src/main/config/modules/nosql.mod     |  8 ++------
 .../src/main/config/modules/overlay.mod           |  3 ---
 jetty-plus/src/main/config/modules/plus.mod       |  3 ---
 jetty-proxy/src/main/config/modules/proxy.mod     |  3 ---
 .../src/main/config/modules/quickstart.mod        |  4 ----
 jetty-rewrite/src/main/config/modules/rewrite.mod |  2 --
 .../src/main/config/modules/security.mod          |  3 ---
 .../src/main/config/modules/continuation.mod      |  3 ---
 jetty-server/src/main/config/modules/debuglog.mod |  3 ---
 jetty-server/src/main/config/modules/ext.mod      |  3 ---
 jetty-server/src/main/config/modules/gzip.mod     |  3 ---
 .../src/main/config/modules/home-base-warning.mod |  3 ---
 jetty-server/src/main/config/modules/http.mod     |  3 ---
 jetty-server/src/main/config/modules/https.mod    |  3 ---
 jetty-server/src/main/config/modules/ipaccess.mod |  3 ---
 .../src/main/config/modules/jdbc-sessions.mod     | 15 ++++++---------
 jetty-server/src/main/config/modules/jvm.mod      |  3 ---
 .../src/main/config/modules/lowresources.mod      |  3 ---
 .../src/main/config/modules/requestlog.mod        | 11 ++++-------
 .../src/main/config/modules/resources.mod         |  3 ---
 jetty-server/src/main/config/modules/server.mod   |  3 ---
 jetty-server/src/main/config/modules/ssl.mod      |  2 --
 jetty-server/src/main/config/modules/stats.mod    |  3 ---
 jetty-servlet/src/main/config/modules/servlet.mod |  3 ---
 .../src/main/config/modules/servlets.mod          |  2 --
 jetty-spring/src/main/config/modules/spring.mod   |  2 --
 jetty-util/src/main/config/modules/logging.mod    |  9 +++------
 jetty-webapp/src/main/config/modules/webapp.mod   |  3 ---
 .../src/main/config/modules/websocket.mod         |  3 ---
 74 files changed, 26 insertions(+), 247 deletions(-)

diff --git a/apache-jsp/src/main/config/modules/apache-jsp.mod b/apache-jsp/src/main/config/modules/apache-jsp.mod
index 8d5e1b63591..5123670cb0c 100644
--- a/apache-jsp/src/main/config/modules/apache-jsp.mod
+++ b/apache-jsp/src/main/config/modules/apache-jsp.mod
@@ -2,9 +2,6 @@
 # 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 ed7104c4ce2..e4a9001a2ae 100644
--- a/apache-jstl/src/main/config/modules/apache-jstl.mod
+++ b/apache-jstl/src/main/config/modules/apache-jstl.mod
@@ -2,9 +2,6 @@
 # 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 1e677eef4dd..a1002a48cce 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,6 +1,3 @@
-[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 1e677eef4dd..a1002a48cce 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,6 +1,3 @@
-[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 1e677eef4dd..a1002a48cce 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,6 +1,3 @@
-[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 1e677eef4dd..a1002a48cce 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,6 +1,3 @@
-[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 1e677eef4dd..a1002a48cce 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,6 +1,3 @@
-[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 1e677eef4dd..a1002a48cce 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,6 +1,3 @@
-[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 1e677eef4dd..a1002a48cce 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,6 +1,3 @@
-[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 796c3cf0ecb..a5543244945 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,6 +1,3 @@
-[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 796c3cf0ecb..a5543244945 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,6 +1,3 @@
-[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 86a2608896a..3f6f912c6d9 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,6 +1,3 @@
-[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 86a2608896a..3f6f912c6d9 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,6 +1,3 @@
-[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 0a967513970..ac315d6df7d 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,6 +1,3 @@
-[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 0a967513970..ac315d6df7d 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,6 +1,3 @@
-[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 975761c779e..cb91b4c2fda 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,6 +1,3 @@
-[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 975761c779e..cb91b4c2fda 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,6 +1,3 @@
-[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 975761c779e..cb91b4c2fda 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,6 +1,3 @@
-[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 975761c779e..cb91b4c2fda 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,6 +1,3 @@
-[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 11a9c0e9d88..6d6d75efa4e 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,6 +1,3 @@
-[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 11bad4792c6..e52bd23c1c9 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,6 +1,3 @@
-[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 ad3a02f7dcd..41149793194 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,6 +1,3 @@
-[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 ad3a02f7dcd..41149793194 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,6 +1,3 @@
-[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 a7d084d654b..7928e649280 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,9 +16,6 @@
 # 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
 
@@ -38,15 +35,15 @@ lib/
 lib/alpn/
 
 [ini-template]
-# Overrides the order protocols are chosen by the server.
-# The default order is that specified by the order of the
-# modules declared in start.ini.
+## Overrides the order protocols are chosen by the server.
+## The default order is that specified by the order of the
+## modules declared in start.ini.
 # jetty.alpn.protocols=h2-16,http/1.1
 
-# Specifies what protocol to use when negotiation fails.
+## Specifies what protocol to use when negotiation fails.
 # jetty.alpn.defaultProtocol=http/1.1
 
-# ALPN debug logging on System.err
+## ALPN debug logging on System.err
 # jetty.alpn.debug=false
 
 [license]
diff --git a/jetty-annotations/src/main/config/modules/annotations.mod b/jetty-annotations/src/main/config/modules/annotations.mod
index 25488f48acb..65e4654127d 100644
--- a/jetty-annotations/src/main/config/modules/annotations.mod
+++ b/jetty-annotations/src/main/config/modules/annotations.mod
@@ -2,9 +2,6 @@
 # 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 0c09808ac91..ebffb55aed9 100644
--- a/jetty-cdi/cdi-servlet/src/main/config/modules/cdi.mod
+++ b/jetty-cdi/cdi-servlet/src/main/config/modules/cdi.mod
@@ -1,10 +1,7 @@
 #
-# CDI / Weld Jetty module
+# [EXPERIMENTAL] 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 fd0529e51bd..39b58d4e691 100644
--- a/jetty-client/src/main/config/modules/client.mod
+++ b/jetty-client/src/main/config/modules/client.mod
@@ -2,8 +2,5 @@
 # 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 ad62936a101..f567a2090f0 100644
--- a/jetty-deploy/src/main/config/modules/deploy.mod
+++ b/jetty-deploy/src/main/config/modules/deploy.mod
@@ -2,9 +2,6 @@
 # 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 5a98ab8dc8b..f6d0d9d511b 100644
--- a/jetty-distribution/src/main/resources/modules/hawtio.mod
+++ b/jetty-distribution/src/main/resources/modules/hawtio.mod
@@ -2,9 +2,6 @@
 # Hawtio x module
 #
 
-[version]
-9.3
-
 [depend]
 stats
 deploy
@@ -25,7 +22,7 @@ http://github.com/hawtio/hawtio
 http://www.apache.org/licenses/LICENSE-2.0.html
 
 [ini-template]
-
+## Hawt.io configuration
 -Dhawtio.authenticationEnabled=false
 -Dhawtio.dirname=/dirname
 -Dhawtio.config.dir=${jetty.base}/etc/hawtio
diff --git a/jetty-distribution/src/main/resources/modules/jamon.mod b/jetty-distribution/src/main/resources/modules/jamon.mod
index 93589a35697..2d1f144d1b7 100644
--- a/jetty-distribution/src/main/resources/modules/jamon.mod
+++ b/jetty-distribution/src/main/resources/modules/jamon.mod
@@ -2,9 +2,6 @@
 # JAMon Jetty module
 #
 
-[version]
-9.3
-
 [depend]
 stats
 deploy
@@ -28,6 +25,7 @@ http://jamonapi.sourceforge.net
 http://jamonapi.sourceforge.net/JAMonLicense.html
 
 [ini-template]
+## Jamon Configuration
+# jamon.summaryLabels=demo
 jamon.summaryLabels=default, request.getStatus().contextpath.value.ms
-#jamon.summaryLabels=demo
 
diff --git a/jetty-distribution/src/main/resources/modules/jminix.mod b/jetty-distribution/src/main/resources/modules/jminix.mod
index 785537c51ed..05788f09159 100644
--- a/jetty-distribution/src/main/resources/modules/jminix.mod
+++ b/jetty-distribution/src/main/resources/modules/jminix.mod
@@ -2,9 +2,6 @@
 # JaMON Jetty module
 #
 
-[version]
-9.3
-
 [depend]
 stats
 jmx
@@ -39,6 +36,6 @@ https://code.google.com/p/jminix/
 http://www.apache.org/licenses/LICENSE-2.0
 
 [ini-template]
-# Jminix Configuration
+## Jminix Configuration
 jminix.port=8088
 
diff --git a/jetty-distribution/src/main/resources/modules/jolokia.mod b/jetty-distribution/src/main/resources/modules/jolokia.mod
index 0b1f664bee8..da8ac8f8c2e 100644
--- a/jetty-distribution/src/main/resources/modules/jolokia.mod
+++ b/jetty-distribution/src/main/resources/modules/jolokia.mod
@@ -2,9 +2,6 @@
 # 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 07b43b610c8..a16cc93dc93 100644
--- a/jetty-distribution/src/main/resources/modules/jsp.mod
+++ b/jetty-distribution/src/main/resources/modules/jsp.mod
@@ -2,9 +2,6 @@
 # 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 3a02136109c..efc310af6e9 100644
--- a/jetty-distribution/src/main/resources/modules/jstl.mod
+++ b/jetty-distribution/src/main/resources/modules/jstl.mod
@@ -2,9 +2,6 @@
 # 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 54fab8f2625..41ef757e82d 100644
--- a/jetty-distribution/src/main/resources/modules/setuid.mod
+++ b/jetty-distribution/src/main/resources/modules/setuid.mod
@@ -2,9 +2,6 @@
 # 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 026bd2702dc..14152d5f2bd 100644
--- a/jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod
+++ b/jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod
@@ -2,9 +2,6 @@
 # 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 d541aef0ab5..585c1fa5ee6 100644
--- a/jetty-http2/http2-server/src/main/config/modules/http2.mod
+++ b/jetty-http2/http2-server/src/main/config/modules/http2.mod
@@ -2,9 +2,6 @@
 # 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 a165dfdb849..15883cab2ce 100644
--- a/jetty-http2/http2-server/src/main/config/modules/http2c.mod
+++ b/jetty-http2/http2-server/src/main/config/modules/http2c.mod
@@ -5,9 +5,6 @@
 # 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 2f04d182576..afa39fc9619 100644
--- a/jetty-infinispan/src/main/config/modules/infinispan.mod
+++ b/jetty-infinispan/src/main/config/modules/infinispan.mod
@@ -2,14 +2,10 @@
 # Jetty Infinispan module
 #
 
-[version]
-9.3
-
 [depend]
 annotations
 webapp
 
-
 [files]
 maven://org.infinispan/infinispan-core/7.1.1.Final|lib/infinispan/infinispan-core-7.1.1.Final.jar
 maven://org.infinispan/infinispan-commons/7.1.1.Final|lib/infinispan/infinispan-commons-7.1.1.Final.jar
@@ -21,7 +17,6 @@ maven://org.jboss.logging/jboss-logging/3.1.2.GA|lib/infinispan/jboss-logging-3.
 lib/jetty-infinispan-${jetty.version}.jar
 lib/infinispan/*.jar
 
-
 [xml]
 etc/jetty-infinispan.xml
 
@@ -34,5 +29,5 @@ http://www.apache.org/licenses/LICENSE-2.0.html
 ## Infinispan Session config
 
 ## Unique identifier for this node in the cluster
-jetty.infinispanSession.workerName=node1
+# jetty.infinispanSession.workerName=node1
 
diff --git a/jetty-jaas/src/main/config/modules/jaas.mod b/jetty-jaas/src/main/config/modules/jaas.mod
index 483aa6515b2..fee3f59d871 100644
--- a/jetty-jaas/src/main/config/modules/jaas.mod
+++ b/jetty-jaas/src/main/config/modules/jaas.mod
@@ -2,9 +2,6 @@
 # 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 ab30b7dcd42..e7019ae1b60 100644
--- a/jetty-jaspi/src/main/config/modules/jaspi.mod
+++ b/jetty-jaspi/src/main/config/modules/jaspi.mod
@@ -2,9 +2,6 @@
 # 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 aeb2e16cb35..f8a5111d8f8 100644
--- a/jetty-jmx/src/main/config/modules/jmx-remote.mod
+++ b/jetty-jmx/src/main/config/modules/jmx-remote.mod
@@ -2,9 +2,6 @@
 # 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 21228e67a2f..ee091c706a8 100644
--- a/jetty-jmx/src/main/config/modules/jmx.mod
+++ b/jetty-jmx/src/main/config/modules/jmx.mod
@@ -2,9 +2,6 @@
 # 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 4e3603130d2..33c077ce684 100644
--- a/jetty-jndi/src/main/config/modules/jndi.mod
+++ b/jetty-jndi/src/main/config/modules/jndi.mod
@@ -2,9 +2,6 @@
 # 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 d573e5908c4..09132c7b2ca 100644
--- a/jetty-monitor/src/main/config/modules/monitor.mod
+++ b/jetty-monitor/src/main/config/modules/monitor.mod
@@ -2,9 +2,6 @@
 # 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 bbefc7f4d14..a5b5a9ed752 100644
--- a/jetty-nosql/src/main/config/modules/nosql.mod
+++ b/jetty-nosql/src/main/config/modules/nosql.mod
@@ -2,9 +2,6 @@
 # Jetty NoSql module
 #
 
-[version]
-9.3
-
 [depend]
 webapp
 
@@ -27,9 +24,8 @@ http://www.apache.org/licenses/LICENSE-2.0.html
 ## MongoDB SessionIdManager config
 
 ## Unique identifier for this node in the cluster
-jetty.nosqlSession.workerName=node1
-
+# jetty.nosqlSession.workerName=node1
 
 ## Interval in seconds between scavenging expired sessions
-jetty.nosqlSession.scavenge=1800
+# jetty.nosqlSession.scavenge=1800
 
diff --git a/jetty-overlay-deployer/src/main/config/modules/overlay.mod b/jetty-overlay-deployer/src/main/config/modules/overlay.mod
index 289987b3fcf..87bf9e17222 100644
--- a/jetty-overlay-deployer/src/main/config/modules/overlay.mod
+++ b/jetty-overlay-deployer/src/main/config/modules/overlay.mod
@@ -2,9 +2,6 @@
 # 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 4b5cdd5d0ce..aac0f8f3ecb 100644
--- a/jetty-plus/src/main/config/modules/plus.mod
+++ b/jetty-plus/src/main/config/modules/plus.mod
@@ -2,9 +2,6 @@
 # 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 9e48d549946..6b91f689145 100644
--- a/jetty-proxy/src/main/config/modules/proxy.mod
+++ b/jetty-proxy/src/main/config/modules/proxy.mod
@@ -2,9 +2,6 @@
 # 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 6e5eee0957f..4e59dd08624 100644
--- a/jetty-quickstart/src/main/config/modules/quickstart.mod
+++ b/jetty-quickstart/src/main/config/modules/quickstart.mod
@@ -2,14 +2,10 @@
 # Jetty Quickstart module
 #
 
-[version]
-9.3
-
 [depend]
 server
 plus
 annotations
 
-
 [lib]
 lib/jetty-quickstart-${jetty.version}.jar
diff --git a/jetty-rewrite/src/main/config/modules/rewrite.mod b/jetty-rewrite/src/main/config/modules/rewrite.mod
index cd55a1c4594..c8a1750618a 100644
--- a/jetty-rewrite/src/main/config/modules/rewrite.mod
+++ b/jetty-rewrite/src/main/config/modules/rewrite.mod
@@ -1,8 +1,6 @@
 #
 # 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 c9f94316034..ba3163275f5 100644
--- a/jetty-security/src/main/config/modules/security.mod
+++ b/jetty-security/src/main/config/modules/security.mod
@@ -2,9 +2,6 @@
 # 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 48241fcfbf3..231c09d0f37 100644
--- a/jetty-server/src/main/config/modules/continuation.mod
+++ b/jetty-server/src/main/config/modules/continuation.mod
@@ -2,8 +2,5 @@
 # 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 175523aa40f..ba8b60a7274 100644
--- a/jetty-server/src/main/config/modules/debuglog.mod
+++ b/jetty-server/src/main/config/modules/debuglog.mod
@@ -2,9 +2,6 @@
 # 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 defe073e62e..56b10f7ea42 100644
--- a/jetty-server/src/main/config/modules/ext.mod
+++ b/jetty-server/src/main/config/modules/ext.mod
@@ -2,9 +2,6 @@
 # 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 3f318c4ea6b..1efc8346489 100644
--- a/jetty-server/src/main/config/modules/gzip.mod
+++ b/jetty-server/src/main/config/modules/gzip.mod
@@ -3,9 +3,6 @@
 # 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 c84dbdcf423..28e5757e815 100644
--- a/jetty-server/src/main/config/modules/home-base-warning.mod
+++ b/jetty-server/src/main/config/modules/home-base-warning.mod
@@ -2,9 +2,6 @@
 # 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 6c3d26f516f..01e986243e5 100644
--- a/jetty-server/src/main/config/modules/http.mod
+++ b/jetty-server/src/main/config/modules/http.mod
@@ -2,9 +2,6 @@
 # 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 88e7c08f6ef..092e0d70c72 100644
--- a/jetty-server/src/main/config/modules/https.mod
+++ b/jetty-server/src/main/config/modules/https.mod
@@ -2,9 +2,6 @@
 # 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 caafa4c5ef5..956ea0f2e3a 100644
--- a/jetty-server/src/main/config/modules/ipaccess.mod
+++ b/jetty-server/src/main/config/modules/ipaccess.mod
@@ -2,9 +2,6 @@
 # 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 b59787884d9..d77ff043e22 100644
--- a/jetty-server/src/main/config/modules/jdbc-sessions.mod
+++ b/jetty-server/src/main/config/modules/jdbc-sessions.mod
@@ -2,9 +2,6 @@
 # Jetty JDBC Session module
 #
 
-[version]
-9.3
-
 [depend]
 annotations
 webapp
@@ -17,14 +14,14 @@ etc/jetty-jdbc-sessions.xml
 ## JDBC Session config
 
 ## Unique identifier for this node in the cluster
-jetty.jdbcSession.workerName=node1
+# jetty.jdbcSession.workerName=node1
 
 ## The interval in seconds between sweeps of the scavenger
-jetty.jdbcSession.scavenge=600
+# jetty.jdbcSession.scavenge=600
 
-##Uncomment either the datasource name or driverClass and connectionURL
-#jetty.jdbcSession.datasource=sessions
-#jetty.jdbcSession.driverClass=changeme
-#jetty.jdbcSession.connectionURL=changeme
+## Uncomment either the datasource name or driverClass and connectionURL
+# jetty.jdbcSession.datasource=sessions
+# jetty.jdbcSession.driverClass=changeme
+# jetty.jdbcSession.connectionURL=changeme
 
 
diff --git a/jetty-server/src/main/config/modules/jvm.mod b/jetty-server/src/main/config/modules/jvm.mod
index 6aa8c442b41..195521c57f5 100644
--- a/jetty-server/src/main/config/modules/jvm.mod
+++ b/jetty-server/src/main/config/modules/jvm.mod
@@ -1,6 +1,3 @@
-[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 72bf652feb2..2f765d9af2c 100644
--- a/jetty-server/src/main/config/modules/lowresources.mod
+++ b/jetty-server/src/main/config/modules/lowresources.mod
@@ -2,9 +2,6 @@
 # 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 a3afc062eae..e27b246ea24 100644
--- a/jetty-server/src/main/config/modules/requestlog.mod
+++ b/jetty-server/src/main/config/modules/requestlog.mod
@@ -2,9 +2,6 @@
 # Request Log module
 #
 
-[version]
-9.3
-
 [depend]
 server
 
@@ -21,19 +18,19 @@ logs/
 ## File path
 # jetty.requestlog.filePath=${jetty.requestlog.dir}/yyyy_mm_dd.request.log
 
-# Date format for rollovered files (uses SimpleDateFormat syntax)
+## Date format for rollovered files (uses SimpleDateFormat syntax)
 # jetty.requestlog.filenameDateFormat=yyyy_MM_dd
 
-# How many days to retain old log files
+## How many days to retain old log files
 # jetty.requestlog.retainDays=90
 
 ## Whether to append to existing file
 # jetty.requestlog.append=true
 
-# Whether to use the extended log output
+## Whether to use the extended log output
 # jetty.requestlog.extended=true
 
-# Whether to log http cookie information
+## Whether to log http cookie information
 # jetty.requestlog.cookies=true
 
 ## Timezone of the log entries
diff --git a/jetty-server/src/main/config/modules/resources.mod b/jetty-server/src/main/config/modules/resources.mod
index 91eed41bfdc..8647d81325b 100644
--- a/jetty-server/src/main/config/modules/resources.mod
+++ b/jetty-server/src/main/config/modules/resources.mod
@@ -2,9 +2,6 @@
 # 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 524017f46df..6b5dbe95ba0 100644
--- a/jetty-server/src/main/config/modules/server.mod
+++ b/jetty-server/src/main/config/modules/server.mod
@@ -2,9 +2,6 @@
 # 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 d491f18e64b..809543f94f7 100644
--- a/jetty-server/src/main/config/modules/ssl.mod
+++ b/jetty-server/src/main/config/modules/ssl.mod
@@ -1,8 +1,6 @@
 #
 # 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 0212f878798..0922469cdfb 100644
--- a/jetty-server/src/main/config/modules/stats.mod
+++ b/jetty-server/src/main/config/modules/stats.mod
@@ -2,9 +2,6 @@
 # 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 65bf86f5c54..fdb65c57a16 100644
--- a/jetty-servlet/src/main/config/modules/servlet.mod
+++ b/jetty-servlet/src/main/config/modules/servlet.mod
@@ -2,9 +2,6 @@
 # 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 453a9380fa7..2e977c05f14 100644
--- a/jetty-servlets/src/main/config/modules/servlets.mod
+++ b/jetty-servlets/src/main/config/modules/servlets.mod
@@ -2,8 +2,6 @@
 # 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 0e11358cfca..39b9b8d85a3 100644
--- a/jetty-spring/src/main/config/modules/spring.mod
+++ b/jetty-spring/src/main/config/modules/spring.mod
@@ -1,8 +1,6 @@
 #
 # Spring
 #
-[version]
-9.3
 
 [name]
 spring
diff --git a/jetty-util/src/main/config/modules/logging.mod b/jetty-util/src/main/config/modules/logging.mod
index 2a17a5892eb..4f30a8862d4 100644
--- a/jetty-util/src/main/config/modules/logging.mod
+++ b/jetty-util/src/main/config/modules/logging.mod
@@ -2,9 +2,6 @@
 # Jetty std err/out logging
 #
 
-[version]
-9.3
-
 [xml]
 etc/jetty-logging.xml
 
@@ -17,13 +14,13 @@ resources/
 
 [ini-template]
 ## Logging Configuration
-# Configure jetty logging for default internal behavior STDERR output
+## Configure jetty logging for default internal behavior STDERR output
 # -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
 
-# Configure jetty logging for slf4j
+## Configure jetty logging for slf4j
 # -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog
 
-# Configure jetty logging for java.util.logging
+## Configure jetty logging for java.util.logging
 # -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.JavaUtilLog
 
 ## Logging directory (relative to $jetty.base)
diff --git a/jetty-webapp/src/main/config/modules/webapp.mod b/jetty-webapp/src/main/config/modules/webapp.mod
index 3f889b6a95e..6bb37ef2efe 100644
--- a/jetty-webapp/src/main/config/modules/webapp.mod
+++ b/jetty-webapp/src/main/config/modules/webapp.mod
@@ -2,9 +2,6 @@
 # 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 768bcc8e7f8..e866b179890 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,9 +2,6 @@
 # WebSocket Module
 #
 
-[version]
-9.3
-
 [depend]
 # javax.websocket needs annotations
 annotations

From 771178985222a458136ebe88b5f2d07281dc8d3b Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Fri, 12 Jun 2015 09:22:04 -0700
Subject: [PATCH 2/4] Updating start.jar & tests with new [version] behavior

---
 .../org/eclipse/jetty/start/StartArgs.java    | 23 +++----------------
 .../org/eclipse/jetty/start/MainTest.java     |  2 +-
 .../org/eclipse/jetty/start/TestUseCases.java |  2 +-
 .../test/resources/assert-home-with-http2.txt |  4 ++--
 .../modules/alpn-impl/alpn-1.7.0_40.mod       | 11 ---------
 .../modules/alpn-impl/alpn-1.7.0_45.mod       | 11 ---------
 .../modules/alpn-impl/alpn-1.7.0_51.mod       | 11 ---------
 .../modules/alpn-impl/alpn-1.7.0_55.mod       | 11 ---------
 .../modules/alpn-impl/alpn-1.7.0_60.mod       | 11 ---------
 .../modules/alpn-impl/alpn-1.7.0_65.mod       | 11 ---------
 .../modules/alpn-impl/alpn-1.7.0_67.mod       | 11 ---------
 .../modules/alpn-impl/alpn-1.7.0_71.mod       | 11 ---------
 .../modules/alpn-impl/alpn-1.7.0_72.mod       | 11 ---------
 .../modules/alpn-impl/alpn-1.7.0_75.mod       | 11 ---------
 .../modules/alpn-impl/alpn-1.7.0_76.mod       | 11 ---------
 .../modules/alpn-impl/alpn-1.7.0_79.mod       | 11 ---------
 .../modules/alpn-impl/alpn-1.7.0_80.mod       | 11 ---------
 .../modules/alpn-impl/alpn-1.8.0.mod          |  3 ---
 .../modules/alpn-impl/alpn-1.8.0_05.mod       |  3 ---
 .../modules/alpn-impl/alpn-1.8.0_11.mod       |  3 ---
 .../modules/alpn-impl/alpn-1.8.0_20.mod       |  3 ---
 .../modules/alpn-impl/alpn-1.8.0_25.mod       |  3 ---
 .../modules/alpn-impl/alpn-1.8.0_31.mod       |  3 ---
 .../modules/alpn-impl/alpn-1.8.0_40.mod       |  3 ---
 .../modules/alpn-impl/alpn-1.8.0_45.mod       |  3 ---
 .../test/resources/dist-home/modules/alpn.mod | 13 ++++-------
 .../dist-home/modules/annotations.mod         |  3 ---
 .../dist-home/modules/apache-jsp.mod          |  3 ---
 .../dist-home/modules/apache-jstl.mod         |  3 ---
 .../test/resources/dist-home/modules/cdi.mod  |  5 +---
 .../resources/dist-home/modules/client.mod    |  3 ---
 .../dist-home/modules/continuation.mod        |  3 ---
 .../resources/dist-home/modules/debuglog.mod  |  3 ---
 .../resources/dist-home/modules/deploy.mod    |  3 ---
 .../test/resources/dist-home/modules/ext.mod  |  3 ---
 .../test/resources/dist-home/modules/fcgi.mod |  3 ---
 .../test/resources/dist-home/modules/gzip.mod |  3 ---
 .../resources/dist-home/modules/hawtio.mod    |  5 +---
 .../dist-home/modules/home-base-warning.mod   |  3 ---
 .../test/resources/dist-home/modules/http.mod |  5 +---
 .../resources/dist-home/modules/http2.mod     |  3 ---
 .../resources/dist-home/modules/http2c.mod    |  3 ---
 .../resources/dist-home/modules/https.mod     |  3 ---
 .../dist-home/modules/infinispan.mod          |  7 +-----
 .../resources/dist-home/modules/ipaccess.mod  |  3 ---
 .../test/resources/dist-home/modules/jaas.mod |  3 ---
 .../resources/dist-home/modules/jamon.mod     |  6 ++---
 .../resources/dist-home/modules/jaspi.mod     |  3 ---
 .../dist-home/modules/jdbc-sessions.mod       | 15 +++++-------
 .../resources/dist-home/modules/jminix.mod    |  5 +---
 .../dist-home/modules/jmx-remote.mod          |  3 ---
 .../test/resources/dist-home/modules/jmx.mod  |  3 ---
 .../test/resources/dist-home/modules/jndi.mod |  3 ---
 .../resources/dist-home/modules/jolokia.mod   |  3 ---
 .../test/resources/dist-home/modules/jsp.mod  |  3 ---
 .../test/resources/dist-home/modules/jstl.mod |  3 ---
 .../test/resources/dist-home/modules/jvm.mod  |  3 ---
 .../resources/dist-home/modules/logging.mod   |  9 +++-----
 .../dist-home/modules/lowresources.mod        |  3 ---
 .../resources/dist-home/modules/monitor.mod   |  3 ---
 .../resources/dist-home/modules/nosql.mod     |  8 ++-----
 .../test/resources/dist-home/modules/plus.mod |  3 ---
 .../resources/dist-home/modules/proxy.mod     |  3 ---
 .../dist-home/modules/quickstart.mod          |  4 ----
 .../dist-home/modules/requestlog.mod          | 11 ++++-----
 .../resources/dist-home/modules/resources.mod |  3 ---
 .../resources/dist-home/modules/rewrite.mod   |  2 --
 .../resources/dist-home/modules/security.mod  |  3 ---
 .../resources/dist-home/modules/server.mod    |  3 ---
 .../resources/dist-home/modules/servlet.mod   |  3 ---
 .../resources/dist-home/modules/servlets.mod  |  2 --
 .../resources/dist-home/modules/setuid.mod    |  3 ---
 .../resources/dist-home/modules/spring.mod    |  2 --
 .../test/resources/dist-home/modules/ssl.mod  |  2 --
 .../resources/dist-home/modules/stats.mod     |  3 ---
 .../resources/dist-home/modules/webapp.mod    |  3 ---
 .../resources/dist-home/modules/websocket.mod |  3 ---
 .../test/resources/usecases/http2.assert.txt  |  6 ++---
 .../versioned-modules/modules/old.mod         |  2 +-
 79 files changed, 38 insertions(+), 377 deletions(-)
 delete mode 100644 jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_40.mod
 delete mode 100644 jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_45.mod
 delete mode 100644 jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_51.mod
 delete mode 100644 jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_55.mod
 delete mode 100644 jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_60.mod
 delete mode 100644 jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_65.mod
 delete mode 100644 jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_67.mod
 delete mode 100644 jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_71.mod
 delete mode 100644 jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_72.mod
 delete mode 100644 jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_75.mod
 delete mode 100644 jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_76.mod
 delete mode 100644 jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_79.mod
 delete mode 100644 jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_80.mod

diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
index b81ba1eddfe..88e9688ff33 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
@@ -1082,28 +1082,11 @@ public class StartArgs
 
     public void parseModule(Module module)
     {
-        // Starting with Jetty 9.3 indicated modules, the default config
-        // is parsed from the [default] section only
-        if (module.getVersion().isNewerThanOrEqualTo(new Version("9.3")))
+        if (module.hasDefaultConfig())
         {
-            if (module.hasDefaultConfig())
+            for (String line : module.getDefaultConfig())
             {
-                for (String line : module.getDefaultConfig())
-                {
-                    parse(line,module.getFilesystemRef(),false);
-                }
-            }
-        }
-        else
-        {
-            // With Jetty 9.2 indicated modules and older, the default
-            // config is parsed from the [ini-template] section
-            if (module.hasIniTemplate())
-            {
-                for (String line : module.getIniTemplate())
-                {
-                    parse(line,module.getFilesystemRef(),false);
-                }
+                parse(line,module.getFilesystemRef(),false);
             }
         }
     }
diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
index 957d3d4bb3d..450384e8fb2 100644
--- a/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
+++ b/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
@@ -159,7 +159,7 @@ public class MainTest
         Path homePath = MavenTestingUtils.getTestResourceDir("dist-home").toPath().toRealPath();
         cmdLineArgs.add("jetty.home=" + homePath);
         cmdLineArgs.add("user.dir=" + homePath);
-        cmdLineArgs.add("java.version=1.7.0_60");
+        cmdLineArgs.add("java.version=1.8.0_31");
 
         // Modules
         cmdLineArgs.add("--module=deploy");
diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java b/jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java
index 313bc80e9d1..4ae6492af8b 100644
--- a/jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java
+++ b/jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java
@@ -50,7 +50,7 @@ public class TestUseCases
         ret.add(new String[] {"versioned-modules", null});
         
         // Ones with command lines
-        ret.add(new Object[] {"http2", new String[]{"java.version=1.7.0_60"}});
+        ret.add(new Object[] {"http2", new String[]{"java.version=1.8.0_31"}});
         ret.add(new Object[] {"basic-properties", new String[]{"port=9090"}});
         ret.add(new Object[] {"agent-properties", new String[]{"java.vm.specification.version=1.6"}});
         
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 bf92c388e2b..3d8973b2520 100644
--- a/jetty-start/src/test/resources/assert-home-with-http2.txt
+++ b/jetty-start/src/test/resources/assert-home-with-http2.txt
@@ -53,7 +53,7 @@ LIB|${jetty.base}/lib/jetty-jndi-9.3.jar
 
 # The Properties we expect (order is irrelevant)
 # (these are the properties we actually set in the configuration)
-PROP|java.version=1.7.0_60
+PROP|java.version=1.8.0_31
 PROP|jetty.http.port=8080
 PROP|jetty.httpConfig.delayDispatchUntilContent=false
 PROP|jetty.server.dumpAfterStart=false
@@ -72,7 +72,7 @@ JVM|-Xms1024m
 JVM|-Xmx1024m
 
 # Downloads
-DOWNLOAD|maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
+DOWNLOAD|maven://org.mortbay.jetty.alpn/alpn-boot/8.1.3.v20150130|lib/alpn/alpn-boot-8.1.3.v20150130.jar
 DOWNLOAD|http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/test/config/etc/keystore?id=master|etc/keystore
 
 # Files
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
deleted file mode 100644
index 1e677eef4dd..00000000000
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_40.mod
+++ /dev/null
@@ -1,11 +0,0 @@
-[version]
-9.3
-
-[name]
-alpn-boot
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
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
deleted file mode 100644
index 1e677eef4dd..00000000000
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_45.mod
+++ /dev/null
@@ -1,11 +0,0 @@
-[version]
-9.3
-
-[name]
-alpn-boot
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
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
deleted file mode 100644
index 1e677eef4dd..00000000000
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_51.mod
+++ /dev/null
@@ -1,11 +0,0 @@
-[version]
-9.3
-
-[name]
-alpn-boot
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
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
deleted file mode 100644
index 1e677eef4dd..00000000000
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_55.mod
+++ /dev/null
@@ -1,11 +0,0 @@
-[version]
-9.3
-
-[name]
-alpn-boot
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
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
deleted file mode 100644
index 1e677eef4dd..00000000000
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_60.mod
+++ /dev/null
@@ -1,11 +0,0 @@
-[version]
-9.3
-
-[name]
-alpn-boot
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
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
deleted file mode 100644
index 1e677eef4dd..00000000000
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_65.mod
+++ /dev/null
@@ -1,11 +0,0 @@
-[version]
-9.3
-
-[name]
-alpn-boot
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
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
deleted file mode 100644
index 1e677eef4dd..00000000000
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_67.mod
+++ /dev/null
@@ -1,11 +0,0 @@
-[version]
-9.3
-
-[name]
-alpn-boot
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
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
deleted file mode 100644
index 796c3cf0ecb..00000000000
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_71.mod
+++ /dev/null
@@ -1,11 +0,0 @@
-[version]
-9.3
-
-[name]
-alpn-boot
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/7.1.2.v20141202|lib/alpn/alpn-boot-7.1.2.v20141202.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.2.v20141202.jar
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
deleted file mode 100644
index 796c3cf0ecb..00000000000
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_72.mod
+++ /dev/null
@@ -1,11 +0,0 @@
-[version]
-9.3
-
-[name]
-alpn-boot
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/7.1.2.v20141202|lib/alpn/alpn-boot-7.1.2.v20141202.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.2.v20141202.jar
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
deleted file mode 100644
index 86a2608896a..00000000000
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_75.mod
+++ /dev/null
@@ -1,11 +0,0 @@
-[version]
-9.3
-
-[name]
-alpn-boot
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/7.1.3.v20150130|lib/alpn/alpn-boot-7.1.3.v20150130.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.3.v20150130.jar
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
deleted file mode 100644
index 86a2608896a..00000000000
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_76.mod
+++ /dev/null
@@ -1,11 +0,0 @@
-[version]
-9.3
-
-[name]
-alpn-boot
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/7.1.3.v20150130|lib/alpn/alpn-boot-7.1.3.v20150130.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.3.v20150130.jar
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
deleted file mode 100644
index 0a967513970..00000000000
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_79.mod
+++ /dev/null
@@ -1,11 +0,0 @@
-[version]
-9.3
-
-[name]
-protonego-boot
-
-[files]
-http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.3.v20150130/alpn-boot-7.1.3.v20150130.jar|lib/alpn/alpn-boot-7.1.3.v20150130.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.3.v20150130.jar
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
deleted file mode 100644
index 0a967513970..00000000000
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_80.mod
+++ /dev/null
@@ -1,11 +0,0 @@
-[version]
-9.3
-
-[name]
-protonego-boot
-
-[files]
-http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.3.v20150130/alpn-boot-7.1.3.v20150130.jar|lib/alpn/alpn-boot-7.1.3.v20150130.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.3.v20150130.jar
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 975761c779e..cb91b4c2fda 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,6 +1,3 @@
-[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 975761c779e..cb91b4c2fda 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,6 +1,3 @@
-[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 975761c779e..cb91b4c2fda 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,6 +1,3 @@
-[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 975761c779e..cb91b4c2fda 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,6 +1,3 @@
-[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 11a9c0e9d88..6d6d75efa4e 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,6 +1,3 @@
-[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 11bad4792c6..e52bd23c1c9 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,6 +1,3 @@
-[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 ad3a02f7dcd..41149793194 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,6 +1,3 @@
-[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 ad3a02f7dcd..41149793194 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,6 +1,3 @@
-[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 a7d084d654b..7928e649280 100644
--- a/jetty-start/src/test/resources/dist-home/modules/alpn.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn.mod
@@ -16,9 +16,6 @@
 # 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
 
@@ -38,15 +35,15 @@ lib/
 lib/alpn/
 
 [ini-template]
-# Overrides the order protocols are chosen by the server.
-# The default order is that specified by the order of the
-# modules declared in start.ini.
+## Overrides the order protocols are chosen by the server.
+## The default order is that specified by the order of the
+## modules declared in start.ini.
 # jetty.alpn.protocols=h2-16,http/1.1
 
-# Specifies what protocol to use when negotiation fails.
+## Specifies what protocol to use when negotiation fails.
 # jetty.alpn.defaultProtocol=http/1.1
 
-# ALPN debug logging on System.err
+## ALPN debug logging on System.err
 # jetty.alpn.debug=false
 
 [license]
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 25488f48acb..65e4654127d 100644
--- a/jetty-start/src/test/resources/dist-home/modules/annotations.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/annotations.mod
@@ -2,9 +2,6 @@
 # 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 8d5e1b63591..5123670cb0c 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,9 +2,6 @@
 # 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 ed7104c4ce2..e4a9001a2ae 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
@@ -2,9 +2,6 @@
 # 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 0c09808ac91..ebffb55aed9 100644
--- a/jetty-start/src/test/resources/dist-home/modules/cdi.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/cdi.mod
@@ -1,10 +1,7 @@
 #
-# CDI / Weld Jetty module
+# [EXPERIMENTAL] 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 fd0529e51bd..39b58d4e691 100644
--- a/jetty-start/src/test/resources/dist-home/modules/client.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/client.mod
@@ -2,8 +2,5 @@
 # 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 48241fcfbf3..231c09d0f37 100644
--- a/jetty-start/src/test/resources/dist-home/modules/continuation.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/continuation.mod
@@ -2,8 +2,5 @@
 # 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 175523aa40f..ba8b60a7274 100644
--- a/jetty-start/src/test/resources/dist-home/modules/debuglog.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/debuglog.mod
@@ -2,9 +2,6 @@
 # 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 ad62936a101..f567a2090f0 100644
--- a/jetty-start/src/test/resources/dist-home/modules/deploy.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/deploy.mod
@@ -2,9 +2,6 @@
 # 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 defe073e62e..56b10f7ea42 100644
--- a/jetty-start/src/test/resources/dist-home/modules/ext.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/ext.mod
@@ -2,9 +2,6 @@
 # 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 026bd2702dc..14152d5f2bd 100644
--- a/jetty-start/src/test/resources/dist-home/modules/fcgi.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/fcgi.mod
@@ -2,9 +2,6 @@
 # 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 3f318c4ea6b..1efc8346489 100644
--- a/jetty-start/src/test/resources/dist-home/modules/gzip.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/gzip.mod
@@ -3,9 +3,6 @@
 # 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 5a98ab8dc8b..f6d0d9d511b 100644
--- a/jetty-start/src/test/resources/dist-home/modules/hawtio.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/hawtio.mod
@@ -2,9 +2,6 @@
 # Hawtio x module
 #
 
-[version]
-9.3
-
 [depend]
 stats
 deploy
@@ -25,7 +22,7 @@ http://github.com/hawtio/hawtio
 http://www.apache.org/licenses/LICENSE-2.0.html
 
 [ini-template]
-
+## Hawt.io configuration
 -Dhawtio.authenticationEnabled=false
 -Dhawtio.dirname=/dirname
 -Dhawtio.config.dir=${jetty.base}/etc/hawtio
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 c84dbdcf423..28e5757e815 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,9 +2,6 @@
 # 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 d8d10f75a21..01e986243e5 100644
--- a/jetty-start/src/test/resources/dist-home/modules/http.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/http.mod
@@ -2,9 +2,6 @@
 # Jetty HTTP Connector
 #
 
-[version]
-9.3
-
 [depend]
 server
 
@@ -18,7 +15,7 @@ etc/jetty-http.xml
 # jetty.http.host=0.0.0.0
 
 ## Connector port to listen on
-jetty.http.port=8080
+# jetty.http.port=8080
 
 ## Connector idle timeout in milliseconds
 # jetty.http.idleTimeout=30000
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 d541aef0ab5..585c1fa5ee6 100644
--- a/jetty-start/src/test/resources/dist-home/modules/http2.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/http2.mod
@@ -2,9 +2,6 @@
 # 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 a165dfdb849..15883cab2ce 100644
--- a/jetty-start/src/test/resources/dist-home/modules/http2c.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/http2c.mod
@@ -5,9 +5,6 @@
 # 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 88e7c08f6ef..092e0d70c72 100644
--- a/jetty-start/src/test/resources/dist-home/modules/https.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/https.mod
@@ -2,9 +2,6 @@
 # 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 2f04d182576..afa39fc9619 100644
--- a/jetty-start/src/test/resources/dist-home/modules/infinispan.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/infinispan.mod
@@ -2,14 +2,10 @@
 # Jetty Infinispan module
 #
 
-[version]
-9.3
-
 [depend]
 annotations
 webapp
 
-
 [files]
 maven://org.infinispan/infinispan-core/7.1.1.Final|lib/infinispan/infinispan-core-7.1.1.Final.jar
 maven://org.infinispan/infinispan-commons/7.1.1.Final|lib/infinispan/infinispan-commons-7.1.1.Final.jar
@@ -21,7 +17,6 @@ maven://org.jboss.logging/jboss-logging/3.1.2.GA|lib/infinispan/jboss-logging-3.
 lib/jetty-infinispan-${jetty.version}.jar
 lib/infinispan/*.jar
 
-
 [xml]
 etc/jetty-infinispan.xml
 
@@ -34,5 +29,5 @@ http://www.apache.org/licenses/LICENSE-2.0.html
 ## Infinispan Session config
 
 ## Unique identifier for this node in the cluster
-jetty.infinispanSession.workerName=node1
+# jetty.infinispanSession.workerName=node1
 
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 caafa4c5ef5..956ea0f2e3a 100644
--- a/jetty-start/src/test/resources/dist-home/modules/ipaccess.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/ipaccess.mod
@@ -2,9 +2,6 @@
 # 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 483aa6515b2..fee3f59d871 100644
--- a/jetty-start/src/test/resources/dist-home/modules/jaas.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/jaas.mod
@@ -2,9 +2,6 @@
 # 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 93589a35697..2d1f144d1b7 100644
--- a/jetty-start/src/test/resources/dist-home/modules/jamon.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/jamon.mod
@@ -2,9 +2,6 @@
 # JAMon Jetty module
 #
 
-[version]
-9.3
-
 [depend]
 stats
 deploy
@@ -28,6 +25,7 @@ http://jamonapi.sourceforge.net
 http://jamonapi.sourceforge.net/JAMonLicense.html
 
 [ini-template]
+## Jamon Configuration
+# jamon.summaryLabels=demo
 jamon.summaryLabels=default, request.getStatus().contextpath.value.ms
-#jamon.summaryLabels=demo
 
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 ab30b7dcd42..e7019ae1b60 100644
--- a/jetty-start/src/test/resources/dist-home/modules/jaspi.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/jaspi.mod
@@ -2,9 +2,6 @@
 # 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 b59787884d9..d77ff043e22 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,9 +2,6 @@
 # Jetty JDBC Session module
 #
 
-[version]
-9.3
-
 [depend]
 annotations
 webapp
@@ -17,14 +14,14 @@ etc/jetty-jdbc-sessions.xml
 ## JDBC Session config
 
 ## Unique identifier for this node in the cluster
-jetty.jdbcSession.workerName=node1
+# jetty.jdbcSession.workerName=node1
 
 ## The interval in seconds between sweeps of the scavenger
-jetty.jdbcSession.scavenge=600
+# jetty.jdbcSession.scavenge=600
 
-##Uncomment either the datasource name or driverClass and connectionURL
-#jetty.jdbcSession.datasource=sessions
-#jetty.jdbcSession.driverClass=changeme
-#jetty.jdbcSession.connectionURL=changeme
+## Uncomment either the datasource name or driverClass and connectionURL
+# jetty.jdbcSession.datasource=sessions
+# jetty.jdbcSession.driverClass=changeme
+# jetty.jdbcSession.connectionURL=changeme
 
 
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 785537c51ed..05788f09159 100644
--- a/jetty-start/src/test/resources/dist-home/modules/jminix.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/jminix.mod
@@ -2,9 +2,6 @@
 # JaMON Jetty module
 #
 
-[version]
-9.3
-
 [depend]
 stats
 jmx
@@ -39,6 +36,6 @@ https://code.google.com/p/jminix/
 http://www.apache.org/licenses/LICENSE-2.0
 
 [ini-template]
-# Jminix Configuration
+## Jminix Configuration
 jminix.port=8088
 
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 aeb2e16cb35..f8a5111d8f8 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,9 +2,6 @@
 # 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 21228e67a2f..ee091c706a8 100644
--- a/jetty-start/src/test/resources/dist-home/modules/jmx.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/jmx.mod
@@ -2,9 +2,6 @@
 # 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 4e3603130d2..33c077ce684 100644
--- a/jetty-start/src/test/resources/dist-home/modules/jndi.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/jndi.mod
@@ -2,9 +2,6 @@
 # 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 0b1f664bee8..da8ac8f8c2e 100644
--- a/jetty-start/src/test/resources/dist-home/modules/jolokia.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/jolokia.mod
@@ -2,9 +2,6 @@
 # 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 07b43b610c8..a16cc93dc93 100644
--- a/jetty-start/src/test/resources/dist-home/modules/jsp.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/jsp.mod
@@ -2,9 +2,6 @@
 # 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 3a02136109c..efc310af6e9 100644
--- a/jetty-start/src/test/resources/dist-home/modules/jstl.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/jstl.mod
@@ -2,9 +2,6 @@
 # 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 6aa8c442b41..195521c57f5 100644
--- a/jetty-start/src/test/resources/dist-home/modules/jvm.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/jvm.mod
@@ -1,6 +1,3 @@
-[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 2a17a5892eb..4f30a8862d4 100644
--- a/jetty-start/src/test/resources/dist-home/modules/logging.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/logging.mod
@@ -2,9 +2,6 @@
 # Jetty std err/out logging
 #
 
-[version]
-9.3
-
 [xml]
 etc/jetty-logging.xml
 
@@ -17,13 +14,13 @@ resources/
 
 [ini-template]
 ## Logging Configuration
-# Configure jetty logging for default internal behavior STDERR output
+## Configure jetty logging for default internal behavior STDERR output
 # -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
 
-# Configure jetty logging for slf4j
+## Configure jetty logging for slf4j
 # -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog
 
-# Configure jetty logging for java.util.logging
+## Configure jetty logging for java.util.logging
 # -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.JavaUtilLog
 
 ## Logging directory (relative to $jetty.base)
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 72bf652feb2..2f765d9af2c 100644
--- a/jetty-start/src/test/resources/dist-home/modules/lowresources.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/lowresources.mod
@@ -2,9 +2,6 @@
 # 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 d573e5908c4..09132c7b2ca 100644
--- a/jetty-start/src/test/resources/dist-home/modules/monitor.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/monitor.mod
@@ -2,9 +2,6 @@
 # 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 bbefc7f4d14..a5b5a9ed752 100644
--- a/jetty-start/src/test/resources/dist-home/modules/nosql.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/nosql.mod
@@ -2,9 +2,6 @@
 # Jetty NoSql module
 #
 
-[version]
-9.3
-
 [depend]
 webapp
 
@@ -27,9 +24,8 @@ http://www.apache.org/licenses/LICENSE-2.0.html
 ## MongoDB SessionIdManager config
 
 ## Unique identifier for this node in the cluster
-jetty.nosqlSession.workerName=node1
-
+# jetty.nosqlSession.workerName=node1
 
 ## Interval in seconds between scavenging expired sessions
-jetty.nosqlSession.scavenge=1800
+# jetty.nosqlSession.scavenge=1800
 
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 4b5cdd5d0ce..aac0f8f3ecb 100644
--- a/jetty-start/src/test/resources/dist-home/modules/plus.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/plus.mod
@@ -2,9 +2,6 @@
 # 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 9e48d549946..6b91f689145 100644
--- a/jetty-start/src/test/resources/dist-home/modules/proxy.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/proxy.mod
@@ -2,9 +2,6 @@
 # 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 6e5eee0957f..4e59dd08624 100644
--- a/jetty-start/src/test/resources/dist-home/modules/quickstart.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/quickstart.mod
@@ -2,14 +2,10 @@
 # Jetty Quickstart module
 #
 
-[version]
-9.3
-
 [depend]
 server
 plus
 annotations
 
-
 [lib]
 lib/jetty-quickstart-${jetty.version}.jar
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 a3afc062eae..e27b246ea24 100644
--- a/jetty-start/src/test/resources/dist-home/modules/requestlog.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/requestlog.mod
@@ -2,9 +2,6 @@
 # Request Log module
 #
 
-[version]
-9.3
-
 [depend]
 server
 
@@ -21,19 +18,19 @@ logs/
 ## File path
 # jetty.requestlog.filePath=${jetty.requestlog.dir}/yyyy_mm_dd.request.log
 
-# Date format for rollovered files (uses SimpleDateFormat syntax)
+## Date format for rollovered files (uses SimpleDateFormat syntax)
 # jetty.requestlog.filenameDateFormat=yyyy_MM_dd
 
-# How many days to retain old log files
+## How many days to retain old log files
 # jetty.requestlog.retainDays=90
 
 ## Whether to append to existing file
 # jetty.requestlog.append=true
 
-# Whether to use the extended log output
+## Whether to use the extended log output
 # jetty.requestlog.extended=true
 
-# Whether to log http cookie information
+## Whether to log http cookie information
 # jetty.requestlog.cookies=true
 
 ## Timezone of the log entries
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 91eed41bfdc..8647d81325b 100644
--- a/jetty-start/src/test/resources/dist-home/modules/resources.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/resources.mod
@@ -2,9 +2,6 @@
 # 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 cd55a1c4594..c8a1750618a 100644
--- a/jetty-start/src/test/resources/dist-home/modules/rewrite.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/rewrite.mod
@@ -1,8 +1,6 @@
 #
 # 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 c9f94316034..ba3163275f5 100644
--- a/jetty-start/src/test/resources/dist-home/modules/security.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/security.mod
@@ -2,9 +2,6 @@
 # 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 524017f46df..6b5dbe95ba0 100644
--- a/jetty-start/src/test/resources/dist-home/modules/server.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/server.mod
@@ -2,9 +2,6 @@
 # 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 65bf86f5c54..fdb65c57a16 100644
--- a/jetty-start/src/test/resources/dist-home/modules/servlet.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/servlet.mod
@@ -2,9 +2,6 @@
 # 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 453a9380fa7..2e977c05f14 100644
--- a/jetty-start/src/test/resources/dist-home/modules/servlets.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/servlets.mod
@@ -2,8 +2,6 @@
 # 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 54fab8f2625..41ef757e82d 100644
--- a/jetty-start/src/test/resources/dist-home/modules/setuid.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/setuid.mod
@@ -2,9 +2,6 @@
 # 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 0e11358cfca..39b9b8d85a3 100644
--- a/jetty-start/src/test/resources/dist-home/modules/spring.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/spring.mod
@@ -1,8 +1,6 @@
 #
 # 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 d491f18e64b..809543f94f7 100644
--- a/jetty-start/src/test/resources/dist-home/modules/ssl.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/ssl.mod
@@ -1,8 +1,6 @@
 #
 # 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 0212f878798..0922469cdfb 100644
--- a/jetty-start/src/test/resources/dist-home/modules/stats.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/stats.mod
@@ -2,9 +2,6 @@
 # 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 3f889b6a95e..6bb37ef2efe 100644
--- a/jetty-start/src/test/resources/dist-home/modules/webapp.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/webapp.mod
@@ -2,9 +2,6 @@
 # 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 768bcc8e7f8..e866b179890 100644
--- a/jetty-start/src/test/resources/dist-home/modules/websocket.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/websocket.mod
@@ -2,9 +2,6 @@
 # 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 574c4d08bb6..da7e6208cc3 100644
--- a/jetty-start/src/test/resources/usecases/http2.assert.txt
+++ b/jetty-start/src/test/resources/usecases/http2.assert.txt
@@ -25,7 +25,7 @@ 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|java.version=1.7.0_60
+PROP|java.version=1.8.0_31
 PROP|jetty.sslContext.keyStorePath=etc/keystore
 PROP|jetty.sslContext.keyStorePassword=friendly
 PROP|jetty.sslContext.keyManagerPassword=icecream
@@ -33,11 +33,11 @@ PROP|jetty.sslContext.trustStorePath=etc/keystore
 PROP|jetty.sslContext.trustStorePassword=sundae
 
 # The Downloads
-DOWNLOAD|maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
+DOWNLOAD|maven://org.mortbay.jetty.alpn/alpn-boot/8.1.3.v20150130|lib/alpn/alpn-boot-8.1.3.v20150130.jar
 DOWNLOAD|http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/test/config/etc/keystore?id=master|etc/keystore
 
 # The Bootlib
-BOOTLIB|-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
+BOOTLIB|-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.3.v20150130.jar
 
 # The Files
 FILE|lib/
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
index 79fcfcb81d1..ff27710cdd2 100644
--- a/jetty-start/src/test/resources/usecases/versioned-modules/modules/old.mod
+++ b/jetty-start/src/test/resources/usecases/versioned-modules/modules/old.mod
@@ -2,6 +2,6 @@
 # Old Module (backward compat test with 9.2 modules)
 #
 
-[ini-template]
+[defaults]
 from-module=old
 

From c20c5a2bedee72791a4408181299837c2da5bd6f Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Fri, 12 Jun 2015 09:24:24 -0700
Subject: [PATCH 3/4] Jetty SSL distribution default port is 8443 (XML is now
 source of default)

---
 jetty-server/src/main/config/etc/jetty-ssl.xml | 2 +-
 jetty-server/src/main/config/modules/ssl.mod   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jetty-server/src/main/config/etc/jetty-ssl.xml b/jetty-server/src/main/config/etc/jetty-ssl.xml
index 30169d023e2..6bb613e21b2 100644
--- a/jetty-server/src/main/config/etc/jetty-ssl.xml
+++ b/jetty-server/src/main/config/etc/jetty-ssl.xml
@@ -27,7 +27,7 @@
         </Arg>
 
         <Set name="host"><Property name="jetty.ssl.host" deprecated="jetty.host" /></Set>
-        <Set name="port"><Property name="jetty.ssl.port" deprecated="ssl.port" default="443" /></Set>
+        <Set name="port"><Property name="jetty.ssl.port" deprecated="ssl.port" default="8443" /></Set>
         <Set name="idleTimeout"><Property name="jetty.ssl.idleTimeout" deprecated="ssl.timeout" default="30000"/></Set>
         <Set name="soLingerTime"><Property name="jetty.ssl.soLingerTime" deprecated="ssl.soLingerTime" default="-1"/></Set>
         <Set name="acceptorPriorityDelta"><Property name="jetty.ssl.acceptorPriorityDelta" deprecated="ssl.acceptorPriorityDelta" default="0"/></Set>
diff --git a/jetty-server/src/main/config/modules/ssl.mod b/jetty-server/src/main/config/modules/ssl.mod
index 809543f94f7..292780a1cb4 100644
--- a/jetty-server/src/main/config/modules/ssl.mod
+++ b/jetty-server/src/main/config/modules/ssl.mod
@@ -22,7 +22,7 @@ http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/
 # jetty.ssl.host=0.0.0.0
 
 ## Connector port to listen on
-jetty.ssl.port=8443
+# jetty.ssl.port=8443
 
 ## Connector idle timeout in milliseconds
 # jetty.ssl.idleTimeout=30000

From 574373b806d54425e708a85c554167b8f38f6b0b Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Fri, 12 Jun 2015 18:26:46 +0200
Subject: [PATCH 4/4] Removed JDK 7 ALPN files and build profiles.

---
 .../modules/alpn-impl/alpn-1.7.0_40.mod       |   8 -
 .../modules/alpn-impl/alpn-1.7.0_45.mod       |   8 -
 .../modules/alpn-impl/alpn-1.7.0_51.mod       |   8 -
 .../modules/alpn-impl/alpn-1.7.0_55.mod       |   8 -
 .../modules/alpn-impl/alpn-1.7.0_60.mod       |   8 -
 .../modules/alpn-impl/alpn-1.7.0_65.mod       |   8 -
 .../modules/alpn-impl/alpn-1.7.0_67.mod       |   8 -
 .../modules/alpn-impl/alpn-1.7.0_71.mod       |   8 -
 .../modules/alpn-impl/alpn-1.7.0_72.mod       |   8 -
 .../modules/alpn-impl/alpn-1.7.0_75.mod       |   8 -
 .../modules/alpn-impl/alpn-1.7.0_76.mod       |   8 -
 .../modules/alpn-impl/alpn-1.7.0_79.mod       |   8 -
 .../modules/alpn-impl/alpn-1.7.0_80.mod       |   8 -
 pom.xml                                       | 158 ------------------
 14 files changed, 262 deletions(-)
 delete mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_40.mod
 delete mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_45.mod
 delete mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_51.mod
 delete mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_55.mod
 delete mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_60.mod
 delete mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_65.mod
 delete mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_67.mod
 delete mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_71.mod
 delete mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_72.mod
 delete mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_75.mod
 delete mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_76.mod
 delete mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_79.mod
 delete mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_80.mod

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
deleted file mode 100644
index a1002a48cce..00000000000
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_40.mod
+++ /dev/null
@@ -1,8 +0,0 @@
-[name]
-alpn-boot
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
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
deleted file mode 100644
index a1002a48cce..00000000000
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_45.mod
+++ /dev/null
@@ -1,8 +0,0 @@
-[name]
-alpn-boot
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
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
deleted file mode 100644
index a1002a48cce..00000000000
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_51.mod
+++ /dev/null
@@ -1,8 +0,0 @@
-[name]
-alpn-boot
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
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
deleted file mode 100644
index a1002a48cce..00000000000
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_55.mod
+++ /dev/null
@@ -1,8 +0,0 @@
-[name]
-alpn-boot
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
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
deleted file mode 100644
index a1002a48cce..00000000000
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_60.mod
+++ /dev/null
@@ -1,8 +0,0 @@
-[name]
-alpn-boot
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
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
deleted file mode 100644
index a1002a48cce..00000000000
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_65.mod
+++ /dev/null
@@ -1,8 +0,0 @@
-[name]
-alpn-boot
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
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
deleted file mode 100644
index a1002a48cce..00000000000
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_67.mod
+++ /dev/null
@@ -1,8 +0,0 @@
-[name]
-alpn-boot
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
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
deleted file mode 100644
index a5543244945..00000000000
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_71.mod
+++ /dev/null
@@ -1,8 +0,0 @@
-[name]
-alpn-boot
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/7.1.2.v20141202|lib/alpn/alpn-boot-7.1.2.v20141202.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.2.v20141202.jar
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
deleted file mode 100644
index a5543244945..00000000000
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_72.mod
+++ /dev/null
@@ -1,8 +0,0 @@
-[name]
-alpn-boot
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/7.1.2.v20141202|lib/alpn/alpn-boot-7.1.2.v20141202.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.2.v20141202.jar
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
deleted file mode 100644
index 3f6f912c6d9..00000000000
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_75.mod
+++ /dev/null
@@ -1,8 +0,0 @@
-[name]
-alpn-boot
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/7.1.3.v20150130|lib/alpn/alpn-boot-7.1.3.v20150130.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.3.v20150130.jar
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
deleted file mode 100644
index 3f6f912c6d9..00000000000
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_76.mod
+++ /dev/null
@@ -1,8 +0,0 @@
-[name]
-alpn-boot
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/7.1.3.v20150130|lib/alpn/alpn-boot-7.1.3.v20150130.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.3.v20150130.jar
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
deleted file mode 100644
index ac315d6df7d..00000000000
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_79.mod
+++ /dev/null
@@ -1,8 +0,0 @@
-[name]
-protonego-boot
-
-[files]
-http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.3.v20150130/alpn-boot-7.1.3.v20150130.jar|lib/alpn/alpn-boot-7.1.3.v20150130.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.3.v20150130.jar
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
deleted file mode 100644
index ac315d6df7d..00000000000
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_80.mod
+++ /dev/null
@@ -1,8 +0,0 @@
-[name]
-protonego-boot
-
-[files]
-http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.3.v20150130/alpn-boot-7.1.3.v20150130.jar|lib/alpn/alpn-boot-7.1.3.v20150130.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.1.3.v20150130.jar
diff --git a/pom.xml b/pom.xml
index 54aa35fcad2..c4bb0f2b80f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -847,164 +847,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>7u40</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.7.0_40</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>7.1.0.v20141016</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>7u45</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.7.0_45</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>7.1.0.v20141016</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>7u51</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.7.0_51</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>7.1.0.v20141016</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>7u55</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.7.0_55</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>7.1.0.v20141016</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>7u60</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.7.0_60</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>7.1.0.v20141016</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>7u65</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.7.0_65</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>7.1.0.v20141016</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>7u67</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.7.0_67</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>7.1.0.v20141016</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>7u71</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.7.0_71</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>7.1.2.v20141202</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>7u72</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.7.0_72</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>7.1.2.v20141202</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>7u75</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.7.0_75</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>7.1.3.v20150130</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>7u76</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.7.0_76</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>7.1.3.v20150130</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>7u79</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.7.0_79</value>
-        </property>
-      </activation>
-      <properties>
-        <npn.version>1.1.10.v20150130</npn.version>
-        <alpn.version>7.1.3.v20150130</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>7u80</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.7.0_80</value>
-        </property>
-      </activation>
-      <properties>
-        <npn.version>1.1.11.v20150415</npn.version>
-        <alpn.version>7.1.3.v20150130</alpn.version>
-      </properties>
-    </profile>
     <profile>
       <id>8u00</id>
       <activation>