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
commit 0dcba0099a1964f0953291d4cadefb5375120ebb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jan 13 16:45:41 2022 +0000
Parameterise the version of Java used to build Tomcat
With the use of --release, this no longer needs to be the same as the
minimum version.
---
BUILDING.txt | 4 ++--
build.xml | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/BUILDING.txt b/BUILDING.txt
index af3451e..43c7376 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -35,8 +35,8 @@ source distribution, do the following:
1. If the JDK is already installed, skip to (2).
- 2. Download a version 11 of Java Development Kit (JDK) release (use the
- latest update available for your chosen version) from one of:
+ 2. Download a version @BUILD_JAVA_VERSION@ or later of Java Development Kit
(JDK) release (use
+ the latest update available for your chosen version) from one of:
http://www.oracle.com/technetwork/java/javase/downloads/index.html
http://openjdk.java.net/install/index.html
diff --git a/build.xml b/build.xml
index 4e88511..f8bc7df 100644
--- a/build.xml
+++ b/build.xml
@@ -104,6 +104,7 @@
<!-- Servlet 4.0 spec requires Java 8+ -->
<property name="compile.release" value="8"/>
<property name="min.java.version" value="8"/>
+ <property name="build.java.version" value="11"/>
<!-- Locations to create the JAR artifacts -->
<!-- Standard JARs -->
@@ -256,6 +257,7 @@
<filter token="JDT_VERSION" value="${jdt.version}"/>
<filter token="GIT_BRANCH" value="${git.branch}"/>
<filter token="MIN_JAVA_VERSION" value="${min.java.version}"/>
+ <filter token="BUILD_JAVA_VERSION" value="${build.java.version}"/>
</filterset>
<!-- Files to change line endings for depending on target platform -->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
