Issue #2948 - Require JDK 11 for Jetty 10.x.

First pass at making Jetty 10.x require JDK 11.

* Removed JDK 8 modules (in particular ALPN and ALPN *.mod files).
* Removed profiles targeting JDK 8, 9 and 10.
* Updated dependencies to newer versions that support JDK 11.
* Temporarily commented out the Jetty Maven Plugins due to
maven-plugin-plugin not working with JDK 11.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

examples/embedded/pom.xml

@@ -77,7 +77,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-alpn-openjdk8-server</artifactId>
+      <artifactId>jetty-alpn-java-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
@@ -128,7 +128,7 @@
       <groupId>org.eclipse.jetty.orbit</groupId>
       <artifactId>javax.mail.glassfish</artifactId>
     </dependency>
-     <dependency>
+    <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>
       <artifactId>jetty-test-helper</artifactId>
       <!-- scope>test</scope-->
@@ -141,20 +141,4 @@
       <scope>test</scope>
     </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>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
 </project>

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

@@ -1,73 +0,0 @@
-<?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">
-
-  <parent>
-    <groupId>org.eclipse.jetty</groupId>
-    <artifactId>jetty-alpn-parent</artifactId>
-    <version>10.0.0-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>jetty-alpn-openjdk8-client</artifactId>
-  <name>Jetty :: ALPN :: OpenJDK8 Client Implementation</name>
-
-  <properties>
-    <bundle-symbolic-name>${project.groupId}.alpn.openjdk8.client</bundle-symbolic-name>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-alpn-client</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.http2</groupId>
-      <artifactId>http2-client</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>parse-version</id>
-            <goals>
-              <goal>parse-version</goal>
-            </goals>
-            <configuration>
-              <propertyPrefix>alpn</propertyPrefix>
-              <versionString>${alpn.api.version}</versionString>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-       <plugin>
-         <groupId>org.apache.felix</groupId>
-         <artifactId>maven-bundle-plugin</artifactId>
-         <extensions>true</extensions>
-             <configuration>
-               <instructions>
-                 <Bundle-Description>OpenJDK8 Client ALPN</Bundle-Description>
-                 <Import-Package>org.eclipse.jetty.alpn;version="${alpn.majorVersion}.${alpn.minorVersion}.${alpn.incrementalVersion}",*</Import-Package>
-                 <Export-Package>*</Export-Package>
-                 <Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional</Require-Capability>
-                 <Provide-Capability>osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Client</Provide-Capability>
-                 <_nouses>true</_nouses>
-               </instructions>
-             </configuration>
-       </plugin>
-    </plugins>
-  </build>
-</project>

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

@@ -1,106 +0,0 @@
-//
-//  ========================================================================
-//  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
-//  ------------------------------------------------------------------------
-//  All rights reserved. This program and the accompanying materials
-//  are made available under the terms of the Eclipse Public License v1.0
-//  and Apache License v2.0 which accompanies this distribution.
-//
-//      The Eclipse Public License is available at
-//      http://www.eclipse.org/legal/epl-v10.html
-//
-//      The Apache License v2.0 is available at
-//      http://www.opensource.org/licenses/apache2.0.php
-//
-//  You may elect to redistribute this code under either of these licenses.
-//  ========================================================================
-//
-
-package org.eclipse.jetty.alpn.java.client;
-
-import java.util.List;
-
-import javax.net.ssl.SSLEngine;
-
-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.util.JavaVersion;
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
-
-public class OpenJDK8ClientALPNProcessor implements ALPNProcessor.Client
-{
-    private static final Logger LOG = Log.getLogger(OpenJDK8ClientALPNProcessor.class);
-
-    @Override
-    public void init()
-    {
-        if (JavaVersion.VERSION.getPlatform()!=8)
-            throw new IllegalStateException(this + " not applicable for java "+JavaVersion.VERSION);
-        if (ALPN.class.getClassLoader()!=null)
-            throw new IllegalStateException(ALPN.class.getName() + " must be on JVM boot classpath");
-        if (LOG.isDebugEnabled())
-            ALPN.debug = true;
-    }
-
-    @Override
-    public boolean appliesTo(SSLEngine sslEngine)
-    {
-        return sslEngine.getClass().getName().startsWith("sun.security.ssl.");
-    }
-
-    @Override
-    public void configure(SSLEngine sslEngine, Connection connection)
-    {
-        connection.addListener(new ALPNListener((ALPNClientConnection)connection));
-    }
-
-    private final class ALPNListener implements ALPN.ClientProvider, Connection.Listener
-    {
-        private final ALPNClientConnection alpnConnection;
-
-        private ALPNListener(ALPNClientConnection connection)
-        {
-            alpnConnection = connection;
-        }
-
-        @Override
-        public void onOpened(Connection connection)
-        {
-            if (LOG.isDebugEnabled())
-                LOG.debug("onOpened {}", alpnConnection);
-            ALPN.put(alpnConnection.getSSLEngine(), this);
-        }
-
-        @Override
-        public void onClosed(Connection connection)
-        {
-            if (LOG.isDebugEnabled())
-                LOG.debug("onClosed {}", alpnConnection);
-            ALPN.remove(alpnConnection.getSSLEngine());
-        }
-
-        @Override
-        public List<String> protocols()
-        {
-            return alpnConnection.getProtocols();
-        }
-
-        @Override
-        public void unsupported()
-        {
-            if (LOG.isDebugEnabled())
-                LOG.debug("unsupported {}", alpnConnection);
-            ALPN.remove(alpnConnection.getSSLEngine());
-            alpnConnection.selected(null);
-        }
-
-        @Override
-        public void selected(String protocol)
-        {
-            alpnConnection.selected(protocol);
-        }
-    }
-}

jetty-alpn/jetty-alpn-openjdk8-client/src/main/resources/META-INF/services/org.eclipse.jetty.io.ssl.ALPNProcessor$Client

@@ -1 +0,0 @@
-org.eclipse.jetty.alpn.java.client.OpenJDK8ClientALPNProcessor

jetty-alpn/jetty-alpn-openjdk8-client/src/test/java/org/eclipse/jetty/alpn/java/client/OpenJDK8HTTP2Client.java

@@ -1,85 +0,0 @@
-//
-//  ========================================================================
-//  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
-//  ------------------------------------------------------------------------
-//  All rights reserved. This program and the accompanying materials
-//  are made available under the terms of the Eclipse Public License v1.0
-//  and Apache License v2.0 which accompanies this distribution.
-//
-//      The Eclipse Public License is available at
-//      http://www.eclipse.org/legal/epl-v10.html
-//
-//      The Apache License v2.0 is available at
-//      http://www.opensource.org/licenses/apache2.0.php
-//
-//  You may elect to redistribute this code under either of these licenses.
-//  ========================================================================
-//
-
-package org.eclipse.jetty.alpn.java.client;
-
-import java.net.InetSocketAddress;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import org.eclipse.jetty.http.HttpFields;
-import org.eclipse.jetty.http.HttpURI;
-import org.eclipse.jetty.http.HttpVersion;
-import org.eclipse.jetty.http.MetaData;
-import org.eclipse.jetty.http2.api.Session;
-import org.eclipse.jetty.http2.api.Stream;
-import org.eclipse.jetty.http2.client.HTTP2Client;
-import org.eclipse.jetty.http2.frames.DataFrame;
-import org.eclipse.jetty.http2.frames.HeadersFrame;
-import org.eclipse.jetty.util.Callback;
-import org.eclipse.jetty.util.FuturePromise;
-import org.eclipse.jetty.util.Jetty;
-import org.eclipse.jetty.util.Promise;
-import org.eclipse.jetty.util.ssl.SslContextFactory;
-
-public class OpenJDK8HTTP2Client
-{
-    public static void main(String[] args) throws Exception
-    {
-        HTTP2Client client = new HTTP2Client();
-        SslContextFactory sslContextFactory = new SslContextFactory();
-        client.addBean(sslContextFactory);
-        client.start();
-
-        String host = "webtide.com";
-        int port = 443;
-
-        FuturePromise<Session> sessionPromise = new FuturePromise<>();
-        client.connect(sslContextFactory, new InetSocketAddress(host, port), new Session.Listener.Adapter(), sessionPromise);
-        Session session = sessionPromise.get(5, TimeUnit.SECONDS);
-
-        HttpFields requestFields = new HttpFields();
-        requestFields.put("User-Agent", client.getClass().getName() + "/" + Jetty.VERSION);
-        MetaData.Request metaData = new MetaData.Request("GET", new HttpURI("https://" + host + ":" + port + "/"), HttpVersion.HTTP_2, requestFields);
-        HeadersFrame headersFrame = new HeadersFrame(metaData, null, true);
-        CountDownLatch latch = new CountDownLatch(1);
-        session.newStream(headersFrame, new Promise.Adapter<>(), new Stream.Listener.Adapter()
-        {
-            @Override
-            public void onHeaders(Stream stream, HeadersFrame frame)
-            {
-                System.err.println(frame);
-                if (frame.isEndStream())
-                    latch.countDown();
-            }
-
-            @Override
-            public void onData(Stream stream, DataFrame frame, Callback callback)
-            {
-                System.err.println(frame);
-                callback.succeeded();
-                if (frame.isEndStream())
-                    latch.countDown();
-            }
-        });
-
-        latch.await(5, TimeUnit.SECONDS);
-
-        client.stop();
-    }
-}

