db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1481818 - in /db/derby/code/trunk: ./ java/engine/org/apache/derby/iapi/jdbc/ java/testing/org/apache/derby/ java/testing/org/apache/derbyTesting/functionTests/harness/ java/testing/org/apache/derbyTesting/functionTests/suites/ java/testin...
Date Mon, 13 May 2013 12:22:19 GMT
Author: kahatlen
Date: Mon May 13 12:22:18 2013
New Revision: 1481818

URL: http://svn.apache.org/r1481818
Log:
DERBY-6213: Deprecate support for Java 5 and CDC

Compile all test code against Java 6 libraries.

Modified:
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml
    db/derby/code/trunk/java/testing/org/apache/derby/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/compatibility/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetJDBC30Test.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/JDBCDriverTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/derbyNet/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TableVTI.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/multi/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/perf/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/mailjdbc/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/nstest/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/optimizer/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/sttest/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/build.xml

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Mon May 13 12:22:18 2013
@@ -331,9 +331,9 @@
 
     <!-- 
             The lowest common denominator compile path for Derby. We expect that
-            the bulk of the Derby product will run on small device platforms (CDC/FP 1.1).
+            the bulk of the Derby product will run on Java SE 6.
     -->
-    <property name="compile.classpath" value="${jsr169compile.classpath}"/>
+    <property name="compile.classpath" value="${java16compile.classpath}"/>
 
     <property name="compilerPropsAlreadySet" value="true"/>
     <antcall target="printCompilerProperties"> <param name="checkEvent" value="After setting properties: "/> </antcall>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml Mon May 13 12:22:18 2013
