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
commit 0b84147c37cad9cabb298cfe6b2ce79689d342aa
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Oct 10 12:48:58 2024 -0600
Update minimum Java version to 21
---
build.xml | 10 +++++-----
webapps/docs/changelog.xml | 3 +++
webapps/docs/tomcat-docs.xsl | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/build.xml b/build.xml
index 88c9ac6725..902d981f97 100644
--- a/build.xml
+++ b/build.xml
@@ -104,11 +104,11 @@
<!-- build output directory for generated reflectionless code -->
<property name="tomcat.xreflect" value="${tomcat.output}/xreflect"/>
- <!-- Jakarta EE 12 platform requires Java 17+ -->
+ <!-- Jakarta EE 12 platform requires Java 21+ -->
<!-- Keep in sync with webapps/docs/tomcat-docs.xsl -->
- <property name="compile.release" value="17"/>
- <property name="min.java.version" value="17"/>
- <property name="build.java.version" value="17"/>
+ <property name="compile.release" value="21"/>
+ <property name="min.java.version" value="21"/>
+ <property name="build.java.version" value="21"/>
<property name="release.java.version" value="22"/>
<!-- Check Java Build Version -->
@@ -2416,7 +2416,7 @@
<link href="../elapi"/>
<link href="../websocketapi"/>
<link href="../jaspicapi"/>
- <link href="https://docs.oracle.com/en/java/javase/17/docs/api/"/>
+ <link href="https://docs.oracle.com/en/java/javase/21/docs/api/"/>
<link href="https://jakarta.ee/specifications/platform/11/apidocs/"/>
<packageset dir="${tomcat.dist}/src/java/">
<include name="org/**"/>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7fa1fab682..3210fba314 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -111,6 +111,9 @@
This release contains all of the changes up to and including those in
Apache Tomcat 11.0.0 plus the additional changes listed below. (markt)
</scode>
+ <update>
+ The minimum Java version has been updated to Java 21. (markt)
+ </update>
</changelog>
</subsection>
<subsection name="Catalina">
diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
index 66aa1c1c77..e70311d2d4 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -37,7 +37,7 @@
<xsl:param name="version" select="'12.0.x'"/>
<xsl:param name="majorversion" select="'12'"/>
<xsl:param name="majorminorversion" select="'12.0'"/>
- <xsl:param name="minjavaversion" select="'17'"/>
+ <xsl:param name="minjavaversion" select="'21'"/>
<xsl:param name="buildjavaversion" select="'22'"/>
<xsl:param name="antversionrequired" select="'1.10.2'"/>
<xsl:param name="build-date" select="'MMM d yyyy'"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
