Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing jetty-start tests 

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2018-03-15 07:36:50 -05:00
parent 1da19dc2fd
commit 44546e5ca9
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-documentation/src/main/asciidoc/administration/startup/screen-empty-base-listconfig.adoc
View File

@ -59,10 +59,6 @@ System Properties:
Properties: Properties:
----------- -----------
java.version = 1.8.0_92 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: Jetty Server Classpath:
----------------------- -----------------------

4
jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy-listconfig.adoc
View File

@ -59,10 +59,6 @@ System Properties:
Properties: Properties:
----------- -----------
java.version = 1.8.0_92 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: Jetty Server Classpath:
----------------------- -----------------------

8
jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
View File

@ -1265,11 +1265,11 @@ public class StartArgs
try try
{ {
JavaVersion ver = JavaVersion.parse(value); 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.platform",Integer.toString(ver.getPlatform()),source);
properties.setProperty("java.version.major",Integer.toString(ver.getMajor()),source); // @deprecated - below will be removed in Jetty 10.x
properties.setProperty("java.version.minor",Integer.toString(ver.getMinor()),source); properties.setProperty("java.version.major", Integer.toString(ver.getMajor()), "Deprecated");
properties.setProperty("java.version.micro",Integer.toString(ver.getMicro()),source); properties.setProperty("java.version.minor", Integer.toString(ver.getMinor()), "Deprecated");
properties.setProperty("java.version.micro", Integer.toString(ver.getMicro()), "Deprecated");
} }
catch (Throwable x) catch (Throwable x)
{ {