This is an automated email from the ASF dual-hosted git repository. markt-asf pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 766f0a4a362e23ecba572ec712ee0ab1e9d1127a Author: Mark Thomas <[email protected]> AuthorDate: Wed Jul 1 14:28:02 2026 +0100 Update to the Eclipse JDT compiler 4.40 --- build.properties.default | 6 +++--- java/org/apache/jasper/compiler/JDTCompiler.java | 13 +++---------- webapps/docs/changelog.xml | 3 +++ 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/build.properties.default b/build.properties.default index 884dbb165b..fe7c402531 100644 --- a/build.properties.default +++ b/build.properties.default @@ -143,11 +143,11 @@ 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 # -jdt.version=4.39 -jdt.release=R-4.39-202602260420 +jdt.version=4.40 +jdt.release=R-4.40-202606010713 jdt.checksum.enabled=true jdt.checksum.algorithm=SHA-512 -jdt.checksum.value=af25493d4a429fd24256f69a085a618afffe23bb09b284976fb9e82f651715a0455b704ee800432b43dd409f74874765089cd65fc148e2175d251f9ef830ce0a +jdt.checksum.value=0b2c799e20dbdd074272faf2aed454186f0ad25759c09963350bceea8e9bec0ad9a04693115401cab6a1c9122b94aba6d79d741eef2e003a4149b2fe00f6f158 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 a5d42dbb4b..c2dc42facc 100644 --- a/java/org/apache/jasper/compiler/JDTCompiler.java +++ b/java/org/apache/jasper/compiler/JDTCompiler.java @@ -318,11 +318,7 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { case "23" -> settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_23); case "24" -> settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_24); 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, "26"); + case "26" -> settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_26); case "27" -> // Constant not available in latest ECJ version shipped with // Tomcat. May be supported in a snapshot build. @@ -433,11 +429,8 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { 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, "26"); - settings.put(CompilerOptions.OPTION_Compliance, "26"); + settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_26); + settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_26); } case "27" -> { // Constant not available in latest ECJ version shipped with diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index a726b3ed70..205830b422 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -439,6 +439,9 @@ Update Checkstyle to 13.4.2. (markt) </update> <!-- Entries for backport and removal before 12.0.0-M1 below this line --> + <update> + Update to the Eclipse JDT compiler 4.40. (markt) + </update> </changelog> </subsection> </section> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
