This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new ff5d86fc3e Increase minimum Ant version to 1.10.2 for reproducible
builds
ff5d86fc3e is described below
commit ff5d86fc3e14841562fa133bff958035ce2c2fc3
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 9 08:34:22 2022 +0100
Increase minimum Ant version to 1.10.2 for reproducible builds
Ant 1.10.x requires Java 8 and Tomcat 10.1.x requires Java 11 so this
allows a simpler build script.
---
build.properties.default | 2 +-
build.xml | 15 ++-------------
2 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 9f6bd005ff..b514c3f845 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -36,7 +36,7 @@ version.patch=0
version.suffix=-M17-dev
# ----- Build tools -----
-ant.version.required=1.9.10
+ant.version.required=1.10.2
# ----- Reproducible builds -----
# Uncomment and set to current time for reproducible builds
diff --git a/build.xml b/build.xml
index 2885adb91f..b2141ccecc 100644
--- a/build.xml
+++ b/build.xml
@@ -2615,22 +2615,11 @@ skip.installer property in build.properties" />
</fail>
</target>
- <target name="-ant-version-check" if="ant.tstamp.now.iso">
- <antversion property="ant.current.version" />
- <fail message="This build process requires ant 1.10.2 in order to use
ant.tstamp.now.iso for reproducible builds, but you are running ant
${ant.current.version}.">
- <condition>
- <not>
- <antversion atleast="1.10.2" />
- </not>
- </condition>
- </fail>
- </target>
-
<target name="-pre-release-read-asf-username" unless="release.asfusername">
<input message="Enter ASF username" addproperty="release.asfusername"
defaultValue="${user.name}" />
</target>
- <target name="pre-release" depends="-pre-release-lone-target-check,
-pre-release-read-asf-username, -ant-version-check" description="Prepares for a
release build by writing build-release.properties which contains information
about the release-build environment.">
+ <target name="pre-release" depends="-pre-release-lone-target-check,
-pre-release-read-asf-username" description="Prepares for a release build by
writing build-release.properties which contains information about the
release-build environment.">
<tstamp>
<format pattern="yyyy-MM-dd'T'HH:mm:ss'Z'" property="now-readable"
timezone="UTC" />
</tstamp>
@@ -2657,7 +2646,7 @@ maven.asf.release.deploy.version=${version}
</target>
<target name="release"
-
depends="-ant-version-check,clean,release-init,dist-deployer,installer-sign,package-zip,package-winzip,package-tgz,package-deployer-zip,package-deployer-tgz,javadoc,package-docs-tgz,package-src-zip,package-src-tgz,package-src-jar"
+
depends="clean,release-init,dist-deployer,installer-sign,package-zip,package-winzip,package-tgz,package-deployer-zip,package-deployer-tgz,javadoc,package-docs-tgz,package-src-zip,package-src-tgz,package-src-jar"
description="Create a Tomcat packaged distribution">
<copy file="KEYS"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
