Re: [tomcat] branch 10.0.x updated: Update Eclipse JDT from 4.20 to 4.22

Mon, 03 Jan 2022 02:53:36 -0800

For reference: this is probably the ticket about moving JDT (and ECJ) to Java 11: 

https://bugs.eclipse.org/bugs/show_bug.cgi?id=572389

And this is the parallel mail discussion:

https://www.eclipse.org/lists/eclipse-dev/msg11703.html
If we roll back the change for TC 10.0 and 9, there is also the later change about JSP compilation for Java 17/18 that was depeding on the ECJ update. 

Regards,

Rainer

Am 03.01.2022 um 11:28 schrieb Rainer Jung:

It seems JDT 4.22 contains Java 11 compiled classes:

compile:
...
    [javac] /shared/build/dev/tomcat/git/10.0.x/java/org/apache/jasper/compiler/JDTCompiler.java:40: error: cannot access IProblem 
     [javac] import org.eclipse.jdt.core.compiler.IProblem;
     [javac]                                     ^
    [javac]   bad class file: /path/to/ecj-4.22/ecj-4.22.jar(org/eclipse/jdt/core/compiler/IProblem.class) 
     [javac]     class file has wrong version 55.0, should be 52.0
    [javac]     Please remove or make sure it appears in the correct subdirectory of the classpath. 

Best regards,

Rainer

Am 02.01.2022 um 17:08 schrieb ma...@apache.org:

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.0.x by this push:
      new d08f3d9  Update Eclipse JDT from 4.20 to 4.22
d08f3d9 is described below

commit d08f3d9a3126867cfc787626a2dc0295261016d3
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sun Jan 2 16:02:32 2022 +0000

     Update Eclipse JDT from 4.20 to 4.22
---
  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 3d55063..60d1598 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -137,15 +137,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.20" link at
-# https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/ -# https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/checksum/eclipse-4.20-SUMSSHA512 
+# 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 
  #
-jdt.version=4.20
-jdt.release=R-4.20-202106111600
+jdt.version=4.22
+jdt.release=R-4.22-202111241800
  jdt.checksum.enabled=true
  jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=ab441acf5551a7dc81c353eaccb3b3df9e89a48987294d19e39acdb83a5b640fcdff7414cee29f5b96eaa8826647f1d5323e185018fe33a64c402d69c73c9158 +jdt.checksum.value=a014bbedd96b31576bb2b28ad16ac23edc15b59833ac810409fd42834ac6081b695167903bec0fa98d614031aeb863b3de28697d4636f23b2c47ffd93f443aae 
  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 cc24716..b081ec5 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.20/ecj-4.20.jar"/> +    <classpathentry kind="var" path="TOMCAT_LIBS_BASE/ecj-4.22/ecj-4.22.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 a77a639..6e6a29a 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.20/ecj-4.20.jar!/" /> +          <root url="jar://$TOMCAT_BUILD_LIBS$/ecj-4.22/ecj-4.22.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 65b5205..c1c5039 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/junit-4.13.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.20/ecj-4.20.jar:${tomcat.classes} +nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.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}   # 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 81429d0..19d4262 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.20/ecj-4.20.jar:${base.path}/bnd-5.3.0/biz.aQute.bnd-5.3.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.22/ecj-4.22.jar:${base.path}/bnd-5.3.0/biz.aQute.bnd-5.3.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 cbd5193..36b2349 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.26.0</version>
+      <version>3.28.0</version>
      </dependency>
      <dependency>
        <groupId>org.apache.tomcat</groupId>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7b3181b..b25615b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -172,6 +172,9 @@
        <update>
          Update SpotBugs to 4.5.2. (markt)
        </update>
+      <update>
+        Update to the Eclipse JDT compiler 4.22. (markt)
+      </update>
      </changelog>
    </subsection>
  </section>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to