Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2014-10-27 20:42:30 +0000
committerJoakim Erdfelt2014-10-27 20:42:30 +0000
commit6ff43a0af17f140a16b21241104c9ebbfa2dc5c6 (patch)
tree67c520b96e360af0a5d84022924190d15b69d5d5 /jetty-start
parent707b2f5ab81aa9dabdb6c729b2401992baa6afbb (diff)
parentbfd7414b30736a835fa127e258cfdddaf95c1700 (diff)
downloadorg.eclipse.jetty.project-6ff43a0af17f140a16b21241104c9ebbfa2dc5c6.tar.gz
org.eclipse.jetty.project-6ff43a0af17f140a16b21241104c9ebbfa2dc5c6.tar.xz
org.eclipse.jetty.project-6ff43a0af17f140a16b21241104c9ebbfa2dc5c6.zip
Merge branch 'jetty-9.2.x' into cdi-testing
Diffstat (limited to 'jetty-start')
-rw-r--r--jetty-start/src/test/resources/assert-home-with-spdy.txt2
-rw-r--r--jetty-start/src/test/resources/usecases/assert-enable-spdy.txt4
-rw-r--r--jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_40.mod4
-rw-r--r--jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_45.mod4
-rw-r--r--jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_51.mod4
-rw-r--r--jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_55.mod4
-rw-r--r--jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_60.mod4
-rw-r--r--jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0.mod4
-rw-r--r--jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0_05.mod4
-rw-r--r--jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_55.mod4
-rw-r--r--jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_60.mod4
11 files changed, 21 insertions, 21 deletions
diff --git a/jetty-start/src/test/resources/assert-home-with-spdy.txt b/jetty-start/src/test/resources/assert-home-with-spdy.txt
index 9069c2bf79..aa5aea9789 100644
--- a/jetty-start/src/test/resources/assert-home-with-spdy.txt
+++ b/jetty-start/src/test/resources/assert-home-with-spdy.txt
@@ -62,7 +62,7 @@ JVM|-Xms1024m
JVM|-Xmx1024m
# Downloads
-DOWNLOAD|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
+DOWNLOAD|http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
DOWNLOAD|http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/keystore|etc/keystore
# Files
diff --git a/jetty-start/src/test/resources/usecases/assert-enable-spdy.txt b/jetty-start/src/test/resources/usecases/assert-enable-spdy.txt
index 40577a7ed3..a69eeb6dda 100644
--- a/jetty-start/src/test/resources/usecases/assert-enable-spdy.txt
+++ b/jetty-start/src/test/resources/usecases/assert-enable-spdy.txt
@@ -37,11 +37,11 @@ PROP|spdy.port=8443
PROP|spdy.timeout=30000
# The Downloads
-DOWNLOAD|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
+DOWNLOAD|http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
DOWNLOAD|http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/keystore|etc/keystore
# The Bootlib
-BOOTLIB|-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar
+BOOTLIB|-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
# The Files
FILE|lib/
diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_40.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_40.mod
index 45bbad75c9..54d3731052 100644
--- a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_40.mod
+++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_40.mod
@@ -2,7 +2,7 @@
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
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar
+-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_45.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_45.mod
index 45bbad75c9..54d3731052 100644
--- a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_45.mod
+++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_45.mod
@@ -2,7 +2,7 @@
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
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar
+-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_51.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_51.mod
index 45bbad75c9..54d3731052 100644
--- a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_51.mod
+++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_51.mod
@@ -2,7 +2,7 @@
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
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar
+-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_55.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_55.mod
index 45bbad75c9..54d3731052 100644
--- a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_55.mod
+++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_55.mod
@@ -2,7 +2,7 @@
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
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar
+-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_60.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_60.mod
index 45bbad75c9..54d3731052 100644
--- a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_60.mod
+++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_60.mod
@@ -2,7 +2,7 @@
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
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar
+-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0.mod
index 65e6cb3c4d..a81732c453 100644
--- a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0.mod
+++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0.mod
@@ -2,7 +2,7 @@
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
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.0.v20141016/alpn-boot-8.1.0.v20141016.jar|lib/alpn/alpn-boot-8.1.0.v20141016.jar
[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.0.0.v20140317.jar
+-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0_05.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0_05.mod
index 65e6cb3c4d..a81732c453 100644
--- a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0_05.mod
+++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0_05.mod
@@ -2,7 +2,7 @@
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
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.0.v20141016/alpn-boot-8.1.0.v20141016.jar|lib/alpn/alpn-boot-8.1.0.v20141016.jar
[exec]
--Xbootclasspath/p:lib/alpn/alpn-boot-8.0.0.v20140317.jar
+-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_55.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_55.mod
index 639c70e3ff..5f8704d68a 100644
--- a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_55.mod
+++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_55.mod
@@ -2,7 +2,7 @@
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
+http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.8.v20141013/npn-boot-1.1.8.v20141013.jar|lib/npn/npn-boot-1.1.8.v20141013.jar
[exec]
--Xbootclasspath/p:lib/npn/npn-boot-1.1.7.v20140316.jar
+-Xbootclasspath/p:lib/npn/npn-boot-1.1.8.v20141013.jar
diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_60.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_60.mod
index 639c70e3ff..5f8704d68a 100644
--- a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_60.mod
+++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_60.mod
@@ -2,7 +2,7 @@
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
+http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.8.v20141013/npn-boot-1.1.8.v20141013.jar|lib/npn/npn-boot-1.1.8.v20141013.jar
[exec]
--Xbootclasspath/p:lib/npn/npn-boot-1.1.7.v20140316.jar
+-Xbootclasspath/p:lib/npn/npn-boot-1.1.8.v20141013.jar

Back to the top