Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimone Bordet2014-08-21 10:19:23 +0000
committerSimone Bordet2014-08-21 10:19:23 +0000
commit6e58e3b00e85958f310885ef2b4fdac5e62a2093 (patch)
treeae226dadd7ee602c005ccc0e58843bbe0fc92c4d
parentb7408757c31e064a26b0ff0ea9dd51d06ae177b8 (diff)
downloadorg.eclipse.jetty.project-6e58e3b00e85958f310885ef2b4fdac5e62a2093.tar.gz
org.eclipse.jetty.project-6e58e3b00e85958f310885ef2b4fdac5e62a2093.tar.xz
org.eclipse.jetty.project-6e58e3b00e85958f310885ef2b4fdac5e62a2093.zip
Properly updated NPN and ALPN files and configuration for JDK 7u65
and 8u20.
-rw-r--r--jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_67.mod8
-rw-r--r--jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_20.mod8
-rw-r--r--jetty-spdy/spdy-http-server/src/main/config/modules/protonego-impl/npn-1.7.0_67.mod8
-rw-r--r--pom.xml12
4 files changed, 36 insertions, 0 deletions
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_67.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_67.mod
new file mode 100644
index 0000000000..45bbad75c9
--- /dev/null
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_67.mod
@@ -0,0 +1,8 @@
+[name]
+protonego-boot
+
+[files]
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar
+
+[exec]
+-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_20.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_20.mod
new file mode 100644
index 0000000000..65e6cb3c4d
--- /dev/null
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_20.mod
@@ -0,0 +1,8 @@
+[name]
+protonego-boot
+
+[files]
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.0.0.v20140317/alpn-boot-8.0.0.v20140317.jar|lib/alpn/alpn-boot-8.0.0.v20140317.jar
+
+[exec]
+-Xbootclasspath/p:lib/alpn/alpn-boot-8.0.0.v20140317.jar
diff --git a/jetty-spdy/spdy-http-server/src/main/config/modules/protonego-impl/npn-1.7.0_67.mod b/jetty-spdy/spdy-http-server/src/main/config/modules/protonego-impl/npn-1.7.0_67.mod
new file mode 100644
index 0000000000..639c70e3ff
--- /dev/null
+++ b/jetty-spdy/spdy-http-server/src/main/config/modules/protonego-impl/npn-1.7.0_67.mod
@@ -0,0 +1,8 @@
+[name]
+protonego-boot
+
+[files]
+http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.7.v20140316/npn-boot-1.1.7.v20140316.jar|lib/npn/npn-boot-1.1.7.v20140316.jar
+
+[exec]
+-Xbootclasspath/p:lib/npn/npn-boot-1.1.7.v20140316.jar
diff --git a/pom.xml b/pom.xml
index a9589250b5..fa72d9c0b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -956,6 +956,18 @@
<alpn.version>8.0.0.v20140317</alpn.version>
</properties>
</profile>
+ <profile>
+ <id>8u20</id>
+ <activation>
+ <property>
+ <name>java.version</name>
+ <value>1.8.0_20</value>
+ </property>
+ </activation>
+ <properties>
+ <alpn.version>8.0.0.v20140317</alpn.version>
+ </properties>
+ </profile>
</profiles>
</project>

Back to the top