db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1726495 - 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/engine/org/...
Date Sun, 24 Jan 2016 14:43:29 GMT
Author: rhillegas
Date: Sun Jan 24 14:43:28 2016
New Revision: 1726495

URL: http://svn.apache.org/viewvc?rev=1726495&view=rev
Log:
DERBY-6857: Remove support for java 6 and 7; compile Derby completely into java 8 byte code; commit derby-6857-01-aa-remove6and7.diff.

Removed:
    db/derby/code/trunk/java/stubs/jdbc4/java/sql/
    db/derby/code/trunk/java/stubs/jdbc4/javax/
    db/derby/code/trunk/java/stubs/jdbc4/sql/
Modified:
    db/derby/code/trunk/BUILDING.html
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/java/build/org/apache/derbyBuild/build.xml
    db/derby/code/trunk/java/build/org/apache/derbyPreBuild/PropertySetter.java
    db/derby/code/trunk/java/client/build.xml
    db/derby/code/trunk/java/demo/build.xml
    db/derby/code/trunk/java/demo/toursdb/build.xml
    db/derby/code/trunk/java/drda/org/apache/derby/drda/build.xml
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/agg/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/authentication/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/catalog/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/database/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/diag/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayUtil.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/impl/db/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/impl/io/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/impl/load/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/impl/services/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/io/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/mbeans/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/modules.properties
    db/derby/code/trunk/java/engine/org/apache/derby/osgi/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/security/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/vti/build.xml
    db/derby/code/trunk/java/optional/build.xml
    db/derby/code/trunk/java/shared/build.xml
    db/derby/code/trunk/java/storeless/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/build.xml
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml
    db/derby/code/trunk/java/tools/org/apache/derby/tools/build.xml

Modified: db/derby/code/trunk/BUILDING.html
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/BUILDING.html?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/BUILDING.html (original)
+++ db/derby/code/trunk/BUILDING.html Sun Jan 24 14:43:28 2016
@@ -84,8 +84,8 @@ If you are reading these instructions, c
 
     <TR>
       <TD><b><i>Java Development Kit</i></b></TD>
-      <TD>You need to install a Java 6 or later JDK. Probably, your machine
-      already has this JDK. If not, Sun and IBM supply free JDKs for many machines.</TD>
+      <TD>You need to install a Java 8 JDK. Probably, your machine
+      already has this JDK. If not, Oracle and IBM supply free JDKs for many machines.</TD>
     </TR>
 
     <TR>
@@ -135,8 +135,7 @@ test harness also:
 Before building Derby, cd
 to the root of your Derby source distribution. That is the top level
 directory which contains the LICENSE and NOTICE files. In addition,
-make sure that the version of Java which you are using is Java 6 or
-later. You can verify this by checking the output of the following command:
+make sure that the version of Java which you are using is Java 8. You can verify this by checking the output of the following command:
 </p>
 
 <blockquote>
@@ -408,7 +407,7 @@ junit=/local0/junit.jar
 <h3><a name="Advanced Build">Advanced Build</a></h3>
 
 <p>
-Derby is supposed to run in all of the following environments:
+Derby is supposed to run in the following environment:
 </p>
 
 <TABLE border="2">
@@ -424,25 +423,15 @@ Derby is supposed to run in all of the f
       <TD><b><i>JDBC 4.2</i></b></TD>
     </TR>
 
-    <TR>
-      <TD><b><i>Java 7</i></b></TD>
-      <TD><b><i>JDBC 4.1</i></b></TD>
-    </TR>
-
-    <TR>
-      <TD><b><i>Java 6</i></b></TD>
-      <TD><b><i>JDBC 4.0</i></b></TD>
-    </TR>
-
   </TBODY>
 </TABLE>
 
 <br/>
 <p>
 The default Derby build does NOT necessarily verify that the compile-time contract is
-satisfied for any of these platforms. To get compile-time checks, you
-need to make sure that the following variables are set correctly. To
-see the values which the Derby build uses for these variables, build
+satisfied for this platform. To get compile-time checks, you
+need to make sure that the following variable is set correctly. To
+see the value which the Derby build uses for this variable, build
 Derby after setting the
 following debug variable in your <i>ant.properties</i>:
 </p>
@@ -455,8 +444,8 @@ printCompilerProperties=true
 
 <br/>
 <p>
-Here are the variables which determine whether the Derby build
-enforces compile-time contracts for the supported platforms:
+Here is the variable which determines whether the Derby build
+enforces compile-time contracts for the supported platform:
 </p>
 
 <TABLE border="2">
@@ -473,31 +462,10 @@ enforces compile-time contracts for the
       <TD><b><i>Java 8</i></b></TD>
       <TD><b><i>java18compile.classpath</i></b></TD>
       <TD>The set of libraries in the Java 8 JDK. The build fails if
-      your environment isn't a Java 6, 7, or 8 JDK.</TD>
+      your environment isn't a Java 8 JDK.</TD>
       <TD>The set of system jars in your JDK if your environment is
       JDK 8. Otherwise,