jetty-alpn/jetty-alpn-openjdk8-client/src/test/resources/jetty-logging.properties

@@ -1,2 +0,0 @@
-org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
-#org.eclipse.jetty.LEVEL=DEBUG

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

@@ -1,78 +0,0 @@
-<?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">
-  <parent>
-    <groupId>org.eclipse.jetty</groupId>
-    <artifactId>jetty-alpn-parent</artifactId>
-    <version>10.0.0-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>jetty-alpn-openjdk8-server</artifactId>
-  <name>Jetty :: ALPN :: OpenJDK8 Server Implementation</name>
-
-  <properties>
-    <bundle-symbolic-name>${project.groupId}.alpn.openjdk8.server</bundle-symbolic-name>
-  </properties>
-
-  <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-server</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.http2</groupId>
-      <artifactId>http2-server</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>parse-version</id>
-            <goals>
-              <goal>parse-version</goal>
-            </goals>
-            <configuration>
-              <propertyPrefix>alpn</propertyPrefix>
-              <versionString>${alpn.api.version}</versionString>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-       <plugin>
-         <groupId>org.apache.felix</groupId>
-         <artifactId>maven-bundle-plugin</artifactId>
-         <extensions>true</extensions>
-             <configuration>
-               <instructions>
-                 <Bundle-Description>OpenJDK8 Server ALPN</Bundle-Description>
-                 <Export-Package>*</Export-Package>
-                 <Import-Package>org.eclipse.jetty.alpn;version="${alpn.majorVersion}.${alpn.minorVersion}.${alpn.incrementalVersion}",*</Import-Package>
-                 <Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional</Require-Capability>
-                 <Provide-Capability>osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Server</Provide-Capability>
-                 <_nouses>true</_nouses>
-               </instructions>
-             </configuration>
-       </plugin>
-    </plugins>
-  </build>
-</project>

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

@@ -1,104 +0,0 @@
-//
-//  ========================================================================
-//  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
-//  ------------------------------------------------------------------------
-//  All rights reserved. This program and the accompanying materials
-//  are made available under the terms of the Eclipse Public License v1.0
-//  and Apache License v2.0 which accompanies this distribution.
-//
-//      The Eclipse Public License is available at
-//      http://www.eclipse.org/legal/epl-v10.html
-//
-//      The Apache License v2.0 is available at
-//      http://www.opensource.org/licenses/apache2.0.php
-//
-//  You may elect to redistribute this code under either of these licenses.
-//  ========================================================================
-//
-
-package org.eclipse.jetty.alpn.openjdk8.server;
-
-import java.util.Collections;
-import java.util.List;
-
-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.util.JavaVersion;
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
-
-public class OpenJDK8ServerALPNProcessor implements ALPNProcessor.Server
-{
-    private static final Logger LOG = Log.getLogger(OpenJDK8ServerALPNProcessor.class);
-    
-    @Override
-    public void init()
-    {
-        if (JavaVersion.VERSION.getPlatform()!=8)
-            throw new IllegalStateException(this + " not applicable for java "+JavaVersion.VERSION);
-        if (ALPN.class.getClassLoader()!=null)
-            throw new IllegalStateException(ALPN.class.getName() + " must be on JVM boot classpath");
-        if (LOG.isDebugEnabled())
-            ALPN.debug = true;
-    }
-
-    @Override
-    public boolean appliesTo(SSLEngine sslEngine)
-    {
-        return sslEngine.getClass().getName().startsWith("sun.security.ssl.");
-    }
-
-    @Override
-    public void configure(SSLEngine sslEngine, Connection connection)
-    {
-        connection.addListener(new ALPNListener((ALPNServerConnection)connection));
-    }
-
-    private final class ALPNListener implements ALPN.ServerProvider, Connection.Listener
-    {
-        private final ALPNServerConnection alpnConnection;
-
-        private ALPNListener(ALPNServerConnection connection)
-        {
-            alpnConnection = connection;
-        }
-
-        @Override
-        public void onOpened(Connection connection)
-        {
-            if (LOG.isDebugEnabled())
-                LOG.debug("onOpened {}", alpnConnection);
-            ALPN.put(alpnConnection.getSSLEngine(), this);
-        }
-
-        @Override
-        public void onClosed(Connection connection)
-        {
-            if (LOG.isDebugEnabled())
-                LOG.debug("onClosed {}", alpnConnection);
-            ALPN.remove(alpnConnection.getSSLEngine());
-        }
-        
-        @Override
-        public void unsupported()
-        {
-            if (LOG.isDebugEnabled())
-                LOG.debug("unsupported {}", alpnConnection);
-            alpnConnection.select(Collections.emptyList());
-        }
-
-        @Override
-        public String select(List<String> protocols) throws SSLException
-        {
-            if (LOG.isDebugEnabled())
-                LOG.debug("select {} {}", alpnConnection, protocols);
-            alpnConnection.select(protocols);
-            return alpnConnection.getProtocol();
-        }
-    }
-}

jetty-alpn/jetty-alpn-openjdk8-server/src/main/resources/META-INF/services/org.eclipse.jetty.io.ssl.ALPNProcessor$Server

@@ -1 +0,0 @@
-org.eclipse.jetty.alpn.openjdk8.server.OpenJDK8ServerALPNProcessor

jetty-alpn/jetty-alpn-openjdk8-server/src/test/java/org/eclipse/jetty/alpn/openjdk8/server/OpenJDK8HTTP2Server.java

@@ -1,66 +0,0 @@
-//
-//  ========================================================================
-//  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
-//  ------------------------------------------------------------------------
-//  All rights reserved. This program and the accompanying materials
-//  are made available under the terms of the Eclipse Public License v1.0
-//  and Apache License v2.0 which accompanies this distribution.
-//
-//      The Eclipse Public License is available at
-//      http://www.eclipse.org/legal/epl-v10.html
-//
-//      The Apache License v2.0 is available at
-//      http://www.opensource.org/licenses/apache2.0.php
-//
-//  You may elect to redistribute this code under either of these licenses.
-//  ========================================================================
-//
-
-package org.eclipse.jetty.alpn.openjdk8.server;
-
-import org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory;
-import org.eclipse.jetty.http2.HTTP2Cipher;
-import org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory;
-import org.eclipse.jetty.server.HttpConfiguration;
-import org.eclipse.jetty.server.HttpConnectionFactory;
-import org.eclipse.jetty.server.SecureRequestCustomizer;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.server.SslConnectionFactory;
-import org.eclipse.jetty.util.ssl.SslContextFactory;
-
-/**
- * Test server that verifies that the JDK 8 ALPN mechanism works.
- */
-public class OpenJDK8HTTP2Server
-{
-    public static void main(String... args) throws Exception
-    {
-        Server server = new Server();
-
-        HttpConfiguration httpsConfig = new HttpConfiguration();
-        httpsConfig.setSecureScheme("https");
-        httpsConfig.setSecurePort(8443);
-        httpsConfig.setSendXPoweredBy(true);
-        httpsConfig.setSendServerVersion(true);
-        httpsConfig.addCustomizer(new SecureRequestCustomizer());
-
-        SslContextFactory sslContextFactory = new SslContextFactory();
-        sslContextFactory.setKeyStorePath("src/test/resources/keystore.jks");
-        sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4");
-        sslContextFactory.setKeyManagerPassword("OBF:1u2u1wml1z7s1z7a1wnl1u2g");
-        sslContextFactory.setCipherComparator(HTTP2Cipher.COMPARATOR);
-
-        HttpConnectionFactory http = new HttpConnectionFactory(httpsConfig);
-        HTTP2ServerConnectionFactory h2 = new HTTP2ServerConnectionFactory(httpsConfig);
-        ALPNServerConnectionFactory alpn = new ALPNServerConnectionFactory();
-        alpn.setDefaultProtocol(http.getProtocol());
-        SslConnectionFactory ssl = new SslConnectionFactory(sslContextFactory, alpn.getProtocol());
-
-        ServerConnector http2Connector = new ServerConnector(server, ssl, alpn, h2, http);
-        http2Connector.setPort(8443);
-        server.addConnector(http2Connector);
-
-        server.start();
-    }
-}

jetty-alpn/jetty-alpn-openjdk8-server/src/test/resources/jetty-logging.properties

@@ -1,3 +0,0 @@
-org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
-#org.eclipse.jetty.LEVEL=DEBUG
-#org.eclipse.jetty.alpn.LEVEL=DEBUG

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_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_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-10.mod

@@ -1,4 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[depend]
-alpn-impl/alpn-9

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

@@ -1,33 +0,0 @@
-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
-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/
-
-[license]
-ALPN is a hosted at github under the GPL v2 with ClassPath Exception.
-ALPN replaces/modifies OpenJDK classes in the sun.security.ssl package.
-http://github.com/jetty-project/jetty-alpn
-http://openjdk.java.net/legal/gplv2+ce.html

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

