Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimone Bordet2015-09-21 10:32:58 -0400
committerSimone Bordet2015-09-21 10:32:58 -0400
commitda3699dc5596c93dbb71156cd9c7978232abff5f (patch)
tree031eb46303efc5e4db7e54f4ac1e3bbfd06087a4
parentfde718a3adf9cbfa478bec71134e8f2c29d08158 (diff)
parent77fdfb87548a3d970e9753bf1ec2d886a31cb165 (diff)
downloadorg.eclipse.jetty.project-da3699dc5596c93dbb71156cd9c7978232abff5f.tar.gz
org.eclipse.jetty.project-da3699dc5596c93dbb71156cd9c7978232abff5f.tar.xz
org.eclipse.jetty.project-da3699dc5596c93dbb71156cd9c7978232abff5f.zip
Merged branch 'jetty-9.2.x' into 'master'.
-rw-r--r--jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_60.mod8
-rw-r--r--jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_60.mod8
-rw-r--r--pom.xml12
3 files changed, 28 insertions, 0 deletions
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_60.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_60.mod
new file mode 100644
index 0000000000..9d207d9a65
--- /dev/null
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_60.mod
@@ -0,0 +1,8 @@
+[name]
+protonego-boot
+
+[files]
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.5.v20150921/alpn-boot-8.1.5.v20150921.jar|lib/alpn/alpn-boot-8.1.5.v20150921.jar
+
+[exec]
+-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.5.v20150921.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_60.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_60.mod
new file mode 100644
index 0000000000..9d207d9a65
--- /dev/null
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_60.mod
@@ -0,0 +1,8 @@
+[name]
+protonego-boot
+
+[files]
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.5.v20150921/alpn-boot-8.1.5.v20150921.jar|lib/alpn/alpn-boot-8.1.5.v20150921.jar
+
+[exec]
+-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.5.v20150921.jar
diff --git a/pom.xml b/pom.xml
index eaff7dbb30..b23e0c1181 100644
--- a/pom.xml
+++ b/pom.xml
@@ -968,5 +968,17 @@
<alpn.version>8.1.4.v20150727</alpn.version>
</properties>
</profile>
+ <profile>
+ <id>8u60</id>
+ <activation>
+ <property>
+ <name>java.version</name>
+ <value>1.8.0_60</value>
+ </property>
+ </activation>
+ <properties>
+ <alpn.version>8.1.5.v20150921</alpn.version>
+ </properties>
+ </profile>
</profiles>
</project>

Back to the top