This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new cbfc9eb850 BZ 67538: Make use of Ant's <javaversion /> task to enfore
the mininum Java build version
cbfc9eb850 is described below
commit cbfc9eb85085cd32f2e7c23fadcf1303de46eb79
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
---
build.xml | 7 +++++++
webapps/docs/changelog.xml | 8 ++++++++
2 files changed, 15 insertions(+)
diff --git a/build.xml b/build.xml
index be035680d5..ea6a2b9d52 100644
--- a/build.xml
+++ b/build.xml
@@ -109,6 +109,13 @@
<property name="min.java.version" value="11"/>
<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>
+ <not><javaversion atleast="${build.java.version}" /></not>
+ </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 ad09a9ea3d..f13e0e0639 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 10.1.15 (schultz)" rtext="release in progress">
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
