diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml index d9b4a30a9a3..e07c130db0b 100644 --- a/examples/embedded/pom.xml +++ b/examples/embedded/pom.xml @@ -77,7 +77,7 @@ org.eclipse.jetty - jetty-alpn-openjdk8-server + jetty-alpn-java-server ${project.version} @@ -128,7 +128,7 @@ org.eclipse.jetty.orbit javax.mail.glassfish - + org.eclipse.jetty.toolchain jetty-test-helper @@ -141,20 +141,4 @@ test - - - - jdk9 - - [1.9,) - - - - org.eclipse.jetty - jetty-alpn-java-server - ${project.version} - - - - diff --git a/jetty-alpn/jetty-alpn-openjdk8-client/pom.xml b/jetty-alpn/jetty-alpn-openjdk8-client/pom.xml deleted file mode 100644 index f007c01bd10..00000000000 --- a/jetty-alpn/jetty-alpn-openjdk8-client/pom.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - org.eclipse.jetty - jetty-alpn-parent - 10.0.0-SNAPSHOT - - - 4.0.0 - jetty-alpn-openjdk8-client - Jetty :: ALPN :: OpenJDK8 Client Implementation - - - ${project.groupId}.alpn.openjdk8.client - - - - - org.eclipse.jetty - jetty-alpn-client - ${project.version} - - - org.eclipse.jetty.alpn - alpn-api - ${alpn.api.version} - - - org.eclipse.jetty.http2 - http2-client - ${project.version} - test - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - parse-version - - parse-version - - - alpn - ${alpn.api.version} - - - - - - org.apache.felix - maven-bundle-plugin - true - - - OpenJDK8 Client ALPN - org.eclipse.jetty.alpn;version="${alpn.majorVersion}.${alpn.minorVersion}.${alpn.incrementalVersion}",* - * - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Client - <_nouses>true - - - - - - diff --git a/jetty-alpn/jetty-alpn-openjdk8-client/src/main/java/org/eclipse/jetty/alpn/java/client/OpenJDK8ClientALPNProcessor.java b/jetty-alpn/jetty-alpn-openjdk8-client/src/main/java/org/eclipse/jetty/alpn/java/client/OpenJDK8ClientALPNProcessor.java deleted file mode 100644 index fd1d4f10db3..00000000000 --- a/jetty-alpn/jetty-alpn-openjdk8-client/src/main/java/org/eclipse/jetty/alpn/java/client/OpenJDK8ClientALPNProcessor.java +++ /dev/null @@ -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 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); - } - } -} diff --git a/jetty-alpn/jetty-alpn-openjdk8-client/src/main/resources/META-INF/services/org.eclipse.jetty.io.ssl.ALPNProcessor$Client b/jetty-alpn/jetty-alpn-openjdk8-client/src/main/resources/META-INF/services/org.eclipse.jetty.io.ssl.ALPNProcessor$Client deleted file mode 100644 index de5d9cd9ec4..00000000000 --- a/jetty-alpn/jetty-alpn-openjdk8-client/src/main/resources/META-INF/services/org.eclipse.jetty.io.ssl.ALPNProcessor$Client +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.jetty.alpn.java.client.OpenJDK8ClientALPNProcessor diff --git a/jetty-alpn/jetty-alpn-openjdk8-client/src/test/java/org/eclipse/jetty/alpn/java/client/OpenJDK8HTTP2Client.java b/jetty-alpn/jetty-alpn-openjdk8-client/src/test/java/org/eclipse/jetty/alpn/java/client/OpenJDK8HTTP2Client.java deleted file mode 100644 index bdbacdbfc56..00000000000 --- a/jetty-alpn/jetty-alpn-openjdk8-client/src/test/java/org/eclipse/jetty/alpn/java/client/OpenJDK8HTTP2Client.java +++ /dev/null @@ -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 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(); - } -} diff --git a/jetty-alpn/jetty-alpn-openjdk8-client/src/test/resources/jetty-logging.properties b/jetty-alpn/jetty-alpn-openjdk8-client/src/test/resources/jetty-logging.properties deleted file mode 100644 index d96a696f82e..00000000000 --- a/jetty-alpn/jetty-alpn-openjdk8-client/src/test/resources/jetty-logging.properties +++ /dev/null @@ -1,2 +0,0 @@ -org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog -#org.eclipse.jetty.LEVEL=DEBUG diff --git a/jetty-alpn/jetty-alpn-openjdk8-server/pom.xml b/jetty-alpn/jetty-alpn-openjdk8-server/pom.xml deleted file mode 100644 index 77d8fc006b7..00000000000 --- a/jetty-alpn/jetty-alpn-openjdk8-server/pom.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - org.eclipse.jetty - jetty-alpn-parent - 10.0.0-SNAPSHOT - - - 4.0.0 - jetty-alpn-openjdk8-server - Jetty :: ALPN :: OpenJDK8 Server Implementation - - - ${project.groupId}.alpn.openjdk8.server - - - - - org.eclipse.jetty.alpn - alpn-api - ${alpn.api.version} - provided - - - org.eclipse.jetty - jetty-alpn-server - ${project.version} - - - org.eclipse.jetty - jetty-io - ${project.version} - - - - org.eclipse.jetty.http2 - http2-server - ${project.version} - test - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - parse-version - - parse-version - - - alpn - ${alpn.api.version} - - - - - - org.apache.felix - maven-bundle-plugin - true - - - OpenJDK8 Server ALPN - * - org.eclipse.jetty.alpn;version="${alpn.majorVersion}.${alpn.minorVersion}.${alpn.incrementalVersion}",* - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Server - <_nouses>true - - - - - - diff --git a/jetty-alpn/jetty-alpn-openjdk8-server/src/main/java/org/eclipse/jetty/alpn/openjdk8/server/OpenJDK8ServerALPNProcessor.java b/jetty-alpn/jetty-alpn-openjdk8-server/src/main/java/org/eclipse/jetty/alpn/openjdk8/server/OpenJDK8ServerALPNProcessor.java deleted file mode 100644 index 91058abc384..00000000000 --- a/jetty-alpn/jetty-alpn-openjdk8-server/src/main/java/org/eclipse/jetty/alpn/openjdk8/server/OpenJDK8ServerALPNProcessor.java +++ /dev/null @@ -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 protocols) throws SSLException - { - if (LOG.isDebugEnabled()) - LOG.debug("select {} {}", alpnConnection, protocols); - alpnConnection.select(protocols); - return alpnConnection.getProtocol(); - } - } -} diff --git a/jetty-alpn/jetty-alpn-openjdk8-server/src/main/resources/META-INF/services/org.eclipse.jetty.io.ssl.ALPNProcessor$Server b/jetty-alpn/jetty-alpn-openjdk8-server/src/main/resources/META-INF/services/org.eclipse.jetty.io.ssl.ALPNProcessor$Server deleted file mode 100644 index 3a2141ba0e8..00000000000 --- a/jetty-alpn/jetty-alpn-openjdk8-server/src/main/resources/META-INF/services/org.eclipse.jetty.io.ssl.ALPNProcessor$Server +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.jetty.alpn.openjdk8.server.OpenJDK8ServerALPNProcessor diff --git a/jetty-alpn/jetty-alpn-openjdk8-server/src/test/java/org/eclipse/jetty/alpn/openjdk8/server/OpenJDK8HTTP2Server.java b/jetty-alpn/jetty-alpn-openjdk8-server/src/test/java/org/eclipse/jetty/alpn/openjdk8/server/OpenJDK8HTTP2Server.java deleted file mode 100644 index 714cdc1dcf4..00000000000 --- a/jetty-alpn/jetty-alpn-openjdk8-server/src/test/java/org/eclipse/jetty/alpn/openjdk8/server/OpenJDK8HTTP2Server.java +++ /dev/null @@ -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(); - } -} diff --git a/jetty-alpn/jetty-alpn-openjdk8-server/src/test/resources/jetty-logging.properties b/jetty-alpn/jetty-alpn-openjdk8-server/src/test/resources/jetty-logging.properties deleted file mode 100644 index c391f84e35b..00000000000 --- a/jetty-alpn/jetty-alpn-openjdk8-server/src/test/resources/jetty-logging.properties +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-openjdk8-server/src/test/resources/keystore.jks b/jetty-alpn/jetty-alpn-openjdk8-server/src/test/resources/keystore.jks deleted file mode 100644 index d6592f95ee9..00000000000 Binary files a/jetty-alpn/jetty-alpn-openjdk8-server/src/test/resources/keystore.jks and /dev/null differ diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0.mod deleted file mode 100644 index bbcca55ad48..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_05.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_05.mod deleted file mode 100644 index bbcca55ad48..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_05.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_101.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_101.mod deleted file mode 100644 index 98e9460dd1a..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_101.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_102.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_102.mod deleted file mode 100644 index 98e9460dd1a..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_102.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_11.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_11.mod deleted file mode 100644 index bbcca55ad48..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_11.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_111.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_111.mod deleted file mode 100644 index 98e9460dd1a..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_111.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_112.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_112.mod deleted file mode 100644 index 8d4ac37b4f4..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_112.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_121.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_121.mod deleted file mode 100644 index 7a3a9192362..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_121.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_131.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_131.mod deleted file mode 100644 index 7a3a9192362..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_131.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_141.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_141.mod deleted file mode 100644 index 7a3a9192362..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_141.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_144.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_144.mod deleted file mode 100644 index 7a3a9192362..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_144.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_151.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_151.mod deleted file mode 100644 index 7a3a9192362..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_151.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_152.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_152.mod deleted file mode 100644 index 7a3a9192362..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_152.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_161.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_161.mod deleted file mode 100644 index 00366a87b3d..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_161.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_162.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_162.mod deleted file mode 100644 index 00366a87b3d..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_162.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_171.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_171.mod deleted file mode 100644 index 00366a87b3d..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_171.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_172.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_172.mod deleted file mode 100644 index 00366a87b3d..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_172.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_181.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_181.mod deleted file mode 100644 index 00366a87b3d..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_181.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_20.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_20.mod deleted file mode 100644 index bbcca55ad48..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_20.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_25.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_25.mod deleted file mode 100644 index f34b1841244..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_25.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_31.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_31.mod deleted file mode 100644 index 9ffca1a9699..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_31.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_40.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_40.mod deleted file mode 100644 index 9ffca1a9699..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_40.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_45.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_45.mod deleted file mode 100644 index 9ffca1a9699..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_45.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_51.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_51.mod deleted file mode 100644 index bd6891a07e4..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_51.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_60.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_60.mod deleted file mode 100644 index 004663c5e7a..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_60.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_65.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_65.mod deleted file mode 100644 index 532c440dd42..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_65.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_66.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_66.mod deleted file mode 100644 index 532c440dd42..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_66.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_71.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_71.mod deleted file mode 100644 index 48de22c2231..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_71.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_72.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_72.mod deleted file mode 100644 index 48de22c2231..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_72.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_73.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_73.mod deleted file mode 100644 index 48de22c2231..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_73.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_74.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_74.mod deleted file mode 100644 index 48de22c2231..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_74.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_77.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_77.mod deleted file mode 100644 index 48de22c2231..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_77.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_91.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_91.mod deleted file mode 100644 index 48de22c2231..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_91.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_92.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_92.mod deleted file mode 100644 index a3677be88e3..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_92.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-10.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-10.mod deleted file mode 100644 index 689601a4197..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-10.mod +++ /dev/null @@ -1,4 +0,0 @@ -DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html - -[depend] -alpn-impl/alpn-9 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-8.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-8.mod deleted file mode 100644 index 252d27466af..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-8.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-9.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-9.mod deleted file mode 100644 index e1de6726af9..00000000000 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-9.mod +++ /dev/null @@ -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 diff --git a/jetty-alpn/pom.xml b/jetty-alpn/pom.xml index 7c81dd18a9a..5b8fde10bb6 100644 --- a/jetty-alpn/pom.xml +++ b/jetty-alpn/pom.xml @@ -14,21 +14,10 @@ jetty-alpn-server jetty-alpn-client - jetty-alpn-openjdk8-server - jetty-alpn-openjdk8-client jetty-alpn-conscrypt-server jetty-alpn-conscrypt-client + jetty-alpn-java-client + jetty-alpn-java-server - - - jdk9 - - [1.9,) - - - jetty-alpn-java-client - jetty-alpn-java-server - - - + diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml index 4897f5e94ea..54daf034c7f 100644 --- a/jetty-bom/pom.xml +++ b/jetty-bom/pom.xml @@ -116,16 +116,6 @@ jetty-alpn-java-server 10.0.0-SNAPSHOT - - org.eclipse.jetty - jetty-alpn-openjdk8-client - 10.0.0-SNAPSHOT - - - org.eclipse.jetty - jetty-alpn-openjdk8-server - 10.0.0-SNAPSHOT - org.eclipse.jetty jetty-alpn-conscrypt-client diff --git a/jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc b/jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc index adb8a86e31a..df2cecbb0cd 100644 --- a/jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc +++ b/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: ... ----- - -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. - -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 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 protocols); - { - ALPN.remove(sslEngine); - return protocols.get(0); - } -}); ----- - -The ALPN implementation calls `ALPN.ServerProvider` methods `unsupported()`, and `select(List),` 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}"] ----- - - - - 8.1.4.v20150727 - - - - - - maven-surefire-plugin - - - -Xbootclasspath/p:${settings.localRepository}/org/mortbay/jetty/alpn/alpn-boot/${alpn-boot-version}/alpn-boot-${alpn-boot-version}.jar - - - - - ... - - - - -... - - ----- - -[[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 - -.... - -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`. +For example, you do not have the `jetty-alpn-java-server` artifact in the classpath. diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index 1fd13d8c603..1fae7929d6b 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -662,7 +662,7 @@ org.eclipse.jetty - jetty-alpn-openjdk8-server + jetty-alpn-java-server ${project.version} @@ -702,20 +702,4 @@ - - - jdk9 - - [1.9,) - - - - org.eclipse.jetty - jetty-alpn-java-server - ${project.version} - - - - - diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index f472d8c8efa..3b96c7f85d1 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -35,6 +35,24 @@ ${project.version} provided + + javax.xml + jaxws-api + 2.0EA3 + test + + + com.sun.xml.ws + jaxws-rt + 2.3.0.2 + test + + + javax.activation + javax.activation-api + 1.2.0 + test + @@ -74,32 +92,4 @@ - - - jdk9 - - [1.9,) - - - - javax.xml - jaxws-api - 2.0EA3 - test - - - com.sun.xml.ws - jaxws-rt - 2.3.0.2 - test - - - javax.activation - javax.activation-api - 1.2.0 - test - - - - diff --git a/jetty-http2/http2-alpn-tests/pom.xml b/jetty-http2/http2-alpn-tests/pom.xml index fac18b98d19..d09a1f308fb 100644 --- a/jetty-http2/http2-alpn-tests/pom.xml +++ b/jetty-http2/http2-alpn-tests/pom.xml @@ -1,106 +1,55 @@ - - - org.eclipse.jetty.http2 - http2-parent - 10.0.0-SNAPSHOT - + + + org.eclipse.jetty.http2 + http2-parent + 10.0.0-SNAPSHOT + - 4.0.0 - http2-alpn-tests - Jetty :: HTTP2 :: ALPN Tests + 4.0.0 + http2-alpn-tests + Jetty :: HTTP2 :: ALPN Tests - - ${project.groupId}.alpn.tests - + + ${project.groupId}.alpn.tests + - - - - maven-dependency-plugin - - - copy - generate-resources - - copy - - - - - org.mortbay.jetty.alpn - alpn-boot - ${alpn.version} - jar - false - ${project.build.directory}/alpn - - - - - - - - maven-surefire-plugin - - -Xbootclasspath/p:${project.build.directory}/alpn/alpn-boot-${alpn.version}.jar - - - - + + + org.eclipse.jetty.alpn + alpn-api + ${alpn.api.version} + provided + + + org.eclipse.jetty + jetty-alpn-java-server + ${project.version} + test + + + org.eclipse.jetty + jetty-server + ${project.version} + test + + + org.eclipse.jetty.http2 + http2-server + ${project.version} + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + junit + junit + test + + - - - org.eclipse.jetty.alpn - alpn-api - ${alpn.api.version} - provided - - - org.eclipse.jetty - jetty-alpn-openjdk8-server - ${project.version} - test - - - org.eclipse.jetty - jetty-server - ${project.version} - test - - - org.eclipse.jetty.http2 - http2-server - ${project.version} - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - junit - junit - test - - - - - - jdk9 - - [1.9,) - - - - - org.eclipse.jetty - jetty-alpn-java-server - ${project.version} - test - - - - diff --git a/jetty-http2/http2-http-client-transport/pom.xml b/jetty-http2/http2-http-client-transport/pom.xml index 9a97816f35d..6ab68c019ea 100644 --- a/jetty-http2/http2-http-client-transport/pom.xml +++ b/jetty-http2/http2-http-client-transport/pom.xml @@ -1,115 +1,65 @@ - - - org.eclipse.jetty.http2 - http2-parent - 10.0.0-SNAPSHOT - + + + org.eclipse.jetty.http2 + http2-parent + 10.0.0-SNAPSHOT + - 4.0.0 - http2-http-client-transport - Jetty :: HTTP2 :: HTTP Client Transport + 4.0.0 + http2-http-client-transport + Jetty :: HTTP2 :: HTTP Client Transport - - ${project.groupId}.client.http - + + ${project.groupId}.client.http + - - - jdk8 - - [1.8,1.9) - - - - - maven-dependency-plugin - - - copy - generate-resources - - copy - - - - - org.mortbay.jetty.alpn - alpn-boot - ${alpn.version} - jar - false - ${project.build.directory}/alpn - - - - - - - - maven-surefire-plugin - - -Xbootclasspath/p:${project.build.directory}/alpn/alpn-boot-${alpn.version}.jar - - - - - - - jdk9 - - [1.9,) - - - - org.eclipse.jetty - jetty-alpn-java-client - ${project.version} - - - org.eclipse.jetty - jetty-alpn-java-server - ${project.version} - test - - - - + + + org.eclipse.jetty + jetty-client + ${project.version} + + + org.eclipse.jetty.http2 + http2-client + ${project.version} + + + org.eclipse.jetty + jetty-alpn-java-client + ${project.version} + - - - org.eclipse.jetty - jetty-client - ${project.version} - - - org.eclipse.jetty.http2 - http2-client - ${project.version} - - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - jetty-server - ${project.version} - test - - - org.eclipse.jetty.http2 - http2-server - ${project.version} - test - - - junit - junit - test - - + + org.eclipse.jetty + jetty-alpn-java-server + ${project.version} + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.eclipse.jetty + jetty-server + ${project.version} + test + + + org.eclipse.jetty.http2 + http2-server + ${project.version} + test + + + junit + junit + test + + diff --git a/jetty-http2/pom.xml b/jetty-http2/pom.xml index 603237f7296..ab5ef4fd22f 100644 --- a/jetty-http2/pom.xml +++ b/jetty-http2/pom.xml @@ -18,18 +18,7 @@ http2-hpack http2-http-client-transport http2-server + http2-alpn-tests - - - jdk8 - - [1.8,1.9) - - - http2-alpn-tests - - - - diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 94dcbb85e84..2e52b821de2 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -420,6 +420,36 @@ ${project.version} test + + org.eclipse.jetty + jetty-alpn-conscrypt-server + ${project.version} + test + + + org.eclipse.jetty + jetty-alpn-conscrypt-client + ${project.version} + test + + + org.conscrypt + conscrypt-openjdk-uber + ${conscrypt.version} + test + + + org.eclipse.jetty + jetty-alpn-java-server + ${project.version} + test + + + org.eclipse.jetty + jetty-alpn-java-client + ${project.version} + test + @@ -431,6 +461,9 @@ ${settings.localRepository} + + **/TestJettyOSGiBootHTTP2 + @@ -495,117 +528,4 @@ - - - jdk8 - - [1.8,9) - - - - org.eclipse.jetty - jetty-alpn-openjdk8-server - ${project.version} - test - - - org.eclipse.jetty - jetty-alpn-openjdk8-client - ${project.version} - test - - - org.eclipse.jetty - jetty-alpn-conscrypt-server - ${project.version} - test - - - org.eclipse.jetty - jetty-alpn-conscrypt-client - ${project.version} - test - - - org.conscrypt - conscrypt-openjdk-uber - ${conscrypt.version} - test - - - - false - - - - - maven-surefire-plugin - - - - **/TestJettyOSGiBootHTTP2JDK9* - - - - -Dmortbay-alpn-boot=${settings.localRepository}/org/mortbay/jetty/alpn/alpn-boot/${alpn.version}/alpn-boot-${alpn.version}.jar - - - - - - - jdk9 - - [9,) - - - - org.eclipse.jetty - jetty-alpn-conscrypt-server - ${project.version} - test - - - org.eclipse.jetty - jetty-alpn-conscrypt-client - ${project.version} - test - - - org.conscrypt - conscrypt-openjdk-uber - 1.0.0.RC11 - test - - - org.eclipse.jetty - jetty-alpn-java-server - ${project.version} - test - - - org.eclipse.jetty - jetty-alpn-java-client - ${project.version} - test - - - - false - - - - - maven-surefire-plugin - - ${skipTests} - - **/TestJettyOSGiBootHTTP2 - - - - - - - diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2.java index bb6152af2e5..1fb500c97af 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2.java +++ b/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