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 2016/01/26 03:42:02 UTC
svn commit: r1726721 [2/2] - in /db/derby/code/trunk: ./
java/build/org/apache/derbyBuild/ java/build/org/apache/derbyPreBuild/
java/client/ java/demo/ java/demo/toursdb/ java/drda/org/apache/derby/drda/
java/drda/org/apache/derby/impl/drda/ java/engin...
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=1726721&r1=1726720&r2=1726721&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 Tue Jan 26 02:42:00 2016
@@ -43,9 +43,8 @@
<target name="compile">
<javac
- source="1.6"
- target="1.6"
- bootclasspath="${empty}"
+ source="${min.version}"
+ target="${min.version}"
nowarn="on"
debug="true"
depend="${depend}"
@@ -57,7 +56,6 @@
destdir="${out.dir}">
<classpath>
<pathelement location="${oro}"/>
- <pathelement path="${compile.classpath}"/>
<pathelement path="${junit}"/>
</classpath>
<include name="${this.dir}/*.java"/>
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=1726721&r1=1726720&r2=1726721&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 Tue Jan 26 02:42:00 2016
@@ -56,9 +56,8 @@
<target name="junitcomponents"
description="Build Derby JUnit test components">
<javac
- source="1.6"
- target="1.6"
- bootclasspath="${empty}"
+ source="${min.version}"
+ target="${min.version}"
nowarn="on"
debug="true"
depend="${depend}"
@@ -70,7 +69,6 @@
includes="${derby.testing.junit.dir}/**/*.java"
destdir="${out.dir}">
<classpath>
- <pathelement path="${compile.classpath}"/>
<pathelement path="${junit}"/>
</classpath>
<compilerarg value="-Xlint"/>
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=1726721&r1=1726720&r2=1726721&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 Tue Jan 26 02:42:00 2016
@@ -56,9 +56,8 @@
<target name="perfcomponents"
description="Build Derby Performance test components">
<javac
- source="1.6"
- target="1.6"
- bootclasspath="${empty}"
+ source="${min.version}"
+ target="${min.version}"
nowarn="on"
debug="true"
depend="${depend}"
@@ -69,7 +68,6 @@
srcdir="${derby.testing.src.dir}"
destdir="${out.dir}">
<classpath>
- <pathelement path="${compile.classpath}"/>
<pathelement path="${junit}"/>
</classpath>
<include name="${derby.testing.perf.dir}/**/*.java"/>
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=1726721&r1=1726720&r2=1726721&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 Tue Jan 26 02:42:00 2016
@@ -56,9 +56,8 @@
<target name="mailjdbc"
description="MailJdbc scenario based system test">
<javac
- source="1.6"
- target="1.6"
- bootclasspath="${empty}"
+ source="${min.version}"
+ target="${min.version}"
nowarn="on"
debug="true"
depend="${depend}"
@@ -69,7 +68,6 @@
srcdir="${derby.testing.src.dir}"
destdir="${out.dir}">
<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=1726721&r1=1726720&r2=1726721&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 Tue Jan 26 02:42:00 2016
@@ -56,9 +56,8 @@
<target name="nstest"
description="N/W server system test">
<javac
- source="1.6"
- target="1.6"
- bootclasspath="${empty}"
+ source="${min.version}"
+ target="${min.version}"
nowarn="on"
debug="true"
depend="${depend}"
@@ -69,7 +68,6 @@
srcdir="${derby.testing.src.dir}"
destdir="${out.dir}">
<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=1726721&r1=1726720&r2=1726721&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 Tue Jan 26 02:42:00 2016
@@ -56,9 +56,8 @@
<target name="orderentry"
description="Build Order Entry system test kit">
<javac
- source="1.6"
- target="1.6"
- bootclasspath="${empty}"
+ source="${min.version}"
+ target="${min.version}"
nowarn="on"
debug="true"
depend="${depend}"
@@ -69,7 +68,6 @@
srcdir="${derby.testing.src.dir}"
destdir="${out.dir}">
<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=1726721&r1=1726720&r2=1726721&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 Tue Jan 26 02:42:00 2016
@@ -56,9 +56,8 @@
<target name="optimizer"
description="test for optimizer">
<javac
- source="1.6"
- target="1.6"
- bootclasspath="${empty}"
+ source="${min.version}"
+ target="${min.version}"
nowarn="on"
debug="true"
depend="${depend}"
@@ -69,7 +68,6 @@
srcdir="${derby.testing.src.dir}"
destdir="${out.dir}">
<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=1726721&r1=1726720&r2=1726721&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 Tue Jan 26 02:42:00 2016
@@ -56,9 +56,8 @@
<target name="sttest"
description="single table test">
<javac
- source="1.6"
- target="1.6"
- bootclasspath="${empty}"
+ source="${min.version}"
+ target="${min.version}"
nowarn="on"
debug="true"
depend="${depend}"
@@ -69,7 +68,6 @@
srcdir="${derby.testing.src.dir}"
destdir="${out.dir}">
<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=1726721&r1=1726720&r2=1726721&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 Tue Jan 26 02:42:00 2016
@@ -56,9 +56,8 @@
<target name="unitTests"
description="Build Derby unit testing files">
<javac
- source="1.6"
- target="1.6"
- bootclasspath="${empty}"
+ source="${min.version}"
+ target="${min.version}"
nowarn="on"
debug="true"
depend="${depend}"
@@ -69,7 +68,6 @@
srcdir="${derby.testing.src.dir}"
destdir="${out.dir}">
<classpath>
- <pathelement path="${compile.classpath}"/>
<pathelement path="${junit}"/>
</classpath>
<include name="${derby.testing.unittest.dir}/**/*.java"/>
Modified: db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/build.xml?rev=1726721&r1=1726720&r2=1726721&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/build.xml (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/build.xml Tue Jan 26 02:42:00 2016
@@ -36,9 +36,8 @@
<target name="compile_tools_iapi">
<javac
- source="1.6"
- target="1.6"
- bootclasspath="${empty}"
+ source="${min.version}"
+ target="${min.version}"
nowarn="on"
debug="${debug}"
depend="${depend}"
@@ -48,9 +47,6 @@
verbose="${verbose}"
srcdir="${derby.tools.src.dir}"
destdir="${out.dir}">
- <classpath>
- <pathelement path="${compile.classpath}"/>
- </classpath>
<include name="${derby.dir}/iapi/tools/**"/>
<exclude name="${derby.dir}/iapi/tools/run.java"/>
<compilerarg value="-Xlint:unchecked"/>
@@ -59,9 +55,8 @@
<target name="compile_tools_iapi_run">
<javac
- source="1.6"
- target="1.6"
- bootclasspath="${empty}"
+ source="${min.version}"
+ target="${min.version}"
nowarn="on"
debug="${debug}"
depend="${depend}"
@@ -71,9 +66,6 @@
verbose="${verbose}"
srcdir="${derby.tools.src.dir}"
destdir="${out.dir}">
- <classpath>
- <pathelement path="${compile.classpath}"/>
- </classpath>
<include name="${derby.dir}/iapi/tools/run.java"/>
<compilerarg value="-Xlint:unchecked"/>
</javac>
Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml?rev=1726721&r1=1726720&r2=1726721&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml Tue Jan 26 02:42:00 2016
@@ -93,9 +93,8 @@
<target name="compile" depends="parser">
<javac
- source="1.8"
- target="1.8"
- bootclasspath="${empty}"
+ source="${min.version}"
+ target="${min.version}"
nowarn="on"
debug="${debug}"
depend="${depend}"
@@ -105,9 +104,6 @@
verbose="${verbose}"
srcdir="${derby.tools.src.dir}:${generated.src.dir}"
destdir="${out.dir}">
- <classpath>
- <pathelement path="${java18compile.classpath}"/>
- </classpath>
<include name="${derby.dir}/impl/tools/**"/>
<compilerarg value="-Xlint:unchecked"/>
</javac>
Modified: db/derby/code/trunk/java/tools/org/apache/derby/tools/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/tools/build.xml?rev=1726721&r1=1726720&r2=1726721&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/tools/build.xml (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/tools/build.xml Tue Jan 26 02:42:00 2016
@@ -37,9 +37,8 @@
<target name="compile">
<javac
- source="1.8"
- target="1.8"
- bootclasspath="${empty}"
+ source="${min.version}"
+ target="${min.version}"
nowarn="on"
debug="${debug}"
depend="${depend}"
@@ -49,9 +48,6 @@
verbose="${verbose}"
srcdir="${derby.tools.src.dir}"
destdir="${out.dir}">
- <classpath>
- <pathelement path="${java18compile.classpath}"/>
- </classpath>
<include name="${derby.dir}/tools/*.java"/>
<compilerarg value="-Xlint:unchecked"/>
</javac>
Modified: db/derby/code/trunk/tools/ant/properties/defaultcompiler.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/ant/properties/defaultcompiler.properties?rev=1726721&r1=1726720&r2=1726721&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/defaultcompiler.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/defaultcompiler.properties Tue Jan 26 02:42:00 2016
@@ -15,3 +15,6 @@
build.compiler=modern
fail_on_error=false
+
+# minimum Java version supported by Derby
+min.version=1.8
Modified: db/derby/code/trunk/tools/l10n/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/l10n/build.xml?rev=1726721&r1=1726720&r2=1726721&view=diff
==============================================================================
--- db/derby/code/trunk/tools/l10n/build.xml (original)
+++ db/derby/code/trunk/tools/l10n/build.xml Tue Jan 26 02:42:00 2016
@@ -36,9 +36,8 @@
<target name="compile">
<javac
- source="1.8"
- target="1.8"
- bootclasspath="${empty}"
+ source="${min.version}"
+ target="${min.version}"
nowarn="on"
debug="${debug}"
depend="${depend}"
@@ -49,9 +48,6 @@
srcdir="."
destdir="${out.dir}"
includes="LocCompare*">
- <classpath>
- <pathelement path="${java18compile.classpath}"/>
- </classpath>
<compilerarg value="-Xlint:unchecked"/>
</javac>
</target>