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 35f7c99fba Update Eclipse JDT compiler to 4.38 / 3.43.0 / Dec 2025
35f7c99fba is described below
commit 35f7c99fba7f6642bb981313ec375c243ffe9df3
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Jan 9 08:59:55 2026 +0000
Update Eclipse JDT compiler to 4.38 / 3.43.0 / Dec 2025
---
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, 20 insertions(+), 12 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 4356a36e83..c49ed7e572 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -144,15 +144,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.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
+# Checksum is from "SHA512 Checksums for 4.38" link at
+# https://download.eclipse.org/eclipse/downloads/drops4/R-4.38-202512010920/
+#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.38-202512010920/checksum/eclipse-4.38-SUMSSHA512
#
-jdt.version=4.37
-jdt.release=R-4.37-202509050730
+jdt.version=4.38
+jdt.release=R-4.38-202512010920
jdt.checksum.enabled=true
jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=06d8974af46d81f7a03c257b54fb5854a9b9ba8ab2733db4946745142e07e7dc3e69ea864d4b011230ffb8f92243503d7ffb6ac2ddf9b747c1bbc155c55fb583
+jdt.checksum.value=41d5cea69f9bdc75eee3b5e89bf29ae9cbfe8de9f1ccdc94ea9364c182463bc4003fdee19b23c17b9ddc7c8950f4d196bb4cf3d8a5c2d1af56a769905385e906
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 7d2dbaee41..85d2708958 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -310,11 +310,12 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
case "22" -> settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_22);
case "23" -> settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_23);
case "24" -> settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_24);
- case "25" ->
+ case "25" -> settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_25);
+ case "26" ->
// 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, "25");
+ settings.put(CompilerOptions.OPTION_Source, "26");
default -> {
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", opt));
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_21);
@@ -416,11 +417,15 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_24);
}
case "25" -> {
+ settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_25);
+ settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_25);
+ }
+ case "26" -> {
// 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, "25");
- settings.put(CompilerOptions.OPTION_Compliance, "25");
+ settings.put(CompilerOptions.OPTION_TargetPlatform, "26");
+ settings.put(CompilerOptions.OPTION_Compliance, "26");
}
default -> {
log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM", opt));
diff --git a/res/maven/tomcat-embed-jasper.pom
b/res/maven/tomcat-embed-jasper.pom
index 50ebc3949c..451898b2e4 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.43.0</version>
+ <version>3.44.0</version>
</dependency>
</dependencies>
</project>
diff --git a/res/maven/tomcat-jasper.pom b/res/maven/tomcat-jasper.pom
index d8e96d6eec..b8d10c6cfb 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.43.0</version>
+ <version>3.44.0</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 360c6f2db0..40618e54f8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -359,6 +359,9 @@
<update>
Update Commons Daemon to 1.5.1. (markt)
</update>
+ <update>
+ Update to the Eclipse JDT compiler 4.37. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
