Update to JDT 3.33 (#10082)

Use JDT jars from maven central rather than packaging our own. Fix #10026
gwtproject · Feb 19, 2025 · a339938 · a339938
1 parent a0cd441
commit a339938
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/dev/build.xml b/dev/build.xml
@@ -63,8 +63,7 @@
           <include name="apache/tapestry-util-text-4.0.2.jar"/>
           <include name="apache/ant-zipscanner/ant-zipscanner-1.6.5-1-rebased.jar"/>
           <include name="colt/colt-1.2.jar"/>
-          <include name="eclipse/org.eclipse.jdt.core_3.32.0.v20221108-1853.jar"/>
-          <include name="eclipse/jdtCompilerAdapter_3.32.0.v20221108-1853.jar"/>
+          <include name="eclipse/3.33.0/*.jar"/>
           <include name="objectweb/asm-9.6/asm-9.6.jar"/>
           <include name="objectweb/asm-9.6/asm-commons-9.6.jar"/>
           <include name="objectweb/asm-9.6/asm-util-9.6.jar"/>
@@ -126,10 +125,9 @@
           <zipfileset src="${gwt.tools.lib}/apache/tapestry-util-text-4.0.2.jar"/>
           <zipfileset src="${gwt.tools.lib}/apache/ant-zipscanner/ant-zipscanner-1.6.5-1-rebased.jar"/>
           <zipfileset src="${gwt.tools.lib}/colt/colt-1.2.jar"/>
-          <zipfileset
-              src="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core_3.32.0.v20221108-1853.jar"/>
-          <zipfileset
-              src="${gwt.tools.lib}/eclipse/jdtCompilerAdapter_3.32.0.v20221108-1853.jar"/>
+          <zipgroupfileset dir="${gwt.tools.lib}/eclipse/3.33.0">
+            <include name="**/*.jar"/>
+          </zipgroupfileset>
           <zipfileset src="${gwt.tools.lib}/guava/guava-33.0/guava-33.0.0-jre-rebased.jar"/>
           <zipfileset src="${gwt.tools.lib}/guava/guava-33.0/failureaccess-1.0.2-rebased.jar" />
           <zipfileset src="${gwt.tools.lib}/icu4j/63.1/icu4j.jar"/>
@@ -224,10 +222,9 @@
         <pathelement location="${gwt.tools.lib}/objectweb/asm-9.6/asm-util-9.6.jar"/>
         <pathelement
             location="${gwt.tools.lib}/apache/commons/commons-collections-3.2.2.jar"/>
-        <pathelement
-            location="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core_3.32.0.v20221108-1853.jar"/>
-        <pathelement
-            location="${gwt.tools.lib}/eclipse/jdtCompilerAdapter_3.32.0.v20221108-1853.jar"/>
+        <fileset dir="${gwt.tools.lib}/eclipse/3.33.0">
+          <include name="**/*.jar"/>
+        </fileset>
         <pathelement
             location="${gwt.tools.lib}/guava/guava-33.0/guava-33.0.0-jre-rebased.jar"/>
         <pathelement

diff --git a/maven/lib-gwt.sh b/maven/lib-gwt.sh
@@ -80,7 +80,7 @@ function maven-gwt() {
 
   echo "Removing bundled third-parties from gwt-dev"
   zip -q $GWT_EXTRACT_DIR/gwt-dev.jar --copy --out $GWT_EXTRACT_DIR/gwt-dev-trimmed.jar \
-      "com/google/gwt/*" "org/eclipse/jdt/*"
+      "com/google/gwt/*"
   mv $GWT_EXTRACT_DIR/gwt-dev-trimmed.jar $GWT_EXTRACT_DIR/gwt-dev.jar
   echo "Removing bundled third-parties from gwt-user"
   zip -q $GWT_EXTRACT_DIR/gwt-user.jar --copy --out $GWT_EXTRACT_DIR/gwt-user-trimmed.jar \

diff --git a/maven/poms/gwt/gwt-dev/pom-template.xml b/maven/poms/gwt/gwt-dev/pom-template.xml
@@ -114,5 +114,9 @@
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>apache-jsp</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.core</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/maven/poms/gwt/pom-template.xml b/maven/poms/gwt/pom-template.xml
@@ -251,6 +251,12 @@
                 <artifactId>jetty-xml</artifactId>
                 <version>${jetty.version}</version>
             </dependency>
+            <!-- https://mvnrepository.com/artifact/org.eclipse.jdt/org.eclipse.jdt.core -->
+            <dependency>
+                <groupId>org.eclipse.jdt</groupId>
+                <artifactId>org.eclipse.jdt.core</artifactId>
+                <version>3.33.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>