-      <i>${java17compile.classpath}</i></TD>
-    </TR>
-
-    <TR>
-      <TD><b><i>Java 7</i></b></TD>
-      <TD><b><i>java17compile.classpath</i></b></TD>
-      <TD>The set of libraries in the Java 7 JDK. The build fails if
-      your environment isn't a Java 6, 7, or 8 JDK.</TD>
-      <TD>The set of system jars in your JDK if your environment is
-      JDK 7. Otherwise,
-      <i>${java16compile.classpath}</i></TD>
-    </TR>
-
-    <TR>
-      <TD><b><i>Java 6</i></b></TD>
-      <TD><b><i>java16compile.classpath</i></b></TD>
-      <TD>The set of libraries in the Java 6 JDK. The build fails if
-      your environment isn't a Java 6, 7, or 8 JDK.</TD>
-      <TD>The set of system jars in your JDK if your environment is
-      JDK 6. Otherwise, <i>classes/stubs/jdbc4:${java18compile.classpath}</i> if your environment
-      is JDK 8. Otherwise
-      <i>${java17compile.classpath}</i></TD>
+      the build fails.</TD>
     </TR>
 
   </TBODY>
@@ -505,9 +473,9 @@ enforces compile-time contracts for the
 
 <br/>
 <p>
-The preceding variables are mandatory for the Derby build.
-You can also force the setting of the preceding variables by setting the following optional
-library variables in <i>ant.properties</i>:
+The preceding variable is mandatory for the Derby build.
+You can also force the setting of the preceding variable by setting the following optional
+library variable in <i>ant.properties</i>:
 </p>
 
 <TABLE border="2">
@@ -520,24 +488,6 @@ library variables in <i>ant.properties</
     </TR>
 
     <TR>
-      <TD><b><i>j16lib</i></b></TD>
-      <TD>If you set this variable to be the directory which contains
-      your Java 6 jars, then the Derby build will set
-      <i>java16compile.classpath</i> to be the list of jars in that directory.
-      </TD>
-      <TD>Optional variable. No default value.</TD>
-    </TR>
-
-    <TR>
-      <TD><b><i>j17lib</i></b></TD>
-      <TD>If you set this variable to be the directory which contains
-      your Java 7 jars, then the Derby build will set
-      <i>java17compile.classpath</i> to be the list of jars in that directory.
-      </TD>
-      <TD>Optional variable. No default value.</TD>
-    </TR>
-
-    <TR>
       <TD><b><i>j18lib</i></b></TD>
       <TD>If you set this variable to be the directory which contains
       your Java 8 jars, then the Derby build will set
@@ -559,15 +509,19 @@ simply to improve readability):
 
 <blockquote>
 <pre><b><font color="blue" size="+2">
-java16compile.classpath=/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Classes/charsets.jar: \
-    /System/Library/Frameworks/JavaVM.framework/Versions/1.6/Classes/classes.jar: \
-    /System/Library/Frameworks/JavaVM.framework/Versions/1.6/Classes/dt.jar: \
-    /System/Library/Frameworks/JavaVM.framework/Versions/1.6/Classes/jce.jar: \
-    /System/Library/Frameworks/JavaVM.framework/Versions/1.6/Classes/jconsole.jar: \
-    /System/Library/Frameworks/JavaVM.framework/Versions/1.6/Classes/jsse.jar: \
-    /System/Library/Frameworks/JavaVM.framework/Versions/1.6/Classes/laf.jar: \
-    /System/Library/Frameworks/JavaVM.framework/Versions/1.6/Classes/management-agent: \
-    /System/Library/Frameworks/JavaVM.framework/Versions/1.6/Classes/ui.jar
+java18compile.classpath =
+    /Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home/jre/lib/charsets.jar: \
+    /Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home/jre/lib/deploy.jar: \
+    /Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home/jre/lib/htmlconverter.jar: \
+    /Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home/jre/lib/javaws.jar: \
+    /Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home/jre/lib/jce.jar: \
+    /Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home/jre/lib/jfr.jar: \
+    /Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home/jre/lib/jfxswt.jar: \
+    /Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home/jre/lib/jsse.jar: \
+    /Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home/jre/lib/management-agent.jar: \
+    /Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home/jre/lib/plugin.jar: \
+    /Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home/jre/lib/resources.jar: \
+    /Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home/jre/lib/rt.jar
 </font></b></pre>
 </blockquote>
 

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Sun Jan 24 14:43:28 2016
@@ -48,7 +48,7 @@
 
   <target
       name="buildsource"
-      depends="checkCompilerLevel,init,prebuild,setCompilerProperties,jdbc4stubs,felixStubs,engine,storeless,tools,drda,client,optional,build,versioninfo,localeinfo,binscripts"
+      depends="checkCompilerLevel,init,prebuild,setCompilerProperties,felixStubs,engine,storeless,tools,drda,client,optional,build,versioninfo,localeinfo,binscripts"
       description="Compile the product source (does not build the tests)."
   />
   <target
