Merge branch 'jetty-10.0.x' of github.com:eclipse/jetty.project into jetty-10.0.x

jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java

@@ -70,6 +70,7 @@ public class AnnotationParser
 {
     private static final Logger LOG = Log.getLogger(AnnotationParser.class);
     protected static int ASM_OPCODE_VERSION = Opcodes.ASM6; //compatibility of api
+    protected static String ASM_OPCODE_VERSION_STR = "ASM6";
     
     /**
      * Map of classnames scanned and the first location from which scan occurred
@@ -87,12 +88,12 @@ public class AnnotationParser
         int asmVersion = ASM_OPCODE_VERSION;
         Package asm = Opcodes.class.getPackage();
         if (asm == null)
-            LOG.warn("Unknown asm runtime version, assuming version {}", asmVersion);
+            LOG.warn("Unknown asm runtime version, assuming version {}", ASM_OPCODE_VERSION_STR);
         else
         {
             String s = asm.getImplementationVersion();
             if (s==null)
-                LOG.warn("Unknown asm implementation version, assuming version {}", asmVersion);
+                LOG.info("Unknown asm implementation version, assuming version {}", ASM_OPCODE_VERSION_STR);
             else
             {
                 int dot = s.indexOf('.');
@@ -119,13 +120,13 @@ public class AnnotationParser
                         }
                         default:
                         {
-                            LOG.warn("Unrecognized runtime asm version, assuming {}", asmVersion);
+                            LOG.warn("Unrecognized runtime asm version, assuming {}", ASM_OPCODE_VERSION_STR);
                         }
                     }
                 }
                 catch (NumberFormatException e)
                 {
-                    LOG.warn("Unable to parse runtime asm version, assuming version {}", asmVersion);
+                    LOG.warn("Unable to parse runtime asm version, assuming version {}", ASM_OPCODE_VERSION_STR);
                 }
             }
         }

jetty-cdi/pom.xml

@@ -10,9 +10,6 @@
   <name>Jetty :: CDI :: Parent</name>
   <url>http://www.eclipse.org/jetty</url>
   <packaging>pom</packaging>
-  <properties>
-    <weld.version>2.4.3.Final</weld.version>
-  </properties>
 
   <modules>
     <module>cdi-2</module>

jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesClientTest.java

@@ -22,7 +22,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -48,16 +47,17 @@ import org.eclipse.jetty.client.util.FutureResponseListener;
 import org.eclipse.jetty.http.HttpScheme;
 import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
-import org.eclipse.jetty.util.JavaVersion;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
-
 import org.junit.jupiter.api.AfterEach;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledOnJre;
+import org.junit.jupiter.api.condition.EnabledOnJre;
 import org.junit.jupiter.api.condition.JRE;
 
+/* This whole test is very specific to how TLS < 1.3 works.
+ * Starting in Java 11, TLS/1.3 is now enabled by default.
+ */
+@EnabledOnJre({JRE.JAVA_8, JRE.JAVA_9, JRE.JAVA_10})
 public class SslBytesClientTest extends SslBytesTest
 {
     private ExecutorService threadPool;
@@ -66,8 +66,6 @@ public class SslBytesClientTest extends SslBytesTest
     private SSLServerSocket acceptor;
     private SimpleProxy proxy;
 
-    // This whole test is very specific to how TLS < 1.3 works.
-    @DisabledOnJre( JRE.JAVA_11 )
     @BeforeEach
     public void init() throws Exception
     {

jetty-documentation/src/main/asciidoc/administration/startup/startup-unix-service.adoc

@@ -81,10 +81,10 @@ Make sure you have it installed.
 
 [source, screen, subs="{sub-order}"]
 ....
-# apt-get install openjdk-7-jdk
+# apt-get install openjdk-8-jdk
 ....
 
-Or download Java 7 from: http://www.oracle.com/technetwork/java/javase/downloads/index.html
+Or download Java 8 from: http://www.oracle.com/technetwork/java/javase/downloads/index.html
 
 [source, screen, subs="{sub-order}"]
 ....

jetty-documentation/src/main/asciidoc/configuring/security/spnego-support.adoc

@@ -17,17 +17,17 @@
 //
 
 [[spnego-support]]
-=== Spnego Support
+=== SPNEGO Support
 
-Simple and Protected GSSAPI Negotiation Mechanism (Spnego) is a way for users to be seamlessly authenticated when running on a Windows or Active Directory based network.
+Simple and Protected GSSAPI Negotiation Mechanism (SPNEGO) is a way for users to be seamlessly authenticated when running on a Windows or Active Directory based network.
 Jetty supports this type of authentication and authorization through the JDK (which has been enabled since the later versions of Java 6 and 7).
 Also important to note is that this is an _incredibly_ fragile setup where everything needs to be configured just right for things to work, otherwise it can fail in fun and exciting, not to mention obscure, ways.
 
 There is a substantial amount of configuration and testing required to enable this feature as well as knowledge and access to central systems on a Windows network such as the Active Domain Controller and the ability to create and maintain service users.
 
-==== Configuring Jetty and Spnego
+==== Configuring Jetty and SPNEGO
 
-To run with Spengo enabled the following command line options are required:
+To run with SPNEGO enabled the following command line options are required:
 
 [source,screen, subs="{sub-order}"]
 ----
@@ -36,7 +36,7 @@ To run with Spengo enabled the following command line options are required:
 -Djavax.security.auth.useSubjectCredsOnly=false
 ----
 
-For debugging the Spengo authentication the following options are very helpful:
+For debugging the SPNEGO authentication the following options are very helpful:
 
 [source,screen, subs="{sub-order}"]
 ----
@@ -44,7 +44,7 @@ For debugging the Spengo authentication the following options are very helpful:
 -Dsun.security.spnego.debug=all
 ----
 
-Spengo Authentication must be enabled in the webapp in the following way.
+SPNEGO Authentication must be enabled in the webapp in the following way.
 The name of the role will be different for your network.
 
 [source, xml, subs="{sub-order}"]
@@ -65,7 +65,7 @@ The name of the role will be different for your network.
    <realm-name>Test Realm</realm-name>
    <!-- optionally to add custom error page -->
    <spnego-login-config>
-     <spengo-error-page>/loginError.html?param=foo</spnego-error-page>
+     <spnego-error-page>/loginError.html?param=foo</spnego-error-page>
    </spnego-login-config>
  </login-config>
 
@@ -119,7 +119,7 @@ krb5.ini::
 spnego.conf::
   configures the glue between gssapi and kerberos
 
-It is important to note that the keytab file referenced in the `krb5.ini` and the `spengo.conf` files needs to contain the keytab for the `targetName` for the http server.
+It is important to note that the keytab file referenced in the `krb5.ini` and the `spnego.conf` files needs to contain the keytab for the `targetName` for the http server.
 To do this use a process similar to this:
 
 On the Windows Active Domain Controller run:
@@ -159,12 +159,12 @@ The follows steps have been required to inform Internet Explorer that it should
 5.  Tools -> Options -> Advanced -> Security (in the checkbox list)
 6.  Locate and select `Enable Integrated Windows Authentication`
 7.  Tools -> Options -> Advanced -> Security -> Ok
-8.  Close IE then reopen and browse to your Spengo protected resource
+8.  Close IE then reopen and browse to your SPNEGO protected resource
 
 
 You *must* use hostname and not the IP.
 If you use the IP it will default to NTLM authentication.
-The following conditions must be true for Spnego authentication to work:
+The following conditions must be true for SPNEGO authentication to work:
 
 * You must be within the Intranet Zone of the network
 * Access the server using a Hostname rather than IP

jetty-documentation/src/main/asciidoc/reference/contributing/source-build.adoc

@@ -49,7 +49,7 @@ Files associated with the development of Jetty -- code styles, formatting, iplog
 
 ==== Build
 
-Jetty requires the use of Java 7 and the latest releases are always recommended to build.
+Jetty requires the use of Java 8 and the latest releases are always recommended to build.
 
 Jetty uses http://maven.apache.org/[Apache Maven 3] for managing its build and primary project metadata.
 

jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/LdapLoginModule.java

@@ -329,9 +329,16 @@ public class LdapLoginModule extends AbstractLoginModule
             }
         }
 
-        String userDn = _userRdnAttribute + "=" + rdnValue + "," + _userBaseDn;
+        String filter = "({0}={1})";
 
-        return getUserRolesByDn(dirContext, userDn);
+        Object[] filterArguments = new Object[]{
+                _userRdnAttribute,
+                rdnValue
+        };
+
+        SearchResult searchResult = findUser(dirContext, filter, filterArguments);
+
+        return getUserRolesByDn(dirContext, searchResult.getNameInNamespace());
     }
 
     private List<String> getUserRolesByDn(DirContext dirContext, String userDn) throws NamingException
