Update JDT

update JDT dependencies to be similar to what we get from maven. Fix #10026
gwtproject · Feb 9, 2025 · 202dfb8 · 202dfb8
1 parent ca58ab0
commit 202dfb8
Showing 1 changed file with 19 additions and 15 deletions.
diff --git a/dev/build.xml b/dev/build.xml
@@ -55,16 +55,25 @@
     </gwt.javac>
   </target>
 
-  <target name="build.alldeps.jar" description="Merges all dependency jars into a single jar">
+  <target name="remove.jars.signature" description="Call Bash script to remove signatures from JARs">
+    <exec executable="${gwt.tools.lib}/eclipse/remove-signature-files.sh" failonerror="true">
+      <!-- Pass the input.dir and output.dir as command-line arguments -->
+      <arg value="${gwt.tools.lib}/eclipse/3.33.0"/>
+      <arg value="${gwt.root}/build/out/eclipse"/>
+    </exec>
+  </target>
+
+  <target name="build.alldeps.jar"
+          depends="remove.jars.signature"
+          description="Merges all dependency jars into a single jar">
     <mkdir dir="${project.build}"/>
     <outofdate> <!-- saves rescanning all the source jars' contents -->
       <sourcefiles>
         <fileset dir="${gwt.tools.lib}">
           <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.33.0.v20230222-1748.jar"/>
-          <include name="eclipse/org.eclipse.jdt.core.compiler.batch_3.33.0.v20230218-1114.jar"/>
+          <include name="${gwt.root}/build/out/eclipse/*.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,14 +135,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.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>
+          <zipgroupfileset dir="${gwt.root}/build/out/eclipse">
+            <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"/>
@@ -200,6 +204,7 @@
   </target>
 
   <target name="compiler.standalone"
+          depends="remove.jars.signature"
           description="Validates that the standalone gwt-compiler project can build.">
     <mkdir dir="${javac.out}"/>
     <gwt.javac srcdir="core/super" excludes="com/google/gwt/dev/jjs/intrinsic/"/>
@@ -228,10 +233,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.33.0.v20230222-1748.jar"/>
-        <pathelement
-            location="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core.compiler.batch_3.33.0.v20230218-1114.jar"/>
+        <fileset dir="${gwt.root}/build/out/eclipse">
+          <include name="**/*.jar"/>
+        </fileset>
         <pathelement
             location="${gwt.tools.lib}/guava/guava-33.0/guava-33.0.0-jre-rebased.jar"/>
         <pathelement