Skip to content

Commit a339938

Browse files
authored
Update to JDT 3.33 (#10082)
Use JDT jars from maven central rather than packaging our own. Fix #10026
1 parent a0cd441 commit a339938

File tree

4 files changed

+18
-11
lines changed

4 files changed

+18
-11
lines changed

dev/build.xml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@
6363
<include name="apache/tapestry-util-text-4.0.2.jar"/>
6464
<include name="apache/ant-zipscanner/ant-zipscanner-1.6.5-1-rebased.jar"/>
6565
<include name="colt/colt-1.2.jar"/>
66-
<include name="eclipse/org.eclipse.jdt.core_3.32.0.v20221108-1853.jar"/>
67-
<include name="eclipse/jdtCompilerAdapter_3.32.0.v20221108-1853.jar"/>
66+
<include name="eclipse/3.33.0/*.jar"/>
6867
<include name="objectweb/asm-9.6/asm-9.6.jar"/>
6968
<include name="objectweb/asm-9.6/asm-commons-9.6.jar"/>
7069
<include name="objectweb/asm-9.6/asm-util-9.6.jar"/>
@@ -126,10 +125,9 @@
126125
<zipfileset src="${gwt.tools.lib}/apache/tapestry-util-text-4.0.2.jar"/>
127126
<zipfileset src="${gwt.tools.lib}/apache/ant-zipscanner/ant-zipscanner-1.6.5-1-rebased.jar"/>
128127
<zipfileset src="${gwt.tools.lib}/colt/colt-1.2.jar"/>
129-
<zipfileset
130-
src="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core_3.32.0.v20221108-1853.jar"/>
131-
<zipfileset
132-
src="${gwt.tools.lib}/eclipse/jdtCompilerAdapter_3.32.0.v20221108-1853.jar"/>
128+
<zipgroupfileset dir="${gwt.tools.lib}/eclipse/3.33.0">
129+
<include name="**/*.jar"/>
130+
</zipgroupfileset>
133131
<zipfileset src="${gwt.tools.lib}/guava/guava-33.0/guava-33.0.0-jre-rebased.jar"/>
134132
<zipfileset src="${gwt.tools.lib}/guava/guava-33.0/failureaccess-1.0.2-rebased.jar" />
135133
<zipfileset src="${gwt.tools.lib}/icu4j/63.1/icu4j.jar"/>
@@ -224,10 +222,9 @@
224222
<pathelement location="${gwt.tools.lib}/objectweb/asm-9.6/asm-util-9.6.jar"/>
225223
<pathelement
226224
location="${gwt.tools.lib}/apache/commons/commons-collections-3.2.2.jar"/>
227-
<pathelement
228-
location="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core_3.32.0.v20221108-1853.jar"/>
229-
<pathelement
230-
location="${gwt.tools.lib}/eclipse/jdtCompilerAdapter_3.32.0.v20221108-1853.jar"/>
225+
<fileset dir="${gwt.tools.lib}/eclipse/3.33.0">
226+
<include name="**/*.jar"/>
227+
</fileset>
231228
<pathelement
232229
location="${gwt.tools.lib}/guava/guava-33.0/guava-33.0.0-jre-rebased.jar"/>
233230
<pathelement

maven/lib-gwt.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ function maven-gwt() {
8080

8181
echo "Removing bundled third-parties from gwt-dev"
8282
zip -q $GWT_EXTRACT_DIR/gwt-dev.jar --copy --out $GWT_EXTRACT_DIR/gwt-dev-trimmed.jar \
83-
"com/google/gwt/*" "org/eclipse/jdt/*"
83+
"com/google/gwt/*"
8484
mv $GWT_EXTRACT_DIR/gwt-dev-trimmed.jar $GWT_EXTRACT_DIR/gwt-dev.jar
8585
echo "Removing bundled third-parties from gwt-user"
8686
zip -q $GWT_EXTRACT_DIR/gwt-user.jar --copy --out $GWT_EXTRACT_DIR/gwt-user-trimmed.jar \

maven/poms/gwt/gwt-dev/pom-template.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,5 +114,9 @@
114114
<groupId>org.eclipse.jetty</groupId>
115115
<artifactId>apache-jsp</artifactId>
116116
</dependency>
117+
<dependency>
118+
<groupId>org.eclipse.jdt</groupId>
119+
<artifactId>org.eclipse.jdt.core</artifactId>
120+
</dependency>
117121
</dependencies>
118122
</project>

maven/poms/gwt/pom-template.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,12 @@
251251
<artifactId>jetty-xml</artifactId>
252252
<version>${jetty.version}</version>
253253
</dependency>
254+
<!-- https://mvnrepository.com/artifact/org.eclipse.jdt/org.eclipse.jdt.core -->
255+
<dependency>
256+
<groupId>org.eclipse.jdt</groupId>
257+
<artifactId>org.eclipse.jdt.core</artifactId>
258+
<version>3.33.0</version>
259+
</dependency>
254260
</dependencies>
255261
</dependencyManagement>
256262
</project>

0 commit comments

Comments
 (0)