@@ -1,8 +0,0 @@
-DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[description]
-Provides support for ALPN based on JDK 9+ APIs.
-
-[lib]
-lib/jetty-alpn-java-server-${jetty.version}.jar
-lib/alpn-api-*.jar

jetty-alpn/pom.xml

@@ -14,21 +14,10 @@
   <modules>
     <module>jetty-alpn-server</module>
     <module>jetty-alpn-client</module>
-    <module>jetty-alpn-openjdk8-server</module>
-    <module>jetty-alpn-openjdk8-client</module>
     <module>jetty-alpn-conscrypt-server</module>
     <module>jetty-alpn-conscrypt-client</module>
+    <module>jetty-alpn-java-client</module>
+    <module>jetty-alpn-java-server</module>
   </modules>
-  <profiles>
+
-    <profile>
-      <id>jdk9</id>
-      <activation>
-        <jdk>[1.9,)</jdk>
-      </activation>
-      <modules>
-        <module>jetty-alpn-java-client</module>
-        <module>jetty-alpn-java-server</module>
-      </modules>
-    </profile>
-  </profiles>
 </project>

jetty-bom/pom.xml

@@ -116,16 +116,6 @@
         <artifactId>jetty-alpn-java-server</artifactId>
         <version>10.0.0-SNAPSHOT</version>
       </dependency>
-      <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-alpn-openjdk8-client</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-alpn-openjdk8-server</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
-      </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-alpn-conscrypt-client</artifactId>

jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc

@@ -35,9 +35,6 @@ When using Jetty embedded, the `jetty-alpn-client` and `jetty-alpn-server` artif
 
 The ALPN implementation is _provided_ to these two artifacts with the following three options:
 
-* For JDK 8 only, a provider based on modified OpenJDK classes
-** Only works with JDK 8, pure Java implementation
-** Requires the `-Xbootclasspath/p` option on command line
 * For JDK 8 or later, a provider based on the link:#conscrypt[Conscrypt security provider]
 ** Works with JDK 8 or later and provides improved performance
 ** Binds to the OpenSSL native library shipped by Conscrypt and is therefore only available on the platforms supported by Conscrypt
@@ -57,35 +54,6 @@ When a new connection is created, an `SSLEngine` instance is associated to it; e
 
 It is therefore possible to have multiple providers active at the same time, for example the JDK 9 provider and the Conscrypt provider, and at runtime the correct one will be chosen by the Jetty runtime.
 
