You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2013/03/25 19:20:02 UTC
svn commit: r1460804 - in /db/derby/code/branches/10.9: ./ build.xml
java/build/org/apache/derbyPreBuild/PropertySetter.java
Author: rhillegas
Date: Mon Mar 25 18:20:02 2013
New Revision: 1460804
URL: http://svn.apache.org/r1460804
Log:
DERBY-5949: Port derby-5949-01-aa-addJava8.diff from trunk to 10.9 branch.
Modified:
db/derby/code/branches/10.9/ (props changed)
db/derby/code/branches/10.9/build.xml
db/derby/code/branches/10.9/java/build/org/apache/derbyPreBuild/PropertySetter.java
Propchange: db/derby/code/branches/10.9/
------------------------------------------------------------------------------
Merged /db/derby/code/trunk:r1441568
Modified: db/derby/code/branches/10.9/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.9/build.xml?rev=1460804&r1=1460803&r2=1460804&view=diff
==============================================================================
--- db/derby/code/branches/10.9/build.xml (original)
+++ db/derby/code/branches/10.9/build.xml Mon Mar 25 18:20:02 2013
@@ -298,6 +298,9 @@
If a Java 6 JDK isn't present, then use the Java 5 environment to build the JDBC 4 support.
If a Java 5 JDK also isn't present then use the Java 7 environment to build the JDBC 4 support
-->
+ <condition property="java17compile.classpath" value="${out.jdbc4.dir}:${java18compile.classpath}">
+ <isset property="java18compile.classpath"/>
+ </condition>
<condition property="java16compile.classpath" value="${out.jdbc4.dir}:${java15compile.classpath}" else="${java17compile.classpath}">
<isset property="java15compile.classpath"/>
</condition>
Modified: db/derby/code/branches/10.9/java/build/org/apache/derbyPreBuild/PropertySetter.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.9/java/build/org/apache/derbyPreBuild/PropertySetter.java?rev=1460804&r1=1460803&r2=1460804&view=diff
==============================================================================
--- db/derby/code/branches/10.9/java/build/org/apache/derbyPreBuild/PropertySetter.java (original)
+++ db/derby/code/branches/10.9/java/build/org/apache/derbyPreBuild/PropertySetter.java Mon Mar 25 18:20:02 2013
@@ -54,6 +54,7 @@ import org.apache.tools.ant.taskdefs.Pro
* <li>java15compile.classpath</li>
* <li>java16compile.classpath</li>
* <li>java17compile.classpath</li>
+ * <li>java18compile.classpath</li>
* </ul>
*
* <p>
@@ -65,6 +66,7 @@ import org.apache.tools.ant.taskdefs.Pro
* <li>j15lib</li>
* <li>j16lib</li>
* <li>j17lib</li>
+ * <li>j18lib</li>
* </ul>
*
* <p>
@@ -94,6 +96,7 @@ public class PropertySetter extends Task
new VMLevel( "15", "1.5" ),
new VMLevel( "16", "1.6" ),
new VMLevel( "17", "1.7" ),
+ new VMLevel( "18", "1.8" ),
};
private static final String JDK_VENDOR = "java.vendor";