root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Prepared for JDK 1.9 

Aiming for the JdkVersion class to support one generation ahead now, in order for the test suite to properly detect 1.7/1.8+ JVMs even when running against a JDK 1.9 preview at some point.
This commit is contained in:
Juergen Hoeller 2013-05-02 11:40:16 +02:00
parent 47103ed1b3
commit 9f9b972f00
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-core/src/main/java/org/springframework/core/JdkVersion.java
View File

@ -59,6 +59,11 @@ public abstract class JdkVersion {
*/ */
public static final int JAVA_18 = 5; public static final int JAVA_18 = 5;
/**
* Constant identifying the 1.9 JVM (Java 9).
*/
public static final int JAVA_19 = 5;
private static final String javaVersion; private static final String javaVersion;
@ -67,7 +72,10 @@ public abstract class JdkVersion {
static { static {
javaVersion = System.getProperty("java.version"); javaVersion = System.getProperty("java.version");
// version String should look like "1.4.2_10" // version String should look like "1.4.2_10"
if (javaVersion.contains("1.8.")) { if (javaVersion.contains("1.9.")) {
majorJavaVersion = JAVA_19;
}
else if (javaVersion.contains("1.8.")) {
majorJavaVersion = JAVA_18; majorJavaVersion = JAVA_18;
} }
else if (javaVersion.contains("1.7.")) { else if (javaVersion.contains("1.7.")) {