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

sbordet · sbordet · commit 038c7ee6d7b6 · 2019-04-18T18:07:00.000+02:00
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
@@ -0,0 +1,7 @@
+DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+
+[files]
+maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
+
+[exec]
+-Xbootclasspath/p: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
@@ -0,0 +1,7 @@
+DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+
+[files]
+maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
+
+[exec]
+-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar
diff --git a/jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc b/jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc
@@ -351,6 +351,8 @@ The ALPN implementation, relying on modifications of OpenJDK classes, updates ev
 |1.8.0u192 |8.1.13.v20181017
 |1.8.0u201 |8.1.13.v20181017
 |1.8.0u202 |8.1.13.v20181017
+|1.8.0u211 |8.1.13.v20181017
+|1.8.0u212 |8.1.13.v20181017
 |=============================
 
 [[alpn-build]]
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_211.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_211.mod
@@ -0,0 +1,5 @@
+[files]
+maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
+
+[exec]
+-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_212.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_212.mod
@@ -0,0 +1,5 @@
+[files]
+maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
+
+[exec]
+-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar
diff --git a/pom.xml b/pom.xml
@@ -1814,6 +1814,30 @@
         <alpn.version>8.1.13.v20181017</alpn.version>
       </properties>
     </profile>
+    <profile>
+      <id>8u211</id>
+      <activation>
+        <property>
+          <name>java.version</name>
+          <value>1.8.0_211</value>
+        </property>
+      </activation>
+      <properties>
+        <alpn.version>8.1.13.v20181017</alpn.version>
+      </properties>
+    </profile>
+    <profile>
+      <id>8u212</id>
+      <activation>
+        <property>
+          <name>java.version</name>
+          <value>1.8.0_212</value>
+        </property>
+      </activation>
+      <properties>
+        <alpn.version>8.1.13.v20181017</alpn.version>
+      </properties>
+    </profile>
     <profile>
       <id>jdk9</id>
       <activation>

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +[files]
 +maven://org.mortbay.jetty.alpn/alpn-boot/8.1.13.v20181017|lib/alpn/alpn-boot-8.1.13.v20181017.jar
++
 +[exec]
 +-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar