This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3390cb88819f89fa642e44f1463c35cddae74905 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 19126be..4fe3618 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 ec5c210..c98a2a2 100644 --- a/build.xml +++ b/build.xml @@ -95,6 +95,7 @@ <!-- Servlet 3.1 spec requires Java 7+ --> <property name="compile.release" value="7"/> <property name="min.java.version" value="7"/> + <property name="build.java.version" value="11"/> <!-- Locations to create the JAR artifacts --> <!-- Standard JARs --> @@ -252,6 +253,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