This is an automated email from the ASF dual-hosted git repository.
rmaucher pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 46a068ab97 Drop the Ant test and release
46a068ab97 is described below
commit 46a068ab97505431f2f51e12080248b3a6f6eaac
Author: remm <[email protected]>
AuthorDate: Tue Oct 27 12:41:25 2026 +0100
Drop the Ant test and release
I think using Maven is more reasonable than trying to maintain both.
---
modules/jdbc-pool/build.properties.default | 71 ------
modules/jdbc-pool/build.xml | 345 +----------------------------
2 files changed, 2 insertions(+), 414 deletions(-)
diff --git a/modules/jdbc-pool/build.properties.default
b/modules/jdbc-pool/build.properties.default
index e300ecb797..28701722ab 100644
--- a/modules/jdbc-pool/build.properties.default
+++ b/modules/jdbc-pool/build.properties.default
@@ -22,24 +22,11 @@
# in the top-level source directory, and customize it as needed.
# -----------------------------------------------------------------------------
-# ----- Version Control Flags -----
-version.major=1
-version.minor=1
-version.build=0
-version.patch=1
-version.suffix=
-
# ----- Reproducible builds -----
# Uncomment and set to current time for reproducible builds
#2021-03-18T06:00:00Z
#ant.tstamp.now=1616047200
-# ----- Default Base Path for Dependent Packages -----
-# Please note this path must be absolute, not relative,
-# as it is referenced with different working directory
-# contexts by the various build scripts.
-base.path=${basedir}/includes
-
compile.source=1.8
compile.target=1.8
compile.release=8
@@ -47,61 +34,3 @@ compile.debug=true
# Do not pass -deprecation (-Xlint:deprecation) flag to javac
compile.deprecation=false
-
-# ----- Settings for Junit test database.
-
-# Common settings
-testdb.username=root
-testdb.password=password
-
-# H2
-testdb.url=jdbc:h2:~/.h2/test;QUERY_TIMEOUT=0;DB_CLOSE_ON_EXIT=TRUE;LOCK_TIMEOUT=50000;DEFAULT_LOCK_TIMEOUT=50000
-testdb.driverClassName=org.h2.Driver
-testdb.validationQuery=SELECT 1
-
-# MySQL
-#testdb.url=jdbc:mysql://localhost:3306/mysql?autoReconnect=true
-#testdb.driverClassName=com.mysql.jdbc.Driver
-#testdb.validationQuery=SELECT 1
-
-# Derby
-#testdb.url=jdbc:derby:derbyDB;create=true
-#testdb.driverClassName=org.apache.derby.jdbc.EmbeddedDriver
-#testdb.validationQuery=VALUES 1
-
-# JUnit Unit Test Suite
-junit.version=4.13
-junit.home=${base.path}/junit-${junit.version}
-junit.jar=${junit.home}/junit-${junit.version}.jar
-junit.loc=https://repo.maven.apache.org/maven2/junit/junit/${junit.version}/junit-${junit.version}.jar
-
-# Hamcrest Library, used by JUnit
-hamcrest.version=2.2
-hamcrest.home=${base.path}/hamcrest-${hamcrest.version}
-hamcrest.jar=${hamcrest.home}/hamcrest-${hamcrest.version}.jar
-hamcrest.loc=https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest/${hamcrest.version}/hamcrest-${hamcrest.version}.jar
-
-mysql.home=${base.path}/mysql-connector-java-5.1.12
-mysql.jar=${mysql.home}/mysql-connector-java-5.1.12-bin.jar
-mysql.loc=http://mysql.mirrors.hoobly.com/Downloads/Connector-J/mysql-connector-java-5.1.12.zip
-
-tomcat.version=8.0.14
-tomcat.home=${base.path}/apache-tomcat-${tomcat.version}
-tomcat.dbcp.jar=${tomcat.home}/lib/tomcat-dbcp.jar
-tomcat.juli.jar=${tomcat.home}/bin/tomcat-juli.jar
-tomcat.loc=https://archive.apache.org/dist/tomcat/tomcat-8/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip
-
-tomcat.project.loc=https://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/project.xml
-tomcat.project.dest=${base.path}/project.xml
-
-tomcat.xsl.loc=https://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/tomcat-docs.xsl
-tomcat.xsl.dest=${base.path}/tomcat-docs.xsl
-
-derby.home=${base.path}/db-derby-10.5.1.1-bin
-derby.loc=https://archive.apache.org/dist/db/derby/db-derby-10.5.1.1/db-derby-10.5.1.1-bin.tar.gz
-derby.jar=${derby.home}/lib/derby.jar
-
-h2.version=2.1.210
-h2.home=${base.path}/h2-${h2.version}
-h2.loc=https://repo.maven.apache.org/maven2/com/h2database/h2/${h2.version}/h2-${h2.version}.jar
-h2.jar=${h2.home}/h2-${h2.version}.jar
diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml
index 86fab9bc1e..77a6c837ed 100644
--- a/modules/jdbc-pool/build.xml
+++ b/modules/jdbc-pool/build.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
<!-- Basedir points at tomcat-trunk directory -->
-<project name="Tomcat JDBC Pool" default="simplebuild" basedir=".">
+<project name="Tomcat JDBC Pool" default="build" basedir=".">
<!-- ===================== Initialize Property Values =================== -->
@@ -53,14 +53,11 @@
<property name="tomcat.build" value="${tomcat.pool}/build"/>
<property name="tomcat.classes" value="${tomcat.pool}/classes"/>
<property name="tomcat.api" value="${tomcat.pool}/api"/>
- <property name="tomcat.testclasses" value="${tomcat.pool}/testclasses"/>
<property name="tomcat.mbeans" value="${tomcat.pool}/mbeans"/>
<!-- JAR Artifacts -->
<property name="tomcat-jdbc.jar" value="${tomcat.pool}/tomcat-jdbc.jar"/>
<property name="tomcat-jdbc-src.jar"
value="${tomcat.pool}/tomcat-jdbc-src.jar"/>
- <property name="tomcat-jdbc-test.jar"
value="${tomcat.pool}/tomcat-jdbc-test.jar"/>
- <property name="tomcat-jdbc-test-src.jar"
value="${tomcat.pool}/tomcat-jdbc-test-src.jar"/>
<property name="tomcat-jdbc-api.jar"
value="${tomcat.pool}/tomcat-jdbc-api.jar"/>
<!-- Classpath -->
<path id="tomcat.jdbc.classpath">
@@ -68,18 +65,6 @@
<pathelement location="${tomcat.juli.jar}"/>
</path>
- <path id="test.classpath">
- <pathelement location="${tomcat-jdbc.jar}"/>
- <pathelement location="${tomcat.testclasses}"/>
- <pathelement location="${c3p0.jar}"/>
- <pathelement location="${mysql.jar}"/>
- <pathelement location="${junit.jar}"/>
- <pathelement location="${hamcrest.jar}"/>
- <pathelement location="${tomcat.dbcp.jar}"/>
- <pathelement location="${derby.jar}"/>
- <pathelement location="${h2.jar}"/>
- </path>
-
<fileset id="license.notice" dir="${tomcat.pool}">
<include name="NOTICE"/>
<include name="LICENSE"/>
@@ -101,7 +86,6 @@
<target name="prepare">
<mkdir dir="${tomcat.build}"/>
<mkdir dir="${tomcat.classes}"/>
- <mkdir dir="${tomcat.testclasses}"/>
<copy todir="${tomcat.pool}">
<fileset dir="${basedir}">
<include name="LICENSE"/>
@@ -158,7 +142,7 @@
<delete
file="${basedir}/src/main/java/org/apache/tomcat/jdbc/pool/package.html"/>
</target>
- <target name="build" depends="prepare,download,build-src">
+ <target name="build" depends="prepare,build-src">
<!-- compile org.apache.tomcat.jdbc-->
<javac srcdir="${basedir}/src/main/java" destdir="${tomcat.classes}"
debug="${compile.debug}"
@@ -195,42 +179,6 @@
</jar>
</target>
- <target name="build-test" depends="prepare, build, download-test">
- <mkdir dir="${tomcat.pool}"/>
- <!-- compile org.apache.tomcat.jdbc-->
- <javac srcdir="${basedir}/src/test/java" destdir="${tomcat.testclasses}"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- release="${compile.release}"
- encoding="ISO-8859-1"
- includeantruntime="false">
- <classpath refid="tomcat.jdbc.classpath"/>
- <classpath refid="test.classpath"/>
- <include name="org/apache/tomcat/jdbc/**" />
- </javac>
- <!-- connection pool JAR File -->
- <jar jarfile="${tomcat-jdbc-test.jar}"
- update="true"
- modificationtime="${tstamp.file}">
- <fileset dir="${tomcat.testclasses}">
- <include name="org/apache/tomcat/jdbc/**" />
- </fileset>
- <fileset dir="${basedir}/src/test/java">
- <include name="org/apache/tomcat/jdbc/**/*.xml" />
- </fileset>
- <fileset refid="license.notice"/>
- </jar>
- <jar jarfile="${tomcat-jdbc-test-src.jar}"
- update="true"
- modificationtime="${tstamp.file}">
- <fileset dir="${basedir}/src/test/java">
- <include name="org/apache/tomcat/jdbc/**" />
- </fileset>
- <fileset refid="license.notice"/>
- </jar>
- </target>
-
-
<target name="clean">
<mkdir dir="${tomcat.pool}"/>
<delete file="${tomcat-jdbc.jar}" />
@@ -247,301 +195,12 @@
</delete>
<delete dir="${tomcat.pool}/doc"/>
<delete dir="${tomcat.classes}"/>
- <delete dir="${tomcat.testclasses}"/>
<delete file="${tomcat.pool}/build.xml"/>
<delete dir="${tomcat.pool}/build"/>
<delete dir="${tomcat.api}"/>
</target>
- <target name="docs" depends="prepare">
- <xslt basedir="${tomcat.pool}/doc"
- destdir="${tomcat.pool}/"
- extension=".html"
- style="${tomcat.xsl.dest}"
- excludes="build.xml project.xml"
- includes="*.xml">
- <param name="relative-path"
expression="https://tomcat.apache.org/tomcat-9.0-doc"/>
- <param name="apache-logo" expression="/images/asf-logo.svg"/>
- </xslt>
- </target>
-
- <target name="dist" depends="clean, build, build-test, docs, javadoc">
- <property name="destdir" value="${tomcat.pool}/release/v${version}"/>
- <mkdir dir="${destdir}"/>
- <zip destfile="${destdir}/apache-tomcat-jdbc-${version}-bin.zip">
- <fileset dir="${tomcat.pool}">
- <include name="jdbc-pool.html"/>
- <include name="changelog.html"/>
- <include name="LICENSE"/>
- <include name="NOTICE"/>
- <include name="tomcat-jdbc.jar"/>
- <include name="tomcat-jdbc-test.jar"/>
- <include name="tomcat-jdbc-src.jar"/>
- <include name="tomcat-jdbc-test-src.jar"/>
- </fileset>
- <fileset dir="${tomcat.home}/bin">
- <include name="tomcat-juli.jar"/>
- </fileset>
- </zip>
- <tar destfile="${destdir}/apache-tomcat-jdbc-${version}-bin.tar">
- <fileset dir="${tomcat.pool}">
- <include name="jdbc-pool.html"/>
- <include name="changelog.html"/>
- <include name="LICENSE"/>
- <include name="NOTICE"/>
- <include name="tomcat-jdbc.jar"/>
- <include name="tomcat-jdbc-test.jar"/>
- <include name="tomcat-jdbc-src.jar"/>
- <include name="tomcat-jdbc-test-src.jar"/>
- </fileset>
- <fileset dir="${tomcat.home}/bin">
- <include name="tomcat-juli.jar"/>
- </fileset>
- </tar>
- <gzip src="${destdir}/apache-tomcat-jdbc-${version}-bin.tar"
- destfile="${destdir}/apache-tomcat-jdbc-${version}-bin.tar.gz"/>
- <delete file="${destdir}/apache-tomcat-jdbc-${version}-bin.tar"/>
-
- <zip destfile="${destdir}/apache-tomcat-jdbc-${version}-src.zip">
- <zipfileset src="${tomcat-jdbc-src.jar}" prefix="java"/>
- <zipfileset src="${tomcat-jdbc-test-src.jar}" prefix="test"/>
- <fileset dir="${basedir}">
- <include name="build.xml"/>
- <include name="build.properties.default"/>
- <include name="doc/*.xml"/>
- <include name="doc/*.xsl"/>
- <include name="resources/MANIFEST.MF"/>
- <include name="LICENSE"/>
- <include name="NOTICE"/>
- </fileset>
- </zip>
- <tar destfile="${destdir}/apache-tomcat-jdbc-${version}-src.tar">
- <zipfileset src="${tomcat-jdbc-src.jar}" prefix="java"/>
- <zipfileset src="${tomcat-jdbc-test-src.jar}" prefix="test"/>
- <fileset dir="${basedir}">
- <include name="build.xml"/>
- <include name="build.properties.default"/>
- <include name="doc/*.xml"/>
- <include name="doc/*.xsl"/>
- <include name="resources/MANIFEST.MF"/>
- <include name="LICENSE"/>
- <include name="NOTICE"/>
- </fileset>
- </tar>
- <gzip src="${destdir}/apache-tomcat-jdbc-${version}-src.tar"
- destfile="${destdir}/apache-tomcat-jdbc-${version}-src.tar.gz"/>
-
- <delete file="${destdir}/apache-tomcat-jdbc-${version}-src.tar"/>
- <echo message="Options +Indexes" file="${destdir}/.htaccess"/>
-
- <checksum file="${destdir}/apache-tomcat-jdbc-${version}-bin.tar.gz"
forceOverwrite="yes" fileext=".md5" />
- <checksum file="${destdir}/apache-tomcat-jdbc-${version}-bin.zip"
forceOverwrite="yes" fileext=".md5" />
- <checksum file="${destdir}/apache-tomcat-jdbc-${version}-src.tar.gz"
forceOverwrite="yes" fileext=".md5" />
- <checksum file="${destdir}/apache-tomcat-jdbc-${version}-src.zip"
forceOverwrite="yes" fileext=".md5" />
-
-
- </target>
-
- <!-- Download and dependency building -->
- <target name="proxyflags">
- <!-- check proxy parameters. -->
- <condition property="useproxy">
- <equals arg1="${proxy.use}" arg2="on" />
- </condition>
- </target>
-
- <target name="setproxy" depends="proxyflags" if="useproxy">
- <taskdef name="setproxy"
- classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" />
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
- <echo message="Using ${proxy.host}:${proxy.port} to download
${sourcefile}"/>
- </target>
-
- <target name="testexist">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
- <target name="downloadfile" unless="exist" depends="setproxy,testexist">
- <!-- Download extract the file -->
- <mkdir dir="${destdir}" />
- <get src="${sourcefile}" dest="${destfile}" />
- </target>
-
- <target name="downloadgz" unless="exist" depends="setproxy,testexist">
- <!-- Download and extract the package -->
- <get src="${sourcefile}" dest="${base.path}/file.tar.gz" />
- <gunzip src="${base.path}/file.tar.gz" dest="${base.path}/file.tar"/>
- <untar src="${base.path}/file.tar" dest="${base.path}"/>
- <delete file="${base.path}/file.tar"/>
- <delete file="${base.path}/file.tar.gz"/>
- </target>
-
- <target name="downloadzip" unless="exist" depends="setproxy,testexist">
- <!-- Download and extract the package -->
- <get src="${sourcefile}" dest="${base.path}/file.zip" />
- <mkdir dir="${destdir}" />
- <unzip src="${base.path}/file.zip" dest="${destdir}"/>
- <delete file="${base.path}/file.zip"/>
- </target>
-
- <target name="download" unless="skip.download">
- <mkdir dir="${base.path}"/>
-<!--
- <antcall target="downloadzip">
- <param name="sourcefile" value="${dbcp.loc}"/>
- <param name="destfile" value="${dbcp.jar}"/>
- <param name="destdir" value="${base.path}"/>
- </antcall>
- -->
- <antcall target="downloadzip">
- <param name="sourcefile" value="${tomcat.loc}"/>
- <param name="destfile" value="${tomcat.juli.jar}"/>
- <param name="destdir" value="${base.path}"/>
- </antcall>
- <antcall target="downloadfile">
- <param name="sourcefile" value="${tomcat.xsl.loc}"/>
- <param name="destfile" value="${tomcat.xsl.dest}"/>
- <param name="destdir" value="${base.path}"/>
- </antcall>
- <antcall target="downloadfile">
- <param name="sourcefile" value="${tomcat.project.loc}"/>
- <param name="destfile" value="${tomcat.project.dest}"/>
- <param name="destdir" value="${base.path}"/>
- </antcall>
- <!-- Derby database
- <antcall target="downloadgz">
- <param name="sourcefile" value="${derby.loc}"/>
- <param name="destfile" value="${derby.jar}"/>
- <param name="destdir" value="${base.path}"/>
- </antcall>
- -->
- <antcall target="downloadfile">
- <param name="sourcefile" value="${h2.loc}"/>
- <param name="destfile" value="${h2.jar}"/>
- <param name="destdir" value="${h2.home}"/>
- </antcall>
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
- <param name="destfile" value="${junit.jar}"/>
- <param name="destdir" value="${junit.home}"/>
- </antcall>
- <antcall target="downloadfile">
- <param name="sourcefile" value="${hamcrest.loc}"/>
- <param name="destfile" value="${hamcrest.jar}"/>
- <param name="destdir" value="${hamcrest.home}"/>
- </antcall>
-
- </target>
-
- <target name="download-test" depends="prepare">
- <mkdir dir="${base.path}"/>
- <!-- Derby database
- <antcall target="downloadgz">
- <param name="sourcefile" value="${derby.loc}"/>
- <param name="destfile" value="${derby.jar}"/>
- <param name="destdir" value="${base.path}"/>
- </antcall>
- -->
- <antcall target="downloadfile">
- <param name="sourcefile" value="${h2.loc}"/>
- <param name="destfile" value="${h2.jar}"/>
- <param name="destdir" value="${h2.home}"/>
- </antcall>
- <antcall target="downloadfile">
- <param name="sourcefile" value="${junit.loc}"/>
- <param name="destfile" value="${junit.jar}"/>
- <param name="destdir" value="${junit.home}"/>
- </antcall>
- <antcall target="downloadfile">
- <param name="sourcefile" value="${hamcrest.loc}"/>
- <param name="destfile" value="${hamcrest.jar}"/>
- <param name="destdir" value="${hamcrest.home}"/>
- </antcall>
- </target>
-
- <!-- Extract the testdb.* properties and remove the leading testdb. -->
- <propertyset dynamic="false" id="testdb">
- <propertyref prefix="testdb"/>
- <mapper type="regexp" from="^testdb\.(.*)$$" to="\1"/>
- </propertyset>
-
- <target name="test" depends="build,build-test">
- <echo/>
- <echo>Creating test table for test purposes.</echo>
-
- <junit printsummary="withOutAndErr" showoutput="on">
- <syspropertyset refid="testdb"/>
- <formatter type="brief" usefile="no"/>
- <classpath refid="tomcat.jdbc.classpath"/>
- <classpath refid="test.classpath"/>
- <batchtest fork="yes" todir="${tomcat.testclasses}">
- <fileset dir="${basedir}/src/test/java">
- <include name="**/CreateTestTable*"/>
- </fileset>
- </batchtest>
- </junit>
-
- <echo/>
- <echo>Performance and fairness tests.</echo>
- <junit printsummary="withOutAndErr" showoutput="on">
- <syspropertyset refid="testdb"/>
- <formatter type="brief" usefile="no"/>
- <classpath refid="tomcat.jdbc.classpath"/>
- <classpath refid="test.classpath"/>
- <batchtest fork="yes" todir="${tomcat.testclasses}">
- <fileset dir="${basedir}/src/test/java">
- <include
name="org/apache/tomcat/jdbc/test/*CheckOutThreadTest*.java"/>
- <include name="org/apache/tomcat/jdbc/test/FairnessTest*.java"/>
- <exclude name="**/CreateTestTable*"/>
- <exclude name="**/DefaultTestCase*"/>
- </fileset>
- </batchtest>
- </junit>
-
- <echo/>
- <echo>Functional tests.</echo>
- <junit printsummary="yes">
- <syspropertyset refid="testdb"/>
- <formatter type="brief" usefile="no"/>
- <classpath refid="tomcat.jdbc.classpath"/>
- <classpath refid="test.classpath"/>
- <batchtest fork="yes" todir="${tomcat.testclasses}">
- <fileset dir="${basedir}/src/test/java">
- <include name="org/apache/tomcat/jdbc/test/*Test*.java"/>
- <exclude
name="org/apache/tomcat/jdbc/test/*CheckOutThreadTest*.java"/>
- <exclude name="**/CreateTestTable*"/>
- <exclude name="**/DefaultTestCase*"/>
- <exclude name="**/CheckOutThread*"/>
- <exclude name="**/Fairness*"/>
- </fileset>
- </batchtest>
- </junit>
-
- </target>
-
- <target name="simplebuild" depends="build"/>
<target name="clean-and-build" depends="clean,build"/>
- <target name="onetest" depends="build,build-test">
-
- <echo>Testing:${test}</echo>
- <junit printsummary="withOutAndErr" showoutput="on">
- <syspropertyset refid="testdb"/>
- <formatter type="brief" usefile="no"/>
- <classpath refid="tomcat.jdbc.classpath"/>
- <classpath refid="test.classpath"/>
- <batchtest fork="yes" todir="${tomcat.testclasses}">
- <fileset dir="${basedir}/src/test/java">
- <include name="org/apache/tomcat/jdbc/test/*${test}*.java"/>
- <exclude name="**/CreateTestTable*"/>
- <exclude name="**/DefaultTestCase*"/>
- </fileset>
- </batchtest>
- </junit>
-
- </target>
-
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
