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 2017-08-01 11:21:05 +02:00
parent 14a7ff0ff3 b616249603
commit c04c395833
7 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_141.mod
View File

@ -1,6 +1,3 @@
[name]
protonego-boot
[files] [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 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

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

@ -0,0 +1,5 @@
[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

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

@ -246,6 +246,7 @@ The ALPN implementation, relying on modifications of OpenJDK classes, updates ev
|1.8.0u121 |8.1.11.v20170118 |1.8.0u121 |8.1.11.v20170118
|1.8.0u131 |8.1.11.v20170118 |1.8.0u131 |8.1.11.v20170118
|1.8.0u141 |8.1.11.v20170118 |1.8.0u141 |8.1.11.v20170118
|1.8.0u144 |8.1.11.v20170118
|============================= |=============================
[[alpn-build]] [[alpn-build]]

3
jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_131.mod
View File

@ -1,6 +1,3 @@
[name]
protonego-boot
[files] [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 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

3
jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_141.mod
View File

@ -1,6 +1,3 @@
[name]
protonego-boot
[files] [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 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

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

@ -0,0 +1,5 @@
[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

12
pom.xml
View File

@ -1478,6 +1478,18 @@
<alpn.version>8.1.11.v20170118</alpn.version> <alpn.version>8.1.11.v20170118</alpn.version>
</properties> </properties>
</profile> </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> </profiles>
<issueManagement> <issueManagement>