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 7b420ac2d12a09e5dcfe62f997203f80f0013adf
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jun 24 11:01:04 2025 +0100
Update Eclipse JDT compiler to 4.36
---
build.properties.default | 12 ++++++------
java/org/apache/jasper/compiler/JDTCompiler.java | 13 +++----------
res/maven/tomcat-embed-jasper.pom | 2 +-
res/maven/tomcat-jasper.pom | 2 +-
webapps/docs/changelog.xml | 3 +++
5 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 00515a4d49..3dddd5836e 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -140,15 +140,15 @@ base-maven.loc=https://repo.maven.apache.org/maven2
# ----- Eclipse JDT, version 4.7 or later -----#
# See
https://cwiki.apache.org/confluence/display/TOMCAT/Managing+Tomcat%27s+Dependency+on+the+Eclipse+JDT+Core+Batch+Compiler
#
-# Checksum is from "SHA512 Checksums for 4.35" link at
-# https://download.eclipse.org/eclipse/downloads/drops4/R-4.35-202502280140/
-#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.35-202502280140/checksum/eclipse-4.35-SUMSSHA512
+# Checksum is from "SHA512 Checksums for 4.36" link at
+# https://download.eclipse.org/eclipse/downloads/drops4/R-4.36-202505281830/
+#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.36-202505281830/checksum/eclipse-4.36-SUMSSHA512
#
-jdt.version=4.35
-jdt.release=R-4.35-202502280140
+jdt.version=4.36
+jdt.release=R-4.36-202505281830
jdt.checksum.enabled=true
jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=f79cadd22cc0b2c9ce8d7cd168280b98835caa24dd6b8c14aab06ce67fe2048c161c6f4b38df686783e64aeb4953cbb0886fea6e3abffad99aa62f1aa80e6d40
+jdt.checksum.value=4f0da140e5c447717e5111bd4bf6e6e9a4431f1db2c67deaf37b13f4ec0f6314d8d799a8a3da19859028c5ff6bcf32ac417228697941c590ce3f0f89ab3a30fc
jdt.home=${base.path}/ecj-${jdt.version}
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
# The download will be moved to the archive area eventually. We are taking
care of that in advance.
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 5d5cb011f3..3829378a4a 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -311,11 +311,7 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
case "21" -> settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_21);
case "22" -> settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_22);
case "23" -> settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_23);
- case "24" ->
- // Constant not available in latest ECJ version shipped
with
- // Tomcat. May be supported in a snapshot build.
- // This is checked against the actual version below.
- settings.put(CompilerOptions.OPTION_Source, "24");
+ case "24" -> settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_24);
case "25" ->
// Constant not available in latest ECJ version shipped
with
// Tomcat. May be supported in a snapshot build.
@@ -418,11 +414,8 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_23);
}
case "24" -> {
- // Constant not available in latest ECJ version shipped
with
- // Tomcat. May be supported in a snapshot build.
- // This is checked against the actual version below.
- settings.put(CompilerOptions.OPTION_TargetPlatform, "24");
- settings.put(CompilerOptions.OPTION_Compliance, "24");
+ settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_24);
+ settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_24);
}
case "25" -> {
// Constant not available in latest ECJ version shipped
with
diff --git a/res/maven/tomcat-embed-jasper.pom
b/res/maven/tomcat-embed-jasper.pom
index dcbb0701be..427ad83bcd 100644
--- a/res/maven/tomcat-embed-jasper.pom
+++ b/res/maven/tomcat-embed-jasper.pom
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
- <version>3.41.0</version>
+ <version>3.42.0</version>
</dependency>
</dependencies>
</project>
diff --git a/res/maven/tomcat-jasper.pom b/res/maven/tomcat-jasper.pom
index 43176d669c..3a54d0735f 100644
--- a/res/maven/tomcat-jasper.pom
+++ b/res/maven/tomcat-jasper.pom
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
- <version>3.41.0</version>
+ <version>3.42.0</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0e362e36b9..ee5ad30476 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -294,6 +294,9 @@
Update Derby to 10.17.1.0. (markt)
</update>
<!-- Entries for backport and removal before 12.0.0-M1 below this line
-->
+ <update>
+ Update to the Eclipse JDT compiler 4.36. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
