2018-12-13 16:54:49 +00:00
committed by Git OBS Bridge
parent b80064ec43
commit cc9c65cdca
9 changed files with 502 additions and 45 deletions

View File

@@ -1,27 +1,35 @@
--- commons-dbcp2-2.1.1-src/build.xml 2018-05-15 11:17:10.227422992 +0200
+++ commons-dbcp2-2.1.1-src/build.xml 2018-05-15 11:24:49.257464289 +0200
@@ -58,7 +58,8 @@
<property name="src.java.dir" value="${src.dir}/main/java"/>
<property name="src.resource.dir" value="${src.dir}/main/resources"/>
<property name="src.test.dir" value="${src.dir}/test/java"/>
- <property name="javac.source" value="1.7" />
+ <property name="javac.source" value="8" />
+ <property name="javac.target" value="8" />
--- commons-dbcp-1.4-src/build.xml 2010-02-07 17:59:20.000000000 +0100
+++ commons-dbcp-1.4-src/build.xml 2018-12-13 17:31:58.987624926 +0100
@@ -133,6 +133,7 @@
<property name="src.java.dir" value="${src.dir}/java"/>
<property name="src.test.dir" value="${src.dir}/test"/>
<property name="javac.source" value="1.4" />
+ <property name="javac.target" value="1.4" />
<property name="test.failonerror" value="true" />
<property name="test.runner" value="junit.textui.TestRunner" />
@@ -161,7 +160,8 @@
<mkdir dir="${src.dir}"/>
<copy todir="${src.dir}" filtering="yes">
@@ -153,7 +154,8 @@
<property name="src.dir" value="${basedir}/src"/>
<property name="src.java.dir" value="${src.dir}/java"/>
<property name="src.test.dir" value="${src.dir}/test"/>
- <property name="javac.source" value="1.5" />
+ <property name="javac.source" value="1.7" />
+ <property name="javac.target" value="1.7" />
</target>
<target name="prepare" depends="init,prepare-nojdbc4,prepare-jdbc4"/>
@@ -194,7 +196,8 @@
debug="${javac.debug}"
deprecation="${javac.deprecation}"
optimize="${javac.optimize}"
- source="${javac.source}">
+ source="${javac.source}"
+ target="${javac.target}">
</javac>
<copy todir="${build.classes.dir}" >
<fileset dir="${src.resource.dir}"/>
@@ -176,7 +176,8 @@
includeantruntime="false"
<exclude name="org/apache/commons/dbcp/BasicDataSourceFactory.java"
unless="jndi.present"/>
<exclude name="org/apache/commons/dbcp/datasources/**"
@@ -211,7 +214,8 @@
debug="${javac.debug}"
deprecation="${javac.deprecation}"
optimize="${javac.optimize}"
- source="${javac.source}">