@@ -54,7 +54,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${jsr169compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/${cur.dir}/*.java"/>
 	  <exclude name="${derby.dir}/${cur.dir}/BrokeredConnection.java"/>

Modified: db/derby/code/trunk/java/testing/org/apache/derby/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derby/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derby/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derby/build.xml Mon May 13 12:22:18 2013
@@ -29,8 +29,8 @@
         <mkdir dir="${out.pptesting.dir}"/>
 
         <javac
-            source="1.5"
-            target="1.5"
+            source="1.6"
+            target="1.6"
             fork="yes"
             bootclasspath="${empty}"
             nowarn="on"
@@ -43,7 +43,7 @@
             srcdir="${derby.testing.src.dir}"
             destdir="${out.pptesting.dir}">
             <classpath>
-                <pathelement path="${java15compile.classpath}"/>
+                <pathelement path="${compile.classpath}"/>
                 <pathelement path="${junit}"/>
                 <pathelement path="${out.dir}"/>
             </classpath>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/build.xml Mon May 13 12:22:18 2013
@@ -66,8 +66,8 @@
 
   <target name="compile">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -80,7 +80,7 @@
       destdir="${out.dir}">
       <classpath>
         <pathelement location="${oro}"/>
-        <pathelement path="${java15compile.classpath}"/>
+        <pathelement path="${compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
         <include name="${this.dir}/*.java"/> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/build.xml Mon May 13 12:22:18 2013
@@ -46,8 +46,8 @@
 	  <target name="junitsuites" 
 	          description="Build Derby JUnit suites">
 	    <javac
-	      source="1.4"
-	      target="1.4"
+	      source="1.6"
+	      target="1.6"
 	      bootclasspath="${empty}"
 	      nowarn="on"
 	      debug="true"

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml Mon May 13 12:22:18 2013
@@ -32,7 +32,7 @@
   <property file="${user.home}/properties/derbytesting.properties"/>
 
 <!-- Targets -->
-  <target name="testdata" depends="copyfiles,compile_jdk15"/>
+  <target name="testdata" depends="copyfiles,compile"/>
 
   <target name="copyfiles">
     <copy todir="${out.dir}/${derby.testing.functest.dir}/testData/v1">
@@ -61,10 +61,10 @@
     </copy>
   </target>
 
-  <target name="compile_jdk15" >
+  <target name="compile" >
     <javac
-      source="1.5"
-      target="1.5"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -76,7 +76,7 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java15compile.classpath}"/>
+        <pathelement path="${compile.classpath}"/>
       </classpath>
       <include name="${derby.testing.functest.dir}/testData/serializedDataSources/*.java"/>
     </javac>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/compatibility/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/compatibility/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/compatibility/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/compatibility/build.xml Mon May 13 12:22:18 2013
@@ -48,8 +48,8 @@
 
     <target name="compile" depends="copyfiles">
         <javac
-            source="1.5"
-            target="1.5"
+            source="1.6"
+            target="1.6"
             bootclasspath="${empty}"
             nowarn="on"
             debug="true"
@@ -61,8 +61,8 @@
             srcdir="${derby.testing.src.dir}"
             destdir="${out.dir}">
             <classpath>
-                <pathelement path="${java15compile.classpath}"/>
-		        <pathelement path="${junit}"/>
+              <pathelement path="${compile.classpath}"/>
+              <pathelement path="${junit}"/>
             </classpath>
             <include name="${this.dir}/*.java"/>
         </javac>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/build.xml Mon May 13 12:22:18 2013
@@ -67,8 +67,8 @@
 
   <target name="compile">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -80,7 +80,6 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <!--pathelement location="${oro}"/-->
         <pathelement path="${compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/build.xml Mon May 13 12:22:18 2013
@@ -58,17 +58,17 @@
 
 <!--             ============ Begin Targets ==============                -->
  
-  <target name="FTOtestsubdir" depends="compilet2,compilet1,copyfiles"/>
+  <target name="FTOtestsubdir" depends="compilet1,copyfiles"/>
 
   <!-- mkdir / init target may not be necessary, just here for reference... -->
   <target name="init">
     <mkdir dir="${out.dir}/${derby.testing.functest.dir}/tests/derbynet"/>
   </target>
 
-  <target name="compilet1" depends="compilet2, compilet3">
+  <target name="compilet1">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -80,61 +80,10 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java15compile.classpath}"/>
+        <pathelement path="${compile.classpath}"/>
 	<pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>
-      <exclude name="${this.dir}/dataSourcePermissions_net.java"/>
-      <exclude name="${this.dir}/SqlExceptionTest.java"/>
-      <exclude name="${this.dir}/ProtocolTest.java"/>
-      <exclude name="${this.dir}/NetworkServerControlApiTest.java"/>
-    </javac>
-  </target>
-
-  <target name="compilet2">
-    <javac
-      source="1.4"
-      target="1.4"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="true"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}"
-      srcdir="${derby.testing.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${junit}"/>
-        <pathelement path="${java15compile.classpath}"/>
-      </classpath>
-      <include name="${this.dir}/dataSourcePermissions_net.java"/>
-      <include name="${this.dir}/SqlExceptionTest.java"/>
-    </javac>
-  </target> 
-
-  <target name="compilet3">
-    <javac
-      source="1.5"
-      target="1.5"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="true"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}"
-      srcdir="${derby.testing.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${junit}"/>
-        <pathelement path="${java15compile.classpath}"/>
-      </classpath>
-      <compilerarg value="-Xlint"/>
-      <include name="${this.dir}/ProtocolTest.java"/>
-      <include name="${this.dir}/NetworkServerControlApiTest.java"/>
     </javac>
   </target>
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/build.xml Mon May 13 12:22:18 2013
@@ -67,8 +67,8 @@
 
   <target name="compilet1" >
      <javac
-        source="1.4"
-        target="1.4"
+        source="1.6"
+        target="1.6"
         bootclasspath="${empty}"
         nowarn="on"
         debug="true"

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/build.xml Mon May 13 12:22:18 2013
@@ -67,8 +67,8 @@
 
   <target name="compile">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -80,8 +80,7 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <!--pathelement location="${oro}"/-->
-        <pathelement path="${java15compile.classpath}"/>
+        <pathelement path="${compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetJDBC30Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetJDBC30Test.java?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetJDBC30Test.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetJDBC30Test.java Mon May 13 12:22:18 2013
@@ -106,7 +106,7 @@ public class ResultSetJDBC30Test extends
                     " JSR169", JDBC.vmSupportsJSR169());
         }
         try {
-            rs.updateBlob(8, null);
+            rs.updateBlob(8, (Blob) null);
             if (usingEmbedded()) {
                 fail("FAIL - Shouldn't reach here. Method is being invoked" +
                         " on a read only resultset.");
@@ -118,7 +118,7 @@ public class ResultSetJDBC30Test extends
             assertSQLState(UPDATABLE_RESULTSET_API_DISALLOWED, se);
         }
         try {
-            rs.updateBlob("c", null);
+            rs.updateBlob("c", (Blob) null);
             if (usingEmbedded()) {
                 fail("FAIL - Shouldn't reach here. Method is being invoked" +
                         " on a read only resultset.");
@@ -130,7 +130,7 @@ public class ResultSetJDBC30Test extends
             assertSQLState(UPDATABLE_RESULTSET_API_DISALLOWED, se);
         }
         try {
-            rs.updateClob(8, null);
+            rs.updateClob(8, (Clob) null);
             if (usingEmbedded()) {
                 fail("FAIL - Shouldn't reach here. Method is being invoked" +
                         " on a read only resultset.");
@@ -142,7 +142,7 @@ public class ResultSetJDBC30Test extends
             assertSQLState(UPDATABLE_RESULTSET_API_DISALLOWED, se);
         }
         try {
-            rs.updateClob("c", null);
+            rs.updateClob("c", (Clob) null);
             if (usingEmbedded()) {
                 fail("FAIL - Shouldn't reach here. Method is being invoked" +
                         " on a read only resultset.");
@@ -220,7 +220,7 @@ public class ResultSetJDBC30Test extends
             throws Exception
     {
         try {
-            rs.updateBlob("c",null);
+            rs.updateBlob("c", (Blob) null);
             fail("FAIL - rs.updateBlob() on a read-only result set" +
                 "should not have succeeded");
         } catch (SQLException ex) {}

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml Mon May 13 12:22:18 2013
@@ -58,40 +58,17 @@
 
 <!--             ============ Begin Targets ==============                -->
  
-  <target name="FTOtestsubdir" depends="compileSuite,copyfiles"/>
+  <target name="FTOtestsubdir" depends="compilet1,copyfiles"/>
 
   <!-- mkdir / init target may not be necessary, just here for reference... -->
   <target name="init">
     <mkdir dir="${out.dir}/${derby.testing.functest.dir}/tests/jdbcapi"/>
   </target>
 
-	  <target name="compileSuite" depends="compilet2">
-	    <javac
-	      source="1.4"
-	      target="1.4"
-	      bootclasspath="${empty}"
-	      nowarn="on"
-	      debug="true"
-	      depend="${depend}"
-	      deprecation="${deprecation}"
-	      optimize="${optimize}"
-	      proceed="${proceed}"
-	      verbose="${verbose}" 
-	      srcdir="${derby.testing.src.dir}"
-	      destdir="${out.dir}">
-	      <classpath>
-	        <!--pathelement location="${oro}"/-->
-	        <pathelement path="${compile.classpath}"/>
-			<pathelement path="${junit}"/>
-	      </classpath>
-	      <include name="${this.dir}/_Suite.java"/>
-	    </javac>
-	  </target>
-	
   <target name="compilet1">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -103,83 +80,10 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <!--pathelement location="${oro}"/-->
-        <pathelement path="${java15compile.classpath}"/>
-		<pathelement path="${junit}"/>
-      </classpath>
-      <include name="${this.dir}/*.java"/>
-      <exclude name="${this.dir}/AutoGenJDBC30Test.java"/>
-      <exclude name="${this.dir}/dbMetaDataJdbc30.java"/>
-      <exclude name="${this.dir}/ResultSetJDBC30Test.java"/>
-      <exclude name="${this.dir}/StatementJdbc30Test.java"/>
-      <exclude name="${this.dir}/savepointJdbc30_XA.java"/>
-      <include name="${this.dir}/ParameterMetaDataJdbc30Test.java"/>
-      <exclude name="${this.dir}/xaJNDI.java"/>
-      <exclude name="${this.dir}/LobStreamsTest.java"/>
-      <exclude name="${this.dir}/XATest.java"/>
-      <exclude name="${this.dir}/XATransactionTest.java"/>
-      <exclude name="${this.dir}/ScrollResultSetTest.java"/>
-      <exclude name="${this.dir}/ClosedObjectTest.java"/>
-      <exclude name="${this.dir}/DatabaseMetaDataTest.java"/>
-      <exclude name="${this.dir}/_Suite.java"/>
-    </javac>
-  </target>
-
-  <target name="compilet2" depends="compilet1,compilex">
-    <javac
-      source="1.4"
-      target="1.4"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="true"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}"
-      srcdir="${derby.testing.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${java15compile.classpath}"/>
+        <pathelement path="${compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
-      <!--exclude name=""/-->
-      <include name="${this.dir}/AutoGenJDBC30Test.java"/>
-      <include name="${this.dir}/dbMetaDataJdbc30.java"/>
-      <include name="${this.dir}/savepointJdbc30_JSR169.java"/>
-      <include name="${this.dir}/savepointJdbc30_XA.java"/>
-      <include name="${this.dir}/ParameterMetaDataJdbc30Test.java"/>
-      <include name="${this.dir}/ResultSetJDBC30Test.java"/>
-      <include name="${this.dir}/StatementJdbc30Test.java"/>
-      <include name="${this.dir}/LobStreamsTest.java"/>
-      <include name="${this.dir}/XATest.java"/>
-      <include name="${this.dir}/XATransactionTest.java"/>
-      <include name="${this.dir}/ScrollResultSetTest.java"/>
-      <include name="${this.dir}/ClosedObjectTest.java"/>
-      <include name="${this.dir}/DatabaseMetaDataTest.java"/>
-    </javac>
-  </target>
-
-  <target name="compilex">
-    <javac
-      source="1.4"
-      target="1.4"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="true"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}"
-      srcdir="${derby.testing.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${java15compile.classpath}"/>
-        <pathelement location="${oro}"/>
-      </classpath>
-      <!--exclude name=""/-->
-      <include name="${this.dir}/xaJNDI.java"/>
+      <include name="${this.dir}/*.java"/>
     </javac>
   </target>
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/JDBCDriverTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/JDBCDriverTest.java?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/JDBCDriverTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/JDBCDriverTest.java Mon May 13 12:22:18 2013
@@ -1429,6 +1429,14 @@ public	class	JDBCDriverTest	extends	Comp
             throw new SQLException("not implemented for this test");
         }
 
+        public void free() throws SQLException {
+            throw new SQLException("not implemented for this test");
+        }
+
+        public InputStream getBinaryStream(long pos, long length) throws SQLException {
+            throw new SQLException("not implemented for this test");
+        }
+
 	}
 
 	/**
@@ -1520,6 +1528,14 @@ public	class	JDBCDriverTest	extends	Comp
             
         }
 
+        public void free() throws SQLException {
+            throw new SQLException("not implemented for this test");
+        }
+
+        public Reader getCharacterStream(long pos, long length) throws SQLException {
+            throw new SQLException("not implemented for this test");
+        }
+
 	}
 
 }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/build.xml Mon May 13 12:22:18 2013
@@ -58,8 +58,8 @@
 
   <target name="compilex">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -71,7 +71,7 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java15compile.classpath}"/>
+        <pathelement path="${compile.classpath}"/>
 	<pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/derbyNet/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/derbyNet/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/derbyNet/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/derbyNet/build.xml Mon May 13 12:22:18 2013
@@ -68,8 +68,8 @@
   <target name="compilet1">
 
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -81,9 +81,8 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <!--pathelement location="${oro}"/-->
         <pathelement path="${compile.classpath}"/>
-		<pathelement path="${junit}"/>
+        <pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>
     </javac>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TableVTI.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TableVTI.java?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TableVTI.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TableVTI.java Mon May 13 12:22:18 2013
@@ -21,6 +21,8 @@ limitations under the License.
 
 package org.apache.derbyTesting.functionTests.tests.lang;
 
+import java.io.InputStream;
+import java.io.Reader;
 import java.sql.Connection;
 import java.sql.Statement;
 import java.sql.ResultSet;
@@ -35,6 +37,9 @@ import java.sql.Ref;
 import java.sql.Blob;
 import java.sql.Clob;
 import java.sql.Array;
+import java.sql.NClob;
+import java.sql.RowId;
+import java.sql.SQLXML;
 import org.apache.derbyTesting.junit.JDBC;
 
 /**
@@ -1467,4 +1472,212 @@ public abstract class TableVTI implement
     throws SQLException {
         throw new SQLException("updateArray");
     }
+
+    public RowId getRowId(int columnIndex) throws SQLException {
+        throw new SQLException("getRowId");
+    }
+
+    public RowId getRowId(String columnLabel) throws SQLException {
+        throw new SQLException("getRowId");
+    }
+
+    public void updateRowId(int columnIndex, RowId x) throws SQLException {
+        throw new SQLException("updateRowId");
+    }
+
+    public void updateRowId(String columnLabel, RowId x) throws SQLException {
+        throw new SQLException("updateRowId");
+    }
+
+    public int getHoldability() throws SQLException {
+        throw new SQLException("getHoldability");
+    }
+
+    public boolean isClosed() throws SQLException {
+        throw new SQLException("isClosed");
+    }
+
+    public void updateNString(int columnIndex, String nString) throws SQLException {
+        throw new SQLException("updateNString");
+    }
+
+    public void updateNString(String columnLabel, String nString) throws SQLException {
+        throw new SQLException("updateNString");
+    }
+
+    public void updateNClob(int columnIndex, NClob nClob) throws SQLException {
+        throw new SQLException("updateNClob");
+    }
+
+    public void updateNClob(String columnLabel, NClob nClob) throws SQLException {
+        throw new SQLException("updateNClob");
+    }
+
+    public NClob getNClob(int columnIndex) throws SQLException {
+        throw new SQLException("getNClob");
+    }
+
+    public NClob getNClob(String columnLabel) throws SQLException {
+        throw new SQLException("getNClob");
+    }
+
+    public SQLXML getSQLXML(int columnIndex) throws SQLException {
+        throw new SQLException("getSQLXML");
+    }
+
+    public SQLXML getSQLXML(String columnLabel) throws SQLException {
+        throw new SQLException("getSQLXML");
+    }
+
+    public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException {
+        throw new SQLException("updateSQLXML");
+    }
+
+    public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException {
+        throw new SQLException("updateSQLXML");
+    }
+
+    public String getNString(int columnIndex) throws SQLException {
+        throw new SQLException("getNString");
+    }
+
+    public String getNString(String columnLabel) throws SQLException {
+        throw new SQLException("getNString");
+    }
+
+    public Reader getNCharacterStream(int columnIndex) throws SQLException {
+        throw new SQLException("getNCharacterStream");
+    }
+
+    public Reader getNCharacterStream(String columnLabel) throws SQLException {
+        throw new SQLException("getNCharacterStream");
+    }
+
+    public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
+        throw new SQLException("updateNCharacterStream");
+    }
+
+    public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
+        throw new SQLException("updateNCharacterStream");
+    }
+
+    public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException {
+        throw new SQLException("updateAsciiStream");
+    }
+
+    public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException {
+        throw new SQLException("updateBinaryStream");
+    }
+
+    public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
+        throw new SQLException("updateCharacterStream");
+    }
+
+    public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException {
+        throw new SQLException("updateAsciiStream");
+    }
+
+    public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException {
+        throw new SQLException("updateBinaryStream");
+    }
+
+    public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
+        throw new SQLException("updateCharacterStream");
+    }
+
+    public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {
+        throw new SQLException("updateBlob");
+    }
+
+    public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {
+        throw new SQLException("updateBlob");
+    }
+
+    public void updateClob(int columnIndex, Reader reader, long length) throws SQLException {
+        throw new SQLException("updateClob");
+    }
+
+    public void updateClob(String columnLabel, Reader reader, long length) throws SQLException {
+        throw new SQLException("updateClob");
+    }
+
+    public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException {
+        throw new SQLException("updateNClob");
+    }
+
+    public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException {
+        throw new SQLException("updateNClob");
+    }
+
+    public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException {
+        throw new SQLException("updateNCharacterStream");
+    }
+
+    public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException {
+        throw new SQLException("updateNCharacterStream");
+    }
+
+    public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException {
+        throw new SQLException("updateAsciiStream");
+    }
+
+    public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException {
+        throw new SQLException("updateBinaryStream");
+    }
+
+    public void updateCharacterStream(int columnIndex, Reader x) throws SQLException {
+        throw new SQLException("updateCharacterStream");
+    }
+
+    public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException {
+        throw new SQLException("updateAsciiStream");
+    }
+
+    public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException {
+        throw new SQLException("updateBinaryStream");
+    }
+
+    public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException {
+        throw new SQLException("updateCharacterStream");
+    }
+
+    public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {
+        throw new SQLException("updateBlob");
+    }
+
+    public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {
+        throw new SQLException("updateBlob");
+    }
+
+    public void updateClob(int columnIndex, Reader reader) throws SQLException {
+        throw new SQLException("updateClob");
+    }
+
+    public void updateClob(String columnLabel, Reader reader) throws SQLException {
+        throw new SQLException("updateClob");
+    }
+
+    public void updateNClob(int columnIndex, Reader reader) throws SQLException {
+        throw new SQLException("updateNClob");
+    }
+
+    public void updateNClob(String columnLabel, Reader reader) throws SQLException {
+        throw new SQLException("updateNClob");
+    }
+
+    public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
+        throw new SQLException("getObject");
+    }
+
+    public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
+        throw new SQLException("getObject");
+    }
+
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        throw new SQLException("unwrap");
+    }
+
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        throw new SQLException("isWrapperFor");
+    }
 }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml Mon May 13 12:22:18 2013
@@ -58,7 +58,7 @@
 
 <!--             ============ Begin Targets ==============                -->
  
-  <target name="FTOtestsubdir" depends="compilett4,copyfiles"/>
+  <target name="FTOtestsubdir" depends="compilet1,copyfiles"/>
 
   <!-- mkdir / init target may not be necessary, just here for reference... -->
   <target name="init">
@@ -67,8 +67,8 @@
 
   <target name="compilet1" >
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -80,130 +80,13 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <!--pathelement location="${oro}"/-->
-        <pathelement path="${java15compile.classpath}"/>
+        <pathelement path="${compile.classpath}"/>
       	<pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>
-      <exclude name="${this.dir}/FullName.java"/>
-      <exclude name="${this.dir}/LongMagnitude.java"/>
-      <exclude name="${this.dir}/GenericMode.java"/>
-      <exclude name="${this.dir}/ModeAggregate.java"/>
-      <exclude name="${this.dir}/LobMode.java"/>
-      <exclude name="${this.dir}/declareGlobalTempTableJavaJDBC30.java"/>
-      <exclude name="${this.dir}/UpdatableResultSetTest.java"/>
-      <exclude name="${this.dir}/holdCursorJavaReflection.java"/>
-      <exclude name="${this.dir}/holdCursorJava.java"/>
-      <exclude name="${this.dir}/StreamsTest.java"/>
-      <exclude name="${this.dir}/procedureJdbc30.java"/>
-      <exclude name="${this.dir}/SpillHash.java"/>
-      <exclude name="${this.dir}/unaryArithmeticDynamicParameter.java"/>
-      <exclude name="${this.dir}/_Suite.java"/>
-      <exclude name="${this.dir}/VarargsRoutines.java"/>
-      <exclude name="${this.dir}/OptionalToolExample.java"/>
-    </javac>
-  </target>
-  <target name="compilet2" depends="compilet1">
-    <javac
-      source="1.4"
-      target="1.4"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="true"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}"
-      srcdir="${derby.testing.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${java15compile.classpath}"/>
-        <pathelement path="${junit}"/>
-      </classpath>
-      <include name="${this.dir}/holdCursorJavaReflection.java"/>
-      <include name="${this.dir}/holdCursorJava.java"/>
-      <include name="${this.dir}/StreamsTest.java"/>
-      <include name="${this.dir}/procedureJdbc30.java"/>
-      <include name="${this.dir}/SpillHash.java"/>
-      <include name="${this.dir}/UpdatableResultSetTest.java"/>
-      <include name="${this.dir}/unaryArithmeticDynamicParameter.java"/>
     </javac>
   </target>
 
-  <target name="compilet3" depends="compilet2">
-    <javac
-      source="1.4"
-      target="1.4"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="true"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}"
-      srcdir="${derby.testing.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${java15compile.classpath}"/>
-      </classpath>
-      <include name="${this.dir}/declareGlobalTempTableJavaJDBC30.java"/>
-    </javac>
-  </target> 
-
-  <target name="compilet3.1" depends="compilet3">
-    <javac
-      source="1.5"
-      target="1.5"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="true"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}"
-      srcdir="${derby.testing.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${java15compile.classpath}"/>
-      </classpath>
-      <include name="${this.dir}/FullName.java"/>
-      <include name="${this.dir}/GenericMode.java"/>
-      <include name="${this.dir}/LongMagnitude.java"/>
-      <include name="${this.dir}/ModeAggregate.java"/>
-      <include name="${this.dir}/LobMode.java"/>
-      <include name="${this.dir}/VarargsRoutines.java"/>
-      <include name="${this.dir}/OptionalToolExample.java"/>
-    </javac>
-  </target> 
-
-	<!-- Compile _Suite last as it needs to include all other JUnit classes 
-	which may be compiled using a higher compiler level, but it needs to be at
-	base level -->
-	<target name="compilett4" depends="compilet3.1" >
-    <javac
-      source="1.4"
-      target="1.4"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="true"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}" 
-      srcdir="${derby.testing.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${compile.classpath}"/>
-      	<pathelement path="${junit}"/>
-      </classpath>
-
-      <include name="${this.dir}/_Suite.java"/>
-    </javac>
-  </target>
   <target name="copyfiles">
     <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/lang">
       <fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/lang" 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsTest.java?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsTest.java Mon May 13 12:22:18 2013
@@ -1612,4 +1612,12 @@ class BlobImplT implements java.sql.Blob
         throw new SQLException("Not implemented");
     }
 
+    public void free() throws SQLException {
+        throw new SQLException("Not implemented");
+    }
+
+    public InputStream getBinaryStream(long pos, long length) throws SQLException {
+        throw new SQLException("Not implemented");
+    }
+
 }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml Mon May 13 12:22:18 2013
@@ -41,8 +41,8 @@
   <target name="largedatatests"  depends="copyfiles" 
           description="Build Derby largedata tests">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -54,7 +54,7 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java15compile.classpath}"/>
+        <pathelement path="${compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
       <include name="${derby.testing.functest.dir}/tests/largedata/*.java"/>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/build.xml Mon May 13 12:22:18 2013
@@ -33,13 +33,10 @@
     <!-- ########    TARGETS    ####### -->
     
     <!-- Compile all tests for Derby's management functionality -->
-    <target name="compile" depends="compile_jdk15"/>
-    
-    <!-- Based on built-in JMX => Requires jdk1.5 or better -->
-    <target name="compile_jdk15">
+    <target name="compile">
         <javac
-            source="1.5"
-            target="1.5"
+            source="1.6"
+            target="1.6"
             fork="yes"
             bootclasspath="${empty}"
             nowarn="on"
@@ -52,7 +49,7 @@
             srcdir="${derby.testing.src.dir}"
             destdir="${out.dir}">
             <classpath>
-                <pathelement path="${java15compile.classpath}"/>
+                <pathelement path="${compile.classpath}"/>
                 <pathelement path="${junit}"/>
             </classpath>
             <include name="${this.dir}/*.java"/>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/build.xml Mon May 13 12:22:18 2013
@@ -41,8 +41,8 @@
   <target name="memorytests" 
           description="Build Derby memory tests">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -54,7 +54,7 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java15compile.classpath}"/>
+        <pathelement path="${compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
       <include name="${derby.testing.functest.dir}/tests/memory/*.java"/>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/build.xml Mon May 13 12:22:18 2013
@@ -67,8 +67,8 @@
 
   <target name="compile">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -81,7 +81,7 @@
       destdir="${out.dir}">
       <classpath>
         <!--pathelement location="${oro}"/-->
-        <pathelement path="${java15compile.classpath}"/>
+        <pathelement path="${compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/multi/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/multi/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/multi/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/multi/build.xml Mon May 13 12:22:18 2013
@@ -41,8 +41,8 @@
   <target name="multitests" 
           description="Build Derby multi tests">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/build.xml Mon May 13 12:22:18 2013
@@ -75,8 +75,8 @@
 	  <target name="nistsuites" 
 	          description="Build Nist">
 	    <javac
-	      source="1.4"
-	      target="1.4"
+	      source="1.6"
+	      target="1.6"
 	      bootclasspath="${empty}"
 	      nowarn="on"
 	      debug="true"

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/perf/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/perf/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/perf/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/perf/build.xml Mon May 13 12:22:18 2013
@@ -67,8 +67,8 @@
 
   <target name="compile">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -80,8 +80,7 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <!--pathelement location="${oro}"/-->
-        <pathelement path="${java15compile.classpath}"/>
+        <pathelement path="${compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/build.xml Mon May 13 12:22:18 2013
@@ -67,8 +67,8 @@
 
   <target name="compilet1">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -80,7 +80,7 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java15compile.classpath}"/>
+        <pathelement path="${compile.classpath}"/>
 	<pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/build.xml Mon May 13 12:22:18 2013
@@ -66,8 +66,8 @@
   </target>
   <target name="compile">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -79,8 +79,7 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <!--pathelement location="${oro}"/-->
-        <pathelement path="${java15compile.classpath}"/>
+        <pathelement path="${compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/build.xml Mon May 13 12:22:18 2013
@@ -67,8 +67,8 @@
 
   <target name="compile">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -80,7 +80,6 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <!--pathelement location="${oro}"/-->
         <pathelement path="${compile.classpath}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/build.xml Mon May 13 12:22:18 2013
@@ -58,7 +58,7 @@
 
 <!--             ============ Begin Targets ==============                -->
  
-  <target name="FTOtestsubdir" depends="compilet2,compilet1,copyfiles"/>
+  <target name="FTOtestsubdir" depends="compilet1,copyfiles"/>
 
   <!-- mkdir / init target may not be necessary, just here for reference... -->
   <target name="init">
@@ -67,8 +67,8 @@
 
   <target name="compilet1">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -80,58 +80,13 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <!--pathelement location="${oro}"/-->
-        <pathelement path="${java15compile.classpath};${junit}"/>
+        <pathelement path="${compile.classpath};${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>
       <!--exclude name=""/-->
     </javac>
   </target>
 
-  <target name="compilet2">
-    <!--javac
-      source="1.4"
-      target="1.4"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="true"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}"
-      srcdir="${derby.testing.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${java15compile.classpath}"/>
-        <pathelement path="${junit}"/>
-      </classpath>
-      <exclude name="**/jdbc4/*"/>
-      <include name="${this.dir}/*.java">
-    </javac-->
-  </target>
-
-  <target name="compilet3">
-    <!--javac
-      source="1.4"
-      target="1.4"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="true"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}"
-      srcdir="${derby.testing.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${java15compile.classpath}"/>
-      </classpath>
-      <include name=""/>
-    </javac-->
-  </target> 
-
   <target name="copyfiles">
     <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/tools">
       <fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/tools" 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml Mon May 13 12:22:18 2013
@@ -67,8 +67,8 @@
 
   <target name="compilet1">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -80,7 +80,7 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java15compile.classpath}"/>
+        <pathelement path="${compile.classpath}"/>
 	<pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/build.xml Mon May 13 12:22:18 2013
@@ -43,8 +43,8 @@
 
   <target name="compile">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -57,55 +57,13 @@
       destdir="${out.dir}">
       <classpath>
         <pathelement location="${oro}"/>
-        <pathelement path="${java15compile.classpath}"/>
-		<pathelement path="${junit}"/>
+        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/> 
       <include name="${this.dir}/StaticInitializers/*.java"/> 
       <include name="${this.dir}/streams/*.java"/> 
       <include name="${this.dir}/corruptio/*.java"/>
-      <exclude name="${this.dir}/XATestUtil.java"/>
-      <exclude name="${this.dir}/ProtocolTestGrammar.java"/>
-      <exclude name="${this.dir}/ThreadDump.java"/>
-    </javac>
-    <javac
-      source="1.4"
-      target="1.4"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="true"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}"
-      srcdir="${derby.testing.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${java15compile.classpath}"/>
-      </classpath>
-      <!--exclude name=""/-->
-	  <include name="${this.dir}/XATestUtil.java"/>
-    </javac>
-
-    <javac
-      source="1.5"
-      target="1.5"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="true"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}"
-      srcdir="${derby.testing.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${java15compile.classpath}"/>
-      </classpath>
-    <include name="${this.dir}/ThreadDump.java"/>
-    <include name="${this.dir}/ProtocolTestGrammar.java"/>
     </javac>
   </target>
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/build.xml Mon May 13 12:22:18 2013
@@ -48,9 +48,6 @@
   <property file="${user.home}/properties/derbytesting.properties"/>
   <property file="${ant.home}/properties/derbytesting.properties"/>
 
-  <!-- Classes which must be compiled against JDK 1.4 or higher -->
-  <property name="junit.14.classes" value="${derby.testing.junit.dir}/JAXPFinder.java,${derby.testing.junit.dir}/ConnectionPoolDataSourceConnector.java,${derby.testing.junit.dir}/J2EEDataSource.java,${derby.testing.junit.dir}/DriverManagerConnector.java,${derby.testing.junit.dir}/XADataSourceConnector.java,${derby.testing.junit.dir}/XATestUtil.java,${derby.testing.junit.dir}/BigDecimalHandler.java"/>
-
   <!-- Release and Version info -->
   <property file="${properties.dir}/release.properties"/>
 
@@ -58,10 +55,9 @@
  
   <target name="junitcomponents" 
           description="Build Derby JUnit test components">
-    <!-- Here we compile the classes which WILL run on small device platforms -->
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -72,33 +68,12 @@
       verbose="${verbose}" 
       srcdir="${derby.testing.src.dir}"
       includes="${derby.testing.junit.dir}/**/*.java"
-      excludes="${junit.14.classes}"
       destdir="${out.dir}">
       <classpath>
         <pathelement path="${compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
     </javac>
-    <!-- Here we compile the classes which will NOT run on small device platforms -->
-    <javac
-      source="1.4"
-      target="1.4"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="true"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}"
-      srcdir="${derby.testing.src.dir}"
-	  includes="${junit.14.classes}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${java15compile.classpath}"/>
-        <pathelement path="${junit}"/>
-      </classpath>
-    </javac>
   </target>
 
 <!--             ============= End Targets ==============                -->

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/build.xml Mon May 13 12:22:18 2013
@@ -56,8 +56,8 @@
   <target name="perfcomponents" 
           description="Build Derby Performance test components">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -69,29 +69,9 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java15compile.classpath}"/>
