This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 1927cd1b5c BZ 67538: Make use of Ant's <javaversion /> task to enfore
the mininum Java build version
1927cd1b5c is described below
commit 1927cd1b5cc8b6da4fa4bcb2d6731421a7e84b66
Author: Michael Osipov <[email protected]>
AuthorDate: Thu Oct 12 15:14:46 2023 +0200
BZ 67538: Make use of Ant's <javaversion /> task to enfore the mininum Java
build version
Introduce property 'skip.build.java.version' to skip Java build check to
perform tests
with Java 8.
---
build.xml | 10 ++++++++++
webapps/docs/changelog.xml | 8 ++++++++
2 files changed, 18 insertions(+)
diff --git a/build.xml b/build.xml
index 723be26ac5..83f3eca952 100644
--- a/build.xml
+++ b/build.xml
@@ -116,6 +116,16 @@
<property name="min.java.version" value="7"/>
<property name="build.java.version" value="11"/>
+ <!-- Check Java Build Version -->
+ <fail message="Java version ${build.java.version} or newer is required
(${java.version} is installed)">
+ <condition>
+ <and>
+ <not><javaversion atleast="${build.java.version}" /></not>
+ <not><isset property="skip.build.java.version"/></not>
+ </and>
+ </condition>
+ </fail>
+
<!-- Locations to create the JAR artifacts -->
<!-- Standard JARs -->
<property name="bootstrap.jar" value="${tomcat.build}/bin/bootstrap.jar"/>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f64befd633..3f6cd5e504 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -113,6 +113,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <add>
+ <bug>67538</bug>: Make use of Ant's <code><javaversion /></code>
task
+ to enfore the mininum Java build version. (michaelo)
+ </add>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 8.5.95 (schultz)" rtext="release in progress">
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