-[[alpn-openjdk8]]
-==== ALPN and OpenJDK 8
-
-When using JDKs based on OpenJDK 8 (for JDK 9 see link:#alpn-jdk9[above]), and you do not or cannot use link:#conscrypt[Conscrypt], you can use Jetty's ALPN boot library to provide the ALPN service implementation, via the `alpn-boot` artifact.
-
-The Jetty ALPN boot library modifies the relevant OpenJDK classes to add ALPN support and provides an ALPN API that application can use to enable ALPN.
-
-When using Jetty as a standalone server via the Jetty distribution, ALPN support is automatically enabled when the `http2` module is enabled.
-This enables transitively the `alpn-8` module which puts the `jetty-alpn-openjdk8-server` artifact in the server classpath, providing the ALPN OpenJDK 8 service implementation.
-
-When using Jetty embedded, the ALPN support is provided by the `jetty-alpn-openjdk8-client` and `jetty-alpn-openjdk8-server` artifacts, respectively for client usage and server usage.
-
-To get ALPN working with the Jetty ALPN Boot library, you need:
-
-* to start the JVM with the Jetty ALPN Boot library in the boot classpath
-* to have the `jetty-alpn-openjdk8-client` artifact or the `jetty-alpn-openjdk8-server`
-artifact in the classpath
-
-Start the JVM as follows:
-
-[source, plain, subs="{sub-order}"]
-----
-java -Xbootclasspath/p:<path_to_alpn_boot_jar> ...
-----
-
-Where `path_to_alpn_boot_jar` is the path on the file system for the `alpn-boot` artifact, such as the one at the Maven coordinates `org.mortbay.jetty.alpn:alpn-boot`.
-
-Be certain to get the link:#alpn-versions[ALPN boot artifact version that matches the version of your JRE].
-
 [[alpn-conscrypt]]
 ==== ALPN and Conscrypt
 
@@ -134,244 +102,4 @@ IllegalStateException: no ALPN processor
 
 The error means that you don't have the ALPN dependencies setup correctly in your classpath.
 
-For example, you may have the `jetty-alpn-java-server` artifact in the classpath (which is correct when using JDK 9), but run your application with JDK 8.
+For example, you do not have the `jetty-alpn-java-server` artifact in the classpath.
-
-Another example is when you have correctly put the `alpn-boot` artifact in the boot classpath, but you don't have the `jetty-alpn-openjdk8-server` artifact in the classpath.
-
-[[alpn-openjdk8-details]]
-==== Details about ALPN and OpenJDK 8
-
-The following sections only refer to the API and implementation of ALPN using the Jetty boot library.
-
-The Jetty ALPN boot library is conceptually made of two parts: the ALPN APIs and the ALPN implementation.
-
-The ALPN API is provided by the `org.eclipse.jetty.alpn:alpn-api` artifact.
-This artifact is only needed by application code that uses the ALPN APIs.
-
-The ALPN implementation is provided by the `org.mortbay.jetty.alpn:alpn-boot` artifact and consist of modifications to the OpenJDK classes.
-The `org.mortbay.jetty.alpn:alpn-boot` artifact contains also the classes present in the `org.eclipse.jetty.alpn:alpn-api` artifact.
-
-[[alpn-openjdk8-understanding]]
-===== Understanding the ALPN API
-
-Applications need to interact with ALPN TLS extension protocol negotiations.
-For example, server applications need to know whether the client supports ALPN, and client applications needs to know whether the server supports ALPN.
-
-To implement this interaction, Jetty's ALPN implementation provides an API to applications, hosted at Maven coordinates `org.eclipse.jetty.alpn:alpn-api`.
-You need to declare this dependency as provided, because the `alpn-boot` jar already includes it (see the previous section), and it is therefore available from the boot classpath.
-
-The API consists of a single class, `org.eclipse.jetty.alpn.ALPN`, and applications need to register instances of `SSLSocket` or `SSLEngine` with a `ClientProvider` or `ServerProvider` (depending on whether the application is a client application or server application).
-Refer to `ALPN` Javadocs and to the examples below for further details about client and server provider methods.
-
-[[alpn-openjdk8-client-example]]
-==== Client Example
-
-[source, java, subs="{sub-order}"]
-----
-SSLContext sslContext = ...;
-SSLSocket sslSocket = (SSLSocket)context.getSocketFactory().createSocket("localhost", server.getLocalPort());
-
-ALPN.put(sslSocket, new ALPN.ClientProvider()
-{
-    @Override
-    public List<String> protocols()
-    {
-        return Arrays.asList("h2", "http/1.1");
-    }
-
-    @Override
-    public void unsupported()
-    {
-        ALPN.remove(sslSocket);
-    }
-
-    @Override
-    public void selected(String protocol)
-    {
-        ALPN.remove(sslSocket);
-        System.out.println("Protocol Selected is: " + protocol);
-    }
-});
-----
-
-The ALPN implementation calls `ALPN.ClientProvider` methods `protocols()`, `unsupported()` and `selected(String)`, so that the client application can:
-
-* Decide whether to support ALPN
-* Provide the protocols supported
-* Know whether the server supports ALPN
-* Know the protocol chosen by the server
-
-[[alpn-openjdk8-server-example]]
-==== Server Example
-
-The example for `SSLEngine` is identical, and you just need to replace the `SSLSocket` instance with an `SSLEngine` instance.
-
-[source, java, subs="{sub-order}"]
-----
-SSLEngine sslEngine = ...;
-ALPN.put(sslEngine, new ALPN.ServerProvider()
-{
-    @Override
-    public void unsupported()
-    {
-        ALPN.remove(sslEngine);
-    }
-
-    @Override
-    public String select(List<String> protocols);
-    {
-        ALPN.remove(sslEngine);
-        return protocols.get(0);
-    }
-});
-----
-
-The ALPN implementation calls `ALPN.ServerProvider` methods `unsupported()`, and `select(List<String>),` so that the server application can:
-
-* know whether the client supports ALPN.
-* select one of the protocols the client supports.
-
-[[alpn-openjdk8-implementation]]
-==== Implementation Details
-
-It is important that implementations of `ALPN.ServerProvider` and `ALPN.ClientProvider` remove the `sslSocket` or `sslEngine` when the negotiation is complete, like shown in the examples above.
-Failing to do so will cause a memory leak.
-
-[[alpn-openjdk8-tests]]
-==== Unit Tests
-
-You can write and run unit tests that use the ALPN implementation.
-The solution that we use with Maven is to specify an additional command line argument to the Surefire plugin:
-
-[source, xml, subs="{sub-order}"]
-----
-<project>
-
-<properties>
-    <alpn-boot-version>8.1.4.v20150727</alpn-boot-version>
-</properties>
-
-<build>
-    <plugins>
-        <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-                <argLine>
-                    -Xbootclasspath/p:${settings.localRepository}/org/mortbay/jetty/alpn/alpn-boot/${alpn-boot-version}/alpn-boot-${alpn-boot-version}.jar
-                </argLine>
-            </configuration>
-        </plugin>
-
-        ...
-
-    </plugins>
-</build>
-
-...
-
-</project>
-----
-
-[[alpn-openjdk8-debugging]]
-==== Debugging
-
-You can enable debug logging for the ALPN implementation in this way:
-
-....
-ALPN.debug = true;
-....
-
-Since the ALPN class is in the boot classpath, we chose not to use logging libraries because we do not want to override application logging library choices; therefore the logging is performed directly on `System.err`.
-
-[[alpn-openjdk8-license-details]]
-==== License Details
-
-The ALPN implementation relies on modification of a few OpenJDK classes and on a few new classes that need to live in the `sun.security.ssl` package.
-These classes are released under the same `GPLv2+exception` license of OpenJDK.
-
-The ALPN class and its nested classes are released under same license as the classes of the Jetty project.
-
-[[alpn-versions]]
-==== Versions
-
-The ALPN implementation, relying on modifications of OpenJDK classes, updates every time there are updates to the modified OpenJDK classes.
-
-.ALPN vs. OpenJDK versions
-[cols=",",options="header",]
-|=============================
-|OpenJDK version |ALPN version
-|1.7.0u40 |7.1.0.v20141016
-|1.7.0u45 |7.1.0.v20141016
-|1.7.0u51 |7.1.0.v20141016
-|1.7.0u55 |7.1.0.v20141016
-|1.7.0u60 |7.1.0.v20141016
-|1.7.0u65 |7.1.0.v20141016
-|1.7.0u67 |7.1.0.v20141016
-|1.7.0u71 |7.1.2.v20141202
-|1.7.0u72 |7.1.2.v20141202
-|1.7.0u75 |7.1.3.v20150130
-|1.7.0u76 |7.1.3.v20150130
-|1.7.0u79 |7.1.3.v20150130
-|1.7.0u80 |7.1.3.v20150130
-|1.8.0 |8.1.0.v20141016
-|1.8.0u05 |8.1.0.v20141016
-|1.8.0u11 |8.1.0.v20141016
-|1.8.0u20 |8.1.0.v20141016
-|1.8.0u25 |8.1.2.v20141202
-|1.8.0u31 |8.1.3.v20150130
-|1.8.0u40 |8.1.3.v20150130
-|1.8.0u45 |8.1.3.v20150130
-|1.8.0u51 |8.1.4.v20150727
-|1.8.0u60 |8.1.5.v20150921
-|1.8.0u65 |8.1.6.v20151105
-|1.8.0u66 |8.1.6.v20151105
-|1.8.0u71 |8.1.7.v20160121
-|1.8.0u72 |8.1.7.v20160121
-|1.8.0u73 |8.1.7.v20160121
-|1.8.0u74 |8.1.7.v20160121
-|1.8.0u77 |8.1.7.v20160121
-|1.8.0u91 |8.1.7.v20160121
-|1.8.0u92 |8.1.8.v20160420
-|1.8.0u101 |8.1.9.v20160720
-|1.8.0u102 |8.1.9.v20160720
-|1.8.0u111 |8.1.9.v20160720
-|1.8.0u112 |8.1.10.v20161026
-|1.8.0u121 |8.1.11.v20170118
-|1.8.0u131 |8.1.11.v20170118
-|1.8.0u141 |8.1.11.v20170118
-|1.8.0u144 |8.1.11.v20170118
-|1.8.0u151 |8.1.11.v20170118
-|1.8.0u152 |8.1.11.v20170118
-|1.8.0u161 |8.1.12.v20180117
-|1.8.0u162 |8.1.12.v20180117
-|1.8.0u171 |8.1.12.v20180117
-|1.8.0u172 |8.1.12.v20180117
-|1.8.0u181 |8.1.12.v20180117
-|=============================
-
-[[alpn-build]]
-==== How to build ALPN
-
-This section is for Jetty developers that need to update the ALPN implementation with the OpenJDK versions.
-
-Clone the OpenJDK repository with the following command:
-
-[source, screen, subs="{sub-order}"]
-....
-$ hg clone http://hg.openjdk.java.net/jdk8u/jdk8u jdk8u
-$ cd !$
-$ ./get_source.sh
-....
-
-To update the source to a specific tag, use the following command:
-
-[source, screen, subs="{sub-order}"]
-....
-$ ./make/scripts/hgforest.sh update <tag-name>
-
-....
-
-The list of OpenJDK tags can be obtained from this page:
-http://hg.openjdk.java.net/jdk8u/jdk8u/tags[OpenJDK 8 Tags].
-
-You will then need to compare and incorporate the OpenJDK source changes into the modified OpenJDK classes at the https://github.com/jetty-project/jetty-alpn[ALPN GitHub Repository], branch `master`.

jetty-home/pom.xml

@@ -662,7 +662,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-alpn-openjdk8-server</artifactId>
+      <artifactId>jetty-alpn-java-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
@@ -702,20 +702,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>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-
 </project>

jetty-http-spi/pom.xml

@@ -35,6 +35,24 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.xml</groupId>
+      <artifactId>jaxws-api</artifactId>
+      <version>2.0EA3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.ws</groupId>
+      <artifactId>jaxws-rt</artifactId>
+      <version>2.3.0.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>javax.activation-api</artifactId>
+      <version>1.2.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -74,32 +92,4 @@
       </plugin>
     </plugins>
   </build>
-  <profiles>
-    <profile>
-      <id>jdk9</id>
-      <activation>
-        <jdk>[1.9,)</jdk>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>javax.xml</groupId>
-          <artifactId>jaxws-api</artifactId>
-          <version>2.0EA3</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>com.sun.xml.ws</groupId>
-          <artifactId>jaxws-rt</artifactId>
-          <version>2.3.0.2</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>javax.activation</groupId>
-          <artifactId>javax.activation-api</artifactId>
-          <version>1.2.0</version>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
 </project>

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

@@ -1,106 +1,55 @@
 <?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"
-    <parent>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-        <groupId>org.eclipse.jetty.http2</groupId>
+  <parent>
-        <artifactId>http2-parent</artifactId>
+    <groupId>org.eclipse.jetty.http2</groupId>
-        <version>10.0.0-SNAPSHOT</version>
+    <artifactId>http2-parent</artifactId>
-    </parent>
+    <version>10.0.0-SNAPSHOT</version>
+  </parent>
 
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
-    <artifactId>http2-alpn-tests</artifactId>
+  <artifactId>http2-alpn-tests</artifactId>
-    <name>Jetty :: HTTP2 :: ALPN Tests</name>
+  <name>Jetty :: HTTP2 :: ALPN Tests</name>
 
-    <properties>
+  <properties>
-        <bundle-symbolic-name>${project.groupId}.alpn.tests</bundle-symbolic-name>
+    <bundle-symbolic-name>${project.groupId}.alpn.tests</bundle-symbolic-name>
-    </properties>
+  </properties>
 
-    <build>
+  <dependencies>
-        <plugins>
+    <dependency>
-            <plugin>
+      <groupId>org.eclipse.jetty.alpn</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
+      <artifactId>alpn-api</artifactId>
-                <executions>
+      <version>${alpn.api.version}</version>
-                    <execution>
+      <scope>provided</scope>
-                        <id>copy</id>
+    </dependency>
-                        <phase>generate-resources</phase>
+    <dependency>
-                        <goals>
+      <groupId>org.eclipse.jetty</groupId>
-                            <goal>copy</goal>
+      <artifactId>jetty-alpn-java-server</artifactId>
-                        </goals>
+      <version>${project.version}</version>
-                        <configuration>
+      <scope>test</scope>
-                            <artifactItems>
+    </dependency>
-                                <artifactItem>
+    <dependency>
-                                    <groupId>org.mortbay.jetty.alpn</groupId>
+      <groupId>org.eclipse.jetty</groupId>
-                                    <artifactId>alpn-boot</artifactId>
+      <artifactId>jetty-server</artifactId>
-                                    <version>${alpn.version}</version>
+      <version>${project.version}</version>
-                                    <type>jar</type>
+      <scope>test</scope>
-                                    <overWrite>false</overWrite>
+    </dependency>
-                                    <outputDirectory>${project.build.directory}/alpn</outputDirectory>
+    <dependency>
-                                </artifactItem>
+      <groupId>org.eclipse.jetty.http2</groupId>
-                            </artifactItems>
+      <artifactId>http2-server</artifactId>
-                        </configuration>
+      <version>${project.version}</version>
-                    </execution>
+      <scope>test</scope>
-                </executions>
+    </dependency>
-            </plugin>
+    <dependency>
-            <plugin>
+      <groupId>org.eclipse.jetty.toolchain</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
+      <artifactId>jetty-test-helper</artifactId>
-                <configuration>
+      <scope>test</scope>
-                    <argLine>-Xbootclasspath/p:${project.build.directory}/alpn/alpn-boot-${alpn.version}.jar</argLine>
+    </dependency>
-                </configuration>
+    <dependency>
-            </plugin>
+      <groupId>junit</groupId>
-        </plugins>
+      <artifactId>junit</artifactId>
-    </build>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
-    <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-server</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-server</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty.http2</groupId>
-            <artifactId>http2-server</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-test-helper</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </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

@@ -1,115 +1,65 @@
 <?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"
-    <parent>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-        <groupId>org.eclipse.jetty.http2</groupId>
+  <parent>
-        <artifactId>http2-parent</artifactId>
+    <groupId>org.eclipse.jetty.http2</groupId>
-        <version>10.0.0-SNAPSHOT</version>
+    <artifactId>http2-parent</artifactId>
-    </parent>
+    <version>10.0.0-SNAPSHOT</version>
+  </parent>
 
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
-    <artifactId>http2-http-client-transport</artifactId>
+  <artifactId>http2-http-client-transport</artifactId>
-    <name>Jetty :: HTTP2 :: HTTP Client Transport</name>
+  <name>Jetty :: HTTP2 :: HTTP Client Transport</name>
 
-    <properties>
+  <properties>
-        <bundle-symbolic-name>${project.groupId}.client.http</bundle-symbolic-name>
+    <bundle-symbolic-name>${project.groupId}.client.http</bundle-symbolic-name>
-    </properties>
+  </properties>
 
-    <profiles>
+  <dependencies>
-        <profile>
+    <dependency>
-            <id>jdk8</id>
+      <groupId>org.eclipse.jetty</groupId>
-            <activation>
+      <artifactId>jetty-client</artifactId>
-                <jdk>[1.8,1.9)</jdk>
+      <version>${project.version}</version>
-            </activation>
+    </dependency>
-            <build>
+    <dependency>
-                <plugins>
+      <groupId>org.eclipse.jetty.http2</groupId>
-                    <plugin>
+      <artifactId>http2-client</artifactId>
-                        <artifactId>maven-dependency-plugin</artifactId>
+      <version>${project.version}</version>
-                        <executions>
+    </dependency>
-                            <execution>
+    <dependency>
-                                <id>copy</id>
+      <groupId>org.eclipse.jetty</groupId>
-                                <phase>generate-resources</phase>
+      <artifactId>jetty-alpn-java-client</artifactId>
-                                <goals>
+      <version>${project.version}</version>
-                                    <goal>copy</goal>
+    </dependency>
-                                </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>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-alpn-java-client</artifactId>
-                    <version>${project.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-alpn-java-server</artifactId>
-                    <version>${project.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
 
-    <dependencies>
+    <dependency>
-        <dependency>
+      <groupId>org.eclipse.jetty</groupId>
-            <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-alpn-java-server</artifactId>
-            <artifactId>jetty-client</artifactId>
+      <version>${project.version}</version>
-            <version>${project.version}</version>
+      <scope>test</scope>
-        </dependency>
+    </dependency>
-        <dependency>
+    <dependency>
-            <groupId>org.eclipse.jetty.http2</groupId>
+      <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>http2-client</artifactId>
+      <artifactId>jetty-test-helper</artifactId>
-            <version>${project.version}</version>
+      <scope>test</scope>
-        </dependency>
+    </dependency>
-
+    <dependency>
-        <dependency>
+      <groupId>org.eclipse.jetty</groupId>
-            <groupId>org.eclipse.jetty.toolchain</groupId>
+      <artifactId>jetty-server</artifactId>
-            <artifactId>jetty-test-helper</artifactId>
+      <version>${project.version}</version>
-            <scope>test</scope>
+      <scope>test</scope>
-        </dependency>
+    </dependency>
-        <dependency>
+    <dependency>
-            <groupId>org.eclipse.jetty</groupId>
+      <groupId>org.eclipse.jetty.http2</groupId>
-            <artifactId>jetty-server</artifactId>
+      <artifactId>http2-server</artifactId>
-            <version>${project.version}</version>
+      <version>${project.version}</version>
-            <scope>test</scope>
+      <scope>test</scope>
-        </dependency>
+    </dependency>
-        <dependency>
+    <dependency>
-            <groupId>org.eclipse.jetty.http2</groupId>
+      <groupId>junit</groupId>
-            <artifactId>http2-server</artifactId>
+      <artifactId>junit</artifactId>
-            <version>${project.version}</version>
+      <scope>test</scope>
-            <scope>test</scope>
+    </dependency>
-        </dependency>
+  </dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
 
 </project>

jetty-http2/pom.xml

@@ -18,18 +18,7 @@
     <module>http2-hpack</module>
     <module>http2-http-client-transport</module>
     <module>http2-server</module>
+    <module>http2-alpn-tests</module>
   </modules>
 
-  <profiles>
-    <profile>
-      <id>jdk8</id>
-      <activation>
-        <jdk>[1.8,1.9)</jdk>
-      </activation>
-      <modules>
-        <module>http2-alpn-tests</module>
-      </modules>
-    </profile>
-  </profiles>
-
 </project>

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

@@ -420,6 +420,36 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-alpn-conscrypt-server</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-alpn-conscrypt-client</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.conscrypt</groupId>
+      <artifactId>conscrypt-openjdk-uber</artifactId>
+      <version>${conscrypt.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-alpn-java-server</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-alpn-java-client</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <pluginManagement>
@@ -431,6 +461,9 @@
             <systemPropertyVariables>
               <mavenRepoPath>${settings.localRepository}</mavenRepoPath>
             </systemPropertyVariables>
+            <excludes>
+              <exclude>**/TestJettyOSGiBootHTTP2</exclude>
+            </excludes>
           </configuration>
           <!-- paxexam still using junit 4 so we have to force the provider here -->
           <dependencies>
@@ -495,117 +528,4 @@
       </plugin>
     </plugins>
   </build>
-  <profiles>
-    <profile>
-      <id>jdk8</id>
-      <activation>
-        <jdk>[1.8,9)</jdk>
-      </activation>
-      <dependencies>
-        <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</groupId>
-          <artifactId>jetty-alpn-openjdk8-client</artifactId>
-          <version>${project.version}</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-alpn-conscrypt-server</artifactId>
-          <version>${project.version}</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-alpn-conscrypt-client</artifactId>
-          <version>${project.version}</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.conscrypt</groupId>
-          <artifactId>conscrypt-openjdk-uber</artifactId>
-          <version>${conscrypt.version}</version>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-      <properties>
-        <skipTests>false</skipTests>
-      </properties>
-      <build>
-        <plugins>
-           <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-
-              <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</argLine>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>jdk9</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-alpn-conscrypt-server</artifactId>
-          <version>${project.version}</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-alpn-conscrypt-client</artifactId>
-          <version>${project.version}</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.conscrypt</groupId>
-          <artifactId>conscrypt-openjdk-uber</artifactId>
-          <version>1.0.0.RC11</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-alpn-java-server</artifactId>
-          <version>${project.version}</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-alpn-java-client</artifactId>
-          <version>${project.version}</version>
-          <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>
-         </configuration>
-       </plugin>
-      </plugins>
-     </build>
-    </profile>
-  </profiles>
 </project>

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

@@ -18,13 +18,6 @@
 
 package org.eclipse.jetty.osgi.test;
 
-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;
-
 import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -54,6 +47,14 @@ import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 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;
+
+// TODO: remove this class, as it is testing the ALPN bootclasspath?
 /**
  * HTTP2 setup.
  */
@@ -63,14 +64,13 @@ public class TestJettyOSGiBootHTTP2
 {
     private static final String LOG_LEVEL = "WARN";
 
-
     @Inject
     private BundleContext bundleContext;
 
     @Configuration
     public Option[] config()
     {
-        ArrayList<Option> options = new ArrayList<Option>();
+        ArrayList<Option> options = new ArrayList<>();
         options.add(CoreOptions.junitBundles());
         options.addAll(TestOSGiUtil.configureJettyHomeAndPort(true,"jetty-http2.xml"));
         options.add(CoreOptions.bootDelegationPackages("org.xml.sax", "org.xml.*", "org.w3c.*", "javax.xml.*", "javax.activation.*"));
@@ -83,7 +83,7 @@ public class TestJettyOSGiBootHTTP2
         options.addAll(TestOSGiUtil.jspDependencies());
         //deploy a test webapp
         options.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("test-jetty-webapp").classifier("webbundle").versionAsInProject());
-        options.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-openjdk8-client").versionAsInProject().start());
+        options.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-java-client").versionAsInProject().start());
         options.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-client").versionAsInProject().start());
         options.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("http2-client").versionAsInProject().start());
         options.add(mavenBundle().groupId("org.eclipse.jetty.http2").artifactId("http2-http-client-transport").versionAsInProject().start());
@@ -91,12 +91,12 @@ public class TestJettyOSGiBootHTTP2
         options.add(systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value(LOG_LEVEL));
         options.add(systemProperty("org.eclipse.jetty.LEVEL").value("DEBUG"));
         options.add(CoreOptions.cleanCaches(true));
-        return options.toArray(new Option[options.size()]);
+        return options.toArray(new Option[0]);
     }
 
     public static List<Option> http2JettyDependencies()
     {
-        List<Option> res = new ArrayList<Option>();
+        List<Option> res = new ArrayList<>();
         res.add(CoreOptions.systemProperty("jetty.alpn.protocols").value("h2,http/1.1"));
 
         String alpnBoot = System.getProperty("mortbay-alpn-boot");
@@ -107,7 +107,7 @@ public class TestJettyOSGiBootHTTP2
         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());
+        res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-java-server").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-server").versionAsInProject().start());
 
 
@@ -128,20 +128,18 @@ public class TestJettyOSGiBootHTTP2
     
     @Ignore
     @Test
-    public void assertAllBundlesActiveOrResolved() throws Exception
+    public void assertAllBundlesActiveOrResolved()
     {
         TestOSGiUtil.debugBundles(bundleContext);
         TestOSGiUtil.assertAllBundlesActiveOrResolved(bundleContext);
-        Bundle openjdk8 = TestOSGiUtil.getBundle(bundleContext, "org.eclipse.jetty.alpn.openjdk8.server");
+        Bundle openjdk9 = TestOSGiUtil.getBundle(bundleContext, "org.eclipse.jetty.alpn.java.server");
-        assertNotNull(openjdk8);
+        assertNotNull(openjdk9);
-        ServiceReference[] services = openjdk8.getRegisteredServices();
+        ServiceReference[] services = openjdk9.getRegisteredServices();
         assertNotNull(services);        
         Bundle server = TestOSGiUtil.getBundle(bundleContext, "org.eclipse.jetty.alpn.server");
         assertNotNull(server);
     }
 
-    
-
     @Test
     public void testHTTP2() throws Exception
     {
@@ -152,10 +150,9 @@ public class TestJettyOSGiBootHTTP2
             //get the port chosen for https
             String tmp = System.getProperty("boot.https.port");
             assertNotNull(tmp);
-            int port = Integer.valueOf(tmp.trim()).intValue();
+            int port = Integer.parseInt(tmp.trim());
             
             Path path = Paths.get("src",  "test", "config");
-            File base = path.toFile();
             File keys = path.resolve("etc").resolve("keystore").toFile();
             
             //set up client to do http2
@@ -181,5 +178,4 @@ public class TestJettyOSGiBootHTTP2
             if (http2Client != null) http2Client.stop();
         }
     }
