diff options
author | Simone Bordet | 2016-02-08 14:56:53 +0000 |
---|---|---|
committer | Simone Bordet | 2016-02-08 14:56:53 +0000 |
commit | 1ed327ecceb9ab343b790efe14d23a5efdebaebf (patch) | |
tree | b14517a942d1938351b9aae9e2a7adf56cf05a42 | |
parent | 4a7fae30fbecfedf49200f2c2b6c644aea2df7b0 (diff) | |
parent | e853632c2210eaf5225dd48618b482004dab38ef (diff) | |
download | org.eclipse.jetty.project-1ed327ecceb9ab343b790efe14d23a5efdebaebf.tar.gz org.eclipse.jetty.project-1ed327ecceb9ab343b790efe14d23a5efdebaebf.tar.xz org.eclipse.jetty.project-1ed327ecceb9ab343b790efe14d23a5efdebaebf.zip |
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
5 files changed, 56 insertions, 0 deletions
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_73.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_73.mod new file mode 100644 index 0000000000..3628757cbf --- /dev/null +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_73.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.7.v20160121/alpn-boot-8.1.7.v20160121.jar|lib/alpn/alpn-boot-8.1.7.v20160121.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.7.v20160121.jar diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_74.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_74.mod new file mode 100644 index 0000000000..3628757cbf --- /dev/null +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_74.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.7.v20160121/alpn-boot-8.1.7.v20160121.jar|lib/alpn/alpn-boot-8.1.7.v20160121.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.7.v20160121.jar diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_73.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_73.mod new file mode 100644 index 0000000000..3628757cbf --- /dev/null +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_73.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.7.v20160121/alpn-boot-8.1.7.v20160121.jar|lib/alpn/alpn-boot-8.1.7.v20160121.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.7.v20160121.jar diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_74.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_74.mod new file mode 100644 index 0000000000..3628757cbf --- /dev/null +++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_74.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.7.v20160121/alpn-boot-8.1.7.v20160121.jar|lib/alpn/alpn-boot-8.1.7.v20160121.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.7.v20160121.jar @@ -1023,5 +1023,29 @@ <alpn.version>8.1.7.v20160121</alpn.version> </properties> </profile> + <profile> + <id>8u73</id> + <activation> + <property> + <name>java.version</name> + <value>1.8.0_73</value> + </property> + </activation> + <properties> + <alpn.version>8.1.7.v20160121</alpn.version> + </properties> + </profile> + <profile> + <id>8u74</id> + <activation> + <property> + <name>java.version</name> + <value>1.8.0_74</value> + </property> + </activation> + <properties> + <alpn.version>8.1.7.v20160121</alpn.version> + </properties> + </profile> </profiles> </project> |