Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update JDT #10082

Merged
merged 7 commits into from
Feb 19, 2025
Merged

Update JDT #10082

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5de028c
use original jdt jar from maven
vegegoku Dec 18, 2024
bfbb5a5
Avoid packaging jdt metainf signatures
niloc132 Dec 18, 2024
4366016
Point github actions to the new branch
niloc132 Dec 18, 2024
ca58ab0
Update JDT
vegegoku Jan 9, 2025
202dfb8
Update JDT
vegegoku Feb 9, 2025
c834a98
Update JDT
vegegoku Feb 12, 2025
0895c05
Update JDT
vegegoku Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/full-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/quick-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 7 additions & 10 deletions dev/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/3.33.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"/>
Expand Down Expand Up @@ -126,10 +125,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.32.0.v20221108-1853.jar"/>
<zipfileset
src="${gwt.tools.lib}/eclipse/jdtCompilerAdapter_3.32.0.v20221108-1853.jar"/>
<zipgroupfileset dir="${gwt.tools.lib}/eclipse/3.33.0">
<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"/>
Expand Down Expand Up @@ -224,10 +222,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.32.0.v20221108-1853.jar"/>
<pathelement
location="${gwt.tools.lib}/eclipse/jdtCompilerAdapter_3.32.0.v20221108-1853.jar"/>
<fileset dir="${gwt.tools.lib}/eclipse/3.33.0">
<include name="**/*.jar"/>
</fileset>
<pathelement
location="${gwt.tools.lib}/guava/guava-33.0/guava-33.0.0-jre-rebased.jar"/>
<pathelement
Expand Down
2 changes: 1 addition & 1 deletion maven/lib-gwt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 4 additions & 0 deletions maven/poms/gwt/gwt-dev/pom-template.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 6 additions & 0 deletions maven/poms/gwt/pom-template.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>