-
 }

jetty-start/pom.xml

@@ -1,4 +1,5 @@
-<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/maven-v4_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/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
@@ -13,7 +14,7 @@
     <bundle-symbolic-name>${project.groupId}.start</bundle-symbolic-name>
   </properties>
   <build>
-   <plugins>
+    <plugins>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
@@ -52,7 +53,7 @@
                     <include>org/eclipse/jetty/util/JavaVersion*</include>
                     <include>org/eclipse/jetty/util/TopologicalSort*</include>
                   </includes>
-              	</filter>
+                </filter>
               </filters>
               <relocations>
                 <relocation>

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_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

@@ -38,6 +38,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
+          <argLine>@{argLine} --module-path src/test/resources/mods</argLine>
           <useManifestOnlyJar>false</useManifestOnlyJar>
           <excludes>
             <exclude>org.eclipse.jetty.webapp.WebAppClassLoaderUrlStreamTest</exclude>
@@ -86,23 +87,4 @@
       <optional>true</optional>
     </dependency>
   </dependencies>
-  <profiles>
-    <profile>
-      <id>jdk9</id>
-      <activation>
-        <jdk>[1.9,)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <argLine>@{argLine} --module-path src/test/resources/mods</argLine>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>

jetty-websocket/websocket-client/pom.xml

