Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Simone Bordet 2019-07-20 19:56:14 +02:00
parent 4ebf4b7477 6a0a2883ad
commit 40fc4ef340
6 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_221.mod Normal file
View File

@ -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

7
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_222.mod Normal file
View File

@ -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

2
jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc
View File

@ -353,6 +353,8 @@ The ALPN implementation, relying on modifications of OpenJDK classes, updates ev
|1.8.0u202 |8.1.13.v20181017
|1.8.0u211 |8.1.13.v20181017
|1.8.0u212 |8.1.13.v20181017
|1.8.0u221 |8.1.13.v20181017
|1.8.0u222 |8.1.13.v20181017
|=============================
[[alpn-build]]

5
jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_221.mod Normal file
View File

@ -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

5
jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_222.mod Normal file
View File

@ -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

24
pom.xml
View File

@ -1919,6 +1919,30 @@
<alpn.version>8.1.13.v20181017</alpn.version>
</properties>
</profile>
<profile>
<id>8u221</id>
<activation>
<property>
<name>java.version</name>
<value>1.8.0_221</value>
</property>
</activation>
<properties>
<alpn.version>8.1.13.v20181017</alpn.version>
</properties>
</profile>
<profile>
<id>8u222</id>
<activation>
<property>
<name>java.version</name>
<value>1.8.0_222</value>
</property>
</activation>
<properties>
<alpn.version>8.1.13.v20181017</alpn.version>
</properties>
</profile>
<profile>
<id>jdk9</id>
<activation>