You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2022/03/17 10:51:29 UTC
[tomcat] 01/02: Update ECJ to 4.23 (a.k.a 3.29.0)
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 21858d9b95aa75673efe3b285a70097f29f2ad1c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Mar 17 10:41:08 2022 +0000
Update ECJ to 4.23 (a.k.a 3.29.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 | 3 +++
7 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 38c3955..f70c26f 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -135,15 +135,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.22" link at
-# https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/
-# https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/checksum/eclipse-4.22-SUMSSHA512
+# 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
#
-jdt.version=4.22
-jdt.release=R-4.22-202111241800
+jdt.version=4.23
+jdt.release=R-4.23-202203080310
jdt.checksum.enabled=true
jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=a014bbedd96b31576bb2b28ad16ac23edc15b59833ac810409fd42834ac6081b695167903bec0fa98d614031aeb863b3de28697d4636f23b2c47ffd93f443aae
+jdt.checksum.value=2f8c6c7bc2e2c738c853f3c977ffb7a258b9f92e260e3affdf9c8fd54ac7b70e404944d0e434eb83a14b8bf01b201effaaf9930ea4b5fdfb1a752b6abf1ae1ec
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 074a01d..d1c32e0 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.22/ecj-4.22.jar"/>
+ <classpathentry kind="var" path="TOMCAT_LIBS_BASE/ecj-4.23/ecj-4.23.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 b755fb9..2c38e31 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.22/ecj-4.22.jar!/" />
+ <root url="jar://$TOMCAT_BUILD_LIBS$/ecj-4.23/ecj-4.23.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 0aa6d06..0ef68ae 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.22/ecj-4.22.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.23/ecj-4.23.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 5b45bab..4a6c884 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.22/ecj-4.22.jar:${base.path}/bnd-6.1.0/biz.aQute.bnd-6.1.0.jar:${base.path}/migration-1.0.0/jakartaee-migration-1.0.0-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.23/ecj-4.23.jar:${base.path}/bnd-6.1.0/biz.aQute.bnd-6.1.0.jar:${base.path}/migration-1.0.0/jakartaee-migration-1.0.0-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 36b2349..0326602 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.28.0</version>
+ <version>3.29.0</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1f756d3..46b2f43 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -162,6 +162,9 @@
Remove OSGi annotations dependency as it is no longer required with bnd
6.2.0. (markt)
</update>
+ <update>
+ Update to the Eclipse JDT compiler 4.23. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org