@@ -547,11 +554,6 @@ public class LdapLoginModule extends AbstractLoginModule
 
     private SearchResult findUser(String username) throws LoginException
     {
-        SearchControls ctls = new SearchControls();
-        ctls.setCountLimit(1);
-        ctls.setDerefLinkFlag(true);
-        ctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
-
         String filter = "(&(objectClass={0})({1}={2}))";
 
         if (LOG.isDebugEnabled())
@@ -563,24 +565,36 @@ public class LdapLoginModule extends AbstractLoginModule
                 username
         };
 
+        return findUser(_rootContext, filter, filterArguments);
+    }
+
+    private SearchResult findUser(DirContext dirContext, String filter, Object[] filterArguments) throws LoginException
+    {
+        SearchControls ctls = new SearchControls();
+        ctls.setDerefLinkFlag(true);
+        ctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
+
+        NamingEnumeration<SearchResult> results;
         try
         {
-            NamingEnumeration<SearchResult> results = _rootContext.search(_userBaseDn, filter, filterArguments, ctls);
+            results = _rootContext.search(_userBaseDn, filter, filterArguments, ctls);
-
-            if (LOG.isDebugEnabled())
-                LOG.debug("Found user?: " + results.hasMoreElements());
-
-            if (!results.hasMoreElements())
-            {
-                throw new FailedLoginException("User not found.");
-            }
-
-            return results.nextElement();
         }
         catch (NamingException ne)
         {
             throw new FailedLoginException(ne.getMessage());
         }
+
+        if (LOG.isDebugEnabled())
+            LOG.debug("Found user?: " + results.hasMoreElements());
+
+        if (!results.hasMoreElements())
+            throw new FailedLoginException("User not found.");
+
+        SearchResult searchResult = (SearchResult)results.nextElement();
+        if (results.hasMoreElements())
+            throw new FailedLoginException("Search result contains ambiguous entries");
+
+        return searchResult;
     }
 
 

jetty-jaas/src/test/java/org/eclipse/jetty/jaas/JAASLdapLoginServiceTest.java

@@ -31,7 +31,6 @@ import org.eclipse.jetty.security.DefaultIdentityService;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.UserIdentity;
 import org.junit.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.runner.RunWith;
 
 import javax.security.auth.login.AppConfigurationEntry;
@@ -59,13 +58,13 @@ import static org.junit.Assert.*;
     "objectClass: top",
     "ou: people",
     // Entry # 2
-    "dn:uid=someone, ou=people,dc=jetty,dc=org",
+    "dn:uid=someone,ou=people,dc=jetty,dc=org",
     "objectClass: inetOrgPerson",
     "cn: someone",
     "sn: sn test",
     "userPassword: complicatedpassword",
     // Entry # 3
-    "dn:uid=someoneelse, ou=people,dc=jetty,dc=org",
+    "dn:uid=someoneelse,ou=people,dc=jetty,dc=org",
     "objectClass: inetOrgPerson",
     "cn: someoneelse",
     "sn: sn test",
@@ -76,27 +75,67 @@ import static org.junit.Assert.*;
     "objectClass: top",
     "ou: groups",
     // Entry 5
+    "dn: ou=subdir,ou=people,dc=jetty,dc=org",
+    "objectClass: organizationalunit",
+    "objectClass: top",
+    "ou: subdir",
+    // Entry # 6
+    "dn:uid=uniqueuser,ou=subdir,ou=people,dc=jetty,dc=org",
+    "objectClass: inetOrgPerson",
+    "cn: uniqueuser",
+    "sn: unique user",
+    "userPassword: hello123",
+    // Entry # 7
+    "dn:uid=ambiguousone,ou=people,dc=jetty,dc=org",
+    "objectClass: inetOrgPerson",
+    "cn: ambiguous1",
+    "sn: ambiguous user",
+    "userPassword: foobar",
+    // Entry # 8
+    "dn:uid=ambiguousone,ou=subdir,ou=people,dc=jetty,dc=org",
+    "objectClass: inetOrgPerson",
+    "cn: ambiguous2",
+    "sn: ambiguous subdir user",
+    "userPassword: barfoo",
+    // Entry 9
     "dn: cn=developers,ou=groups,dc=jetty,dc=org",
     "objectClass: groupOfUniqueNames",
     "objectClass: top",
     "ou: groups",
     "description: People who try to build good software",
-    "uniquemember: uid=someone, ou=people, dc=jetty,dc=org",
+    "uniquemember: uid=someone,ou=people,dc=jetty,dc=org",
+    "uniquemember: uid=uniqueuser,ou=subdir,ou=people,dc=jetty,dc=org",
     "cn: developers",
-    // Entry 6
+    // Entry 10
     "dn: cn=admin,ou=groups,dc=jetty,dc=org",
     "objectClass: groupOfUniqueNames",
     "objectClass: top",
     "ou: groups",
     "description: People who try to run software build by developers",
