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 dbd9fcae2c Increase minimum Java version to Java 21 - aligns with
Jakarta EE 11
dbd9fcae2c is described below
commit dbd9fcae2c2b336f4d05ae2a733e5935277d0088
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu May 11 16:40:33 2023 +0100
Increase minimum Java version to Java 21 - aligns with Jakarta EE 11
---
build.xml | 31 +++++++++++--------------------
webapps/docs/changelog.xml | 7 +++++++
webapps/docs/tomcat-docs.xsl | 4 ++--
3 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/build.xml b/build.xml
index a919258b03..ab0021e3e2 100644
--- a/build.xml
+++ b/build.xml
@@ -105,9 +105,9 @@
<!-- Jakarta EE 11 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"/>
<!-- Locations to create the JAR artifacts -->
<!-- Standard JARs -->
@@ -1969,21 +1969,13 @@
</condition>
</target>
- <!-- Set Java 17 specific properties -->
- <condition property="java17.nativeaccess"
value="--enable-native-access=ALL-UNNAMED"><javaversion
atleast="17"/></condition>
- <property name="java17.nativeaccess" value="-Dtest.1=1"/>
- <condition property="java17.addmodules" value="--add-modules"><javaversion
exactly="17"/></condition>
- <condition property="java17.addmodules"
value="--enable-preview"><javaversion atleast="19"/></condition>
- <property name="java17.addmodules" value="-Dtest.2=2"/>
- <condition property="java17.incubatorforeign"
value="jdk.incubator.foreign"><javaversion exactly="17"/></condition>
- <property name="java17.incubatorforeign" value="-Dtest.3=3"/>
+ <!-- Set native specific properties -->
+ <property name="native.nativeaccess"
value="--enable-native-access=ALL-UNNAMED"/>
+ <property name="native.addmodules" value="--enable-preview" />
<condition property="runtests.librarypath" value="-Dtest.4=4">
- <and>
- <javaversion atleast="17"/>
- <resourceexists>
- <file file="${openssl-lib.jar}"/>
- </resourceexists>
- </and>
+ <resourceexists>
+ <file file="${openssl-lib.jar}"/>
+ </resourceexists>
</condition>
<property name="runtests.librarypath"
value="-Djava.library.path=${test.apr.loc}"/>
<property name="opens.javalang"
value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
@@ -2022,9 +2014,8 @@
<jvmarg value="${opens.sunrmi}"/>
<jvmarg value="${opens.javautil}"/>
<jvmarg value="${opens.javautilconcurrent}"/>
- <jvmarg value="${java17.nativeaccess}"/>
- <jvmarg value="${java17.addmodules}"/>
- <jvmarg value="${java17.incubatorforeign}"/>
+ <jvmarg value="${native.nativeaccess}"/>
+ <jvmarg value="${native.addmodules}"/>
<classpath refid="tomcat.test.classpath" />
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 96421d021a..706b61b93c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,13 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 11.0.0-M7 (markt)" rtext="in development">
+ <subsection name="General">
+ <changelog>
+ <update>
+ Increase the minimum supported Java version to Java 21. (markt)
+ </update>
+ </changelog>
+ </subsection>
<subsection name="Catalina">
<changelog>
<scode>
diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
index ec905cbe8e..f927e4fc4a 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -39,8 +39,8 @@
<xsl:param name="version" select="'11.0.x'"/>
<xsl:param name="majorversion" select="'11'"/>
<xsl:param name="majorminorversion" select="'11.0'"/>
- <xsl:param name="minjavaversion" select="'11'"/>
- <xsl:param name="buildjavaversion" select="'11'"/>
+ <xsl:param name="minjavaversion" select="'21'"/>
+ <xsl:param name="buildjavaversion" select="'21'"/>
<xsl:param name="antversionrequired" select="'1.10.2'"/>
<xsl:param name="build-date" select="'MMM d yyyy'"/>
<xsl:param name="build-date-iso-8601" select="'yyyy-MM-dd'"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
