Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow for building and testing the 3.2.x line against OpenJDK 8

Browse Source
This commit is contained in:
Juergen Hoeller
2013-05-01 21:39:51 +02:00
parent 6458643f15
commit c4f2566070
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build.gradle
View File

@@ -12,6 +12,11 @@ configure(allprojects) { project ->
group = "org.springframework" group = "org.springframework"
version = qualifyVersionIfNecessary(version) version = qualifyVersionIfNecessary(version)
// The following is a work-around until the Gradle build uses
// Ant 1.9.x by default. This is necessary to avoid the
// "Class not found: javac1.8" issue with Ant versions prior to 1.9.x
ant.properties["build.compiler"] = "javac1.7"
ext.aspectjVersion = "1.7.2" ext.aspectjVersion = "1.7.2"
ext.hsqldbVersion = "1.8.0.10" ext.hsqldbVersion = "1.8.0.10"
ext.junitVersion = "4.11" ext.junitVersion = "4.11"
@@ -118,6 +123,7 @@ configure(subprojects - project(":spring-build-src")) { subproject ->
options.author = true options.author = true
options.header = project.name options.header = project.name
options.links(project.ext.javadocLinks) options.links(project.ext.javadocLinks)
options.addStringOption('Xdoclint:none', '-quiet')
// suppress warnings due to cross-module @see and @link references; // suppress warnings due to cross-module @see and @link references;
// note that global 'api' task does display all warnings. // note that global 'api' task does display all warnings.
@@ -811,6 +817,7 @@ configure(rootProject) {
options.stylesheetFile = file("src/api/stylesheet.css") options.stylesheetFile = file("src/api/stylesheet.css")
options.splitIndex = true options.splitIndex = true
options.links(project.ext.javadocLinks) options.links(project.ext.javadocLinks)
options.addStringOption('Xdoclint:none', '-quiet')
source subprojects.collect { project -> source subprojects.collect { project ->
project.sourceSets.main.allJava project.sourceSets.main.allJava

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

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2013 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -54,6 +54,11 @@ public abstract class JdkVersion {
*/ */
public static final int JAVA_17 = 4; public static final int JAVA_17 = 4;
/**
* Constant identifying the 1.8 JVM (Java 8).
*/
public static final int JAVA_18 = 5;
private static final String javaVersion; private static final String javaVersion;
@@ -62,7 +67,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.7.")) { if (javaVersion.contains("1.8.")) {
majorJavaVersion = JAVA_18;
}
else if (javaVersion.contains("1.7.")) {
majorJavaVersion = JAVA_17; majorJavaVersion = JAVA_17;
} }
else if (javaVersion.contains("1.6.")) { else if (javaVersion.contains("1.6.")) {
@@ -87,7 +95,7 @@ public abstract class JdkVersion {
/** /**
* Get the major version code. This means we can do things like * Get the major version code. This means we can do things like
* {@code if (getMajorJavaVersion() < JAVA_14)}. * {@code if (getMajorJavaVersion() >= JAVA_17)}.
* @return a code comparable to the JAVA_XX codes in this class * @return a code comparable to the JAVA_XX codes in this class
* @see #JAVA_13 * @see #JAVA_13
* @see #JAVA_14 * @see #JAVA_14