+        <pathelement path="${compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
-      <include name="${derby.testing.perf.dir}/basic/jdbc/ValuesTest.java"/>
-    </javac>
-    <javac
-      source="1.4"
-      target="1.4"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="true"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}" 
-      srcdir="${derby.testing.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${java15compile.classpath}"/>
-        <pathelement path="${junit}"/>
-      </classpath>
-      <exclude name="${derby.testing.perf.dir}/basic/jdbc/ValuesTest.java"/>
       <include name="${derby.testing.perf.dir}/**/*.java"/>
     </javac>
   </target>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/mailjdbc/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/mailjdbc/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/mailjdbc/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/mailjdbc/build.xml Mon May 13 12:22:18 2013
@@ -56,8 +56,8 @@
   <target name="mailjdbc"
           description="MailJdbc scenario based system test">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -69,7 +69,7 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java15compile.classpath}"/>
+        <pathelement path="${compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
       <include name="${derby.testing.system.dir}/mailjdbc/**/*.java"/>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/nstest/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/nstest/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/nstest/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/nstest/build.xml Mon May 13 12:22:18 2013
@@ -56,8 +56,8 @@
   <target name="nstest"
           description="N/W server system test">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -69,7 +69,7 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java15compile.classpath}"/>
+        <pathelement path="${compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
       <include name="${derby.testing.system.dir}/nstest/**/*.java"/>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/build.xml Mon May 13 12:22:18 2013
