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 7cb52276dd643c64926c92f2dd528098045874d6
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jan 4 14:59:18 2024 +0000
Update to the Eclipse JDT compiler 4.30
---
build.properties.default | 12 ++++++------
java/org/apache/jasper/compiler/JDTCompiler.java | 12 +++---------
res/maven/tomcat-jasper.pom | 2 +-
webapps/docs/changelog.xml | 7 +++++++
4 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 40854f2be4..635ad52cee 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -123,15 +123,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.29" link at
-# https://download.eclipse.org/eclipse/downloads/drops4/R-4.29-202309031000/
-#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.29-202309031000/checksum/eclipse-4.29-SUMSSHA512
+# Checksum is from "SHA512 Checksums for 4.30" link at
+# https://download.eclipse.org/eclipse/downloads/drops4/R-4.30-202312010110/
+#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.30-202312010110/checksum/eclipse-4.30-SUMSSHA512
#
-jdt.version=4.29
-jdt.release=R-4.29-202309031000
+jdt.version=4.30
+jdt.release=R-4.30-202312010110
jdt.checksum.enabled=true
jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=637595f5cdc8b479c6565d1f53bfacb6c3e7c603ccd17a0a67a2615537ade641553633deaede562a0f2a1ab40f17b66db571025aa8773432186d49647b8fdbe4
+jdt.checksum.value=f889b0f305cdf6b548e13ef73cd8ec488be3bf43a3d48659a1fcfce01068fb47adb398bb6006a067d61cfefbee7ecc279e4fcea385f27be211817709cdebc54e
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 7b51b5b584..8d7535d60f 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -320,10 +320,7 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
} else if (opt.equals("20")) {
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_20);
} else if (opt.equals("21")) {
- // 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, "21");
+ settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_21);
} else if (opt.equals("22")) {
// Constant not available in latest ECJ version shipped with
// Tomcat. May be supported in a snapshot build.
@@ -400,11 +397,8 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_20);
settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_20);
} else if (opt.equals("21")) {
- // 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, "21");
- settings.put(CompilerOptions.OPTION_Compliance, "21");
+ settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_21);
+ settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_21);
} else if (opt.equals("22")) {
// Constant not available in latest ECJ version shipped with
// Tomcat. May be supported in a snapshot build.
diff --git a/res/maven/tomcat-jasper.pom b/res/maven/tomcat-jasper.pom
index 1c3e444cad..fd97e2a35f 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.35.0</version>
+ <version>3.36.0</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1812c5d098..1e2f1f7a3b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -160,6 +160,13 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <update>
+ Update to the Eclipse JDT compiler 4.30. (markt)
+ </update>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 11.0.0-M15 (markt)" rtext="2023-12-12">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
