From eb1dd27ba9806ce1741cfd13f0a34e65cc3d28c0 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Tue, 3 Mar 2020 15:16:20 +0100 Subject: [PATCH] Issue #4443 - Track backport of ALPN APIs to Java 8. Modified jetty-alpn-openjdk8-* classes to support both pre 8u252 (via alpn-boot) and post 8u252 (via standard API). Modified build to work with 8u252 without requiring bootclasspath during test execution. Signed-off-by: Simone Bordet --- examples/embedded/pom.xml | 2 +- jetty-alpn/jetty-alpn-java-server/pom.xml | 5 - jetty-alpn/jetty-alpn-openjdk8-client/pom.xml | 1 + .../client/OpenJDK8ClientALPNProcessor.java | 78 ++++++++- .../server/OpenJDK8ServerALPNProcessor.java | 89 ++++++++++- .../config/modules/alpn-impl/alpn-1.8.0.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_05.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_101.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_102.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_11.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_111.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_112.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_121.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_131.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_141.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_144.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_151.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_152.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_161.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_162.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_171.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_172.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_181.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_191.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_192.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_20.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_201.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_202.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_211.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_212.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_221.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_222.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_231.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_232.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_241.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_242.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_25.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_31.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_40.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_45.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_51.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_60.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_65.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_66.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_71.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_72.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_73.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_74.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_77.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_91.mod | 3 + .../modules/alpn-impl/alpn-1.8.0_92.mod | 3 + .../config/modules/alpn-impl/alpn-8-boot.mod | 27 ++++ .../main/config/modules/alpn-impl/alpn-8.mod | 27 +--- jetty-alpn/pom.xml | 2 +- jetty-home/pom.xml | 2 +- jetty-http-spi/pom.xml | 2 +- jetty-http2/http2-alpn-tests/pom.xml | 150 ++++++++++-------- .../http2-http-client-transport/pom.xml | 40 ++++- jetty-http2/pom.xml | 13 +- .../src/it/jetty-deploy-war-mojo-it/pom.xml | 2 +- jetty-osgi/test-jetty-osgi/pom.xml | 43 +++-- .../osgi/test/TestJettyOSGiBootHTTP2.java | 15 +- jetty-webapp/pom.xml | 2 +- pom.xml | 98 +++++++++++- tests/test-http-client-transport/pom.xml | 55 ++++--- tests/test-webapps/test-http2-webapp/pom.xml | 40 +++-- 66 files changed, 649 insertions(+), 182 deletions(-) create mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-8-boot.mod diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml index 35b277a27d42..25fa3bf60c9b 100644 --- a/examples/embedded/pom.xml +++ b/examples/embedded/pom.xml @@ -171,7 +171,7 @@ jdk9 - [1.9,) + [9,) diff --git a/jetty-alpn/jetty-alpn-java-server/pom.xml b/jetty-alpn/jetty-alpn-java-server/pom.xml index 1b5c54347860..55ec3178441d 100644 --- a/jetty-alpn/jetty-alpn-java-server/pom.xml +++ b/jetty-alpn/jetty-alpn-java-server/pom.xml @@ -46,11 +46,6 @@ jetty-io ${project.version} - - org.eclipse.jetty.alpn - alpn-api - ${alpn.api.version} - org.eclipse.jetty jetty-alpn-server diff --git a/jetty-alpn/jetty-alpn-openjdk8-client/pom.xml b/jetty-alpn/jetty-alpn-openjdk8-client/pom.xml index 9c98b9807f8f..a76767a2f0a3 100644 --- a/jetty-alpn/jetty-alpn-openjdk8-client/pom.xml +++ b/jetty-alpn/jetty-alpn-openjdk8-client/pom.xml @@ -25,6 +25,7 @@ org.eclipse.jetty.alpn alpn-api ${alpn.api.version} + provided org.eclipse.jetty.http2 diff --git a/jetty-alpn/jetty-alpn-openjdk8-client/src/main/java/org/eclipse/jetty/alpn/openjdk8/client/OpenJDK8ClientALPNProcessor.java b/jetty-alpn/jetty-alpn-openjdk8-client/src/main/java/org/eclipse/jetty/alpn/openjdk8/client/OpenJDK8ClientALPNProcessor.java index bc6ee6c523d9..28557b64e451 100644 --- a/jetty-alpn/jetty-alpn-openjdk8-client/src/main/java/org/eclipse/jetty/alpn/openjdk8/client/OpenJDK8ClientALPNProcessor.java +++ b/jetty-alpn/jetty-alpn-openjdk8-client/src/main/java/org/eclipse/jetty/alpn/openjdk8/client/OpenJDK8ClientALPNProcessor.java @@ -18,13 +18,20 @@ package org.eclipse.jetty.alpn.openjdk8.client; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.util.List; import javax.net.ssl.SSLEngine; +import javax.net.ssl.SSLException; +import javax.net.ssl.SSLHandshakeException; +import javax.net.ssl.SSLParameters; import org.eclipse.jetty.alpn.ALPN; import org.eclipse.jetty.alpn.client.ALPNClientConnection; import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.io.ssl.ALPNProcessor; +import org.eclipse.jetty.io.ssl.SslConnection; +import org.eclipse.jetty.io.ssl.SslHandshakeListener; import org.eclipse.jetty.util.JavaVersion; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; @@ -33,11 +40,28 @@ public class OpenJDK8ClientALPNProcessor implements ALPNProcessor.Client { private static final Logger LOG = Log.getLogger(OpenJDK8ClientALPNProcessor.class); + private Method alpnProtocols; + private Method alpnProtocol; + @Override public void init() { if (JavaVersion.VERSION.getPlatform() != 8) throw new IllegalStateException(this + " not applicable for java " + JavaVersion.VERSION); + + try + { + // JDK 8u252 has the JDK 9 ALPN API backported. + // Use reflection so we can build with a JDK version less than 8u252. + alpnProtocols = SSLParameters.class.getMethod("setApplicationProtocols", String[].class); + alpnProtocol = SSLEngine.class.getMethod("getApplicationProtocol"); + return; + } + catch (NoSuchMethodException ignored) + { + } + + // Backported ALPN APIs not available. if (ALPN.class.getClassLoader() != null) throw new IllegalStateException(ALPN.class.getName() + " must be on JVM boot classpath"); if (LOG.isDebugEnabled()) @@ -53,14 +77,34 @@ public boolean appliesTo(SSLEngine sslEngine) @Override public void configure(SSLEngine sslEngine, Connection connection) { - connection.addListener(new ALPNListener((ALPNClientConnection)connection)); + ALPNClientConnection alpnConnection = (ALPNClientConnection)connection; + if (alpnProtocols == null) + { + connection.addListener(new ALPNConnectionListener(alpnConnection)); + } + else + { + try + { + Object protocols = alpnConnection.getProtocols().toArray(new String[0]); + SSLParameters sslParameters = sslEngine.getSSLParameters(); + alpnProtocols.invoke(sslParameters, protocols); + sslEngine.setSSLParameters(sslParameters); + ((SslConnection.DecryptedEndPoint)connection.getEndPoint()).getSslConnection() + .addHandshakeListener(new ALPNSSLListener(alpnConnection)); + } + catch (IllegalAccessException | InvocationTargetException x) + { + throw new IllegalStateException(this + " unable to set ALPN protocols", x); + } + } } - private final class ALPNListener implements ALPN.ClientProvider, Connection.Listener + private static final class ALPNConnectionListener implements ALPN.ClientProvider, Connection.Listener { private final ALPNClientConnection alpnConnection; - private ALPNListener(ALPNClientConnection connection) + private ALPNConnectionListener(ALPNClientConnection connection) { alpnConnection = connection; } @@ -102,4 +146,32 @@ public void selected(String protocol) alpnConnection.selected(protocol); } } + + private final class ALPNSSLListener implements SslHandshakeListener + { + private final ALPNClientConnection alpnConnection; + + private ALPNSSLListener(ALPNClientConnection connection) + { + alpnConnection = connection; + } + + @Override + public void handshakeSucceeded(Event event) throws SSLException + { + try + { + SSLEngine sslEngine = alpnConnection.getSSLEngine(); + String protocol = (String)alpnProtocol.invoke(sslEngine); + if (LOG.isDebugEnabled()) + LOG.debug("selected protocol {}", protocol); + alpnConnection.selected(protocol); + } + catch (IllegalAccessException | InvocationTargetException x) + { + SSLHandshakeException failure = new SSLHandshakeException(this + " unable to get ALPN protocol"); + throw (SSLHandshakeException)failure.initCause(x); + } + } + } } 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 index b2668c6391a7..552e98673d6e 100644 --- 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 @@ -18,15 +18,19 @@ package org.eclipse.jetty.alpn.openjdk8.server; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.util.Collections; import java.util.List; +import java.util.function.BiFunction; import javax.net.ssl.SSLEngine; -import javax.net.ssl.SSLException; import org.eclipse.jetty.alpn.ALPN; import org.eclipse.jetty.alpn.server.ALPNServerConnection; import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.io.ssl.ALPNProcessor; +import org.eclipse.jetty.io.ssl.SslConnection; +import org.eclipse.jetty.io.ssl.SslHandshakeListener; import org.eclipse.jetty.util.JavaVersion; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; @@ -35,11 +39,26 @@ public class OpenJDK8ServerALPNProcessor implements ALPNProcessor.Server { private static final Logger LOG = Log.getLogger(OpenJDK8ServerALPNProcessor.class); + private Method alpnSelector; + @Override public void init() { if (JavaVersion.VERSION.getPlatform() != 8) throw new IllegalStateException(this + " not applicable for java " + JavaVersion.VERSION); + + try + { + // JDK 8u252 has the JDK 9 ALPN API backported. + // Use reflection so we can build with a JDK version less than 8u252. + alpnSelector = SSLEngine.class.getMethod("setHandshakeApplicationProtocolSelector", BiFunction.class); + return; + } + catch (NoSuchMethodException ignored) + { + } + + // Backported ALPN APIs not available. if (ALPN.class.getClassLoader() != null) throw new IllegalStateException(ALPN.class.getName() + " must be on JVM boot classpath"); if (LOG.isDebugEnabled()) @@ -55,10 +74,26 @@ public boolean appliesTo(SSLEngine sslEngine) @Override public void configure(SSLEngine sslEngine, Connection connection) { - connection.addListener(new ALPNListener((ALPNServerConnection)connection)); + if (alpnSelector == null) + { + ALPNListener listener = new ALPNListener((ALPNServerConnection)connection); + connection.addListener(listener); + } + else + { + try + { + ALPNCallback callback = new ALPNCallback((ALPNServerConnection)connection); + alpnSelector.invoke(sslEngine, callback); + } + catch (IllegalAccessException | InvocationTargetException x) + { + throw new IllegalStateException(this + " unable to set ALPN selector", x); + } + } } - private final class ALPNListener implements ALPN.ServerProvider, Connection.Listener + private static final class ALPNListener implements ALPN.ServerProvider, Connection.Listener { private final ALPNServerConnection alpnConnection; @@ -92,7 +127,7 @@ public void unsupported() } @Override - public String select(List protocols) throws SSLException + public String select(List protocols) { if (LOG.isDebugEnabled()) LOG.debug("select {} {}", alpnConnection, protocols); @@ -100,4 +135,50 @@ public String select(List protocols) throws SSLException return alpnConnection.getProtocol(); } } + + private static class ALPNCallback implements BiFunction, String>, SslHandshakeListener + { + private final ALPNServerConnection alpnConnection; + + private ALPNCallback(ALPNServerConnection connection) + { + alpnConnection = connection; + ((SslConnection.DecryptedEndPoint)alpnConnection.getEndPoint()).getSslConnection().addHandshakeListener(this); + } + + @Override + public String apply(SSLEngine engine, List protocols) + { + try + { + if (LOG.isDebugEnabled()) + LOG.debug("apply {} {}", alpnConnection, protocols); + alpnConnection.select(protocols); + return alpnConnection.getProtocol(); + } + catch (Throwable x) + { + // Cannot negotiate the protocol, return null to have + // JSSE send Alert.NO_APPLICATION_PROTOCOL to the client. + return null; + } + } + + @Override + public void handshakeSucceeded(Event event) + { + String protocol = alpnConnection.getProtocol(); + if (LOG.isDebugEnabled()) + LOG.debug("TLS handshake succeeded, protocol={} for {}", protocol, alpnConnection); + if (protocol == null) + alpnConnection.unsupported(); + } + + @Override + public void handshakeFailed(Event event, Throwable failure) + { + if (LOG.isDebugEnabled()) + LOG.debug("TLS handshake failed " + alpnConnection, failure); + } + } } diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0.mod index bbcca55ad48d..6764a5e5cef8 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0.mod @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.0.v20141016|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 index bbcca55ad48d..6764a5e5cef8 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_05.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_05.mod @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.0.v20141016|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 index 98e9460dd1a9..e5251d0dc942 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.9.v20160720|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 index 98e9460dd1a9..e5251d0dc942 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.9.v20160720|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 index bbcca55ad48d..6764a5e5cef8 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_11.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_11.mod @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.0.v20141016|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 index 98e9460dd1a9..e5251d0dc942 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.9.v20160720|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 index 8d4ac37b4f43..8406d3461ff2 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.10.v20161026|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 index 7a3a91923625..9fca74267c41 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.11.v20170118|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 index 7a3a91923625..9fca74267c41 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.11.v20170118|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 index 7a3a91923625..9fca74267c41 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.11.v20170118|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 index 7a3a91923625..9fca74267c41 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.11.v20170118|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 index 7a3a91923625..9fca74267c41 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.11.v20170118|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 index 7a3a91923625..9fca74267c41 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.11.v20170118|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 index 00366a87b3dd..d7e337f6e7bc 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.12.v20180117|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 index 00366a87b3dd..d7e337f6e7bc 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.12.v20180117|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 index 00366a87b3dd..d7e337f6e7bc 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.12.v20180117|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 index 00366a87b3dd..d7e337f6e7bc 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.12.v20180117|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 index 00366a87b3dd..d7e337f6e7bc 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.12.v20180117|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_191.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_191.mod index ed8a55508d6d..b2d8aa0a3e81 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_191.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_191.mod @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_192.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_192.mod index ed8a55508d6d..b2d8aa0a3e81 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_192.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_192.mod @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.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 index bbcca55ad48d..6764a5e5cef8 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_20.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_20.mod @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.0.v20141016|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_201.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_201.mod index ed8a55508d6d..b2d8aa0a3e81 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_201.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_201.mod @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_202.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_202.mod index ed8a55508d6d..b2d8aa0a3e81 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_202.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_202.mod @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_211.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_211.mod index ed8a55508d6d..b2d8aa0a3e81 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_211.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_211.mod @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_212.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_212.mod index ed8a55508d6d..b2d8aa0a3e81 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_212.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_212.mod @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_221.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_221.mod index ed8a55508d6d..b2d8aa0a3e81 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_221.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_221.mod @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_222.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_222.mod index ed8a55508d6d..b2d8aa0a3e81 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_222.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_222.mod @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_231.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_231.mod index ed8a55508d6d..b2d8aa0a3e81 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_231.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_231.mod @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_232.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_232.mod index ed8a55508d6d..b2d8aa0a3e81 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_232.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_232.mod @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_241.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_241.mod index ed8a55508d6d..b2d8aa0a3e81 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_241.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_241.mod @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_242.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_242.mod index ed8a55508d6d..b2d8aa0a3e81 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_242.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_242.mod @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.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 index f34b1841244e..ea0cc084782c 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_25.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_25.mod @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.2.v20141202|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 index 9ffca1a96992..397ca23eb731 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_31.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_31.mod @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.3.v20150130|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 index 9ffca1a96992..397ca23eb731 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_40.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_40.mod @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.3.v20150130|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 index 9ffca1a96992..397ca23eb731 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_45.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_45.mod @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.3.v20150130|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 index bd6891a07e48..7144fd2e1937 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.4.v20150727|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 index 004663c5e7ae..10e3b3d74827 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.5.v20150921|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 index 532c440dd42d..d7c1d4f7a6e2 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.6.v20151105|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 index 532c440dd42d..d7c1d4f7a6e2 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.6.v20151105|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 index 48de22c22319..ab86333601ef 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.7.v20160121|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 index 48de22c22319..ab86333601ef 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.7.v20160121|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 index 48de22c22319..ab86333601ef 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.7.v20160121|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 index 48de22c22319..ab86333601ef 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.7.v20160121|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 index 48de22c22319..ab86333601ef 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.7.v20160121|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 index 48de22c22319..ab86333601ef 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.7.v20160121|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 index a3677be88e31..32240a1a9c93 100644 --- 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 @@ -1,5 +1,8 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html +[depend] +alpn-8-boot + [files] maven://org.mortbay.jetty.alpn/alpn-boot/8.1.8.v20160420|lib/alpn/alpn-boot-8.1.8.v20160420.jar diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-8-boot.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-8-boot.mod new file mode 100644 index 000000000000..7977e5c6594e --- /dev/null +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-8-boot.mod @@ -0,0 +1,27 @@ +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/ + +[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-8.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-8.mod index 252d27466af6..875ce270295c 100644 --- 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 @@ -1,33 +1,10 @@ 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/ +Provides ALPN support for JDK 8. [depend] -alpn-impl/alpn-${java.version} +?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/pom.xml b/jetty-alpn/pom.xml index d319192bddaf..ea3559043862 100644 --- a/jetty-alpn/pom.xml +++ b/jetty-alpn/pom.xml @@ -21,7 +21,7 @@ jdk9 - [1.9,) + [9,) jetty-alpn-java-client diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index 879102860419..7cc9e6cf16b5 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -774,7 +774,7 @@ jdk9 - [1.9,) + [9,) diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index 319900b29ac7..ec89e2470da0 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -78,7 +78,7 @@ jdk9 - [1.9,) + [9,) diff --git a/jetty-http2/http2-alpn-tests/pom.xml b/jetty-http2/http2-alpn-tests/pom.xml index ce1c57e3afe0..3a48fde142ac 100644 --- a/jetty-http2/http2-alpn-tests/pom.xml +++ b/jetty-http2/http2-alpn-tests/pom.xml @@ -14,54 +14,95 @@ ${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 - - - - + + + jdk8 + + [1.8,9) + + + + + maven-dependency-plugin + + + copy + generate-resources + + copy + + + ${skip-without-alpn-boot} + + + org.mortbay.jetty.alpn + alpn-boot + ${alpn.version} + jar + false + ${project.build.directory}/alpn + + + + + + + + maven-surefire-plugin + + + default-test + + ${skip-with-alpn-boot} + + + + test-with-alpn-boot + test + + test + + + ${skip-without-alpn-boot} + -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-openjdk8-server + ${project.version} + test + + + + + jdk9 + + [9,) + + + + org.eclipse.jetty + jetty-alpn-java-server + ${project.version} + 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 @@ -81,21 +122,4 @@ - - - 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 82f897283299..1864dbd1505d 100644 --- a/jetty-http2/http2-http-client-transport/pom.xml +++ b/jetty-http2/http2-http-client-transport/pom.xml @@ -18,7 +18,7 @@ jdk8 - [1.8,1.9) + [1.8,9) @@ -32,6 +32,7 @@ copy + ${skip-without-alpn-boot} org.mortbay.jetty.alpn @@ -48,17 +49,46 @@ maven-surefire-plugin - - -Xbootclasspath/p:${project.build.directory}/alpn/alpn-boot-${alpn.version}.jar - + + + default-test + + ${skip-with-alpn-boot} + + + + test-with-alpn-boot + test + + test + + + ${skip-without-alpn-boot} + -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-openjdk8-client + ${project.version} + + jdk9 - [1.9,) + [9,) diff --git a/jetty-http2/pom.xml b/jetty-http2/pom.xml index e71440791feb..f4345fdaaabf 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-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml b/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml index d29454fdaf98..950479296330 100644 --- a/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml @@ -129,7 +129,7 @@ jdk9+ - [1.9,) + [9,) diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 172062ee43d3..1ad5e836b83c 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -446,7 +446,6 @@ maven-surefire-plugin - ${skipTests} ${settings.localRepository} ${env.GLOBAL_MVN_SETTINGS} @@ -541,21 +540,37 @@ test - - false - maven-surefire-plugin - - - **/TestJettyOSGiBootHTTP2JDK9* - - - - -Dmortbay-alpn-boot=${settings.localRepository}/org/mortbay/jetty/alpn/alpn-boot/${alpn.version}/alpn-boot-${alpn.version}.jar -Dconscrypt-version=${conscrypt.version} - + + + default-test + + ${skip-with-alpn-boot} + + **/TestJettyOSGiBootHTTP2JDK9* + + + + + test-with-alpn-boot + test + + test + + + ${skip-without-alpn-boot} + + + -Dmortbay-alpn-boot=${settings.localRepository}/org/mortbay/jetty/alpn/alpn-boot/${alpn.version}/alpn-boot-${alpn.version}.jar -Dconscrypt-version=${conscrypt.version} + + **/TestJettyOSGiBootHTTP2JDK9* + + + + @@ -591,15 +606,11 @@ 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 0881197f9517..afc344cd8582 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 @@ -94,18 +94,13 @@ public static List - org.apache.maven.plugins maven-failsafe-plugin - - -Xbootclasspath/p:${project.build.directory}/alpn/alpn-boot-${alpn.version}.jar - + + + default + + ${skip-with-alpn-boot} + + + + test-with-alpn-boot + integration-test + + integration-test + + + ${skip-without-alpn-boot} + -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-openjdk8-client ${project.version} - - - org.eclipse.jetty.alpn - alpn-api - - org.eclipse.jetty @@ -120,7 +136,7 @@ jdk9 - [1.9,) + [9,)