-    "uniquemember: uid=someone, ou=people, dc=jetty,dc=org",
+    "uniquemember: uid=someone,ou=people,dc=jetty,dc=org",
-    "uniquemember: uid=someoneelse, ou=people, dc=jetty,dc=org",
+    "uniquemember: uid=someoneelse,ou=people,dc=jetty,dc=org",
+    "uniquemember: uid=uniqueuser,ou=subdir,ou=people,dc=jetty,dc=org",
     "cn: admin"
 })
 public class JAASLdapLoginServiceTest
 {
     private static LdapServer _ldapServer;
 
+    private JAASLoginService jaasLoginService(String name) {
+      JAASLoginService ls = new JAASLoginService("foo");
+      ls.setCallbackHandlerClass("org.eclipse.jetty.jaas.callback.DefaultCallbackHandler");
+      ls.setIdentityService(new DefaultIdentityService());
+      ls.setConfiguration(new TestConfiguration(true));
+      return ls;
+    }
+
+    private UserIdentity doLogin(String username, String password) throws Exception
+    {
+        JAASLoginService ls = jaasLoginService("foo");
+        Request request = new Request(null, null);
+        return ls.login( username, password, request);
+    }
+
     public static LdapServer getLdapServer() {
         return _ldapServer;
     }
@@ -175,4 +214,27 @@ public class JAASLdapLoginServiceTest
 
     }
 
+    @Test
+    public void testLdapBindingSubdirUniqueUserName() throws Exception
+    {
+        UserIdentity userIdentity = doLogin("uniqueuser", "hello123");
+        assertNotNull( userIdentity );
+        assertTrue( userIdentity.isUserInRole( "developers", null) );
+        assertTrue( userIdentity.isUserInRole( "admin", null) );
+        assertFalse( userIdentity.isUserInRole( "blabla", null) );
+    }
+
+    @Test
+    public void testLdapBindingAmbiguousUserName() throws Exception
+    {
+        UserIdentity userIdentity = doLogin( "ambiguousone", "foobar");
+        assertNull( userIdentity );
+    }
+
+    @Test
+    public void testLdapBindingSubdirAmbiguousUserName() throws Exception
+    {
+        UserIdentity userIdentity = doLogin( "ambiguousone", "barfoo");
+        assertNull( userIdentity );
+    }
 }

jetty-jspc-maven-plugin/pom.xml

@@ -67,7 +67,7 @@
           <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
           <settingsFile>src/it/settings.xml</settingsFile>
           <scriptVariables>
-            <surefire.version>${surefire.version}</surefire.version>
+            <maven.surefire.version>${maven.surefire.version}</maven.surefire.version>
           </scriptVariables>
           <skipInvocation>${skipTests}</skipInvocation>
           <goals>

jetty-maven-plugin/pom.xml

@@ -74,12 +74,15 @@
           <pomIncludes>
             <pomInclude>*/pom.xml</pomInclude>
           </pomIncludes>
+          <setupIncludes>
+            <setupInclude>it-parent-pom/pom.xml</setupInclude>
+          </setupIncludes>
           <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
           <settingsFile>src/it/settings.xml</settingsFile>
           <scriptVariables>
             <jettyStopKey>${jetty.stopKey}</jettyStopKey>
             <jettyStopPort>${jetty.stopPort}</jettyStopPort>
-            <surefire.version>${surefire.version}</surefire.version>
+            <maven.surefire.version>${maven.surefire.version}</maven.surefire.version>
           </scriptVariables>
           <skipInvocation>${skipTests}</skipInvocation>
           <goals>

jetty-maven-plugin/src/it/it-parent-pom/invoker.properties

@@ -0,0 +1 @@
+invoker.goals = install

