From eef092a2f9d95792863a51ffb427065d1b087346 Mon Sep 17 00:00:00 2001
From: "Ahmad K. Bawaneh" <ahmad.bawaneh@dominokit.com>
Date: Thu, 9 Jan 2025 17:50:49 +0300
Subject: [PATCH] Update JDT

Use JDT jars from maven central rather than packaging our own

Fix #10026
---
 dev/build.xml                           | 13 ++++++++++---
 maven/lib-gwt.sh                        |  2 +-
 maven/poms/gwt/gwt-dev/pom-template.xml |  4 ++++
 maven/poms/gwt/pom-template.xml         |  6 ++++++
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/dev/build.xml b/dev/build.xml
index 97908cf89f..e72134f892 100755
--- 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
index 4d3028523e..24b1386b4b 100644
--- 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
index 368ece89f4..c8f3419350 100644
--- 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
index 0825e6cf47..113e211d8a 100644
--- 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>