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

2017-08-01 11:14:28 +02:00 · 2017-08-01 11:14:28 +02:00 · b616249603
parent bfecc82ad1 d4d5211ede
commit b616249603
8 changed files with 33 additions and 4 deletions
--- 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,5 @@
 [name]
-protonego-boot
+alpn-boot

 [files]
 http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.11.v20170118/alpn-boot-8.1.11.v20170118.jar|lib/alpn/alpn-boot-8.1.11.v20170118.jar
--- 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,5 @@
 [name]
-protonego-boot
+alpn-boot

 [files]
 http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.11.v20170118/alpn-boot-8.1.11.v20170118.jar|lib/alpn/alpn-boot-8.1.11.v20170118.jar
--- 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
@ -0,0 +1,8 @@
+[name]
+alpn-boot
+
+[files]
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.11.v20170118/alpn-boot-8.1.11.v20170118.jar|lib/alpn/alpn-boot-8.1.11.v20170118.jar
+
+[exec]
+-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.11.v20170118.jar
--- a/jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc
@ -246,6 +246,7 @@ The ALPN implementation, relying on modifications of OpenJDK classes, updates ev
 |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
 |=============================

 [[alpn-build]]
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_131.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_131.mod
@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot

 [files]
 http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.11.v20170118/alpn-boot-8.1.11.v20170118.jar|lib/alpn/alpn-boot-8.1.11.v20170118.jar
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_141.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_141.mod
@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot

 [files]
 http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.11.v20170118/alpn-boot-8.1.11.v20170118.jar|lib/alpn/alpn-boot-8.1.11.v20170118.jar
--- a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_144.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_144.mod
@ -0,0 +1,8 @@
+[name]
+alpn-boot
+
+[files]
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.11.v20170118/alpn-boot-8.1.11.v20170118.jar|lib/alpn/alpn-boot-8.1.11.v20170118.jar
+
+[exec]
+-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.11.v20170118.jar
--- a/pom.xml
+++ b/pom.xml
@ -1240,5 +1240,17 @@
        <alpn.version>8.1.11.v20170118</alpn.version>
      </properties>
    </profile>
+    <profile>
+      <id>8u144</id>
+      <activation>
+        <property>
+          <name>java.version</name>
+          <value>1.8.0_144</value>
+        </property>
+      </activation>
+      <properties>
+        <alpn.version>8.1.11.v20170118</alpn.version>
+      </properties>
+    </profile>
  </profiles>
 </project>