This is an automated email from the ASF dual-hosted git repository.
markt 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 6cec219 Parameterise the version of Java used to build Tomcat
6cec219 is described below
commit 6cec219484e712cbdfcf8334bb7cf03d77f629bb
Author: Mark Thomas <[email protected]>
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 | 2 +-
build.xml | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/BUILDING.txt b/BUILDING.txt
index 6ce5ab8..fb95db9 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -36,7 +36,7 @@ source distribution, do the following:
1. If the JDK is already installed, skip to (2).
- 2. Download a version @MIN_JAVA_VERSION@ or later of Java Development Kit
(JDK) release (use
+ 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
diff --git a/build.xml b/build.xml
index 9dc3217..f689c6f 100644
--- a/build.xml
+++ b/build.xml
@@ -104,6 +104,7 @@
<!-- Jakarta EE 10 platform requires Java 11+ -->
<property name="compile.release" value="11"/>
<property name="min.java.version" value="11"/>
+ <property name="build.java.version" value="11"/>
<!-- Locations to create the JAR artifacts -->
<!-- Standard JARs -->
@@ -260,6 +261,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: [email protected]
For additional commands, e-mail: [email protected]
