Update JDT

Use JDT jars from maven central rather than packaging our own Fix gwtproject#10026
vegegoku · Jan 9, 2025 · ea32cc4 · ea32cc4
1 parent b2a37ef
commit ea32cc4
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 4 deletions.
diff --git a/dev/build.xml b/dev/build.xml
@@ -63,7 +63,8 @@
           <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/original/org.eclipse.jdt.core-3.32.0.jar"/>
+          <include name="eclipse/org.eclipse.jdt.core_3.33.0.v20230222-1748.jar"/>
+          <include name="eclipse/org.eclipse.jdt.core.compiler.batch_3.33.0.v20230218-1114.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"/>
@@ -125,7 +126,11 @@
           <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/original/org.eclipse.jdt.core-3.32.0.jar">
+          <zipfileset src="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core_3.33.0.v20230222-1748.jar">
+            <exclude name="META-INF/*.RSA"/>
+            <exclude name="META-INF/*.SF"/>
+          </zipfileset>
+          <zipfileset src="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core.compiler.batch_3.33.0.v20230218-1114.jar">
             <exclude name="META-INF/*.RSA"/>
             <exclude name="META-INF/*.SF"/>
           </zipfileset>
@@ -224,7 +229,9 @@
         <pathelement
             location="${gwt.tools.lib}/apache/commons/commons-collections-3.2.2.jar"/>
         <pathelement
-            location="${gwt.tools.lib}/eclipse/original/org.eclipse.jdt.core-3.32.0.jar"/>
+            location="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core_3.33.0.v20230222-1748.jar"/>
+        <pathelement
+            location="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core.compiler.batch_3.33.0.v20230218-1114.jar"/>
         <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,13 @@
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>apache-jsp</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>ecj</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/maven/poms/gwt/pom-template.xml b/maven/poms/gwt/pom-template.xml
@@ -251,6 +251,18 @@
                 <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>
+            <!-- https://mvnrepository.com/artifact/org.eclipse.jdt/ecj -->
+            <dependency>
+                <groupId>org.eclipse.jdt</groupId>
+                <artifactId>ecj</artifactId>
+                <version>3.33.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>