This is an automated email from the ASF dual-hosted git repository.
remm 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 9c198905bd Harmonize with Tomcat 9.0 change
9c198905bd is described below
commit 9c198905bd8d66a0e9498fe71b383d14906bfb55
Author: remm <[email protected]>
AuthorDate: Mon Nov 6 14:22:12 2023 +0100
Harmonize with Tomcat 9.0 change
---
build.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/build.xml b/build.xml
index 0e04b2c0f0..c84456f80d 100644
--- a/build.xml
+++ b/build.xml
@@ -2640,8 +2640,8 @@ skip.installer property in build.properties" />
<hashAndSign file="${tomcat.release}/v${version}/bin/${final.name}.exe" />
</target>
- <target name="-release-java-check">
- <!--FIXME: add version check for release
+ <target name="release-version-check">
+ <!--FIXME: add version check for release once Java 22 has reasonable
availability
<fail message="Java version ${release.java.version} or newer is required
for release (${java.version} is installed)">
<condition>
<not><javaversion atleast="${release.java.version}" /></not>
@@ -2667,7 +2667,7 @@ skip.installer property in build.properties" />
<input message="Enter ASF username" addproperty="release.asfusername"
defaultValue="${user.name}" />
</target>
- <target name="pre-release"
depends="-release-java-check,-pre-release-lone-target-check,
-pre-release-read-asf-username"
+ <target name="pre-release"
depends="release-version-check,-pre-release-lone-target-check,
-pre-release-read-asf-username"
description="Prepares for a release build by writing
build.properties.release which contains information about the release-build
environment.">
<antversion property="antversion"/>
<echo file="build.properties.release">#
-----------------------------------------------------------------------------
@@ -2794,7 +2794,7 @@ asf.ldap.username=${release.asfusername}
</target>
<!-- Sets properties only required for releases -->
- <target name="release-init"
depends="-release-java-check,gpg-init-1,gpg-init-2,gpg-init-3,compile" >
+ <target name="release-init"
depends="release-version-check,gpg-init-1,gpg-init-2,gpg-init-3,compile" >
<taskdef name="forceUtcTimeZone"
classname="org.apache.tomcat.buildutil.ForceUtcTimeZone"
classpath="${tomcat.classes}" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