@@ -56,8 +56,8 @@
   <target name="orderentry"
           description="Build Order Entry system test kit">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -69,7 +69,7 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java15compile.classpath}"/>
+        <pathelement path="${compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
       <include name="${derby.testing.system.dir}/oe/**/*.java"/>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/optimizer/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/optimizer/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/optimizer/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/optimizer/build.xml Mon May 13 12:22:18 2013
@@ -56,8 +56,8 @@
   <target name="optimizer"
           description="test for optimizer">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -69,7 +69,7 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java15compile.classpath}"/>
+        <pathelement path="${compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
       <include name="${derby.testing.system.dir}/optimizer/**/*.java"/>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/sttest/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/sttest/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/sttest/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/sttest/build.xml Mon May 13 12:22:18 2013
@@ -56,8 +56,8 @@
   <target name="sttest"
           description="single table test">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -69,7 +69,7 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java15compile.classpath}"/>
+        <pathelement path="${compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
       <include name="${derby.testing.system.dir}/sttest/**/*.java"/>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/build.xml?rev=1481818&r1=1481817&r2=1481818&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/build.xml Mon May 13 12:22:18 2013
@@ -56,8 +56,8 @@
   <target name="unitTests" 
           description="Build Derby unit testing files">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -69,7 +69,7 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java15compile.classpath}"/>
+        <pathelement path="${compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
       <include name="${derby.testing.unittest.dir}/**/*.java"/>



Mime
View raw message