diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn.mod index 2260ad3d4bc..5932cbfc224 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn.mod @@ -37,7 +37,7 @@ lib/alpn/ [license] ALPN is a hosted at github under the GPL v2 with ClassPath Exception. -ALPM replaces/modifies OpenJDK classes in the java.sun.security.ssl package. +ALPN replaces/modifies OpenJDK classes in the java.sun.security.ssl package. http://github.com/jetty-project/jetty-alpn http://openjdk.java.net/legal/gplv2+ce.html diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_55.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_55.mod index 639c70e3ffd..5f8704d68a8 100644 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_55.mod +++ b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_55.mod @@ -2,7 +2,7 @@ protonego-boot [files] -http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.7.v20140316/npn-boot-1.1.7.v20140316.jar|lib/npn/npn-boot-1.1.7.v20140316.jar +http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.8.v20141013/npn-boot-1.1.8.v20141013.jar|lib/npn/npn-boot-1.1.8.v20141013.jar [exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.7.v20140316.jar +-Xbootclasspath/p:lib/npn/npn-boot-1.1.8.v20141013.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_60.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_60.mod index 639c70e3ffd..5f8704d68a8 100644 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_60.mod +++ b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_60.mod @@ -2,7 +2,7 @@ protonego-boot [files] -http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.7.v20140316/npn-boot-1.1.7.v20140316.jar|lib/npn/npn-boot-1.1.7.v20140316.jar +http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.8.v20141013/npn-boot-1.1.8.v20141013.jar|lib/npn/npn-boot-1.1.8.v20141013.jar [exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.7.v20140316.jar +-Xbootclasspath/p:lib/npn/npn-boot-1.1.8.v20141013.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_65.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_65.mod index 639c70e3ffd..5f8704d68a8 100644 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_65.mod +++ b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_65.mod @@ -2,7 +2,7 @@ protonego-boot [files] -http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.7.v20140316/npn-boot-1.1.7.v20140316.jar|lib/npn/npn-boot-1.1.7.v20140316.jar +http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.8.v20141013/npn-boot-1.1.8.v20141013.jar|lib/npn/npn-boot-1.1.8.v20141013.jar [exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.7.v20140316.jar +-Xbootclasspath/p:lib/npn/npn-boot-1.1.8.v20141013.jar diff --git a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_67.mod b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_67.mod index 639c70e3ffd..5f8704d68a8 100644 --- a/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_67.mod +++ b/jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_67.mod @@ -2,7 +2,7 @@ protonego-boot [files] -http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.7.v20140316/npn-boot-1.1.7.v20140316.jar|lib/npn/npn-boot-1.1.7.v20140316.jar +http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.8.v20141013/npn-boot-1.1.8.v20141013.jar|lib/npn/npn-boot-1.1.8.v20141013.jar [exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.7.v20140316.jar +-Xbootclasspath/p:lib/npn/npn-boot-1.1.8.v20141013.jar diff --git a/jetty-npn/jetty-npn-server/src/test/java/org/eclipse/jetty/npn/server/NPNModuleTest.java b/jetty-npn/jetty-npn-server/src/test/java/org/eclipse/jetty/npn/server/NPNModuleTest.java index f1c8b1a2a56..5c507b776d5 100644 --- a/jetty-npn/jetty-npn-server/src/test/java/org/eclipse/jetty/npn/server/NPNModuleTest.java +++ b/jetty-npn/jetty-npn-server/src/test/java/org/eclipse/jetty/npn/server/NPNModuleTest.java @@ -58,8 +58,8 @@ public class NPNModuleTest static { - /** The main() method in this test case can be run to validate this list independantly */ - KNOWN_GOOD_NPN_URLS.add("http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.7.v20140316/npn-boot-1.1.7.v20140316.jar"); + /** The main() method in this test case can be run to validate this list independently */ + KNOWN_GOOD_NPN_URLS.add("http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.8.v20141013/npn-boot-1.1.8.v20141013.jar"); KNOWN_GOOD_NPN_URLS.add("http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.6.v20130911/npn-boot-1.1.6.v20130911.jar"); KNOWN_GOOD_NPN_URLS.add("http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar"); KNOWN_GOOD_NPN_URLS.add("http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.4.v20130313/npn-boot-1.1.4.v20130313.jar"); diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_55.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_55.mod index 639c70e3ffd..5f8704d68a8 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_55.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_55.mod @@ -2,7 +2,7 @@ protonego-boot [files] -http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.7.v20140316/npn-boot-1.1.7.v20140316.jar|lib/npn/npn-boot-1.1.7.v20140316.jar +http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.8.v20141013/npn-boot-1.1.8.v20141013.jar|lib/npn/npn-boot-1.1.8.v20141013.jar [exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.7.v20140316.jar +-Xbootclasspath/p:lib/npn/npn-boot-1.1.8.v20141013.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_60.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_60.mod index 639c70e3ffd..5f8704d68a8 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_60.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_60.mod @@ -2,7 +2,7 @@ protonego-boot [files] -http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.7.v20140316/npn-boot-1.1.7.v20140316.jar|lib/npn/npn-boot-1.1.7.v20140316.jar +http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.8.v20141013/npn-boot-1.1.8.v20141013.jar|lib/npn/npn-boot-1.1.8.v20141013.jar [exec] --Xbootclasspath/p:lib/npn/npn-boot-1.1.7.v20140316.jar +-Xbootclasspath/p:lib/npn/npn-boot-1.1.8.v20141013.jar diff --git a/pom.xml b/pom.xml index 62d6101f63d..23c893de95c 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ 1.1 1.6.6 1.2 - 1.1.0.v20120525 + 1.1.1.v20141010 1.0.0 undefined @@ -935,7 +935,7 @@ - 1.1.7.v20140316 + 1.1.8.v20141013 7.0.0.v20140317 @@ -948,7 +948,7 @@ - 1.1.7.v20140316 + 1.1.8.v20141013 7.0.0.v20140317 @@ -961,7 +961,7 @@ - 1.1.7.v20140316 + 1.1.8.v20141013 7.0.0.v20140317 @@ -974,7 +974,7 @@ - 1.1.7.v20140316 + 1.1.8.v20141013 7.0.0.v20140317