Fixing jetty-start tests

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
jetty · Mar 15, 2018 · 44546e5 · 44546e5
1 parent 1da19dc
commit 44546e5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/...tion/src/main/asciidoc/administration/startup/screen-empty-base-listconfig.adoc b/...tion/src/main/asciidoc/administration/startup/screen-empty-base-listconfig.adoc
@@ -59,10 +59,6 @@ System Properties:
 Properties:
 -----------
  java.version = 1.8.0_92
- java.version.major = 1
- java.version.minor = 8
- java.version.revision = 0
- java.version.update = 92
 
 Jetty Server Classpath:
 -----------------------

diff --git a/.../main/asciidoc/administration/startup/screen-http-webapp-deploy-listconfig.adoc b/.../main/asciidoc/administration/startup/screen-http-webapp-deploy-listconfig.adoc
@@ -59,10 +59,6 @@ System Properties:
 Properties:
 -----------
  java.version = 1.8.0_92
- java.version.major = 1
- java.version.minor = 8
- java.version.revision = 0
- java.version.update = 92
 
 Jetty Server Classpath:
 -----------------------

diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
@@ -1265,11 +1265,11 @@ public void setProperty(String key, String value, String source)
             try
             {
                 JavaVersion ver = JavaVersion.parse(value);
-                properties.setProperty("java.version",System.getProperty("java.version"),source);
                 properties.setProperty("java.version.platform",Integer.toString(ver.getPlatform()),source);
-                properties.setProperty("java.version.major",Integer.toString(ver.getMajor()),source);
-                properties.setProperty("java.version.minor",Integer.toString(ver.getMinor()),source);
-                properties.setProperty("java.version.micro",Integer.toString(ver.getMicro()),source);
+                // @deprecated - below will be removed in Jetty 10.x
+                properties.setProperty("java.version.major", Integer.toString(ver.getMajor()), "Deprecated");
+                properties.setProperty("java.version.minor", Integer.toString(ver.getMinor()), "Deprecated");
+                properties.setProperty("java.version.micro", Integer.toString(ver.getMicro()), "Deprecated");
             }
             catch (Throwable x)
             {