Repository: commons-dbcp Updated Branches: refs/heads/master 131e4926b -> 9a9be4855
[DBCP-492] Drop Ant build. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/9a9be485 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/9a9be485 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/9a9be485 Branch: refs/heads/master Commit: 9a9be4855f3d7b826e6ea1de690275bd7b1da81c Parents: 131e492 Author: Gary Gregory <[email protected]> Authored: Mon May 21 10:25:06 2018 -0600 Committer: Gary Gregory <[email protected]> Committed: Mon May 21 10:25:06 2018 -0600 ---------------------------------------------------------------------- build.properties.sample | 58 --------- build.xml | 283 ------------------------------------------- src/changes/changes.xml | 3 + 3 files changed, 3 insertions(+), 341 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/9a9be485/build.properties.sample ---------------------------------------------------------------------- diff --git a/build.properties.sample b/build.properties.sample deleted file mode 100644 index 2aed382..0000000 --- a/build.properties.sample +++ /dev/null @@ -1,58 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -########################################################################## -# Sample Ant build.properties file -# -# This setup assumes dependent jars are in a local maven 2 repository. -# However the jars are located, the properties ending in ".jar" need to -# expand to full paths to the jars. -########################################################################## - -# Repository base path -repository=${user.home}/.m2/repository - -# Maven-generated jar to validate in test-jar target -dbcp.jar=./target/commons-dbcp2-2.3.0-SNAPSHOT.jar - -# commons-pool.jar - path to commons-pool2 jar -commons-pool.home=${repository}/org/apache/commons/commons-pool2/2.5.0 -commons-pool.jar=${commons-pool.home}/commons-pool2-2.5.0.jar - -# JUnit -junit.home=${repository}/junit/junit/4.12 -junit.jar=${junit.home}/junit-4.12.jar -hamcrest.jar=${repository}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar - -# XML parser -xerces.home=${repository}/xerces/xercesImpl/2.4.0 -xerces.jar=${xerces.home}/xercesImpl-2.4.0.jar - -# Tomcat naming jars - needed only for JNDI tests -naming.common.home=${repository}/tomcat/naming-common/5.0.28 -naming-common.jar=${naming.common.home}/naming-common-5.0.28.jar -naming.java.home=${repository}/tomcat/naming-java/5.0.28 -naming-java.jar=${naming.java.home}/naming-java-5.0.28.jar - -# Commons logging - dependency of naming jars -commons-logging.home=${repository}/commons-logging/commons-logging/1.2 -commons-logging.jar=${commons-logging.home}/commons-logging-1.2.jar - -# JTA - needed for managed connections -jta-spec.jar=${repository}/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1.jar -jta-impl.jar=${repository}/org/apache/geronimo/modules/geronimo-transaction/1.2-beta/geronimo-transaction-1.2-beta.jar - -# JTA dependencies - required so the test cases run -backport-util-concurrent.jar=${repository}/backport-util-concurrent/backport-util-concurrent/2.2/backport-util-concurrent-2.2.jar -ejb-spec.jar=${repository}/org/apache/geronimo/specs/geronimo-ejb_2.1_spec/1.1/geronimo-ejb_2.1_spec-1.1.jar http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/9a9be485/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml deleted file mode 100644 index 8f9c15b..0000000 --- a/build.xml +++ /dev/null @@ -1,283 +0,0 @@ -<!-- -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - --> - -<!-- $Id$ --> -<project name="commons-dbcp2" default="test" basedir="."> - - <target name="init"> - <tstamp/> - - <!-- read properties from the build.properties, if any --> - <property name="component-propfile" value="${basedir}/build.properties"/> - <property file="${component-propfile}"/> - - <!-- read properties from the ${user.home}/propfile, if any --> - <property name="user-propfile" value="${user.home}/build.properties"/> - <property file="${user-propfile}"/> - - <!-- command line classpath, if any --> - <property name="cp" value=""/> - - <!-- now combine the classpaths --> - <property name="classpath" - value="${cp}:${commons-pool.jar}:${junit.jar}:${hamcrest.jar}: - ${naming-common.jar}:${naming-java.jar}:${commons-logging.jar}: - ${jta-spec.jar}:${jta-impl.jar}: - ${backport-util-concurrent.jar}:${ejb-spec.jar}"/> - - <property name="name" value="commons-dbcp2"/> - <property name="title" value="Apache Commons Database Pooling Package"/> - <property name="version" value="2.3.0-SNAPSHOT"/> - <property name="package" value="org.apache.commons.dbcp2.*"/> - - <property name="build.dir" value="${basedir}/build"/> - <property name="build.classes.dir" value="${build.dir}/classes"/> - <property name="build.test-classes.dir" value="${build.dir}/test-classes"/> - <property name="dist.dir" value="${basedir}/dist"/> - <property name="dist.jar" value="${dist.dir}/${name}-${version}.jar"/> - - <property name="src.dir" value="${basedir}/src"/> - <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="test.failonerror" value="true" /> - <property name="test.runner" value="junit.textui.TestRunner" /> - - <property name="javadoc.dir" value="${dist.dir}/docs/api"/> - <property name="javadoc.bottom" value="<small>Copyright &copy; 2001-2018 Apache Software Foundation. Documentation generated ${TODAY}</small>."/> - <property name="javadoc.overview" value="${basedir}/src/main/java/org/apache/commons/dbcp2/overview.html"/> - - <property name="javac.optimize" value="false"/> - <property name="javac.debug" value="true"/> - <property name="javac.deprecation" value="false"/> - </target> - - <target name="check_jar"> - <available file="${file}" property="found"/> - <antcall target="check_message"/> - </target> - - <target name="check_message" unless="found"> - <!-- echo could be replaced with fail if required --> - <echo message="Could not find ${file}"/> - </target> - - <!-- Check that all the dependencies exist --> - <target name="check_depends" depends="init"> - <echo>Checking dependencies</echo> - <antcall target="check_jar"> - <param name="file" value="${commons-pool.jar}"/> - </antcall> - <antcall target="check_jar"> - <param name="file" value="${junit.jar}"/> - </antcall> - <antcall target="check_jar"> - <param name="file" value="${naming-common.jar}"/> - </antcall> - <antcall target="check_jar"> - <param name="file" value="${naming-java.jar}"/> - </antcall> - <antcall target="check_jar"> - <param name="file" value="${commons-logging.jar}"/> - </antcall> - <antcall target="check_jar"> - <param name="file" value="${jta-spec.jar}"/> - </antcall> - <antcall target="check_jar"> - <param name="file" value="${jta-impl.jar}"/> - </antcall> - <antcall target="check_jar"> - <param name="file" value="${backport-util-concurrent.jar}"/> - </antcall> - <antcall target="check_jar"> - <param name="file" value="${ejb-spec.jar}"/> - </antcall> - </target> - - <!-- ######################################################### --> - - <target name="clean" depends="init" description="removes generated files"> - <delete dir="${build.dir}"/> - <delete dir="${dist.dir}"/> - <echo>${classpath}</echo> - </target> - - <target name="prepare" depends="init"/> - - <target name="javadoc" depends="prepare" description="generates javadocs"> - <mkdir dir="${javadoc.dir}"/> - <javadoc packagenames="org.*" - sourcepath="${src.java.dir}" - classpath="${classpath}" - destdir="${javadoc.dir}" - windowtitle="${title}" - doctitle="${title}" - bottom="${javadoc.bottom}" - overview="${javadoc.overview}" - public="true" - version="true" - author="true" - splitindex="false" - nodeprecated="true" - nodeprecatedlist="true" - notree="true" - noindex="false" - nohelp="true" - nonavbar="false" - serialwarn="false"> - <link href="http://docs.oracle.com/javase/7/docs/api/"/> - <link href="http://commons.apache.org/pool/apidocs"/> - </javadoc> - </target> - - <!-- ######################################################### --> - - <target name="compile" depends="check_depends,prepare" description="compiles source files"> - <mkdir dir="${build.classes.dir}"/> - <javac destdir="${build.classes.dir}" - srcdir="${src.java.dir}" - classpath="${classpath}" - includeantruntime="false" - debug="${javac.debug}" - deprecation="${javac.deprecation}" - optimize="${javac.optimize}" - source="${javac.source}"> - </javac> - <copy todir="${build.classes.dir}" > - <fileset dir="${src.resource.dir}"/> - </copy> - </target> - - <target name="compile-test" depends="compile"> - <mkdir dir="${build.test-classes.dir}"/> - <javac destdir="${build.test-classes.dir}" - srcdir="${src.test.dir}" - debug="${javac.debug}" - includeantruntime="false" - deprecation="${javac.deprecation}" - optimize="${javac.optimize}" - source="${javac.source}"> - <classpath> - <pathelement location="${build.classes.dir}" /> - <pathelement location="${build.test-classes.dir}" /> - <pathelement path="${classpath}" /> - </classpath> - </javac> - </target> - - <target name="test" depends="compile-test" description="runs (junit) unit tests"> - <echo message="${classpath}"/> - <mkdir dir="${build.dir}/ant-reports"/> - <junit printsummary="true" showoutput="true" fork="yes" haltonfailure="${test.failonerror}"> - <classpath> - <pathelement location="${build.classes.dir}" /> - <pathelement location="${build.test-classes.dir}" /> - <pathelement path="${classpath}" /> - </classpath> - <sysproperty key="org.apache.commons.logging.Log" - value="org.apache.commons.dbcp2.StackMessageLog"/> - <formatter type="plain" usefile="true" /> - <!-- If test.entry is defined, run a single test, otherwise run all valid tests --> - <test name="${test.entry}" if="test.entry"/> - <batchtest todir="${build.dir}/ant-reports" unless="test.entry"> - <fileset dir="${src.test.dir}"> - <include name="**/*Test*.java"/> - <!-- Test support files --> - <exclude name="**/Tester*.java"/> - <!-- Ant JUnit does not handle abstract classes --> - <exclude name="**/TestConnectionPool.java"/> - </fileset> - </batchtest> - </junit> - </target> - - <!-- Target to test that maven-generated jar works against test sources. --> - <target name="test-jar" depends="compile-test" description="runs (junit) unit tests"> - <echo message="${classpath}"/> - <mkdir dir="${build.dir}/ant-reports"/> - <junit printsummary="true" showoutput="true" fork="yes" haltonfailure="${test.failonerror}"> - <classpath> - <pathelement location="${build.test-classes.dir}" /> - <pathelement path="${classpath}:${dbcp.jar}" /> - </classpath> - <sysproperty key="org.apache.commons.logging.Log" - value="org.apache.commons.dbcp2.StackMessageLog"/> - <formatter type="plain" usefile="true" /> - <!-- If test.entry is defined, run a single test, otherwise run all valid tests --> - <test name="${test.entry}" if="test.entry"/> - <batchtest todir="${build.dir}/ant-reports" unless="test.entry"> - <fileset dir="${src.test.dir}"> - <include name="**/*Test*.java"/> - <!-- Test support files --> - <exclude name="**/Tester*.java"/> - <!-- Ant JUnit does not handle abstract classes --> - <exclude name="**/TestConnectionPool.java"/> - </fileset> - </batchtest> - </junit> - </target> - - <target name="build-jar" depends="compile"> - <mkdir dir="${dist.dir}"/> - <jar jarfile="${dist.jar}"> - <fileset dir="${build.classes.dir}"/> - <metainf dir="${basedir}" includes="LICENSE.txt,NOTICE.txt"/> - <manifest> - <attribute name="Built-By" value="${user.name}"/> - <attribute name="Package" value="${package}"/> - <attribute name="Extension-Name" value="${name}"/> - <attribute name="Specification-Vendor" value="Apache Software Foundation"/> - <attribute name="Specification-Title" value="${title}"/> - <attribute name="Implementation-Version" value="${version}"/> - <attribute name="Implementation-Vendor" value="Apache Software Foundation"/> - </manifest> - </jar> - </target> - - <target name="build" depends="clean,build-jar,javadoc"> - <copy todir="${dist.dir}" file="${basedir}/LICENSE.txt"/> - <copy todir="${dist.dir}" file="${basedir}/NOTICE.txt"/> - <copy todir="${dist.dir}" file="${basedir}/README.txt"/> - </target> - - <target name="dist" depends="build" description="gump target"/> - - <target name="mock-jar" depends="compile-test" description="Bundles mock JDBC objects"> - <mkdir dir="${dist.dir}"/> - <jar jarfile="${mock.jar}"> - <fileset dir="${build.test-classes.dir}"> - <include name="**/Tester*.class"/> - </fileset> - <metainf dir="${basedir}" includes="LICENSE.txt,NOTICE.txt"/> - <manifest> - <attribute name="Built-By" value="${user.name}"/> - <attribute name="Package" value="${package}"/> - <attribute name="Extension-Name" value="${name}-mocks"/> - <attribute name="Specification-Vendor" value="Apache Software Foundation"/> - <attribute name="Specification-Title" value="${title}"/> - <attribute name="Implementation-Version" value="${version}"/> - <attribute name="Implementation-Vendor" value="Apache Software Foundation"/> - </manifest> - </jar> - </target> -</project> http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/9a9be485/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 8ce59f5..9f36c1e 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -64,6 +64,9 @@ The <action> type attribute can be add,update,fix,remove. <action dev="ggregory" type="fix" issue="DBCP-484" due-to="Emanuel Freitas"> Connection leak during XATransaction in high load. </action> + <action dev="ggregory" type="update" issue="DBCP-492" due-to="Gary Gregory"> + Drop Ant build. + </action> </release> <release version="2.3.0" date="2018-05-12" description="This is a minor release, including bug fixes and enhancements."> <action dev="pschumacher" type="fix" issue="DBCP-476" due-to="Gary Evesson, Richard Cordova">
