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 757228532c Update Eclipse compiler to 4.25 / 3.31.0
757228532c is described below
commit 757228532c6ae08e3e71b17b5fd7ec4947c25bb3
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Sep 30 11:11:43 2022 +0100
Update Eclipse compiler to 4.25 / 3.31.0
---
build.properties.default | 12 ++++++------
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/ide-support/idea/tomcat.iml | 2 +-
res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
res/ide-support/netbeans/project.xml | 2 +-
res/maven/tomcat-jasper.pom | 2 +-
webapps/docs/changelog.xml | 7 +++++++
7 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 7f3f2f0cd6..88d0eb22b4 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -136,15 +136,15 @@
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
# ----- 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.23" link at
-# https://download.eclipse.org/eclipse/downloads/drops4/R-4.23-202203080310/
-#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.23-202203080310/checksum/eclipse-4.23-SUMSSHA512
+# Checksum is from "SHA512 Checksums for 4.25" link at
+# https://download.eclipse.org/eclipse/downloads/drops4/R-4.25-202208311800/
+#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.25-202208311800/checksum/eclipse-4.25-SUMSSHA512
#
-jdt.version=4.23
-jdt.release=R-4.23-202203080310
+jdt.version=4.25
+jdt.release=R-4.25-202208311800
jdt.checksum.enabled=true
jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=2f8c6c7bc2e2c738c853f3c977ffb7a258b9f92e260e3affdf9c8fd54ac7b70e404944d0e434eb83a14b8bf01b201effaaf9930ea4b5fdfb1a752b6abf1ae1ec
+jdt.checksum.value=2c469433e09957315b93b030f5668b2539dbf7a198f8f43c5c9cb2f350ff22086587e897ecd1af6461cd1f8abe9a58eeaacb27bc9eec38a23caedf5e0e00da56
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/res/ide-support/eclipse/eclipse.classpath
b/res/ide-support/eclipse/eclipse.classpath
index d70b08a72c..b01f2e46a4 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -24,7 +24,7 @@
<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/wsdl4j-1.6.3/wsdl4j-1.6.3.jar"/>
- <classpathentry kind="var" path="TOMCAT_LIBS_BASE/ecj-4.23/ecj-4.23.jar"/>
+ <classpathentry kind="var" path="TOMCAT_LIBS_BASE/ecj-4.25/ecj-4.25.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/easymock-4.3/easymock-4.3.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/hamcrest-2.2/hamcrest-2.2.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/cglib-3.3.0/cglib-nodep-3.3.0.jar"/>
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 56952703ef..af3b5ced15 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -68,7 +68,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$TOMCAT_BUILD_LIBS$/ecj-4.23/ecj-4.23.jar!/" />
+ <root url="jar://$TOMCAT_BUILD_LIBS$/ecj-4.25/ecj-4.25.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties
b/res/ide-support/netbeans/nb-tomcat-build.properties
index 0ef68ae85e..b1c29e9f80 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
# it is not possible to retrieve the classpaths from the build to
# use in the NetBeans targets, so they must be explicitly declared
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13.2/junit-4.13.2.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.23/ecj-4.23.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13.2/junit-4.13.2.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.25/ecj-4.25.jar:${tomcat.classes}
# Extra properties used by the Tomcat project additional NetBeans targets.
diff --git a/res/ide-support/netbeans/project.xml
b/res/ide-support/netbeans/project.xml
index d864c3de91..92af4b3fb0 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
-->
<compilation-unit>
<package-root>java</package-root>
- <classpath
mode="compile">${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.23/ecj-4.23.jar:${base.path}/bnd-6.3.1/biz.aQute.bnd-6.3.1.jar:${base.path}/migration-1.0.4/jakartaee-migration-1.0.4-shaded.jar:${ant.includes}/</classpath>
+ <classpath
mode="compile">${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.25/ecj-4.25.jar:${base.path}/bnd-6.3.1/biz.aQute.bnd-6.3.1.jar:${base.path}/migration-1.0.4/jakartaee-migration-1.0.4-shaded.jar:${ant.includes}/</classpath>
<source-level>1.7</source-level>
</compilation-unit>
<compilation-unit>
diff --git a/res/maven/tomcat-jasper.pom b/res/maven/tomcat-jasper.pom
index 03266024a1..b5bf552c75 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.29.0</version>
+ <version>3.31.0</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ebfcbd7c4e..38be2e332a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -121,6 +121,13 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <update>
+ Update to the Eclipse JDT compiler 4.23. (markt)
+ </update>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 10.1.0 (markt)" rtext="2022-09-26">
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
