Merge pull request #4678 from eclipse/jetty-9.4.x-4443-alpn-backport-8u252

Issue #4443 - Track backport of ALPN APIs to Java 8.

examples/embedded/pom.xml

@@ -171,7 +171,7 @@
     <profile>
       <id>jdk9</id>
       <activation>
-        <jdk>[1.9,)</jdk>
+        <jdk>[9,)</jdk>
       </activation>
       <dependencies>
         <dependency>

jetty-alpn/jetty-alpn-java-client/pom.xml

@@ -20,8 +20,8 @@
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.9</source>
+          <source>9</source>
-          <target>1.9</target>
+          <target>9</target>
           <release>9</release>
         </configuration>
       </plugin>

jetty-alpn/jetty-alpn-java-server/pom.xml

@@ -19,8 +19,8 @@
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.9</source>
+          <source>9</source>
-          <target>1.9</target>
+          <target>9</target>
           <release>9</release>
         </configuration>
       </plugin>
@@ -46,11 +46,6 @@
       <artifactId>jetty-io</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.alpn</groupId>
-      <artifactId>alpn-api</artifactId>
-      <version>${alpn.api.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-alpn-server</artifactId>

jetty-alpn/jetty-alpn-openjdk8-client/pom.xml

@@ -25,6 +25,7 @@
       <groupId>org.eclipse.jetty.alpn</groupId>
       <artifactId>alpn-api</artifactId>
       <version>${alpn.api.version}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.http2</groupId>

jetty-alpn/jetty-alpn-openjdk8-client/src/main/java/org/eclipse/jetty/alpn/openjdk8/client/OpenJDK8ClientALPNProcessor.java

@@ -18,13 +18,20 @@
 
 package org.eclipse.jetty.alpn.openjdk8.client;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.List;
 import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLHandshakeException;
+import javax.net.ssl.SSLParameters;
 
 import org.eclipse.jetty.alpn.ALPN;
 import org.eclipse.jetty.alpn.client.ALPNClientConnection;
 import org.eclipse.jetty.io.Connection;
 import org.eclipse.jetty.io.ssl.ALPNProcessor;
+import org.eclipse.jetty.io.ssl.SslConnection;
+import org.eclipse.jetty.io.ssl.SslHandshakeListener;
 import org.eclipse.jetty.util.JavaVersion;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
@@ -33,11 +40,31 @@ public class OpenJDK8ClientALPNProcessor implements ALPNProcessor.Client
 {
     private static final Logger LOG = Log.getLogger(OpenJDK8ClientALPNProcessor.class);
 
+    private Method alpnProtocols;
+    private Method alpnProtocol;
+
     @Override
     public void init()
     {
         if (JavaVersion.VERSION.getPlatform() != 8)
             throw new IllegalStateException(this + " not applicable for java " + JavaVersion.VERSION);
+
+        try
+        {
+            // JDK 8u252 has the JDK 9 ALPN API backported.
+            // Use reflection so we can build with a JDK version less than 8u252.
+            alpnProtocols = SSLParameters.class.getMethod("setApplicationProtocols", String[].class);
+            alpnProtocol = SSLEngine.class.getMethod("getApplicationProtocol");
+            if (LOG.isDebugEnabled())
+                LOG.debug("Using OpenJDK ALPN APIs instead of Jetty ALPN APIs");
+            return;
+        }
+        catch (NoSuchMethodException x)
+        {
+            LOG.ignore(x);
+        }
+
+        // Backported ALPN APIs not available.
         if (ALPN.class.getClassLoader() != null)
             throw new IllegalStateException(ALPN.class.getName() + " must be on JVM boot classpath");
         if (LOG.isDebugEnabled())
@@ -53,14 +80,34 @@ public class OpenJDK8ClientALPNProcessor implements ALPNProcessor.Client
     @Override
     public void configure(SSLEngine sslEngine, Connection connection)
     {
-        connection.addListener(new ALPNListener((ALPNClientConnection)connection));
+        ALPNClientConnection alpnConnection = (ALPNClientConnection)connection;
+        if (alpnProtocols == null)
+        {
+            connection.addListener(new ALPNConnectionListener(alpnConnection));
+        }
+        else
+        {
+            try
+            {
+                Object protocols = alpnConnection.getProtocols().toArray(new String[0]);
+                SSLParameters sslParameters = sslEngine.getSSLParameters();
+                alpnProtocols.invoke(sslParameters, protocols);
+                sslEngine.setSSLParameters(sslParameters);
+                ((SslConnection.DecryptedEndPoint)connection.getEndPoint()).getSslConnection()
+                    .addHandshakeListener(new ALPNSSLListener(alpnConnection));
+            }
+            catch (IllegalAccessException | InvocationTargetException x)
+            {
+                throw new IllegalStateException(this + " unable to set ALPN protocols", x);
+            }
+        }
     }
 
-    private final class ALPNListener implements ALPN.ClientProvider, Connection.Listener
+    private static final class ALPNConnectionListener implements ALPN.ClientProvider, Connection.Listener
     {
         private final ALPNClientConnection alpnConnection;
 
-        private ALPNListener(ALPNClientConnection connection)
+        private ALPNConnectionListener(ALPNClientConnection connection)
         {
             alpnConnection = connection;
         }
@@ -102,4 +149,32 @@ public class OpenJDK8ClientALPNProcessor implements ALPNProcessor.Client
             alpnConnection.selected(protocol);
         }
     }
+
+    private final class ALPNSSLListener implements SslHandshakeListener
+    {
+        private final ALPNClientConnection alpnConnection;
+
+        private ALPNSSLListener(ALPNClientConnection connection)
+        {
+            alpnConnection = connection;
+        }
+
+        @Override
+        public void handshakeSucceeded(Event event) throws SSLException
+        {
+            try
+            {
+                SSLEngine sslEngine = alpnConnection.getSSLEngine();
+                String protocol = (String)alpnProtocol.invoke(sslEngine);
+                if (LOG.isDebugEnabled())
+                    LOG.debug("selected protocol {}", protocol);
+                alpnConnection.selected(protocol);
+            }
+            catch (IllegalAccessException | InvocationTargetException x)
+            {
+                SSLHandshakeException failure = new SSLHandshakeException(this + " unable to get ALPN protocol");
+                throw (SSLHandshakeException)failure.initCause(x);
+            }
+        }
+    }
 }

jetty-alpn/jetty-alpn-openjdk8-server/src/main/java/org/eclipse/jetty/alpn/openjdk8/server/OpenJDK8ServerALPNProcessor.java

@@ -18,15 +18,19 @@
 
 package org.eclipse.jetty.alpn.openjdk8.server;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.List;
+import java.util.function.BiFunction;
 import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLException;
 
 import org.eclipse.jetty.alpn.ALPN;
 import org.eclipse.jetty.alpn.server.ALPNServerConnection;
 import org.eclipse.jetty.io.Connection;
 import org.eclipse.jetty.io.ssl.ALPNProcessor;
+import org.eclipse.jetty.io.ssl.SslConnection;
+import org.eclipse.jetty.io.ssl.SslHandshakeListener;
 import org.eclipse.jetty.util.JavaVersion;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
@@ -35,11 +39,29 @@ public class OpenJDK8ServerALPNProcessor implements ALPNProcessor.Server
 {
     private static final Logger LOG = Log.getLogger(OpenJDK8ServerALPNProcessor.class);
 
+    private Method alpnSelector;
+
     @Override
     public void init()
     {
         if (JavaVersion.VERSION.getPlatform() != 8)
             throw new IllegalStateException(this + " not applicable for java " + JavaVersion.VERSION);
+
+        try
+        {
+            // JDK 8u252 has the JDK 9 ALPN API backported.
+            // Use reflection so we can build with a JDK version less than 8u252.
+            alpnSelector = SSLEngine.class.getMethod("setHandshakeApplicationProtocolSelector", BiFunction.class);
+            if (LOG.isDebugEnabled())
+                LOG.debug("Using OpenJDK ALPN APIs instead of Jetty ALPN APIs");
+            return;
+        }
+        catch (NoSuchMethodException x)
+        {
+            LOG.ignore(x);
+        }
+
+        // Backported ALPN APIs not available.
         if (ALPN.class.getClassLoader() != null)
             throw new IllegalStateException(ALPN.class.getName() + " must be on JVM boot classpath");
         if (LOG.isDebugEnabled())
@@ -55,10 +77,26 @@ public class OpenJDK8ServerALPNProcessor implements ALPNProcessor.Server
     @Override
     public void configure(SSLEngine sslEngine, Connection connection)
     {
-        connection.addListener(new ALPNListener((ALPNServerConnection)connection));
+        if (alpnSelector == null)
+        {
+            ALPNListener listener = new ALPNListener((ALPNServerConnection)connection);
+            connection.addListener(listener);
+        }
+        else
+        {
+            try
+            {
+                ALPNCallback callback = new ALPNCallback((ALPNServerConnection)connection);
+                alpnSelector.invoke(sslEngine, callback);
+            }
+            catch (IllegalAccessException | InvocationTargetException x)
+            {
+                throw new IllegalStateException(this + " unable to set ALPN selector", x);
+            }
+        }
     }
 
-    private final class ALPNListener implements ALPN.ServerProvider, Connection.Listener
+    private static final class ALPNListener implements ALPN.ServerProvider, Connection.Listener
     {
         private final ALPNServerConnection alpnConnection;
 
@@ -92,7 +130,7 @@ public class OpenJDK8ServerALPNProcessor implements ALPNProcessor.Server
         }
 
         @Override
-        public String select(List<String> protocols) throws SSLException
+        public String select(List<String> protocols)
         {
             if (LOG.isDebugEnabled())
                 LOG.debug("select {} {}", alpnConnection, protocols);
@@ -100,4 +138,50 @@ public class OpenJDK8ServerALPNProcessor implements ALPNProcessor.Server
             return alpnConnection.getProtocol();
         }
     }
+
+    private static class ALPNCallback implements BiFunction<SSLEngine, List<String>, String>, SslHandshakeListener
+    {
+        private final ALPNServerConnection alpnConnection;
+
+        private ALPNCallback(ALPNServerConnection connection)
+        {
+            alpnConnection = connection;
+            ((SslConnection.DecryptedEndPoint)alpnConnection.getEndPoint()).getSslConnection().addHandshakeListener(this);
+        }
+
+        @Override
+        public String apply(SSLEngine engine, List<String> protocols)
+        {
+            try
+            {
+                if (LOG.isDebugEnabled())
+                    LOG.debug("apply {} {}", alpnConnection, protocols);
+                alpnConnection.select(protocols);
+                return alpnConnection.getProtocol();
+            }
+            catch (Throwable x)
+            {
+                // Cannot negotiate the protocol, return null to have
+                // JSSE send Alert.NO_APPLICATION_PROTOCOL to the client.
+                return null;
+            }
+        }
+
+        @Override
+        public void handshakeSucceeded(Event event)
+        {
+            String protocol = alpnConnection.getProtocol();
+            if (LOG.isDebugEnabled())
+                LOG.debug("TLS handshake succeeded, protocol={} for {}", protocol, alpnConnection);
+            if (protocol == null)
+                alpnConnection.unsupported();
+        }
+
+        @Override
+        public void handshakeFailed(Event event, Throwable failure)
+        {
+            if (LOG.isDebugEnabled())
+                LOG.debug("TLS handshake failed " + alpnConnection, failure);
+        }
+    }
 }

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.0.v20141016|lib/alpn/alpn-boot-8.1.0.v20141016.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.0.v20141016.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_05.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.0.v20141016|lib/alpn/alpn-boot-8.1.0.v20141016.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.0.v20141016.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_101.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.9.v20160720|lib/alpn/alpn-boot-8.1.9.v20160720.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.9.v20160720.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_102.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.9.v20160720|lib/alpn/alpn-boot-8.1.9.v20160720.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.9.v20160720.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_11.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.0.v20141016|lib/alpn/alpn-boot-8.1.0.v20141016.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.0.v20141016.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_111.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.9.v20160720|lib/alpn/alpn-boot-8.1.9.v20160720.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.9.v20160720.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_112.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.10.v20161026|lib/alpn/alpn-boot-8.1.10.v20161026.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.10.v20161026.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_121.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.11.v20170118|lib/alpn/alpn-boot-8.1.11.v20170118.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.11.v20170118.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_131.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.11.v20170118|lib/alpn/alpn-boot-8.1.11.v20170118.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.11.v20170118.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_141.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.11.v20170118|lib/alpn/alpn-boot-8.1.11.v20170118.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.11.v20170118.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_144.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.11.v20170118|lib/alpn/alpn-boot-8.1.11.v20170118.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.11.v20170118.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_151.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.11.v20170118|lib/alpn/alpn-boot-8.1.11.v20170118.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.11.v20170118.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_152.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.11.v20170118|lib/alpn/alpn-boot-8.1.11.v20170118.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.11.v20170118.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_161.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.12.v20180117|lib/alpn/alpn-boot-8.1.12.v20180117.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.12.v20180117.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_162.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.12.v20180117|lib/alpn/alpn-boot-8.1.12.v20180117.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.12.v20180117.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_171.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.12.v20180117|lib/alpn/alpn-boot-8.1.12.v20180117.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.12.v20180117.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_172.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.12.v20180117|lib/alpn/alpn-boot-8.1.12.v20180117.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.12.v20180117.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_181.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.12.v20180117|lib/alpn/alpn-boot-8.1.12.v20180117.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.12.v20180117.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_191.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_192.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_20.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.0.v20141016|lib/alpn/alpn-boot-8.1.0.v20141016.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.0.v20141016.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_201.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_202.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_211.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_212.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_221.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_222.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_231.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_232.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_241.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_242.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_25.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.2.v20141202|lib/alpn/alpn-boot-8.1.2.v20141202.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.2.v20141202.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_31.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.3.v20150130|lib/alpn/alpn-boot-8.1.3.v20150130.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.3.v20150130.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_40.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.3.v20150130|lib/alpn/alpn-boot-8.1.3.v20150130.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.3.v20150130.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_45.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.3.v20150130|lib/alpn/alpn-boot-8.1.3.v20150130.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.3.v20150130.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_51.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.4.v20150727|lib/alpn/alpn-boot-8.1.4.v20150727.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.4.v20150727.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_60.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.5.v20150921|lib/alpn/alpn-boot-8.1.5.v20150921.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.5.v20150921.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_65.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.6.v20151105|lib/alpn/alpn-boot-8.1.6.v20151105.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.6.v20151105.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_66.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.6.v20151105|lib/alpn/alpn-boot-8.1.6.v20151105.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.6.v20151105.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_71.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.7.v20160121|lib/alpn/alpn-boot-8.1.7.v20160121.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.7.v20160121.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_72.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.7.v20160121|lib/alpn/alpn-boot-8.1.7.v20160121.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.7.v20160121.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_73.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.7.v20160121|lib/alpn/alpn-boot-8.1.7.v20160121.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.7.v20160121.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_74.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.7.v20160121|lib/alpn/alpn-boot-8.1.7.v20160121.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.7.v20160121.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_77.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.7.v20160121|lib/alpn/alpn-boot-8.1.7.v20160121.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.7.v20160121.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_91.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.7.v20160121|lib/alpn/alpn-boot-8.1.7.v20160121.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.7.v20160121.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_92.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.8.v20160420|lib/alpn/alpn-boot-8.1.8.v20160420.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.8.v20160420.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-8.mod

@@ -1,33 +1,22 @@
 DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Provides ALPN support for JDK 8, modifying the sun.security.ssl
+Provides ALPN support for JDK 8, using the Jetty ALPN Agent.
-classes and adding them to the JVM boot classpath.
-This modification has a tight dependency on specific recent updates of
-Java 1.7 and Java 1.8 (Java versions prior to 1.7u40 are not supported).
-This module will use an appropriate alpn-boot jar for your
-specific version of Java.
-# IMPORTANT: Versions of Java that exist after this module was created are
-#            not guaranteed to work with existing alpn-boot jars, and might
-#            need a new alpn-boot to be created / tested / deployed by the
-#            Jetty project in order to provide support for these future
-#            Java versions.
-#
-# All versions of the alpn-boot jar can be found at
-# https://repo1.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/
-
-[depend]
-alpn-impl/alpn-${java.version}
-
-[lib]
-lib/jetty-alpn-openjdk8-server-${jetty.version}.jar
 
 [files]
 lib/
 lib/alpn/
+maven://org.mortbay.jetty.alpn/jetty-alpn-agent/2.0.10|lib/alpn/jetty-alpn-agent-2.0.10.jar
+
+[lib]
+lib/jetty-alpn-openjdk8-server-${jetty.version}.jar
 
 [license]
-ALPN is a hosted at github under the GPL v2 with ClassPath Exception.
+The ALPN implementation for Java 8u242 and earlier replaces/modifies OpenJDK classes
-ALPN replaces/modifies OpenJDK classes in the sun.security.ssl package.
+in the sun.security.ssl package.
+These modified classes are hosted at GitHub under the GPL v2 with ClassPath Exception.
 http://github.com/jetty-project/jetty-alpn
 http://openjdk.java.net/legal/gplv2+ce.html
+
+[exec]
+-javaagent:lib/alpn/jetty-alpn-agent-2.0.10.jar

jetty-alpn/pom.xml

@@ -21,7 +21,7 @@
     <profile>
       <id>jdk9</id>
       <activation>
-        <jdk>[1.9,)</jdk>
+        <jdk>[9,)</jdk>
       </activation>
       <modules>
         <module>jetty-alpn-java-client</module>

jetty-home/pom.xml

@@ -774,7 +774,7 @@
     <profile>
       <id>jdk9</id>
       <activation>
-        <jdk>[1.9,)</jdk>
+        <jdk>[9,)</jdk>
       </activation>
       <dependencies>
         <dependency>

jetty-http-spi/pom.xml

@@ -78,7 +78,7 @@
     <profile>
       <id>jdk9</id>
       <activation>
-        <jdk>[1.9,)</jdk>
+        <jdk>[9,)</jdk>
       </activation>
       <dependencies>
         <dependency>

jetty-http2/http2-alpn-tests/pom.xml

@@ -20,7 +20,7 @@
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
-            <id>copy</id>
+            <id>copy-alpn-agent</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>copy</goal>
@@ -29,8 +29,8 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>org.mortbay.jetty.alpn</groupId>
-                  <artifactId>alpn-boot</artifactId>
+                  <artifactId>jetty-alpn-agent</artifactId>
-                  <version>${alpn.version}</version>
+                  <version>${alpn.agent.version}</version>
                   <type>jar</type>
                   <overWrite>false</overWrite>
                   <outputDirectory>${project.build.directory}/alpn</outputDirectory>
@@ -43,7 +43,7 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <argLine>-Xbootclasspath/p:${project.build.directory}/alpn/alpn-boot-${alpn.version}.jar</argLine>
+          <argLine>-javaagent:${project.build.directory}/alpn/jetty-alpn-agent-${alpn.agent.version}.jar=debug=true</argLine>
         </configuration>
       </plugin>
     </plugins>
@@ -54,12 +54,6 @@
       <groupId>org.eclipse.jetty.alpn</groupId>
       <artifactId>alpn-api</artifactId>
       <version>${alpn.api.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-alpn-openjdk8-server</artifactId>
-      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -68,6 +62,18 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-alpn-server</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-alpn-openjdk8-server</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.http2</groupId>
       <artifactId>http2-server</artifactId>
@@ -81,21 +87,4 @@
     </dependency>
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>jdk9</id>
-      <activation>
-        <jdk>[1.9,)</jdk>
-      </activation>
-
-      <dependencies>
-        <dependency>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-alpn-java-server</artifactId>
-          <version>${project.version}</version>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
 </project>

jetty-http2/http2-http-client-transport/pom.xml

@@ -18,7 +18,7 @@
     <profile>
       <id>jdk8</id>
       <activation>
-        <jdk>[1.8,1.9)</jdk>
+        <jdk>[1.8,9)</jdk>
       </activation>
       <build>
         <plugins>
@@ -26,7 +26,7 @@
             <artifactId>maven-dependency-plugin</artifactId>
             <executions>
               <execution>
-                <id>copy</id>
+                <id>copy-alpn-agent</id>
                 <phase>generate-resources</phase>
                 <goals>
                   <goal>copy</goal>
@@ -35,8 +35,8 @@
                   <artifactItems>
                     <artifactItem>
                       <groupId>org.mortbay.jetty.alpn</groupId>
-                      <artifactId>alpn-boot</artifactId>
+                      <artifactId>jetty-alpn-agent</artifactId>
-                      <version>${alpn.version}</version>
+                      <version>${alpn.agent.version}</version>
                       <type>jar</type>
                       <overWrite>false</overWrite>
                       <outputDirectory>${project.build.directory}/alpn</outputDirectory>
@@ -49,16 +49,29 @@
           <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-              <argLine>-Xbootclasspath/p:${project.build.directory}/alpn/alpn-boot-${alpn.version}.jar</argLine>
+              <argLine>-javaagent:${project.build.directory}/alpn/jetty-alpn-agent-${alpn.agent.version}.jar=debug=true</argLine>
             </configuration>
           </plugin>
         </plugins>
       </build>
+      <dependencies>
+        <dependency>
+          <groupId>org.eclipse.jetty.alpn</groupId>
+          <artifactId>alpn-api</artifactId>
+          <version>${alpn.api.version}</version>
+          <scope>provided</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.eclipse.jetty</groupId>
+          <artifactId>jetty-alpn-openjdk8-client</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+      </dependencies>
     </profile>
     <profile>
       <id>jdk9</id>
       <activation>
-        <jdk>[1.9,)</jdk>
+        <jdk>[9,)</jdk>
       </activation>
       <dependencies>
         <dependency>

jetty-http2/pom.xml

@@ -24,9 +24,10 @@
     <profile>
       <id>jdk8</id>
       <activation>
-        <jdk>[1.8,1.9)</jdk>
+        <jdk>[1.8,9)</jdk>
       </activation>
       <modules>
+        <!-- These tests can only be run in Java 8 -->
         <module>http2-alpn-tests</module>
       </modules>
     </profile>

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

@@ -129,7 +129,7 @@
     <profile>
       <id>jdk9+</id>
       <activation>
-        <jdk>[1.9,)</jdk>
+        <jdk>[9,)</jdk>
       </activation>
       <build>
         <pluginManagement>

jetty-osgi/test-jetty-osgi/pom.xml

@@ -17,7 +17,6 @@
     <exam.version>4.13.1</exam.version>
     <url.version>2.6.1</url.version>
     <injection.bundle.version>1.0</injection.bundle.version>
-    <skipTests>true</skipTests>
   </properties>
   <dependencies>
     <!-- Pax Exam Dependencies -->
@@ -446,7 +445,6 @@
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
           <configuration>
-            <skipTests>${skipTests}</skipTests>
             <systemPropertyVariables>
               <mavenRepoPath>${settings.localRepository}</mavenRepoPath>
               <settingsFilePath>${env.GLOBAL_MVN_SETTINGS}</settingsFilePath>
@@ -541,20 +539,17 @@
           <scope>test</scope>
         </dependency>
       </dependencies>
-      <properties>
-        <skipTests>false</skipTests>
-      </properties>
       <build>
         <plugins>
           <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
+              <!-- No point defining -javaagent as the actual OSGi VM is run as a forked process by pax-exam -->
+              <!-- But we do pass the sys property of the jetty-alpn-agent jar so that it can be configured inside tests -->
+              <argLine>-Dmortbay-alpn-agent=${settings.localRepository}/org/mortbay/jetty/alpn/jetty-alpn-agent/${alpn.agent.version}/jetty-alpn-agent-${alpn.agent.version}.jar -Dconscrypt-version=${conscrypt.version}</argLine>
               <excludes>
                 <exclude>**/TestJettyOSGiBootHTTP2JDK9*</exclude>
               </excludes>
-              <!-- No point defining -Xbootclasspath as the actual OSGi VM is run as a forked process by pax-exam -->
-              <!-- But we do pass the sys property of the alpn-boot jar so that it can be configured inside tests -->
-              <argLine>-Dmortbay-alpn-boot=${settings.localRepository}/org/mortbay/jetty/alpn/alpn-boot/${alpn.version}/alpn-boot-${alpn.version}.jar -Dconscrypt-version=${conscrypt.version}</argLine>
             </configuration>
           </plugin>
         </plugins>
@@ -591,15 +586,11 @@
           <scope>test</scope>
         </dependency>
       </dependencies>
-      <properties>
-        <skipTests>false</skipTests>
-      </properties>
       <build>
         <plugins>
           <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-              <skipTests>${skipTests}</skipTests>
               <excludes>
                 <exclude>**/TestJettyOSGiBootHTTP2</exclude>
               </excludes>

jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2.java

@@ -47,7 +47,6 @@ import org.osgi.framework.ServiceReference;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
@@ -93,18 +92,13 @@ public class TestJettyOSGiBootHTTP2
         List<Option> res = new ArrayList<>();
         res.add(CoreOptions.systemProperty("jetty.alpn.protocols").value("h2,http/1.1"));
 
-        String alpnBoot = System.getProperty("mortbay-alpn-boot");
+        String alpnAgent = System.getProperty("mortbay-alpn-agent");
-        if (alpnBoot == null)
+        if (alpnAgent == null)
-        {
+            throw new IllegalStateException("Define path to alpn agent jar as system property -Dmortbay-alpn-agent");
-            throw new IllegalStateException("Define path to alpn boot jar as system property -Dmortbay-alpn-boot");
+        File alpnAgentFile = new File(alpnAgent);
-        }
+        if (!alpnAgentFile.exists())
-        File checkALPNBoot = new File(alpnBoot);
+            throw new IllegalStateException("Unable to find the alpn agent jar here: " + alpnAgent);
-        if (!checkALPNBoot.exists())
+        res.add(CoreOptions.vmOptions("-javaagent:" + alpnAgentFile.getAbsolutePath() + "=debug=true"));
-        {
-            throw new IllegalStateException("Unable to find the alpn boot jar here: " + alpnBoot);
-        }
-
-        res.add(CoreOptions.vmOptions("-Xbootclasspath/p:" + checkALPNBoot.getAbsolutePath()));
 
         res.add(mavenBundle().groupId("org.eclipse.jetty.osgi").artifactId("jetty-osgi-alpn").versionAsInProject().noStart());
         res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-openjdk8-server").versionAsInProject().start());
@@ -116,20 +110,13 @@ public class TestJettyOSGiBootHTTP2
         return res;
     }
 
-    public void checkALPNBootOnBootstrapClasspath() throws Exception
-    {
-        Class<?> alpn = Thread.currentThread().getContextClassLoader().loadClass("org.eclipse.jetty.alpn.ALPN");
-        assertNotNull(alpn);
-        assertNull(alpn.getClassLoader());
-    }
-
     public void assertAllBundlesActiveOrResolved()
     {
         TestOSGiUtil.debugBundles(bundleContext);
         TestOSGiUtil.assertAllBundlesActiveOrResolved(bundleContext);
         Bundle openjdk8 = TestOSGiUtil.getBundle(bundleContext, "org.eclipse.jetty.alpn.openjdk8.server");
         assertNotNull(openjdk8);
-        ServiceReference[] services = openjdk8.getRegisteredServices();
+        ServiceReference<?>[] services = openjdk8.getRegisteredServices();
         assertNotNull(services);
         Bundle server = TestOSGiUtil.getBundle(bundleContext, "org.eclipse.jetty.alpn.server");
         assertNotNull(server);
@@ -139,10 +126,7 @@ public class TestJettyOSGiBootHTTP2
     public void testHTTP2() throws Exception
     {
         if (Boolean.getBoolean(TestOSGiUtil.BUNDLE_DEBUG))
-        {
-            checkALPNBootOnBootstrapClasspath();
             assertAllBundlesActiveOrResolved();
-        }
 
         HttpClient httpClient = null;
         HTTP2Client http2Client = null;
@@ -151,7 +135,7 @@ public class TestJettyOSGiBootHTTP2
             //get the port chosen for https
             String tmp = System.getProperty("boot.https.port");
             assertNotNull(tmp);
-            int port = Integer.valueOf(tmp.trim());
+            int port = Integer.parseInt(tmp.trim());
 
             Path path = Paths.get("src", "test", "config");
             File keys = path.resolve("etc").resolve("keystore").toFile();

jetty-server/src/test/java/org/eclipse/jetty/server/DetectorConnectionTest.java

@@ -708,8 +708,16 @@ public class DetectorConnectionTest
             sb.append("AAAA");
         }
         String request = sb.toString();
-        String response = getResponse(request);
 
+        try
+        {
+            String response = getResponse(request);
             assertThat(response, Matchers.nullValue());
         }
+        catch (SocketException expected)
+        {
+            // The test may fail writing the "request"
+            // bytes as the server sends back a TCP RST.
+        }
+    }
 }

jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java

@@ -487,10 +487,12 @@ public class Modules implements Iterable<Module>
         _modules.stream().filter(Module::isEnabled).forEach(m ->
         {
             // Check dependencies
-            m.getDepends().forEach(d ->
+            m.getDepends().stream()
+                .filter(Module::isRequiredDependency)
+                .forEach(d ->
                 {
                     Set<Module> providers = getAvailableProviders(d);
-                if (providers.stream().filter(Module::isEnabled).count() == 0)
+                    if (providers.stream().noneMatch(Module::isEnabled))
                     {
                         if (unsatisfied.length() > 0)
                             unsatisfied.append(',');

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_101.mod

@@ -1,5 +0,0 @@
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.9.v20160720|lib/alpn/alpn-boot-8.1.9.v20160720.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.9.v20160720.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_102.mod

@@ -1,5 +0,0 @@
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.9.v20160720|lib/alpn/alpn-boot-8.1.9.v20160720.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.9.v20160720.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_111.mod

@@ -1,5 +0,0 @@
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.9.v20160720|lib/alpn/alpn-boot-8.1.9.v20160720.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.9.v20160720.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_112.mod

@@ -1,5 +0,0 @@
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.10.v20161026|lib/alpn/alpn-boot-8.1.10.v20161026.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.10.v20161026.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_121.mod

@@ -1,5 +0,0 @@
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.11.v20170118|lib/alpn/alpn-boot-8.1.11.v20170118.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.11.v20170118.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_131.mod

@@ -1,5 +0,0 @@
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.11.v20170118|lib/alpn/alpn-boot-8.1.11.v20170118.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.11.v20170118.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_141.mod

@@ -1,5 +0,0 @@
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.11.v20170118|lib/alpn/alpn-boot-8.1.11.v20170118.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.11.v20170118.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_144.mod

@@ -1,5 +0,0 @@
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.11.v20170118|lib/alpn/alpn-boot-8.1.11.v20170118.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.11.v20170118.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_151.mod

@@ -1,5 +0,0 @@
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.11.v20170118|lib/alpn/alpn-boot-8.1.11.v20170118.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.11.v20170118.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_152.mod

@@ -1,5 +0,0 @@
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.11.v20170118|lib/alpn/alpn-boot-8.1.11.v20170118.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.11.v20170118.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_161.mod

@@ -1,5 +0,0 @@
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.12.v20180117|lib/alpn/alpn-boot-8.1.12.v20180117.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.12.v20180117.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_162.mod

@@ -1,5 +0,0 @@
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.12.v20180117|lib/alpn/alpn-boot-8.1.12.v20180117.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.12.v20180117.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_171.mod

@@ -1,5 +0,0 @@
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.12.v20180117|lib/alpn/alpn-boot-8.1.12.v20180117.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.12.v20180117.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_172.mod

@@ -1,5 +0,0 @@
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.12.v20180117|lib/alpn/alpn-boot-8.1.12.v20180117.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.12.v20180117.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_181.mod

@@ -1,5 +0,0 @@
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.12.v20180117|lib/alpn/alpn-boot-8.1.12.v20180117.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.12.v20180117.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_191.mod

@@ -1,5 +0,0 @@
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_192.mod

@@ -1,5 +0,0 @@
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_201.mod

@@ -1,5 +0,0 @@
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_202.mod

@@ -1,5 +0,0 @@
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_211.mod

@@ -1,5 +0,0 @@
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_212.mod

@@ -1,5 +0,0 @@
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_221.mod

@@ -1,5 +0,0 @@
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_222.mod

@@ -1,5 +0,0 @@
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_231.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_232.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_241.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_242.mod

@@ -1,7 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_91.mod

@@ -1,5 +0,0 @@
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.7.v20160121|lib/alpn/alpn-boot-8.1.7.v20160121.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.7.v20160121.jar

jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_92.mod

@@ -1,5 +0,0 @@
-[files]
-maven://org.mortbay.jetty.alpn/alpn-boot/8.1.8.v20160420|lib/alpn/alpn-boot-8.1.8.v20160420.jar
-
-[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.1.8.v20160420.jar

jetty-webapp/pom.xml

@@ -79,7 +79,7 @@
     <profile>
       <id>jdk9</id>
       <activation>
-        <jdk>[1.9,)</jdk>
+        <jdk>[9,)</jdk>
       </activation>
       <build>
         <plugins>

pom.xml

@@ -26,8 +26,7 @@
     <alpn.api.version>1.1.3.v20160715</alpn.api.version>
     <jsp.version>8.5.49</jsp.version>
     <infinispan.version>9.4.8.Final</infinispan.version>
-    <!-- default values are unsupported, but required to be defined for reactor sanity reasons -->
+    <alpn.agent.version>2.0.10</alpn.agent.version>
-    <alpn.version>undefined</alpn.version>
     <conscrypt.version>2.4.0</conscrypt.version>
     <asm.version>7.2</asm.version>
     <jmh.version>1.21</jmh.version>

tests/test-http-client-transport/pom.xml

@@ -20,8 +20,42 @@
     <profile>
       <id>jdk8</id>
       <activation>
-        <jdk>[1.8,1.9)</jdk>
+        <jdk>[1.8,9)</jdk>
       </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>copy-alpn-agent</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>copy</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.mortbay.jetty.alpn</groupId>
+                      <artifactId>jetty-alpn-agent</artifactId>
+                      <version>${alpn.agent.version}</version>
+                      <type>jar</type>
+                      <overWrite>false</overWrite>
+                      <outputDirectory>${project.build.directory}/alpn</outputDirectory>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <argLine>-javaagent:${project.build.directory}/alpn/jetty-alpn-agent-${alpn.agent.version}.jar=debug=true</argLine>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
       <dependencies>
         <dependency>
           <groupId>org.eclipse.jetty</groupId>
@@ -36,45 +70,11 @@
           <scope>test</scope>
         </dependency>
       </dependencies>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>copy</id>
-                <phase>generate-resources</phase>
-                <goals>
-                  <goal>copy</goal>
-                </goals>
-                <configuration>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>org.mortbay.jetty.alpn</groupId>
-                      <artifactId>alpn-boot</artifactId>
-                      <version>${alpn.version}</version>
-                      <type>jar</type>
-                      <overWrite>false</overWrite>
-                      <outputDirectory>${project.build.directory}/alpn</outputDirectory>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <argLine>-Xbootclasspath/p:${project.build.directory}/alpn/alpn-boot-${alpn.version}.jar</argLine>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
     </profile>
     <profile>
       <id>jdk9</id>
       <activation>
-        <jdk>[1.9,)</jdk>
+        <jdk>[9,)</jdk>
       </activation>
       <dependencies>
         <dependency>

tests/test-webapps/test-http2-webapp/pom.xml

@@ -60,7 +60,7 @@
     <profile>
       <id>jdk8</id>
       <activation>
-        <jdk>[1.8,1.9)</jdk>
+        <jdk>[1.8,9)</jdk>
       </activation>
       <build>
         <plugins>
@@ -68,7 +68,7 @@
             <artifactId>maven-dependency-plugin</artifactId>
             <executions>
               <execution>
-                <id>copy-alpn-boot</id>
+                <id>copy-alpn-agent</id>
                 <phase>pre-integration-test</phase>
                 <goals>
                   <goal>copy</goal>
@@ -77,8 +77,8 @@
                   <artifactItems>
                     <artifactItem>
                       <groupId>org.mortbay.jetty.alpn</groupId>
-                      <artifactId>alpn-boot</artifactId>
+                      <artifactId>jetty-alpn-agent</artifactId>
-                      <version>${alpn.version}</version>
+                      <version>${alpn.agent.version}</version>
                       <type>jar</type>
                       <overWrite>false</overWrite>
                       <outputDirectory>${project.build.directory}/alpn</outputDirectory>
@@ -89,25 +89,24 @@
             </executions>
           </plugin>
           <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-failsafe-plugin</artifactId>
             <configuration>
-              <argLine>-Xbootclasspath/p:${project.build.directory}/alpn/alpn-boot-${alpn.version}.jar</argLine>
+              <argLine>-javaagent:${project.build.directory}/alpn/jetty-alpn-agent-${alpn.agent.version}.jar=debug=true</argLine>
             </configuration>
           </plugin>
         </plugins>
       </build>
       <dependencies>
+        <dependency>
+          <groupId>org.eclipse.jetty.alpn</groupId>
+          <artifactId>alpn-api</artifactId>
+          <version>${alpn.api.version}</version>
+          <scope>provided</scope>
+        </dependency>
         <dependency>
           <groupId>org.eclipse.jetty</groupId>
           <artifactId>jetty-alpn-openjdk8-client</artifactId>
           <version>${project.version}</version>
-          <exclusions>
-            <exclusion>
-              <groupId>org.eclipse.jetty.alpn</groupId>
-              <artifactId>alpn-api</artifactId>
-            </exclusion>
-          </exclusions>
         </dependency>
         <dependency>
           <groupId>org.eclipse.jetty</groupId>
@@ -120,7 +119,7 @@
     <profile>
       <id>jdk9</id>
       <activation>
-        <jdk>[1.9,)</jdk>
+        <jdk>[9,)</jdk>
       </activation>
       <dependencies>
         <dependency>