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.2.x' into 'jetty-9.3.x'.

This commit is contained in:
Simone Bordet 2019-10-16 21:53:17 +02:00
parent 9db19b3c6f c9bf1744a5
commit abc92e5c5d
6 changed files with 68 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,8 @@
[name]
alpn-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.13.v20181017/alpn-boot-8.1.13.v20181017.jar|lib/alpn/alpn-boot-8.1.13.v20181017.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

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

@ -0,0 +1,8 @@
[name]
alpn-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.13.v20181017/alpn-boot-8.1.13.v20181017.jar|lib/alpn/alpn-boot-8.1.13.v20181017.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

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

@ -206,7 +206,7 @@ The ALPN class and its nested classes are released under same license as the cla
The ALPN implementation, relying on modifications of OpenJDK classes, updates every time there are updates to the modified OpenJDK classes.
.ALPN vs. OpenJDK versions
[cols=",",options="header",]
[cols="a,",options="header"]
|=============================
|OpenJDK version |ALPN version
|1.7.0u40 |7.1.0.v20141016
@ -260,11 +260,20 @@ 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.0u211^[1]^ |8.1.13.v20181017
|1.8.0u212 |8.1.13.v20181017
|1.8.0u221 |8.1.13.v20181017
|1.8.0u221^[1]^ |8.1.13.v20181017
|1.8.0u222 |8.1.13.v20181017
|1.8.0u231^[1]^ |8.1.13.v20181017
|1.8.0u232 |8.1.13.v20181017
|=============================
^[1]^ These are Oracle releases for which the source code is not available,
or it is unclear what exactly is because there is no correspondent tag in
the OpenJDK repository.
We assume that the source code for these releases is equivalent (at least
for the files modified to make ALPN work) to the release that follows
(for example, for 1.8.0u211 we assume that the source code is equivalent
to 1.8.0u212, for 1.8.0u221 we assume 1.8.0u222, etc.).
[[alpn-build]]
==== How to build ALPN

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

@ -0,0 +1,8 @@
[name]
alpn-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.13.v20181017/alpn-boot-8.1.13.v20181017.jar|lib/alpn/alpn-boot-8.1.13.v20181017.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.13.v20181017.jar

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

@ -0,0 +1,8 @@
[name]
alpn-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.13.v20181017/alpn-boot-8.1.13.v20181017.jar|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

@ -1585,6 +1585,30 @@
<alpn.version>8.1.13.v20181017</alpn.version>
</properties>
</profile>
<profile>
<id>8u231</id>
<activation>
<property>
<name>java.version</name>
<value>1.8.0_231</value>
</property>
</activation>
<properties>
<alpn.version>8.1.13.v20181017</alpn.version>
</properties>
</profile>
<profile>
<id>8u232</id>
<activation>
<property>
<name>java.version</name>
<value>1.8.0_232</value>
</property>
</activation>
<properties>
<alpn.version>8.1.13.v20181017</alpn.version>
</properties>
</profile>
<profile>
<id>jdk9</id>
<activation>