@@ -1,122 +1,122 @@
 <?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/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    <parent>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-        <groupId>org.eclipse.jetty.websocket</groupId>
+  <parent>
-        <artifactId>websocket-parent</artifactId>
+    <groupId>org.eclipse.jetty.websocket</groupId>
-        <version>10.0.0-SNAPSHOT</version>
+    <artifactId>websocket-parent</artifactId>
-    </parent>
+    <version>10.0.0-SNAPSHOT</version>
+  </parent>
 
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
-    <artifactId>websocket-client</artifactId>
+  <artifactId>websocket-client</artifactId>
-    <name>Jetty :: Websocket :: Client</name>
+  <name>Jetty :: Websocket :: Client</name>
 
-    <properties>
+  <properties>
-        <bundle-symbolic-name>${project.groupId}.client</bundle-symbolic-name>
+    <bundle-symbolic-name>${project.groupId}.client</bundle-symbolic-name>
-    </properties>
+  </properties>
 
-    <dependencies>
+  <dependencies>
-        <dependency>
+    <dependency>
-            <groupId>org.eclipse.jetty</groupId>
+      <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-util</artifactId>
+      <artifactId>jetty-util</artifactId>
-            <version>${project.version}</version>
+      <version>${project.version}</version>
-        </dependency>
+    </dependency>
-        <dependency>
+    <dependency>
-            <groupId>org.eclipse.jetty</groupId>
+      <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-xml</artifactId>
+      <artifactId>jetty-xml</artifactId>
-            <version>${project.version}</version>
+      <version>${project.version}</version>
-            <optional>true</optional>
+      <optional>true</optional>
-        </dependency>
+    </dependency>
-        <dependency>
+    <dependency>
-            <groupId>org.eclipse.jetty</groupId>
+      <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-io</artifactId>
+      <artifactId>jetty-io</artifactId>
-            <version>${project.version}</version>
+      <version>${project.version}</version>
-        </dependency>
+    </dependency>
-        <dependency>
+    <dependency>
-            <groupId>org.eclipse.jetty</groupId>
+      <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-client</artifactId>
+      <artifactId>jetty-client</artifactId>
-            <version>${project.version}</version>
+      <version>${project.version}</version>
-        </dependency>
+    </dependency>
-        <dependency>
+    <dependency>
-            <groupId>org.eclipse.jetty.websocket</groupId>
+      <groupId>org.eclipse.jetty.websocket</groupId>
-            <artifactId>websocket-common</artifactId>
+      <artifactId>websocket-common</artifactId>
-            <version>${project.version}</version>
+      <version>${project.version}</version>
-        </dependency>
+    </dependency>
-        <dependency>
+    <dependency>
-            <groupId>org.eclipse.jetty.toolchain</groupId>
+      <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-test-helper</artifactId>
+      <artifactId>jetty-test-helper</artifactId>
-            <scope>test</scope>
+      <scope>test</scope>
-        </dependency>
+    </dependency>
-    </dependencies>
+  </dependencies>
 
-    <build>
+  <build>
-        <plugins>
+    <plugins>
-            <plugin>
+      <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
+        <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
+        <artifactId>maven-enforcer-plugin</artifactId>
-                <executions>
+        <executions>
-                    <execution>
+          <execution>
-                        <id>ban-java-servlet-api</id>
+            <id>ban-java-servlet-api</id>
-                        <goals>
+            <goals>
-                            <goal>enforce</goal>
+              <goal>enforce</goal>
-                        </goals>
+            </goals>
-                        <configuration>
+            <configuration>
-                            <rules>
+              <rules>
-                                <bannedDependencies>
+                <bannedDependencies>
-                                    <includes>
+                  <includes>
-                                        <include>javax.servlet</include>
+                    <include>javax.servlet</include>
-                                        <include>servletapi</include>
+                    <include>servletapi</include>
-                                        <include>org.eclipse.jetty.orbit:javax.servlet</include>
+                    <include>org.eclipse.jetty.orbit:javax.servlet</include>
-                                        <include>org.mortbay.jetty:servlet-api</include>
+                    <include>org.mortbay.jetty:servlet-api</include>
-                                        <include>jetty:servlet-api</include>
+                    <include>jetty:servlet-api</include>
-                                    </includes>
+                  </includes>
-                                    <searchTransitive>true</searchTransitive>
+                  <searchTransitive>true</searchTransitive>
-                                    <message>The servlet-api dependency is banned in websocket-client as it causes problems in apps that use client only.</message>
+                  <message>The servlet-api dependency is banned in websocket-client as it causes problems in apps that use client only.</message>
-                                </bannedDependencies>
+                </bannedDependencies>
-                            </rules>
+              </rules>
-                        </configuration>
+            </configuration>
-                    </execution>
+          </execution>
-                </executions>
+        </executions>
-            </plugin>
+      </plugin>
-            <plugin>
+      <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
+        <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
+        <artifactId>maven-jar-plugin</artifactId>
-                <executions>
+        <executions>
-                    <execution>
+          <execution>
-                        <id>tests-jar</id>
+            <id>tests-jar</id>
-                        <goals>
+            <goals>
-                            <goal>test-jar</goal>
+              <goal>test-jar</goal>
-                        </goals>
+            </goals>
-                    </execution>
+          </execution>
-                </executions>
+        </executions>
-            </plugin>
+      </plugin>
-            <plugin>
+      <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
+        <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
+        <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.3</version>
+        <executions>
-                <executions>
+          <execution>
-                    <execution>
+            <phase>package</phase>
-                        <phase>package</phase>
+            <goals>
-                        <goals>
+              <goal>shade</goal>
-                            <goal>shade</goal>
+            </goals>
-                        </goals>
+            <configuration>
-                        <configuration>
+              <shadedArtifactAttached>true</shadedArtifactAttached>
-                            <shadedArtifactAttached>true</shadedArtifactAttached>
+              <shadedClassifierName>hybrid</shadedClassifierName>
-                            <shadedClassifierName>hybrid</shadedClassifierName>
+              <artifactSet>
-                            <artifactSet>
+                <includes>
-                                <includes>
+                  <include>org.eclipse.jetty.websocket:websocket-common</include>
-                                    <include>org.eclipse.jetty.websocket:websocket-common</include>
+                </includes>
-                                </includes>
+              </artifactSet>
-                            </artifactSet>
+              <relocations>
-                            <relocations>
+                <relocation>
-                                <relocation>
+                  <pattern>org.eclipse.jetty.websocket.common</pattern>
-                                    <pattern>org.eclipse.jetty.websocket.common</pattern>
+                  <shadedPattern>org.eclipse.jetty.websocket.client.common</shadedPattern>
-                                    <shadedPattern>org.eclipse.jetty.websocket.client.common</shadedPattern>
+                </relocation>
-                                </relocation>
+              </relocations>
-                            </relocations>
+            </configuration>
-                        </configuration>
+          </execution>
-                    </execution>
+        </executions>
-                </executions>
+      </plugin>
-            </plugin>
+    </plugins>
-        </plugins>
+  </build>
-    </build>
 </project>

pom.xml

@@ -13,6 +13,19 @@
   <url>https://eclipse.org/jetty</url>
   <inceptionYear>1995</inceptionYear>
 
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache.snapshots</id>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
   <properties>
     <jetty.url>http://www.eclipse.org/jetty</jetty.url>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -28,7 +41,7 @@
     <!-- default values are unsupported, but required to be defined for reactor sanity reasons -->
     <alpn.version>undefined</alpn.version>
     <conscrypt.version>1.1.4</conscrypt.version>
-    <asm.version>6.2</asm.version>
+    <asm.version>7.0-beta</asm.version>
     <jmh.version>1.21</jmh.version>
     <jmhjar.name>benchmarks</jmhjar.name>
     <tycho-version>1.2.0</tycho-version>
@@ -50,7 +63,6 @@
     <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.1</jetty.test.version>
   </properties>
@@ -90,8 +102,9 @@
     <module>jetty-util-ajax</module>
     <module>apache-jsp</module>
     <module>apache-jstl</module>
-    <module>jetty-maven-plugin</module>
+    <!-- TODO: restore these modules when the maven-plugin-plugin works with JDK 11 -->
-    <module>jetty-jspc-maven-plugin</module>
+    <!--<module>jetty-maven-plugin</module>-->
+    <!--<module>jetty-jspc-maven-plugin</module>-->
     <module>jetty-deploy</module>
     <module>jetty-start</module>
     <module>jetty-plus</module>
@@ -140,12 +153,12 @@
             <configuration>
               <rules>
                 <requireMavenVersion>
-                  <version>[3.0.0,)</version>
+                  <version>[3.5.0,)</version>
-                  <message>[ERROR] OLD MAVEN [${maven.version}] in use, Jetty ${project.version} requires Maven 3.0.0 or newer</message>
+                  <message>[ERROR] OLD MAVEN [${maven.version}] in use, Jetty ${project.version} requires Maven 3.5.0 or newer</message>
                 </requireMavenVersion>
                 <requireJavaVersion>
-                  <version>[1.8,)</version>
+                  <version>[11,)</version>
-                  <message>[ERROR] OLD JDK [${java.version}] in use. Jetty ${project.version} requires JDK 1.8.0 or newer</message>
+                  <message>[ERROR] OLD JDK [${java.version}] in use. Jetty ${project.version} requires JDK 11 or newer</message>
                 </requireJavaVersion>
                 <versionTxtRule implementation="org.eclipse.jetty.toolchain.enforcer.rules.VersionTxtRule" />
                 <versionOsgiRule implementation="org.eclipse.jetty.toolchain.enforcer.rules.RequireOsgiCompatibleVersionRule" />
@@ -154,23 +167,6 @@
               </rules>
             </configuration>
           </execution>
-          <execution>
-            <id>ban-junit-dep.jar</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <bannedDependencies>
-                  <excludes>
-                    <exclude>junit:junit-dep:*:jar</exclude>
-                  </excludes>
-                  <searchTransitive>true</searchTransitive>
-                  <message>We use junit.jar, not junit-dep.jar (as of junit 4.11, hamcrest is no longer embedded)</message>
-                </bannedDependencies>
-              </rules>
-            </configuration>
-          </execution>
         </executions>
         <dependencies>
           <dependency>
@@ -247,7 +243,7 @@
         </executions>
         <configuration>
           <linkXRef>false</linkXRef>
-          <targetJdk>1.8</targetJdk>
+          <targetJdk>11</targetJdk>
           <rulesets>
             <ruleset>jetty/pmd_logging_ruleset.xml</ruleset>
           </rulesets>
@@ -438,8 +434,9 @@
           <artifactId>maven-compiler-plugin</artifactId>
           <version>${maven.compiler.plugin.version}</version>
           <configuration>
-            <source>1.8</source>
+            <source>11</source>
-            <target>1.8</target>
+            <target>11</target>
+            <release>11</release>
           </configuration>
         </plugin>
         <plugin>
@@ -585,7 +582,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-pmd-plugin</artifactId>
-          <version>3.10.0</version>
+          <version>3.11.0-SNAPSHOT</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -610,7 +607,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-shade-plugin</artifactId>
-          <version>3.1.1</version>
+          <version>3.2.1-SNAPSHOT</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -781,9 +778,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.ops4j.pax.exam</groupId>
                     <artifactId>maven-paxexam-plugin</artifactId>
-                    <versionRange>
+                    <versionRange>[1.2.0,)</versionRange>
-                      [1.2.0,)
-                    </versionRange>
                     <goals>
                       <goal>
                         generate-depends-file
@@ -1118,34 +1113,6 @@
         </pluginManagement>
       </build>
     </profile>
-    <profile>
-      <id>jdk8</id>
-      <activation>
-        <jdk>[1.8,1.9)</jdk>
-      </activation>
-      <build>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>org.codehaus.mojo</groupId>
-              <artifactId>clirr-maven-plugin</artifactId>
-              <version>2.8</version>
-              <configuration>
-                <htmlOutputFile>clirr-report.html</htmlOutputFile>
-                <xmlOutputFile>${project.build.directory}/clirr-report.xml</xmlOutputFile>
-                <failOnError>true</failOnError>
-                <failOnWarning>true</failOnWarning>
-                <failOnInfo>false</failOnInfo>
-                <logResults>true</logResults>
-                <minSeverity>info</minSeverity>
-                <comparisonVersion>9.4.6.v20170531</comparisonVersion>
-                <ignoreMaintenenceVersions>false</ignoreMaintenenceVersions>
-              </configuration>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-      </build>
-    </profile>
     <profile>
       <id>config</id>
       <activation>
@@ -1341,7 +1308,7 @@
           <plugin>
             <groupId>org.eclipse.cbi.maven.plugins</groupId>
             <artifactId>eclipse-jarsigner-plugin</artifactId>
-	          <version>${cbi-plugins.version}</version>
+            <version>${cbi-plugins.version}</version>
             <executions>
               <execution>
                 <id>sign</id>
@@ -1369,430 +1336,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>8u00</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.0.v20141016</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u05</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_05</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.0.v20141016</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u11</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_11</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.0.v20141016</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u20</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_20</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.0.v20141016</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u25</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_25</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.2.v20141202</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u31</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_31</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.3.v20150130</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u40</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_40</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.3.v20150130</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u45</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_45</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.3.v20150130</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u51</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_51</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.4.v20150727</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u60</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_60</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.5.v20150921</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u65</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_65</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.6.v20151105</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u66</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_66</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.6.v20151105</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u71</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_71</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.7.v20160121</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u72</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_72</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.7.v20160121</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u73</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_73</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.7.v20160121</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u74</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_74</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.7.v20160121</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u77</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_77</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.7.v20160121</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u91</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_91</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.7.v20160121</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u92</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_92</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.8.v20160420</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u101</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_101</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.9.v20160720</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u102</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_102</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.9.v20160720</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u111</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_111</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.9.v20160720</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u112</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_112</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.10.v20161026</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u121</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_121</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.11.v20170118</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u131</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_131</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.11.v20170118</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u141</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_141</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.11.v20170118</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u144</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_144</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.11.v20170118</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u151</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_151</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.11.v20170118</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u152</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_152</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.11.v20170118</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u161</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_161</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.12.v20180117</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u162</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_162</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.12.v20180117</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u171</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_171</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.12.v20180117</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u172</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_172</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.12.v20180117</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>8u181</id>
-      <activation>
-        <property>
-          <name>java.version</name>
-          <value>1.8.0_181</value>
-        </property>
-      </activation>
-      <properties>
-        <alpn.version>8.1.12.v20180117</alpn.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>jdk9</id>
-      <activation>
-        <jdk>[1.9,)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-              <release>8</release>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
     <profile>
       <id>snapshot-repositories</id>
       <activation>

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

@@ -1,173 +1,111 @@
 <?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/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    <parent>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-        <groupId>org.eclipse.jetty.tests</groupId>
