This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new c14059f856 Ensure tests can continue to be run on Java 8
c14059f856 is described below
commit c14059f856217c85d41fd81f4ebac08aa21ac028
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Nov 6 13:06:02 2023 +0000
Ensure tests can continue to be run on Java 8
---
build.xml | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/build.xml b/build.xml
index 4f218a03a9..7fedc36b03 100644
--- a/build.xml
+++ b/build.xml
@@ -2758,13 +2758,21 @@ asf.ldap.username=${release.asfusername}
</target>
<!-- Sets properties only required for releases -->
- <target name="release-init"
depends="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}" />
<forceUtcTimeZone />
</target>
+ <target name="release-version-check" >
+ <fail message="Release builds must use Java version ${build.java.version}
or newer (${java.version} is installed)">
+ <condition>
+ <not><javaversion atleast="${build.java.version}" /></not>
+ </condition>
+ </fail>
+ </target>
+
<target name="gpg-init-1">
<available file="${gpg.exec}" property="gpg.exec.available"/>
</target>
@@ -3880,7 +3888,7 @@ Read the Building page on the Apache Tomcat documentation
site for details on ho
</antcall>
</target>
- <target name="setup-bnd" depends="download-bnd">
+ <target name="setup-bnd" depends="download-bnd"
unless="skip.build.java.version" >
<!-- Add bnd tasks to project -->
<path id="bnd.classpath">
<fileset file="${bnd.jar}" />
@@ -3955,7 +3963,7 @@ Read the Building page on the Apache Tomcat documentation
site for details on ho
</sequential>
</macrodef>
- <target name="add-osgi" if="${addOSGi}" >
+ <target name="add-osgi" if="${addOSGi}" unless="skip.build.java.version" >
<echo message="add-osgi ${jarfile} ${addOSGi}"></echo>
<local name="filename"/>
<basename property="filename" file="${jarfile}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