@@ -148,20 +148,8 @@
   <!--  Make sure compiler level is Java 6 level or higher -->
   <target name="checkCompilerLevel">
 
-    <!--
-       Allow compilation of JDBC4 classes at 1.6 level if compiler supports it.
-       If we can find the following class, then we assume that the compiler
-       is at least Java 6 level.
-    -->
-    <available property="compilerAtCorrectLevel" classname="java.sql.Wrapper"/>
-    <fail unless="compilerAtCorrectLevel" message="Compiler level must be Java 6 or later."/>
-
-    <property name="compilerLevel16" value="1.6"/>
-
-    <javac source="1.6" srcdir="${basedir}" failonerror="false"
-           includeantruntime="false">
-      <include name="${dummy.src}"/>
-    </javac>
+    <available property="compilerAtCorrectLevel" classname="java.sql.SQLType"/>
+    <fail unless="compilerAtCorrectLevel" message="Compiler level must be Java 8 or later."/>
 
     <antcall target="checkVMLevel"/>
     
@@ -173,11 +161,8 @@
        be checked before running junit tests requiring a certain JVM version.
   -->
   <target name="checkVMLevel">
-    <!-- The java.lang.ManagementFactory class was new in J2SE 5.0 -->
-    <available classname="java.lang.management.ManagementFactory" property="vmLevelIsAtLeast1.5"/>
-    <available classname="java.sql.Wrapper" property="vmLevelIsAtLeast1.6" value="true"/>
-    <available classname="java.sql.PseudoColumnUsage" property="vmLevelIsAtLeast1.7"/>
     <available classname="java.sql.SQLType" property="vmLevelIsAtLeast1.8" value="true"/>
+    <available classname="java.sql.ShardingKey" property="vmLevelIsAtLeast1.9" value="true"/>
   </target>
 
 <!-- ==================================================================== -->
@@ -286,9 +271,8 @@
     />
 
     <!-- 
-            After setting the JDK properties, we expect that java16compile.classpath,
-            java17compile.classpath, or java18compile.classpath will be set. 
-            If none of these are set, then PropertySetter aborts the build.
+            After setting the JDK properties, we expect that java18compile.classpath will be set. 
+            Otherwise, PropertySetter aborts the build.
     -->
     <setJdkProperties/>
 
