Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'jetty-start')
-rw-r--r--jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java1
-rw-r--r--jetty-start/src/test/resources/assert-home-with-spdy.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
index 1f436b2cf3..3ba4137e53 100644
--- a/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
+++ b/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
@@ -142,6 +142,7 @@ public class MainTest
File homePath = MavenTestingUtils.getTestResourceDir("usecases/home").getAbsoluteFile();
cmdLineArgs.add("jetty.home=" + homePath);
cmdLineArgs.add("user.dir=" + homePath);
+ cmdLineArgs.add("java.version=1.7.0_60");
// Modules
cmdLineArgs.add("--module=server");
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 7eddc13f68..9069c2bf79 100644
--- a/jetty-start/src/test/resources/assert-home-with-spdy.txt
+++ b/jetty-start/src/test/resources/assert-home-with-spdy.txt
@@ -46,6 +46,7 @@ LIB|${jetty.base}/lib/websocket/websocket-server-TEST.jar
LIB|${jetty.base}/lib/websocket/websocket-servlet-TEST.jar
# The Properties we expect (order is irrelevant)
+PROP|java.version=1.7.0_60
PROP|jetty.keymanager.password=OBF:1u2u1wml1z7s1z7a1wnl1u2g
PROP|jetty.keystore=etc/keystore
PROP|jetty.keystore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4

Back to the top