From c2dbc8deb82e8d923705f80e771bf004d7396b4e Mon Sep 17 00:00:00 2001
From: "Ahmad K. Bawaneh" <ahmad.bawaneh@dominokit.com>
Date: Wed, 18 Dec 2024 16:16:28 +0300
Subject: [PATCH 1/4] use original jdt jar from maven

---
 dev/build.xml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/dev/build.xml b/dev/build.xml
index 0b181dd75a..d3648b93a7 100755
--- 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/original/org.eclipse.jdt.core-3.32.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"/>
@@ -127,9 +126,7 @@
           <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"/>
+              src="${gwt.tools.lib}/eclipse/original/org.eclipse.jdt.core-3.32.0.jar"/>
           <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"/>
@@ -225,9 +222,7 @@
         <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"/>
+            location="${gwt.tools.lib}/eclipse/original/org.eclipse.jdt.core-3.32.0.jar"/>
         <pathelement
             location="${gwt.tools.lib}/guava/guava-33.0/guava-33.0.0-jre-rebased.jar"/>
         <pathelement

From d1357201e4a4fb017c8f9b2b898192562758def3 Mon Sep 17 00:00:00 2001
From: Colin Alworth <colin@vertispan.com>
Date: Wed, 18 Dec 2024 08:50:04 -0600
Subject: [PATCH 2/4] Avoid packaging jdt metainf signatures

---
 dev/build.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev/build.xml b/dev/build.xml
index d3648b93a7..97908cf89f 100755
--- a/dev/build.xml
+++ b/dev/build.xml
@@ -125,8 +125,10 @@
           <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/original/org.eclipse.jdt.core-3.32.0.jar">
+            <exclude name="META-INF/*.RSA"/>
+            <exclude name="META-INF/*.SF"/>
+          </zipfileset>
           <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"/>

From b2a37ef95cb01ebfc3cdb12f24851d87e6ebfc41 Mon Sep 17 00:00:00 2001
From: Colin Alworth <colin@vertispan.com>
Date: Wed, 18 Dec 2024 08:51:31 -0600
Subject: [PATCH 3/4] Point github actions to the new branch

---
 .github/workflows/full-check.yml  | 3 ++-
 .github/workflows/quick-check.yml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/full-check.yml b/.github/workflows/full-check.yml
index c1a277efd9..ec78628940 100644
--- a/.github/workflows/full-check.yml
+++ b/.github/workflows/full-check.yml
@@ -29,7 +29,8 @@ jobs:
       - name: Checkout GWT tools into a sibling directory
         uses: actions/checkout@v4
         with:
-          repository: 'gwtproject/tools'
+          repository: 'vegegoku/tools'
+          ref: 'no-repackaging-jdt-test'
           path: 'tools'
       - name: Set up JDK ${{ matrix.java-version }}
         # GWT requires Java 11+ to build
diff --git a/.github/workflows/quick-check.yml b/.github/workflows/quick-check.yml
index 09977bd4d6..b836ac876a 100644
--- a/.github/workflows/quick-check.yml
+++ b/.github/workflows/quick-check.yml
@@ -19,7 +19,8 @@ jobs:
       - name: Checkout GWT tools into a sibling directory
         uses: actions/checkout@v4
         with:
-          repository: 'gwtproject/tools'
+          repository: 'vegegoku/tools'
+          ref: 'no-repackaging-jdt-test'
           path: 'tools'
       - name: Set up JDK ${{ matrix.java-version }}
         # GWT presently requires Java 11+ to build

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 4/4] 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>