Merged branch 'jetty-9.2.x' into 'master'.

2014-10-13 22:01:20 +02:00 · 2014-10-13 22:01:20 +02:00 · 890d7a8d1f
parent fb590a5fff 82d86ed0d0
commit 890d7a8d1f
9 changed files with 20 additions and 20 deletions
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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");
--- 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
--- 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
--- a/pom.xml
+++ b/pom.xml
@ -16,7 +16,7 @@
    <build-support-version>1.1</build-support-version>
    <slf4j-version>1.6.6</slf4j-version>
    <jetty-test-policy-version>1.2</jetty-test-policy-version>
-    <npn.api.version>1.1.0.v20120525</npn.api.version>
+    <npn.api.version>1.1.1.v20141010</npn.api.version>
    <alpn.api.version>1.0.0</alpn.api.version>
    <!-- default values are unsupported, but required to be defined for reactor sanity reasons -->
    <npn.version>undefined</npn.version>
@ -935,7 +935,7 @@
        </property>
      </activation>
      <properties>
-        <npn.version>1.1.7.v20140316</npn.version>
+        <npn.version>1.1.8.v20141013</npn.version>
        <alpn.version>7.0.0.v20140317</alpn.version>
      </properties>
    </profile>
@ -948,7 +948,7 @@
        </property>
      </activation>
      <properties>
-        <npn.version>1.1.7.v20140316</npn.version>
+        <npn.version>1.1.8.v20141013</npn.version>
        <alpn.version>7.0.0.v20140317</alpn.version>
      </properties>
    </profile>
@ -961,7 +961,7 @@
        </property>
      </activation>
      <properties>
-        <npn.version>1.1.7.v20140316</npn.version>
+        <npn.version>1.1.8.v20141013</npn.version>
        <alpn.version>7.0.0.v20140317</alpn.version>
      </properties>
    </profile>
@ -974,7 +974,7 @@
        </property>
      </activation>
      <properties>
-        <npn.version>1.1.7.v20140316</npn.version>
+        <npn.version>1.1.8.v20141013</npn.version>
        <alpn.version>7.0.0.v20140317</alpn.version>
      </properties>
    </profile>