diff options
| author | Simone Bordet | 2015-04-15 17:21:11 +0000 |
|---|---|---|
| committer | Simone Bordet | 2015-04-15 17:21:11 +0000 |
| commit | b26552cbb582e6744e3af6f534eb091f4ce65bed (patch) | |
| tree | aa3c6a61b0db78ec1ced82fab9578b92b65c7052 | |
| parent | 7a75faa770180b8757d7a2c40b9e26fd070fee15 (diff) | |
| parent | 6fa863d6be097c93126b6b7e45b2126b247c62c7 (diff) | |
| download | org.eclipse.jetty.project-b26552cbb582e6744e3af6f534eb091f4ce65bed.tar.gz org.eclipse.jetty.project-b26552cbb582e6744e3af6f534eb091f4ce65bed.tar.xz org.eclipse.jetty.project-b26552cbb582e6744e3af6f534eb091f4ce65bed.zip | |
Merged branch 'jetty-9.2.x' into 'master'.
7 files changed, 86 insertions, 0 deletions
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_79.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_79.mod new file mode 100644 index 0000000000..ac315d6df7 --- /dev/null +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_79.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.3.v20150130/alpn-boot-7.1.3.v20150130.jar|lib/alpn/alpn-boot-7.1.3.v20150130.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.3.v20150130.jar diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_80.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_80.mod new file mode 100644 index 0000000000..ac315d6df7 --- /dev/null +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_80.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.3.v20150130/alpn-boot-7.1.3.v20150130.jar|lib/alpn/alpn-boot-7.1.3.v20150130.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.3.v20150130.jar diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_45.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_45.mod new file mode 100644 index 0000000000..4114979319 --- /dev/null +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_45.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.3.v20150130/alpn-boot-8.1.3.v20150130.jar|lib/alpn/alpn-boot-8.1.3.v20150130.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.3.v20150130.jar diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_79.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_79.mod new file mode 100644 index 0000000000..ac315d6df7 --- /dev/null +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_79.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.3.v20150130/alpn-boot-7.1.3.v20150130.jar|lib/alpn/alpn-boot-7.1.3.v20150130.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.3.v20150130.jar diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_80.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_80.mod new file mode 100644 index 0000000000..ac315d6df7 --- /dev/null +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_80.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.3.v20150130/alpn-boot-7.1.3.v20150130.jar|lib/alpn/alpn-boot-7.1.3.v20150130.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.3.v20150130.jar diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_45.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_45.mod new file mode 100644 index 0000000000..4114979319 --- /dev/null +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_45.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.3.v20150130/alpn-boot-8.1.3.v20150130.jar|lib/alpn/alpn-boot-8.1.3.v20150130.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.3.v20150130.jar @@ -970,6 +970,32 @@ </properties> </profile> <profile> + <id>7u79</id> + <activation> + <property> + <name>java.version</name> + <value>1.7.0_79</value> + </property> + </activation> + <properties> + <npn.version>1.1.10.v20150130</npn.version> + <alpn.version>7.1.3.v20150130</alpn.version> + </properties> + </profile> + <profile> + <id>7u80</id> + <activation> + <property> + <name>java.version</name> + <value>1.7.0_80</value> + </property> + </activation> + <properties> + <npn.version>1.1.11.v20150415</npn.version> + <alpn.version>7.1.3.v20150130</alpn.version> + </properties> + </profile> + <profile> <id>8u00</id> <activation> <property> @@ -1053,5 +1079,17 @@ <alpn.version>8.1.3.v20150130</alpn.version> </properties> </profile> + <profile> + <id>8u45</id> + <activation> + <property> + <name>java.version</name> + <value>1.8.0_45</value> + </property> + </activation> + <properties> + <alpn.version>8.1.3.v20150130</alpn.version> + </properties> + </profile> </profiles> </project> |