jetty-maven-plugin/src/it/it-parent-pom/pom.xml

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.eclipse.jetty.its</groupId>
+  <artifactId>it-parent-pom</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <properties>
+    <jetty.version>@project.version@</jetty.version>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>2.6</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>javax.servlet-api</artifactId>
+        <version>@servlet.api.version@</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.weld.servlet</groupId>
+        <artifactId>weld-servlet</artifactId>
+        <version>@weld.version@</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty.toolchain</groupId>
+        <artifactId>jetty-perf-helper</artifactId>
+        <version>@jetty.perf-helper.version@</version>
+      </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-databind</artifactId>
+        <version>2.8.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>@slf4j.version@</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-simple</artifactId>
+        <version>@slf4j.version@</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-servlet</artifactId>
+        <version>@project.version@</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-client</artifactId>
+        <version>@project.version@</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-util</artifactId>
+        <version>@project.version@</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-http</artifactId>
+        <version>@project.version@</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-io</artifactId>
+        <version>@project.version@</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-maven-plugin</artifactId>
+        <version>@project.version@</version>
+        <classifier>tests</classifier>
+        <type>test-jar</type>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-engine</artifactId>
+        <version>@junit.version@</version>
+        <scope>test</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>@maven.compiler.plugin.version@</version>
+          <configuration>
+            <target>1.8</target>
+            <source>1.8</source>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>@maven.dependency.plugin.version@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-failsafe-plugin</artifactId>
+          <version>@maven.surefire.version@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>@maven.resources.plugin.version@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>@maven.source.plugin.version@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.eclipse.jetty</groupId>
+          <artifactId>jetty-maven-plugin</artifactId>
+          <version>${jetty.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>@maven.surefire.version@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-war-plugin</artifactId>
+          <version>@maven.war.plugin.version@</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+</project>

jetty-maven-plugin/src/it/jetty-cdi-run-forked/pom.xml

@@ -4,14 +4,18 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
+  <parent>
+    <groupId>org.eclipse.jetty.its</groupId>
+    <artifactId>it-parent-pom</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+  </parent>
+
   <groupId>org.eclipse.jetty.its.jetty-cdi-run-forked-mojo-it</groupId>
   <artifactId>jetty-weld-minimal</artifactId>
   <version>1.0-SNAPSHOT</version>
   <packaging>war</packaging>
 
   <properties>
-    <jetty.version>@project.version@</jetty.version>
-    <weld.version>2.4.5.Final</weld.version>
     <jetty.port.file>${project.build.directory}/jetty-cdi-run-forked-port.txt</jetty.port.file>
   </properties>
 
@@ -19,30 +23,25 @@
     <dependency>
       <groupId>org.jboss.weld.servlet</groupId>
       <artifactId>weld-servlet</artifactId>
-      <version>${weld.version}</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>@junit.version@</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
-      <version>@project.version@</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-maven-plugin</artifactId>
-      <version>@project.version@</version>
       <classifier>tests</classifier>
       <type>test-jar</type>
       <scope>test</scope>
@@ -51,19 +50,9 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
-        <configuration>
-          <target>1.8</target>
-          <source>1.8</source>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>@surefire.version@</version>
         <configuration>
           <systemPropertyVariables>
             <jetty.port.file>${jetty.port.file}</jetty.port.file>
@@ -77,7 +66,6 @@
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
-        <version>@project.version@</version>
         <executions>
           <execution>
             <id>start-jetty</id>

jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml

@@ -3,6 +3,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
+  <parent>
+    <groupId>org.eclipse.jetty.its</groupId>
+    <artifactId>it-parent-pom</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+  </parent>
+
   <groupId>org.eclipse.jetty.its.jetty-deploy-war-mojo-it</groupId>
   <artifactId>jetty-simple-project</artifactId>
   <version>0.0.1-SNAPSHOT</version>
@@ -11,7 +17,6 @@
   <name>Jetty :: Simple deploy war mojo test</name>
 
   <properties>
-    <jetty.version>@project.version@</jetty.version>
     <jetty.port.file>${project.build.directory}/jetty-deploy-war-port.txt</jetty.port.file>
   </properties>
 
@@ -19,7 +24,6 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-maven-plugin</artifactId>
-      <version>@project.version@</version>
       <classifier>tests</classifier>
       <type>test-jar</type>
       <scope>test</scope>
@@ -27,26 +31,15 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>@junit.version@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
-        <configuration>
-          <target>1.8</target>
-          <source>1.8</source>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>@surefire.version@</version>
         <configuration>
           <systemPropertyVariables>
             <jetty.port.file>${jetty.port.file}</jetty.port.file>
@@ -77,7 +70,6 @@
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
-        <version>@project.version@</version>
         <executions>
           <execution>
             <id>start-jetty</id>
@@ -107,7 +99,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.0.2</version>
         <executions>
           <execution>
             <id>load-war</id>
@@ -147,7 +138,6 @@
             <plugin>
               <groupId>org.eclipse.jetty</groupId>
               <artifactId>jetty-maven-plugin</artifactId>
-              <version>@project.version@</version>
               <dependencies>
                 <dependency>
                   <groupId>javax.xml.bind</groupId>

jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-base/pom.xml

@@ -22,27 +22,21 @@
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>
       <artifactId>jetty-perf-helper</artifactId>
-      <version>1.0.5</version>
     </dependency>
-
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.8.1</version>
     </dependency>
 
   </dependencies>

jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-webapp/pom.xml

@@ -35,7 +35,6 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-maven-plugin</artifactId>
-      <version>@project.version@</version>
       <classifier>tests</classifier>
       <type>test-jar</type>
       <scope>test</scope>
@@ -44,7 +43,6 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>@junit.version@</version>
       <scope>test</scope>
     </dependency>
 
@@ -57,7 +55,6 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-war-plugin</artifactId>
-          <version>${maven-war-plugin-version}</version>
           <configuration>
             <failOnMissingWebXml>false</failOnMissingWebXml>
           </configuration>
@@ -68,7 +65,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>@surefire.version@</version>
         <configuration>
           <systemPropertyVariables>
             <jetty.port.file>${jetty.port.file}</jetty.port.file>

jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/pom.xml

@@ -1,84 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.eclipse.jetty.its.jetty-run-distro-mojo-it</groupId>
+  <parent>
-    <artifactId>jetty-simple-project</artifactId>
+    <groupId>org.eclipse.jetty.its</groupId>
+    <artifactId>it-parent-pom</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <packaging>pom</packaging>
+  </parent>
 
-    <name>Jetty :: Simple</name>
+  <groupId>org.eclipse.jetty.its.jetty-run-distro-mojo-it</groupId>
+  <artifactId>jetty-simple-project</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>pom</packaging>
 
-    <properties>
+  <name>Jetty :: Simple</name>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-        <maven-war-plugin-version>3.0.0</maven-war-plugin-version>
-        <jetty.version>@project.version@</jetty.version>
-    </properties>
 
-    <modules>
+  <properties>
-        <module>jetty-simple-base</module>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <module>jetty-simple-webapp</module>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </modules>
+    <java.version>1.8</java.version>
+    <jetty.version>@project.version@</jetty.version>
+  </properties>
 
-        <dependencyManagement>
+  <modules>
-            <dependencies>
+    <module>jetty-simple-base</module>
-                <dependency>
+    <module>jetty-simple-webapp</module>
-                    <groupId>org.eclipse.jetty.its.jetty-run-distro-mojo-it</groupId>
+  </modules>
-                    <artifactId>jetty-simple-base</artifactId>
-                    <version>${project.version}</version>
-                </dependency>
 
-            <dependency>
+  <dependencyManagement>
-                <groupId>javax.servlet</groupId>
+    <dependencies>
-                <artifactId>javax.servlet-api</artifactId>
+      <dependency>
-                <version>3.1.0</version>
+        <groupId>org.eclipse.jetty.its.jetty-run-distro-mojo-it</groupId>
-                <type>jar</type>
+        <artifactId>jetty-simple-base</artifactId>
-                <scope>provided</scope>
+        <version>${project.version}</version>
-            </dependency>
+      </dependency>
-
+    </dependencies>
-            <dependency>
+  </dependencyManagement>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.7.21</version>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>2.5</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlet</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.5.1</version>
-                    <configuration>
-                        <target>1.8</target>
-                        <source>1.8</source>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-maven-plugin</artifactId>
-                    <version>${jetty.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
 
 </project>

jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-base/pom.xml

@@ -15,34 +15,27 @@
   <name>Jetty :: Simple :: Base</name>
 
   <dependencies>
-
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>
       <artifactId>jetty-perf-helper</artifactId>
-      <version>1.0.5</version>
     </dependency>
-
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.8.1</version>
     </dependency>
 
   </dependencies>

jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/pom.xml

@@ -32,21 +32,17 @@
       <scope>provided</scope>
     </dependency>
 
-
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-maven-plugin</artifactId>
-      <version>@project.version@</version>
       <classifier>tests</classifier>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
 
-
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>@junit.version@</version>
       <scope>test</scope>
     </dependency>
 
@@ -59,7 +55,6 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-war-plugin</artifactId>
-          <version>${maven-war-plugin-version}</version>
           <configuration>
             <failOnMissingWebXml>false</failOnMissingWebXml>
           </configuration>
@@ -70,7 +65,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>@surefire.version@</version>
         <configuration>
           <systemPropertyVariables>
             <jetty.port.file>${jetty.port.file}</jetty.port.file>

jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/pom.xml

@@ -1,85 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.eclipse.jetty.its.jetty-run-forked-mojo-it</groupId>
+  <parent>
-    <artifactId>jetty-simple-project</artifactId>
+    <groupId>org.eclipse.jetty.its</groupId>
+    <artifactId>it-parent-pom</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <packaging>pom</packaging>
+  </parent>
 
-    <name>Jetty :: Simple</name>
+  <groupId>org.eclipse.jetty.its.jetty-run-forked-mojo-it</groupId>
+  <artifactId>jetty-simple-project</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>pom</packaging>
 
-    <properties>
+  <name>Jetty :: Simple</name>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-        <maven-war-plugin-version>3.0.0</maven-war-plugin-version>
-        <jetty.version>@project.version@</jetty.version>
-    </properties>
 
-    <modules>
+  <properties>
-        <module>jetty-simple-base</module>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <module>jetty-simple-webapp</module>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </modules>
+    <java.version>1.8</java.version>
+    <maven-war-plugin-version>3.0.0</maven-war-plugin-version>
+    <jetty.version>@project.version@</jetty.version>
+  </properties>
 
-    <dependencyManagement>
+  <modules>
-        <dependencies>
+    <module>jetty-simple-base</module>
+    <module>jetty-simple-webapp</module>
+  </modules>
 
-            <dependency>
+  <dependencyManagement>
-                <groupId>org.eclipse.jetty.its.jetty-run-forked-mojo-it</groupId>
+    <dependencies>
-                <artifactId>jetty-simple-base</artifactId>
+      <dependency>
-                <version>${project.version}</version>
+        <groupId>org.eclipse.jetty.its.jetty-run-forked-mojo-it</groupId>
-            </dependency>
+        <artifactId>jetty-simple-base</artifactId>
-
+        <version>${project.version}</version>
-            <dependency>
+      </dependency>
-                <groupId>javax.servlet</groupId>
+    </dependencies>
-                <artifactId>javax.servlet-api</artifactId>
+  </dependencyManagement>
-                <version>3.1.0</version>
-                <type>jar</type>
-                <scope>provided</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.7.21</version>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>2.5</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlet</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.5.1</version>
-                    <configuration>
-                        <target>1.8</target>
-                        <source>1.8</source>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-maven-plugin</artifactId>
-                    <version>${jetty.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
 
 </project>

jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-base/pom.xml

@@ -15,36 +15,28 @@
   <name>Jetty :: Simple :: Base</name>
 
   <dependencies>
-
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>
       <artifactId>jetty-perf-helper</artifactId>
-      <version>1.0.5</version>
     </dependency>
-
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.8.1</version>
     </dependency>
-
   </dependencies>
 
 </project>

jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/pom.xml

@@ -38,18 +38,17 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-maven-plugin</artifactId>
-      <version>@project.version@</version>
       <classifier>tests</classifier>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
 
-     <dependency>
+    <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>@junit.version@</version>
       <scope>test</scope>
     </dependency>
+
   </dependencies>
 
   <build>
@@ -59,7 +58,6 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-war-plugin</artifactId>
-          <version>${maven-war-plugin-version}</version>
           <configuration>
             <failOnMissingWebXml>false</failOnMissingWebXml>
           </configuration>
@@ -70,7 +68,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>@surefire.version@</version>
         <configuration>
           <systemPropertyVariables>
             <jetty.port.file>${jetty.port.file}</jetty.port.file>

jetty-maven-plugin/src/it/jetty-run-mojo-it/pom.xml

@@ -1,91 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.eclipse.jetty.its.jetty-run-mojo-it</groupId>
+  <parent>
-    <artifactId>jetty-simple-project</artifactId>
+    <groupId>org.eclipse.jetty.its</groupId>
+    <artifactId>it-parent-pom</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <packaging>pom</packaging>
+  </parent>
 
-    <name>Jetty :: Simple</name>
+  <groupId>org.eclipse.jetty.its.jetty-run-mojo-it</groupId>
+  <artifactId>jetty-simple-project</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>pom</packaging>
 
-    <properties>
+  <name>Jetty :: Simple</name>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-        <maven-war-plugin-version>3.0.0</maven-war-plugin-version>
-        <jetty.version>@project.version@</jetty.version>
-    </properties>
 
-    <modules>
+  <properties>
-        <module>jetty-simple-base</module>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <module>jetty-simple-webapp</module>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </modules>
+    <java.version>1.8</java.version>
+    <jetty.version>@project.version@</jetty.version>
+  </properties>
 
-    <dependencyManagement>
+  <modules>
-        <dependencies>
+    <module>jetty-simple-base</module>
+    <module>jetty-simple-webapp</module>
+  </modules>
 
-            <dependency>
+  <dependencyManagement>
-                <groupId>org.eclipse.jetty.its.jetty-run-mojo-it</groupId>
+    <dependencies>
-                <artifactId>jetty-simple-base</artifactId>
+      <dependency>
-                <version>${project.version}</version>
+        <groupId>org.eclipse.jetty.its.jetty-run-mojo-it</groupId>
-            </dependency>
+        <artifactId>jetty-simple-base</artifactId>
-
+        <version>${project.version}</version>
-            <dependency>
+      </dependency>
-                <groupId>javax.servlet</groupId>
+    </dependencies>
-                <artifactId>javax.servlet-api</artifactId>
+  </dependencyManagement>
-                <version>3.1.0</version>
-                <type>jar</type>
-                <scope>provided</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.7.21</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-simple</artifactId>
-                <version>1.7.21</version>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>2.5</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlet</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.5.1</version>
-                    <configuration>
-                        <target>1.8</target>
-                        <source>1.8</source>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-maven-plugin</artifactId>
-                    <version>${jetty.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
 
 </project>

jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-base/pom.xml

@@ -15,36 +15,28 @@
   <name>Jetty :: Simple :: Base</name>
 
   <dependencies>
-
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>
       <artifactId>jetty-perf-helper</artifactId>
-      <version>1.0.5</version>
     </dependency>
-
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.8.1</version>
     </dependency>
-
   </dependencies>
 
 </project>

jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-webapp/pom.xml

@@ -19,35 +19,27 @@
   </properties>
 
   <dependencies>
-
     <dependency>
       <groupId>org.eclipse.jetty.its.jetty-run-war-exploded-mojo-it</groupId>
       <artifactId>jetty-simple-base</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
       <scope>provided</scope>
     </dependency>
-
-
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-maven-plugin</artifactId>
-      <version>@project.version@</version>
       <classifier>tests</classifier>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>@junit.version@</version>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
 
   <build>
@@ -57,7 +49,6 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-war-plugin</artifactId>
-          <version>${maven-war-plugin-version}</version>
           <configuration>
             <failOnMissingWebXml>false</failOnMissingWebXml>
           </configuration>
@@ -68,7 +59,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>@surefire.version@</version>
         <configuration>
           <skip>true</skip>
         </configuration>
@@ -76,7 +66,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>@surefire.version@</version>
         <configuration>
           <systemPropertyVariables>
             <jetty.port.file>${jetty.port.file}</jetty.port.file>

jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/pom.xml

@@ -1,85 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.eclipse.jetty.its.jetty-run-war-exploded-mojo-it</groupId>
+  <parent>
-    <artifactId>jetty-simple-project</artifactId>
+    <groupId>org.eclipse.jetty.its</groupId>
+    <artifactId>it-parent-pom</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <packaging>pom</packaging>
+  </parent>
 
-    <name>Jetty :: Simple</name>
+  <groupId>org.eclipse.jetty.its.jetty-run-war-exploded-mojo-it</groupId>
+  <artifactId>jetty-simple-project</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>pom</packaging>
 
-    <properties>
+  <name>Jetty :: Simple</name>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-        <maven-war-plugin-version>3.0.0</maven-war-plugin-version>
-        <jetty.version>@project.version@</jetty.version>
-    </properties>
 
-    <modules>
+  <properties>
-        <module>jetty-simple-base</module>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <module>jetty-simple-webapp</module>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </modules>
+    <java.version>1.8</java.version>
+    <jetty.version>@project.version@</jetty.version>
+  </properties>
 
-    <dependencyManagement>
+  <modules>
-        <dependencies>
+    <module>jetty-simple-base</module>
+    <module>jetty-simple-webapp</module>
+  </modules>
 
-            <dependency>
+  <dependencyManagement>
-                <groupId>org.eclipse.jetty.its.jetty-run-war-exploded-mojo-it</groupId>
+    <dependencies>
-                <artifactId>jetty-simple-base</artifactId>
+      <dependency>
-                <version>${project.version}</version>
+        <groupId>org.eclipse.jetty.its.jetty-run-war-exploded-mojo-it</groupId>
-            </dependency>
+        <artifactId>jetty-simple-base</artifactId>
-
+        <version>${project.version}</version>
-            <dependency>
+      </dependency>
-                <groupId>javax.servlet</groupId>
+    </dependencies>
-                <artifactId>javax.servlet-api</artifactId>
+  </dependencyManagement>
-                <version>3.1.0</version>
-                <type>jar</type>
-                <scope>provided</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.7.21</version>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>2.5</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlet</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.5.1</version>
-                    <configuration>
-                        <target>1.8</target>
-                        <source>1.8</source>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-maven-plugin</artifactId>
-                    <version>${jetty.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
 
 </project>

jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-base/pom.xml

@@ -15,36 +15,27 @@
   <name>Jetty :: Simple :: Base</name>
 
   <dependencies>
-
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>
       <artifactId>jetty-perf-helper</artifactId>
-      <version>1.0.5</version>
     </dependency>
-
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.8.1</version>
     </dependency>
-
   </dependencies>
-
 </project>

jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-webapp/pom.xml

@@ -18,34 +18,26 @@
   <properties>
     <jetty.port.file>${project.build.directory}/jetty-run-war-port.txt</jetty.port.file>
   </properties>
-
-
   <dependencies>
-
     <dependency>
       <groupId>org.eclipse.jetty.its.jetty-run-war-mojo-it</groupId>
       <artifactId>jetty-simple-base</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
       <scope>provided</scope>
     </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-maven-plugin</artifactId>
-      <version>@project.version@</version>
       <classifier>tests</classifier>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>@junit.version@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -57,7 +49,6 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-war-plugin</artifactId>
-          <version>${maven-war-plugin-version}</version>
           <configuration>
             <failOnMissingWebXml>false</failOnMissingWebXml>
           </configuration>
@@ -68,7 +59,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>@surefire.version@</version>
         <configuration>
           <skip>true</skip>
         </configuration>
@@ -76,7 +66,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>@surefire.version@</version>
         <configuration>
           <systemPropertyVariables>
             <jetty.port.file>${jetty.port.file}</jetty.port.file>

jetty-maven-plugin/src/it/jetty-run-war-mojo-it/pom.xml

@@ -1,85 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.eclipse.jetty.its.jetty-run-war-mojo-it</groupId>
+  <parent>
-    <artifactId>jetty-simple-project</artifactId>
+    <groupId>org.eclipse.jetty.its</groupId>
+    <artifactId>it-parent-pom</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <packaging>pom</packaging>
+  </parent>
 
-    <name>Jetty :: Simple</name>
+  <groupId>org.eclipse.jetty.its.jetty-run-war-mojo-it</groupId>
+  <artifactId>jetty-simple-project</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>pom</packaging>
 
-    <properties>
+  <name>Jetty :: Simple</name>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-        <maven-war-plugin-version>3.0.0</maven-war-plugin-version>
-        <jetty.version>@project.version@</jetty.version>
-    </properties>
 
-    <modules>
+  <properties>
-        <module>jetty-simple-base</module>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <module>jetty-simple-webapp</module>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </modules>
+    <java.version>1.8</java.version>
+    <jetty.version>@project.version@</jetty.version>
+  </properties>
 
-    <dependencyManagement>
+  <modules>
-        <dependencies>
+    <module>jetty-simple-base</module>
+    <module>jetty-simple-webapp</module>
+  </modules>
 
-            <dependency>
+  <dependencyManagement>
-                <groupId>org.eclipse.jetty.its.jetty-run-war-mojo-it</groupId>
+    <dependencies>
-                <artifactId>jetty-simple-base</artifactId>
+      <dependency>
-                <version>${project.version}</version>
+        <groupId>org.eclipse.jetty.its.jetty-run-war-mojo-it</groupId>
-            </dependency>
+        <artifactId>jetty-simple-base</artifactId>
-
+        <version>${project.version}</version>
-            <dependency>
+      </dependency>
-                <groupId>javax.servlet</groupId>
+    </dependencies>
-                <artifactId>javax.servlet-api</artifactId>
+  </dependencyManagement>
-                <version>3.1.0</version>
-                <type>jar</type>
-                <scope>provided</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.7.21</version>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>2.5</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlet</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.5.1</version>
-                    <configuration>
-                        <target>1.8</target>
-                        <source>1.8</source>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-maven-plugin</artifactId>
-                   <version>${jetty.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
 
 </project>

jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-base/pom.xml

@@ -15,36 +15,27 @@
   <name>Jetty :: Simple :: Base</name>
 
   <dependencies>
-
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>
       <artifactId>jetty-perf-helper</artifactId>
-      <version>1.0.5</version>
     </dependency>
-
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.8.1</version>
     </dependency>
-
   </dependencies>
-
 </project>

jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/pom.xml

@@ -34,7 +34,6 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-maven-plugin</artifactId>
-      <version>@project.version@</version>
       <classifier>tests</classifier>
       <type>test-jar</type>
       <scope>test</scope>
@@ -43,7 +42,6 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>@junit.version@</version>
       <scope>test</scope>
     </dependency>
 
@@ -56,7 +54,6 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-war-plugin</artifactId>
-          <version>${maven-war-plugin-version}</version>
           <configuration>
             <failOnMissingWebXml>false</failOnMissingWebXml>
           </configuration>
@@ -67,7 +64,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>@surefire.version@</version>
         <configuration>
           <systemPropertyVariables>
             <jetty.port.file>${jetty.port.file}</jetty.port.file>

jetty-maven-plugin/src/it/jetty-start-mojo-it/pom.xml

@@ -1,85 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.eclipse.jetty.its.jetty-start-mojo-it</groupId>
+  <parent>
-    <artifactId>jetty-simple-project</artifactId>
+    <groupId>org.eclipse.jetty.its</groupId>
+    <artifactId>it-parent-pom</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <packaging>pom</packaging>
+  </parent>
 
-    <name>Jetty :: Simple</name>
+  <groupId>org.eclipse.jetty.its.jetty-start-mojo-it</groupId>
+  <artifactId>jetty-simple-project</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>pom</packaging>
 
-    <properties>
+  <name>Jetty :: Simple</name>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-        <maven-war-plugin-version>3.0.0</maven-war-plugin-version>
-        <jetty.version>@project.version@</jetty.version>
-    </properties>
 
-    <modules>
+  <properties>
-        <module>jetty-simple-base</module>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <module>jetty-simple-webapp</module>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </modules>
+    <java.version>1.8</java.version>
+    <jetty.version>@project.version@</jetty.version>
+  </properties>
 
-    <dependencyManagement>
+  <modules>
-        <dependencies>
+    <module>jetty-simple-base</module>
+    <module>jetty-simple-webapp</module>
+  </modules>
 
-            <dependency>
+  <dependencyManagement>
-                <groupId>org.eclipse.jetty.its.jetty-start-mojo-it</groupId>
+    <dependencies>
-                <artifactId>jetty-simple-base</artifactId>
+      <dependency>
-                <version>${project.version}</version>
+        <groupId>org.eclipse.jetty.its.jetty-start-mojo-it</groupId>
-            </dependency>
+        <artifactId>jetty-simple-base</artifactId>
-
+        <version>${project.version}</version>
-            <dependency>
+      </dependency>
-                <groupId>javax.servlet</groupId>
+    </dependencies>
-                <artifactId>javax.servlet-api</artifactId>
+  </dependencyManagement>
-                <version>3.1.0</version>
-                <type>jar</type>
-                <scope>provided</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.7.21</version>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>2.5</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlet</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.5.1</version>
-                    <configuration>
-                        <target>1.8</target>
-                        <source>1.8</source>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-maven-plugin</artifactId>
-                    <version>${jetty.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
 
 </project>

jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-server/pom.xml

@@ -34,37 +34,31 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
-      <version>${jetty.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>${jetty.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http</artifactId>
-      <version>${jetty.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-io</artifactId>
-      <version>${jetty.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>@junit.version@</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-maven-plugin</artifactId>
-      <version>@project.version@</version>
       <classifier>tests</classifier>
       <type>test-jar</type>
       <scope>test</scope>
@@ -76,7 +70,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>@surefire.version@</version>
         <configuration>
           <systemPropertyVariables>
             <jetty.port.file>${jetty.port.file}</jetty.port.file>

jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-shared/pom.xml

@@ -21,6 +21,7 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
       </plugin>
     </plugins>

jetty-maven-plugin/src/it/run-mojo-gwt-it/pom.xml

@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
+  <parent>
+    <groupId>org.eclipse.jetty.its</groupId>
+    <artifactId>it-parent-pom</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+  </parent>
+
   <groupId>org.olamy</groupId>
   <artifactId>beer</artifactId>
   <version>1.0-SNAPSHOT</version>
@@ -21,11 +28,6 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>javax.servlet-api</artifactId>
-        <version>3.1.0</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -42,18 +44,9 @@
     </plugins>
     <pluginManagement>
       <plugins>
-        <plugin>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.1</version>
-          <configuration>
-            <source>1.8</source>
-            <target>1.8</target>
-          </configuration>
-        </plugin>
         <plugin>
           <groupId>org.eclipse.jetty</groupId>
           <artifactId>jetty-maven-plugin</artifactId>
-          <version>${jetty.version}</version>
           <configuration>
           </configuration>
         </plugin>
@@ -68,8 +61,8 @@
           </configuration>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
-          <version>3.0.1</version>
           <executions>
             <execution>
               <id>attach-sources</id>

jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/OSGiWebappClassLoader.java

@@ -93,11 +93,10 @@ public class OSGiWebappClassLoader extends WebAppClassLoader implements BundleRe
         _osgiBundleClassLoader = BundleClassLoaderHelperFactory.getFactory().getHelper().getBundleClassLoader(contributor);
     }
     
-    
 
-    /* ------------------------------------------------------------ */
+
     @Override
-    public Class<?> loadClass(String name) throws ClassNotFoundException
+    protected Class<?> findClass(String name) throws ClassNotFoundException
     {
         try
         {
@@ -107,7 +106,8 @@ public class OSGiWebappClassLoader extends WebAppClassLoader implements BundleRe
         {
             try
             {
-                return super.loadClass(name);
+
+                return super.findClass(name);
             }
             catch (ClassNotFoundException cne2)
             {
@@ -147,6 +147,48 @@ public class OSGiWebappClassLoader extends WebAppClassLoader implements BundleRe
         return url != null ? url : super.getResource(name);
     }
     
+    
+    
+    
+    @Override
+    public URL findResource(String name)
+    {
+        URL url = _osgiBundleClassLoader.getResource(name);
+        return url != null ? url : super.findResource(name);
+    }
+    
+    
+
+    /** 
+     * Try to load the class from the bundle classloader.
+     * We do NOT load it as a resource as the WebAppClassLoader does because the
+     * url that is returned is an osgi-special url that does not play
+     * properly with WebAppClassLoader's method of extracting the class
+     * from the resource.  This implementation directly asks the osgi
+     * bundle classloader to load the given class name.
+     * 
+     * @see org.eclipse.jetty.webapp.WebAppClassLoader#loadAsResource(java.lang.String, boolean)
+     */
+    @Override
+    protected Class<?> loadAsResource(String name, boolean checkSystemResource) throws ClassNotFoundException
+    {
+        try
+        {
+            return _osgiBundleClassLoader.loadClass(name);
+        }
+        catch (ClassNotFoundException cne)
+        {
+            try
+            {
+                return super.loadAsResource(name, checkSystemResource);
+            }
+            catch (ClassNotFoundException cne2)
+            {
+                throw cne;
+            }
+        }
+    }
+
     /* ------------------------------------------------------------ */
     private List<URL> toList(Enumeration<URL> e, Enumeration<URL> e2)
     {

jetty-security/src/main/config/etc/README.spnego

@@ -1,7 +1,7 @@
-This setup will enable you to authenticate a user via spnego into your 
+This setup will enable you to authenticate a user via SPNEGO into your
 webapp.
 
-To run with spengo enabled the following command line options are required:
+To run with SPNEGO enabled the following command line options are required:
 
 -Djava.security.krb5.conf=/path/to/jetty/etc/krb5.ini
 -Djava.security.auth.login.config=/path/to/jetty/etc/spnego.conf 
@@ -9,13 +9,13 @@ To run with spengo enabled the following command line options are required:
 
 The easiest place to put these lines are in the start.ini file.
 
-For debugging the spengo authentication the following options are helpful:
+For debugging the SPNEGO authentication the following options are helpful:
 
 -Dorg.eclipse.jetty.LEVEL=debug
 -Dsun.security.spnego.debug=true
 
 
-Spengo Authentication is enabled in the webapp with the following setup.
+SPNEGO Authentication is enabled in the webapp with the following setup.
 
   <security-constraint>
     <web-resource-collection>
@@ -32,7 +32,7 @@ Spengo Authentication is enabled in the webapp with the following setup.
     <realm-name>Test Realm</realm-name>
     (optionally to add custom error page)
     <spnego-login-config>
-      <spengo-error-page>/loginError.html?param=foo</spnego-error-page>
+      <spnego-error-page>/loginError.html?param=foo</spnego-error-page>
     </spnego-login-config>
   </login-config>
    
@@ -59,4 +59,4 @@ embedded, via the jetty.xml or in a context file for the webapp.
       </New>
     </Set>
     <Set name="checkWelcomeFiles">true</Set>
-  </Get>
+  </Get>

jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SpnegoAuthenticator.java

@@ -45,7 +45,7 @@ public class SpnegoAuthenticator extends LoginAuthenticator
     }
 
     /**
-     * Allow for a custom authMethod value to be set for instances where SPENGO may not be appropriate
+     * Allow for a custom authMethod value to be set for instances where SPNEGO may not be appropriate
      * @param authMethod the auth method
      */
     public SpnegoAuthenticator( String authMethod )
@@ -96,7 +96,7 @@ public class SpnegoAuthenticator extends LoginAuthenticator
                  return Authentication.UNAUTHENTICATED;
              }
 
-            LOG.debug("SpengoAuthenticator: sending challenge");
+            LOG.debug("Sending challenge");
             res.setHeader(HttpHeader.WWW_AUTHENTICATE.asString(), HttpHeader.NEGOTIATE.asString());
             res.sendError(HttpServletResponse.SC_UNAUTHORIZED);
             return Authentication.SEND_CONTINUE;

jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppClassLoader.java

@@ -544,27 +544,17 @@ public class WebAppClassLoader extends URLClassLoader
             else
             {
                 // Not parent loader priority, so...
-
+                webapp_class = loadAsResource(name, true);
-                // Try the webapp classloader first
+                if (webapp_class != null)
-                // Look in the webapp classloader as a resource, to avoid 
-                // loading a system class.
-                String path = name.replace('.', '/').concat(".class");
-                URL webapp_url = findResource(path);
-                
-                if (webapp_url!=null && !_context.isSystemResource(name,webapp_url))
                 {
-                    webapp_class = this.foundClass(name,webapp_url);
-                    resolveClass(webapp_class);
-                    if (LOG.isDebugEnabled())
-                        LOG.debug("WAP webapp loaded {}",webapp_class);
                     return webapp_class;
                 }
 
+
                 // Try the parent loader
                 try
                 {
                     parent_class = _parent.loadClass(name); 
-                    
                     // If the webapp is allowed to see this class
                     if (Boolean.TRUE.equals(__loadServerClasses.get()) || !_context.isServerClass(parent_class))
                     {
@@ -580,12 +570,9 @@ public class WebAppClassLoader extends URLClassLoader
 
                 // We couldn't find a parent class, so OK to return a webapp one if it exists 
                 // and we just couldn't see it before 
-                if (webapp_url!=null)
+                webapp_class = loadAsResource(name, false);
+                if (webapp_class != null)
                 {
-                    webapp_class = this.foundClass(name,webapp_url);
-                    resolveClass(webapp_class);
-                    if (LOG.isDebugEnabled())
-                        LOG.debug("WAP !server webapp loaded {}",webapp_class);
                     return webapp_class;
                 }
                 
@@ -629,12 +616,47 @@ public class WebAppClassLoader extends URLClassLoader
         return _transformers.remove(transformer);
     }
 
+    
+    /**
+     * Look for the classname as a resource to avoid loading a class that is 
+     * potentially a system resource.
+     * 
+     * @param name the name of the class to load
+     * @param checkSystemResource if true and the class isn't a system class we return it
+     * @return the loaded class
+     * @throws ClassNotFoundException
+     */
+    protected Class<?> loadAsResource (final String name, boolean checkSystemResource) throws ClassNotFoundException
+    {
+        // Try the webapp classloader first
+        // Look in the webapp classloader as a resource, to avoid 
+        // loading a system class.
+        Class<?> webapp_class = null;
+        String path = name.replace('.', '/').concat(".class");
+        URL webapp_url = findResource(path);
+        
+        if (webapp_url!=null && (!checkSystemResource || !_context.isSystemResource(name,webapp_url)))
+        {
+
+            webapp_class = this.foundClass(name,webapp_url);
+            resolveClass(webapp_class);
+            if (LOG.isDebugEnabled())
+                LOG.debug("WAP webapp loaded {}",webapp_class);
+        }
+        
+        return webapp_class;
+    }
+    
+    
+    
     /* ------------------------------------------------------------ */
     @Override
     protected Class<?> findClass(final String name) throws ClassNotFoundException
     {
         if (_transformers.isEmpty())
+        { 
             return super.findClass(name);
+        }
 
         String path = name.replace('.', '/').concat(".class");
         URL url = findResource(path);

pom.xml

@@ -33,12 +33,22 @@
     <jmhjar.name>benchmarks</jmhjar.name>
     <tycho-version>1.2.0</tycho-version>
     <cbi-plugins.version>1.1.5</cbi-plugins.version>
-    <surefire.version>2.22.0</surefire.version>
     <junit.version>5.3.0</junit.version>
-    <maven-plugin-tools.version>3.5.2</maven-plugin-tools.version>
     <maven.version>3.5.0</maven.version>
+    <weld.version>2.4.5.Final</weld.version>
+    <jetty.perf-helper.version>1.0.5</jetty.perf-helper.version>
     <unix.socket.tmp></unix.socket.tmp>
 
+    <!-- some maven plugins versions -->
+    <maven.surefire.version>2.22.0</maven.surefire.version>
+    <maven.compiler.plugin.version>3.8.0</maven.compiler.plugin.version>
+    <maven.dependency.plugin.version>3.1.1</maven.dependency.plugin.version>
+    <maven.resources.plugin.version>3.1.0</maven.resources.plugin.version>
+    <maven.source.plugin.version>3.0.1</maven.source.plugin.version>
+    <maven.war.plugin.version>3.2.2</maven.war.plugin.version>
+    <maven.plugin-tools.version>3.5.2</maven.plugin-tools.version>
+
+
     <!-- testing -->
     <jetty.test.version>5.0</jetty.test.version>
   </properties>
@@ -263,6 +273,7 @@
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-remote-resources-plugin</artifactId>
         <executions>
           <execution>
@@ -280,6 +291,7 @@
       </plugin>
       <!-- The source maven plugin creates the source bundle and adds manifest -->
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
         <inherited>true</inherited>
         <executions>
@@ -422,7 +434,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.0</version>
+          <version>${maven.compiler.plugin.version}</version>
           <configuration>
             <source>1.8</source>
             <target>1.8</target>
@@ -431,7 +443,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>3.1.1</version>
+          <version>${maven.dependency.plugin.version}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -454,7 +466,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>${surefire.version}</version>
+          <version>${maven.surefire.version}</version>
           <dependencies>
             <dependency>
               <groupId>org.junit.jupiter</groupId>
@@ -598,7 +610,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>${maven.resources.plugin.version}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -620,12 +632,12 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
-          <version>3.0.1</version>
+          <version>${maven.source.plugin.version}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>${surefire.version}</version>
+          <version>${maven.surefire.version}</version>
           <configuration>
             <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds>
             <argLine>@{argLine} -Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US -showversion -Xmx1g -Xms1g -XX:+PrintGCDetails</argLine>
@@ -641,7 +653,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-war-plugin</artifactId>
-          <version>3.2.2</version>
+          <version>${maven.war.plugin.version}</version>
         </plugin>
         <plugin>
           <groupId>org.eclipse.jetty.toolchain</groupId>
@@ -1010,12 +1022,12 @@
       <dependency>
         <groupId>org.apache.maven.plugin-tools</groupId>
         <artifactId>maven-plugin-tools-api</artifactId>
-        <version>${maven-plugin-tools.version}</version>
+        <version>${maven.plugin-tools.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.plugin-tools</groupId>
         <artifactId>maven-plugin-annotations</artifactId>
-        <version>${maven-plugin-tools.version}</version>
+        <version>${maven.plugin-tools.version}</version>
         <scope>provided</scope>
       </dependency>
       <!-- Old Deps -->
@@ -1027,7 +1039,7 @@
       <dependency>
         <groupId>org.eclipse.jetty.toolchain</groupId>
         <artifactId>jetty-perf-helper</artifactId>
-        <version>1.0.5</version>
+        <version>${jetty.perf-helper.version}</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>