@@ -297,25 +281,6 @@
     <!-- Compile-time classpath`< properties files -->
     <property file="${properties.dir}/extrapath.properties"/>
 
-
-    <!-- 
-            If a Java 6 JDK 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>
-    <property name="java16compile.classpath" value="${java17compile.classpath}"/>
-
-    <!-- 
-            If a Java 7 JDK isn't present, then use the Java 6 environment.
-    -->
-    <property name="java17compile.classpath" value="${java16compile.classpath}"/>
-
-    <!-- 
-            If a Java 8 JDK isn't present, then use the Java 7 environment.
-    -->
-    <property name="java18compile.classpath" value="${java17compile.classpath}"/>
-
     <property file="${properties.dir}/compilepath.properties"/>
     <!-- Release and version info -->
     <property file="${properties.dir}/release.properties"/>
@@ -324,7 +289,7 @@
             The lowest common denominator compile path for Derby. We expect that
             the bulk of the Derby product will run on Java SE 6.
     -->
-    <property name="compile.classpath" value="${java16compile.classpath}"/>
+    <property name="compile.classpath" value="${java18compile.classpath}"/>
 
     <property name="compilerPropsAlreadySet" value="true"/>
     <antcall target="printCompilerProperties"> <param name="checkEvent" value="After setting properties: "/> </antcall>
@@ -348,12 +313,6 @@
   <target name="printCompilerProperties" if="printCompilerProperties">
 
     <echo message="${checkEvent} compilerPropsAlreadySet = ${compilerPropsAlreadySet}"/>
-    <echo message="${checkEvent} compilerLevel16 = ${compilerLevel16}"/>
-    <echo message="${checkEvent} compile.classpath = ${compile.classpath}"/>
-    <echo message="${checkEvent} j16lib = ${j16lib}"/>
-    <echo message="${checkEvent} java16compile.classpath = ${java16compile.classpath}"/>
-    <echo message="${checkEvent} j17lib = ${j17lib}"/>
-    <echo message="${checkEvent} java17compile.classpath = ${java17compile.classpath}"/>
     <echo message="${checkEvent} j18lib = ${j18lib}"/>
     <echo message="${checkEvent} java18compile.classpath = ${java18compile.classpath}"/>
 
@@ -814,34 +773,6 @@
   </target>
 
 <!-- =================================================================== -->
-<!--                     Build the stub implementation of JDBC4                  -->
-<!-- =================================================================== -->
-  <target name="jdbc4stubs">
-    <mkdir dir="${out.stubs.dir}"/>
-    <mkdir dir="${out.jdbc4.dir}"/>
-
-    <javac
-      source="1.6"
-      target="1.6"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="${debug}"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}"
-      srcdir="${derby.jdbc4.src.dir}"
-      destdir="${out.jdbc4.dir}">
-      <classpath>
-        <pathelement path="${java16compile.classpath}"/>
-      </classpath>
-      <compilerarg value="-Xlint:unchecked"/>
-     </javac>
-
-  </target>
-
-<!-- =================================================================== -->
 <!--                     Build the stub FELIX (OSGI) implementation                 -->
 <!-- =================================================================== -->
   <target name="felixStubs">
@@ -849,8 +780,8 @@
     <mkdir dir="${out.felix.dir}"/>
 
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -862,7 +793,7 @@
       srcdir="${derby.felix.src.dir}"
       destdir="${out.felix.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <compilerarg value="-Xlint:unchecked"/>
      </javac>
@@ -971,8 +902,8 @@
     </java>
 
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -1343,7 +1274,7 @@
        doctitle="Apache Derby V${major}.${minor} Test Javadoc"
        Footer="${javadoc.Footer}"
        bottom="Apache Derby V${major}.${minor} Internals - &lt;i&gt;Copyright &amp;copy; 2004,${copyright.year} The Apache Software Foundation. All Rights Reserved.&lt;/i&gt;"
-       source="1.6"
+       source="1.8"
      >
       <fileset dir="${derby.testing.src.dir}"
                excludesfile="${javadoc.exclusions}"/>
@@ -2152,7 +2083,6 @@
 
      <antcall target="appendnotice"><param name="sourcefile" value="initialgrant.txt"/></antcall>
      <antcall target="appendnotice"><param name="sourcefile" value="nisttestgrant.txt"/></antcall>
-     <antcall target="appendnotice"><param name="sourcefile" value="jdbcstubs.txt"/></antcall>
      <antcall target="appendnotice"><param name="sourcefile" value="felix.txt"/></antcall>
      <antcall target="appendnotice"><param name="sourcefile" value="lucene.txt"/></antcall>
      <antcall target="appendnotice"><param name="sourcefile" value="simpleJson.txt"/></antcall>
@@ -2601,10 +2531,9 @@
   </target>
 
   <!--
-    Only execute jdbc4 suite if we have a pointer to a 1.6 VM.
     This target is called by junit-jdbc after reading the VM level.
   -->
-  <target name="junit-jdbc4-workhorse" if="vmLevelIsAtLeast1.6" depends="junit-init">
+  <target name="junit-jdbc4-workhorse" depends="junit-init">
   	 <junit printsummary="on"
            fork="yes" forkmode="perTest"
            showoutput="yes"

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/build.xml (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/build.xml Sun Jan 24 14:43:28 2016
@@ -39,8 +39,8 @@
     <copy file="${derby.build.src.dir}/org/apache/derbyBuild/odbcgen_fragments.properties" tofile="${out.dir}/org/apache/derbyBuild/odbcgen_fragments.properties"/>
 
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -52,7 +52,7 @@
       srcdir="${derby.build.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath};${java.home}/../lib/tools.jar"/>
+        <pathelement path="${java18compile.classpath};${java.home}/../lib/tools.jar"/>
         <pathelement path="${ant.core.lib}"/>
       </classpath>
       <include name="org/apache/derbyBuild/**"/>

Modified: db/derby/code/trunk/java/build/org/apache/derbyPreBuild/PropertySetter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyPreBuild/PropertySetter.java?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyPreBuild/PropertySetter.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyPreBuild/PropertySetter.java Sun Jan 24 14:43:28 2016
@@ -51,8 +51,6 @@ import org.apache.tools.ant.taskdefs.Pro
  * </p>
  *
  * <ul>
- * <li>java16compile.classpath</li>
- * <li>java17compile.classpath</li>
  * <li>java18compile.classpath</li>
  * </ul>
  *
@@ -62,8 +60,6 @@ import org.apache.tools.ant.taskdefs.Pro
  * </p>
  *
  * <ul>
- * <li>j16lib</li>
- * <li>j17lib</li>
  * <li>j18lib</li>
  * </ul>
  *
@@ -91,8 +87,6 @@ public class PropertySetter extends Task
     // declared in ascending order
     private static  final   VMLevel[]    VM_LEVELS =
     {
-        new VMLevel( "16", "1.6" ),
-        new VMLevel( "17", "1.7" ),
         new VMLevel( "18", "1.8" ),
     };
 

Modified: db/derby/code/trunk/java/client/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/build.xml (original)
+++ db/derby/code/trunk/java/client/build.xml Sun Jan 24 14:43:28 2016
@@ -50,8 +50,8 @@
 <!-- compile classes  -->
 <target name="compile">
     <javac
-      source="${compilerLevel16}"
-      target="${compilerLevel16}"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -65,16 +65,16 @@
       excludes="**/*42.java"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <compilerarg value="-Xlint"/>
    </javac>
 </target> 
 
-<target name="compile_jdbc42" if="vmLevelIsAtLeast1.8">
+<target name="compile_jdbc42">
     <javac
-      source="${compilerLevel16}"
-      target="${compilerLevel16}"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

Modified: db/derby/code/trunk/java/demo/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/demo/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/demo/build.xml (original)
+++ db/derby/code/trunk/java/demo/build.xml Sun Jan 24 14:43:28 2016
@@ -36,8 +36,8 @@
 
   <target name="compile">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -50,13 +50,13 @@
       destdir="${out.dir}"
       includes="Simple*">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <compilerarg value="-Xlint:unchecked"/>
     </javac>
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -70,14 +70,14 @@
       includes="nserverdemo/**"
       excludes="nserverdemo/Simple*">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <compilerarg value="-Xlint:unchecked"/>
     </javac>
     <!-- "simple" demos under java/demo/ (SimpleApp) -->
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -90,13 +90,13 @@
       destdir="${out.dir}">
       <classpath>
         <pathelement location="${javasrc.dir}"/>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <compilerarg value="-Xlint:unchecked"/>
     </javac>
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -109,7 +109,7 @@
       destdir="${out.dir}">
       <classpath>
         <pathelement location="${javasrc.dir}"/>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <compilerarg value="-Xlint:unchecked"/>
     </javac>
@@ -131,8 +131,8 @@
 
   <target name="compile-vtidemo">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -144,7 +144,7 @@
       srcdir="${derby.demo.src.dir}/vtis/java"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <compilerarg value="-Xlint:unchecked"/>
     </javac>

Modified: db/derby/code/trunk/java/demo/toursdb/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/demo/toursdb/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/demo/toursdb/build.xml (original)
+++ db/derby/code/trunk/java/demo/toursdb/build.xml Sun Jan 24 14:43:28 2016
@@ -38,8 +38,8 @@
 
   <target name="compile">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       debug="${debug}"
       depend="${depend}"
@@ -50,7 +50,7 @@
       srcdir="${derby.demo.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="toursdb/insertMaps.java"/>
       <compilerarg value="-Xlint:unchecked"/>

Modified: db/derby/code/trunk/java/drda/org/apache/derby/drda/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/drda/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/drda/build.xml (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/drda/build.xml Sun Jan 24 14:43:28 2016
@@ -44,8 +44,8 @@
 
   <target name="compile">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -57,7 +57,7 @@
       srcdir="${derby.drda.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/drda/*.java"/>
       <exclude name="${derby.dir}/drda/NetServlet.java"/>
@@ -67,8 +67,8 @@
 
   <target name="servlet" depends="checkservletjar" if="servletjar.available">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -81,7 +81,7 @@
       destdir="${out.dir}">
       <classpath>
         <pathelement location="${servlet24}"/>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/drda/NetServlet.java"/>
       <compilerarg value="-Xlint:unchecked"/>

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/build.xml (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/build.xml Sun Jan 24 14:43:28 2016
@@ -37,8 +37,8 @@
 
   <target name="compile">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -50,7 +50,7 @@
       srcdir="${derby.drda.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/impl/drda/*.java"/>
       <!-- <compilerarg value="-Xlint:unchecked"/> -->

Modified: db/derby/code/trunk/java/engine/org/apache/derby/agg/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/agg/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/agg/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/agg/build.xml Sun Jan 24 14:43:28 2016
@@ -38,8 +38,8 @@
   <target name="compile_agg">
 
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -51,7 +51,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/agg/*.java"/>
       <compilerarg value="-Xlint:unchecked"/>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/authentication/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/authentication/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/authentication/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/authentication/build.xml Sun Jan 24 14:43:28 2016
@@ -37,8 +37,8 @@
 
   <target name="compile_authentication">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -50,7 +50,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/authentication/**"/>
       <compilerarg value="-Xlint:unchecked"/>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/catalog/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/build.xml Sun Jan 24 14:43:28 2016
@@ -37,8 +37,8 @@
 
   <target name="compile_catalog">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -50,7 +50,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/catalog/**"/>
       <compilerarg value="-Xlint:unchecked"/>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/database/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/database/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/database/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/database/build.xml Sun Jan 24 14:43:28 2016
@@ -37,8 +37,8 @@
 
   <target name="compile_database">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -50,7 +50,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/database/**"/>
       <compilerarg value="-Xlint:unchecked"/>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/diag/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/diag/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/diag/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/diag/build.xml Sun Jan 24 14:43:28 2016
@@ -37,8 +37,8 @@
 
   <target name="compile_diag">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -50,7 +50,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/diag/**"/>
       <compilerarg value="-Xlint:unchecked"/>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml Sun Jan 24 14:43:28 2016
@@ -36,8 +36,8 @@
   <target name="iapi">
 
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -48,7 +48,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-         <pathelement path="${java16compile.classpath}"/>
+         <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/iapi/error/**"/>
       <compilerarg value="-Xlint:unchecked"/>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/build.xml Sun Jan 24 14:43:28 2016
@@ -36,8 +36,8 @@
 
   <target name="compile_iapi_db">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -49,7 +49,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/iapi/db/*.java"/>
       <!-- <compilerarg value="-Xlint:unchecked"/> -->

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=1726495&r1=1726494&r2=1726495&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 Sun Jan 24 14:43:28 2016
@@ -41,8 +41,8 @@
 
   <target name="compile_jdbc4" >
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -54,7 +54,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/${cur.dir}/*.java"/>
 	  <exclude name="${derby.dir}/${cur.dir}/*42.java"/>
@@ -64,8 +64,8 @@
 
   <target name="compile_jdbc42" if="vmLevelIsAtLeast1.8">
       <javac
-          source="${compilerLevel16}"
-          target="${compilerLevel16}"
+          source="1.8"
+          target="1.8"
           bootclasspath="${empty}"
           nowarn="on"
           debug="${debug}"

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/build.xml Sun Jan 24 14:43:28 2016
@@ -36,8 +36,8 @@
 
   <target name="compile_reference">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -49,7 +49,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/iapi/reference/**"/>
       <!-- <compilerarg value="-Xlint:unchecked"/> -->

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml Sun Jan 24 14:43:28 2016
@@ -36,8 +36,8 @@
 
   <target name="compile">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -49,7 +49,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/iapi/services/**"/>
       <exclude name="${derby.dir}/iapi/crypto/io/**"/>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml Sun Jan 24 14:43:28 2016
@@ -35,8 +35,8 @@
 <!-- Targets -->
   <target name="compile_crypto">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -48,7 +48,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-         <pathelement path="${java16compile.classpath}"/>
+         <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/iapi/services/crypto/*.java"/>
       <!-- <compilerarg value="-Xlint:unchecked"/> -->

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayUtil.java?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayUtil.java Sun Jan 24 14:43:28 2016
@@ -92,6 +92,7 @@ public abstract class ArrayUtil
      * Make the contents of an array available as a read-only list. If the
      * array is null, an empty list will be returned.
      */
+    @SafeVarargs
     public static <T> List<T> asReadOnlyList(T... array) {
         if (array == null) {
             return Collections.emptyList();

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/build.xml Sun Jan 24 14:43:28 2016
@@ -37,12 +37,10 @@
 
 <!-- Targets -->
 
-  <target name="compile" depends="checkVMLevel,compile_iapi_services_io,compile_iapi_services_io_jdk7"/>
-
-  <target name="compile_iapi_services_io">
+  <target name="compile">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -54,38 +52,12 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/iapi/services/io/*.java"/>
-      <exclude name="${derby.dir}/iapi/services/io/FilePermissionServiceImpl.java"/>
       <!-- <compilerarg value="-Xlint:unchecked"/> -->
     </javac>
   </target>
 
-<target name="compile_iapi_services_io_jdk7" if="vmLevelIsAtLeast1.7">
-    <javac
-      source="1.7"
-      target="1.7"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="${debug}"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}"
-      srcdir="${derby.engine.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${java17compile.classpath}"/>
-      </classpath>
-      <include name="${derby.dir}/iapi/services/io/FilePermissionServiceImpl.java"/>
-      <compilerarg value="-Xlint:unchecked"/>
-    </javac>
-  </target>
-
-  <target name="checkVMLevel">
-    <available classname="java.sql.PseudoColumnUsage" property="vmLevelIsAtLeast1.7"/>
-  </target>
 </project>
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/build.xml Sun Jan 24 14:43:28 2016
@@ -37,8 +37,8 @@
   <target name="compile">
 
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -50,7 +50,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/iapi/sql/**"/>
       <compilerarg value="-Xlint:unchecked"/>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/build.xml Sun Jan 24 14:43:28 2016
@@ -37,8 +37,8 @@
   <target name="compile">
 
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -50,7 +50,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/iapi/store/**"/>
       <compilerarg value="-Xlint:unchecked"/>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/build.xml Sun Jan 24 14:43:28 2016
@@ -36,8 +36,8 @@
 
   <target name="compile_types">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -49,7 +49,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/iapi/types/*.java"/>
       <compilerarg value="-Xlint:unchecked"/>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/build.xml Sun Jan 24 14:43:28 2016
@@ -36,8 +36,8 @@
 
   <target name="compile_util">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -49,7 +49,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/iapi/util/*.java"/>
       <compilerarg value="-Xlint:unchecked"/>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/db/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/db/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/db/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/db/build.xml Sun Jan 24 14:43:28 2016
@@ -36,8 +36,8 @@
 
   <target name="compile">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -49,7 +49,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/impl/db/**"/>
       <compilerarg value="-Xlint:unchecked"/>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/io/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/io/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/io/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/io/build.xml Sun Jan 24 14:43:28 2016
@@ -36,8 +36,8 @@
 
   <target name="compile_impl_io">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -49,7 +49,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/impl/io/**"/>
       <compilerarg value="-Xlint:unchecked"/>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml Sun Jan 24 14:43:28 2016
@@ -38,8 +38,8 @@
 
   <target name="compile_jdbc4">
 	    <javac
-	      source="1.6"
-	      target="1.6"
+	      source="1.8"
+	      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -51,7 +51,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/impl/jdbc/**"/>
 	  <exclude name="${derby.dir}/impl/jdbc/*42.java"/>
@@ -63,8 +63,8 @@
 
 <target name="compile_jdbc42" depends="compile_jdbc4"  if="vmLevelIsAtLeast1.8">
     <javac
-      source="${compilerLevel16}"
-      target="${compilerLevel16}"
+      source="1.8"
+      target="1.8"
         bootclasspath="${empty}"
         nowarn="on"
         debug="${debug}"

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/load/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/load/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/load/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/load/build.xml Sun Jan 24 14:43:28 2016
@@ -36,8 +36,8 @@
 
   <target name="compile">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -49,7 +49,7 @@
       srcdir="${derby.engine.src.dir};${derby.tools.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/impl/load/**"/>
       <compilerarg value="-Xlint:unchecked"/>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/build.xml Sun Jan 24 14:43:28 2016
@@ -36,8 +36,8 @@
 
   <target name="compile_impl_services">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -49,7 +49,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/impl/services/**"/>
       <compilerarg value="-Xlint:unchecked"/>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/build.xml Sun Jan 24 14:43:28 2016
@@ -89,8 +89,8 @@
   <target name="compile" depends="parser">
 
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -102,7 +102,7 @@
       srcdir="${derby.engine.src.dir}:${generated.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/${cur.dir}/**"/>
       <compilerarg value="-Xlint:unchecked"/>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/build.xml Sun Jan 24 14:43:28 2016
@@ -36,8 +36,8 @@
 
   <target name="compile_impl_store">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -49,7 +49,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/impl/store/**"/>
       <compilerarg value="-Xlint:unchecked"/>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/io/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/io/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/io/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/io/build.xml Sun Jan 24 14:43:28 2016
@@ -37,8 +37,8 @@
 
   <target name="compile_io">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -50,7 +50,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/io/**"/>
       <compilerarg value="-Xlint:unchecked"/>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml Sun Jan 24 14:43:28 2016
@@ -37,8 +37,8 @@
 
   <target name="compile_jdbc4" >
     <javac
-      source="${compilerLevel16}"
-      target="${compilerLevel16}"
+      source="1.8"
+      target="1.8"
         bootclasspath="${empty}"
         nowarn="on"
         debug="${debug}"
@@ -50,7 +50,7 @@
         srcdir="${derby.engine.src.dir}"
         destdir="${out.dir}">
         <classpath>
-            <pathelement path="${java16compile.classpath}"/>
+            <pathelement path="${java18compile.classpath}"/>
         </classpath>
         <include name="${derby.dir}/jdbc/*.java"/>
         <exclude name="${derby.dir}/jdbc/*42.java"/>
@@ -60,8 +60,8 @@
 
   <target name="compile_jdbc42" if="vmLevelIsAtLeast1.8">
     <javac
-      source="${compilerLevel16}"
-      target="${compilerLevel16}"
+      source="1.8"
+      target="1.8"
         bootclasspath="${empty}"
         nowarn="on"
         debug="${debug}"

Modified: db/derby/code/trunk/java/engine/org/apache/derby/mbeans/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/mbeans/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/mbeans/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/mbeans/build.xml Sun Jan 24 14:43:28 2016
@@ -35,8 +35,8 @@
 <!-- Targets -->
   <target name="compile_mbeans">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -48,7 +48,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <sourcepath>
       </sourcepath>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/modules.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/modules.properties?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/modules.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/modules.properties Sun Jan 24 14:43:28 2016
@@ -162,13 +162,6 @@ cloudscape.config.cryptographyJ2=derby
 # Connectivity
 ######################
 
-# jdbc40 - requires JDK 1.6 (which is constant 7 in Derby)
-#
-derby.module.jdbcJ6=org.apache.derby.jdbc.InternalDriver
-derby.env.jdk.jdbcJ6=7
-derby.env.classes.jdbcJ6=java.sql.Driver
-cloudscape.config.jdbcJ6=derby
-
 # jdbc42 - requires JDK 1.8 (which is constant 9 in Derby)
 #
 derby.module.jdbcJ8=org.apache.derby.jdbc.Driver42

Modified: db/derby/code/trunk/java/engine/org/apache/derby/osgi/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/osgi/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/osgi/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/osgi/build.xml Sun Jan 24 14:43:28 2016
@@ -37,8 +37,8 @@
 
   <target name="compile_osgi">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -51,7 +51,7 @@
       destdir="${out.dir}">
       <classpath>
 		<pathelement location="${osgi}"/>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/osgi/*.java"/>
       <!-- <compilerarg value="-Xlint:unchecked"/> -->

Modified: db/derby/code/trunk/java/engine/org/apache/derby/security/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/security/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/security/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/security/build.xml Sun Jan 24 14:43:28 2016
@@ -37,8 +37,8 @@
 
   <target name="compile_security">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -50,7 +50,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/security/**"/>
       <compilerarg value="-Xlint:unchecked"/>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/vti/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/vti/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/vti/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/vti/build.xml Sun Jan 24 14:43:28 2016
@@ -38,8 +38,8 @@
   <target name="compile_vti">
 
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -51,7 +51,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/vti/*.java"/>
       <compilerarg value="-Xlint:unchecked"/>

Modified: db/derby/code/trunk/java/optional/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/optional/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/optional/build.xml (original)
+++ db/derby/code/trunk/java/optional/build.xml Sun Jan 24 14:43:28 2016
@@ -55,8 +55,8 @@
           description="Build Derby optional tools">
 
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -68,7 +68,7 @@
       srcdir="${derby.optional.src.dir}:${generated.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
         <pathelement path="${lucene_core}"/>
         <pathelement path="${lucene_a_co}"/>
         <pathelement path="${lucene_qp}"/>

Modified: db/derby/code/trunk/java/shared/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/shared/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/shared/build.xml (original)
+++ db/derby/code/trunk/java/shared/build.xml Sun Jan 24 14:43:28 2016
@@ -53,8 +53,8 @@
   <echo level="info" message="building generated sanity info"/>
   <target name="compile">
   	<javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -66,14 +66,14 @@
       srcdir="${generated.src.dir}"
       destdir="${out.dir}">
       <classpath>
-          <pathelement path="${java16compile.classpath}"/>
+          <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <compilerarg value="-Xlint:unchecked"/>
     </javac>
 
   	<javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -86,7 +86,7 @@
       includes="org/apache/derby/shared/**"
       destdir="${out.dir}">
       <classpath>
-          <pathelement path="${java16compile.classpath}"/>
+          <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="org/apache/derby/shared/**"/>
   	  <exclude name="org/apache/derby/shared/common/sanity/ThreadDump.java"/>
@@ -94,8 +94,8 @@
     </javac>
   	
   	<javac
-  	      source="1.6"
-  	      target="1.6"
+  	      source="1.8"
+  	      target="1.8"
   	      bootclasspath="${empty}"
   	      nowarn="on"
   	      debug="${debug}"
@@ -107,7 +107,7 @@
   	      srcdir="${derby.shared.src.dir}"
   	      destdir="${out.dir}">
   	      <classpath>
-  	        <pathelement path="${java16compile.classpath}"/>
+  	        <pathelement path="${java18compile.classpath}"/>
   	      </classpath>
   	    <include name="org/apache/derby/shared/common/sanity/ThreadDump.java"/>
       <compilerarg value="-Xlint:unchecked"/>

Modified: db/derby/code/trunk/java/storeless/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/storeless/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/storeless/build.xml (original)
+++ db/derby/code/trunk/java/storeless/build.xml Sun Jan 24 14:43:28 2016
@@ -60,8 +60,8 @@
           </fileset>
         </copy>
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -74,7 +74,7 @@
       destdir="${out.storeless.dir}">
       <classpath>
       	  <pathelement path="${out.dir}"/>
-          <pathelement path="${java16compile.classpath}"/>
+          <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <compilerarg value="-Xlint:unchecked"/>
     </javac>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/build.xml?rev=1726495&r1=1726494&r2=1726495&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/build.xml Sun Jan 24 14:43:28 2016
@@ -48,8 +48,8 @@
 
     <target name="compile_jdbc4" depends="copyfiles">
         <javac
-          source="${compilerLevel16}"
-          target="${compilerLevel16}"
+          source="1.8"
+          target="1.8"
             bootclasspath="${empty}"
             nowarn="on"
             debug="true"
@@ -61,7 +61,7 @@
             srcdir="${derby.testing.src.dir}"
             destdir="${out.dir}">
             <classpath>
-                <pathelement path="${java16compile.classpath}"/>
+                <pathelement path="${java18compile.classpath}"/>
 		        <pathelement path="${junit}"/>
             </classpath>
             <include name="${this.dir}/*.java"/>
@@ -72,8 +72,8 @@
 
     <target name="compile_jdbc42" if="vmLevelIsAtLeast1.8">
         <javac
-          source="${compilerLevel16}"
-          target="${compilerLevel16}"
+          source="1.8"
+          target="1.8"
             bootclasspath="${empty}"
             nowarn="on"
             debug="true"

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=1726495&r1=1726494&r2=1726495&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 Sun Jan 24 14:43:28 2016
@@ -93,8 +93,8 @@
   <target name="compile" depends="parser">
 
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -106,7 +106,7 @@
       srcdir="${derby.tools.src.dir}:${generated.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/impl/tools/**"/>
       <compilerarg value="-Xlint:unchecked"/>

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=1726495&r1=1726494&r2=1726495&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 Sun Jan 24 14:43:28 2016
@@ -37,8 +37,8 @@
 
   <target name="compile">
     <javac
-      source="1.6"
-      target="1.6"
+      source="1.8"
+      target="1.8"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -50,7 +50,7 @@
       srcdir="${derby.tools.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java16compile.classpath}"/>
+        <pathelement path="${java18compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/tools/*.java"/>
       <compilerarg value="-Xlint:unchecked"/>



Mime
View raw message