Skip to content

Commit 35f7c99

Browse files
committed
Update Eclipse JDT compiler to 4.38 / 3.43.0 / Dec 2025
1 parent 76ea79d commit 35f7c99

File tree

5 files changed

+20
-12
lines changed

5 files changed

+20
-12
lines changed

build.properties.default

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,15 @@ base-maven.loc=https://repo.maven.apache.org/maven2
144144
# ----- Eclipse JDT, version 4.7 or later -----#
145145
# See https://cwiki.apache.org/confluence/display/TOMCAT/Managing+Tomcat%27s+Dependency+on+the+Eclipse+JDT+Core+Batch+Compiler
146146
#
147-
# Checksum is from "SHA512 Checksums for 4.36" link at
148-
# https://download.eclipse.org/eclipse/downloads/drops4/R-4.36-202505281830/
149-
# https://download.eclipse.org/eclipse/downloads/drops4/R-4.36-202505281830/checksum/eclipse-4.36-SUMSSHA512
147+
# Checksum is from "SHA512 Checksums for 4.38" link at
148+
# https://download.eclipse.org/eclipse/downloads/drops4/R-4.38-202512010920/
149+
# https://download.eclipse.org/eclipse/downloads/drops4/R-4.38-202512010920/checksum/eclipse-4.38-SUMSSHA512
150150
#
151-
jdt.version=4.37
152-
jdt.release=R-4.37-202509050730
151+
jdt.version=4.38
152+
jdt.release=R-4.38-202512010920
153153
jdt.checksum.enabled=true
154154
jdt.checksum.algorithm=SHA-512
155-
jdt.checksum.value=06d8974af46d81f7a03c257b54fb5854a9b9ba8ab2733db4946745142e07e7dc3e69ea864d4b011230ffb8f92243503d7ffb6ac2ddf9b747c1bbc155c55fb583
155+
jdt.checksum.value=41d5cea69f9bdc75eee3b5e89bf29ae9cbfe8de9f1ccdc94ea9364c182463bc4003fdee19b23c17b9ddc7c8950f4d196bb4cf3d8a5c2d1af56a769905385e906
156156
jdt.home=${base.path}/ecj-${jdt.version}
157157
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
158158
# The download will be moved to the archive area eventually. We are taking care of that in advance.

java/org/apache/jasper/compiler/JDTCompiler.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,11 +310,12 @@ public void cleanup() {
310310
case "22" -> settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_22);
311311
case "23" -> settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_23);
312312
case "24" -> settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_24);
313-
case "25" ->
313+
case "25" -> settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_25);
314+
case "26" ->
314315
// Constant not available in latest ECJ version shipped with
315316
// Tomcat. May be supported in a snapshot build.
316317
// This is checked against the actual version below.
317-
settings.put(CompilerOptions.OPTION_Source, "25");
318+
settings.put(CompilerOptions.OPTION_Source, "26");
318319
default -> {
319320
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", opt));
320321
settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_21);
@@ -416,11 +417,15 @@ public void cleanup() {
416417
settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_24);
417418
}
418419
case "25" -> {
420+
settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_25);
421+
settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_25);
422+
}
423+
case "26" -> {
419424
// Constant not available in latest ECJ version shipped with
420425
// Tomcat. May be supported in a snapshot build.
421426
// This is checked against the actual version below.
422-
settings.put(CompilerOptions.OPTION_TargetPlatform, "25");
423-
settings.put(CompilerOptions.OPTION_Compliance, "25");
427+
settings.put(CompilerOptions.OPTION_TargetPlatform, "26");
428+
settings.put(CompilerOptions.OPTION_Compliance, "26");
424429
}
425430
default -> {
426431
log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM", opt));

res/maven/tomcat-embed-jasper.pom

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<dependency>
4949
<groupId>org.eclipse.jdt</groupId>
5050
<artifactId>ecj</artifactId>
51-
<version>3.43.0</version>
51+
<version>3.44.0</version>
5252
</dependency>
5353
</dependencies>
5454
</project>

res/maven/tomcat-jasper.pom

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<dependency>
6161
<groupId>org.eclipse.jdt</groupId>
6262
<artifactId>ecj</artifactId>
63-
<version>3.43.0</version>
63+
<version>3.44.0</version>
6464
</dependency>
6565
<dependency>
6666
<groupId>org.apache.tomcat</groupId>

webapps/docs/changelog.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,9 @@
359359
<update>
360360
Update Commons Daemon to 1.5.1. (markt)
361361
</update>
362+
<update>
363+
Update to the Eclipse JDT compiler 4.37. (markt)
364+
</update>
362365
</changelog>
363366
</subsection>
364367
</section>

0 commit comments

Comments
 (0)