+  <parent>
-        <artifactId>tests-parent</artifactId>
+    <groupId>org.eclipse.jetty.tests</groupId>
-        <version>10.0.0-SNAPSHOT</version>
+    <artifactId>tests-parent</artifactId>
-    </parent>
+    <version>10.0.0-SNAPSHOT</version>
+  </parent>
 
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
-    <artifactId>test-http-client-transport</artifactId>
+  <artifactId>test-http-client-transport</artifactId>
-    <packaging>jar</packaging>
+  <packaging>jar</packaging>
-    <name>Test :: HTTP Client Transports</name>
+  <name>Test :: HTTP Client Transports</name>
 
-    <properties>
+  <properties>
-        <bundle-symbolic-name>${project.groupId}.client.http</bundle-symbolic-name>
+    <bundle-symbolic-name>${project.groupId}.client.http</bundle-symbolic-name>
-        <org.eclipse.jetty.http.client.AbstractTest.Transports></org.eclipse.jetty.http.client.AbstractTest.Transports>
+    <org.eclipse.jetty.http.client.AbstractTest.Transports></org.eclipse.jetty.http.client.AbstractTest.Transports>
-    </properties>
+  </properties>
 
-    <profiles>
+  <build>
-        <profile>
+    <plugins>
-            <id>jdk8</id>
+      <plugin>
-            <activation>
+        <groupId>org.apache.maven.plugins</groupId>
-                <jdk>[1.8,1.9)</jdk>
+        <artifactId>maven-deploy-plugin</artifactId>
-            </activation>
+        <configuration>
-            <dependencies>
+          <!-- DO NOT DEPLOY (or Release) -->
-                <dependency>
+          <skip>true</skip>
-                    <groupId>org.eclipse.jetty</groupId>
+        </configuration>
-                    <artifactId>jetty-alpn-openjdk8-client</artifactId>
+      </plugin>
-                    <version>${project.version}</version>
+      <plugin>
-                    <scope>test</scope>
+        <groupId>org.apache.maven.plugins</groupId>
-                </dependency>
+        <artifactId>maven-surefire-plugin</artifactId>
-                <dependency>
+        <configuration>
-                    <groupId>org.eclipse.jetty</groupId>
+          <systemPropertyVariables>
-                    <artifactId>jetty-alpn-openjdk8-server</artifactId>
+            <org.eclipse.jetty.http.client.AbstractTest.Transports>
-                    <version>${project.version}</version>
+              ${org.eclipse.jetty.http.client.AbstractTest.Transports}
-                    <scope>test</scope>
+            </org.eclipse.jetty.http.client.AbstractTest.Transports>
-                </dependency>
+          </systemPropertyVariables>
-            </dependencies>
+        </configuration>
-            <build>
+      </plugin>
-                <plugins>
+    </plugins>
-                    <plugin>
+  </build>
-                        <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>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-alpn-java-client</artifactId>
-                    <version>${project.version}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-alpn-java-server</artifactId>
-                    <version>${project.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
 
-    <build>
+  <dependencies>
-        <plugins>
+    <dependency>
-            <plugin>
+      <groupId>org.eclipse.jetty</groupId>
-                <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>jetty-alpn-java-client</artifactId>
-                <artifactId>maven-deploy-plugin</artifactId>
+      <version>${project.version}</version>
-                <configuration>
+      <scope>test</scope>
-                    <!-- DO NOT DEPLOY (or Release) -->
+    </dependency>
-                    <skip>true</skip>
+    <dependency>
-                </configuration>
+      <groupId>org.eclipse.jetty</groupId>
-            </plugin>
+      <artifactId>jetty-alpn-java-server</artifactId>
-            <plugin>
+      <version>${project.version}</version>
-                <groupId>org.apache.maven.plugins</groupId>
+      <scope>test</scope>
-                <artifactId>maven-surefire-plugin</artifactId>
+    </dependency>
-                <configuration>
+    <dependency>
-                    <systemPropertyVariables>
+      <groupId>org.eclipse.jetty</groupId>
-                        <org.eclipse.jetty.http.client.AbstractTest.Transports>${org.eclipse.jetty.http.client.AbstractTest.Transports}</org.eclipse.jetty.http.client.AbstractTest.Transports>
+      <artifactId>jetty-jmx</artifactId>
-                    </systemPropertyVariables>
+      <version>${project.version}</version>
-                </configuration>
+      <scope>test</scope>
-            </plugin>
+    </dependency>
-        </plugins>
+    <dependency>
-    </build>
+      <groupId>org.eclipse.jetty</groupId>
-
+      <artifactId>jetty-servlet</artifactId>
-    <dependencies>
+      <version>${project.version}</version>
-        <dependency>
+      <scope>test</scope>
-            <groupId>org.eclipse.jetty</groupId>
+    </dependency>
-            <artifactId>jetty-jmx</artifactId>
+    <dependency>
-            <version>${project.version}</version>
+      <groupId>org.eclipse.jetty</groupId>
-            <scope>test</scope>
+      <artifactId>jetty-client</artifactId>
-        </dependency>
+      <version>${project.version}</version>
-        <dependency>
+      <scope>test</scope>
-            <groupId>org.eclipse.jetty</groupId>
+    </dependency>
-            <artifactId>jetty-servlet</artifactId>
+    <dependency>
-            <version>${project.version}</version>
+      <groupId>org.eclipse.jetty.http2</groupId>
-            <scope>test</scope>
+      <artifactId>http2-server</artifactId>
-        </dependency>
+      <version>${project.version}</version>
-        <dependency>
+      <scope>test</scope>
-            <groupId>org.eclipse.jetty</groupId>
+    </dependency>
-            <artifactId>jetty-client</artifactId>
+    <dependency>
-            <version>${project.version}</version>
+      <groupId>org.eclipse.jetty.http2</groupId>
-            <scope>test</scope>
+      <artifactId>http2-http-client-transport</artifactId>
-        </dependency>
+      <version>${project.version}</version>
-        <dependency>
+      <scope>test</scope>
-            <groupId>org.eclipse.jetty.http2</groupId>
+    </dependency>
-            <artifactId>http2-server</artifactId>
+    <dependency>
-            <version>${project.version}</version>
+      <groupId>org.eclipse.jetty</groupId>
-            <scope>test</scope>
+      <artifactId>jetty-unixsocket</artifactId>
-        </dependency>
+      <version>${project.version}</version>
-        <dependency>
+      <scope>test</scope>
-            <groupId>org.eclipse.jetty.http2</groupId>
+    </dependency>
-            <artifactId>http2-http-client-transport</artifactId>
+    <dependency>
-            <version>${project.version}</version>
+      <groupId>org.eclipse.jetty.fcgi</groupId>
-            <scope>test</scope>
+      <artifactId>fcgi-server</artifactId>
-        </dependency>
+      <version>${project.version}</version>
-        <dependency>
+      <scope>test</scope>
-            <groupId>org.eclipse.jetty</groupId>
+    </dependency>
-            <artifactId>jetty-unixsocket</artifactId>
+    <dependency>
-            <version>${project.version}</version>
+      <groupId>junit</groupId>
-            <scope>test</scope>
+      <artifactId>junit</artifactId>
-        </dependency>
+      <scope>test</scope>
-        <dependency>
+    </dependency>
-            <groupId>org.eclipse.jetty.fcgi</groupId>
+    <dependency>
-            <artifactId>fcgi-server</artifactId>
+      <groupId>org.eclipse.jetty.toolchain</groupId>
-            <version>${project.version}</version>
+      <artifactId>jetty-test-helper</artifactId>
-            <scope>test</scope>
+      <scope>test</scope>
-        </dependency>
+    </dependency>
-        <dependency>
+  </dependencies>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-test-helper</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
 
 </project>

tests/test-sessions/test-infinispan-sessions/pom.xml

@@ -134,22 +134,6 @@
               <includes>
                 <include>**/*.java</include>
               </includes>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>jdk10</id>
-      <activation>
-        <jdk>10</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
               <excludes>
                 <exclude>**/ClusteredSessionScavengingTest</exclude>
               </excludes>
@@ -158,26 +142,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>jdk11</id>
-      <activation>
-        <jdk>11</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <excludes>
-                <exclude>**/ClusteredSessionScavengingTest</exclude>
-              </excludes>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <!-- if you want to run test even with jdk10/11 -->
     <profile>
       <id>alltests</id>
       <activation>

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

@@ -56,88 +56,6 @@
     </plugins>
   </build>
 
-  <profiles>
-    <profile>
-      <id>jdk8</id>
-      <activation>
-        <jdk>[1.8,1.9)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>copy-alpn-boot</id>
-                <phase>pre-integration-test</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>
-            <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>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-      <dependencies>
-        <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>
-          <artifactId>jetty-alpn-openjdk8-server</artifactId>
-          <version>${project.version}</version>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-    </profile>
-    <profile>
-      <id>jdk9</id>
-      <activation>
-        <jdk>[1.9,)</jdk>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-alpn-java-client</artifactId>
-          <version>${project.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-alpn-java-server</artifactId>
-          <version>${project.version}</version>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty.http2</groupId>
@@ -149,7 +67,18 @@
        <artifactId>javax.servlet-api</artifactId>
        <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-alpn-java-client</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-alpn-java-server</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>

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

@@ -206,6 +206,10 @@
       <version>1.0</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+    </dependency>
   </dependencies>
   <profiles>
     <profile>