Skip to content

Commit aba32f1

Browse files
tbroyertbroyer
committed
Update to GWT 2.11.0
Remove testing with the com.google.gwt groupId.
1 parent 680bc45 commit aba32f1

File tree

14 files changed

+31
-38
lines changed

14 files changed

+31
-38
lines changed

‎.github/workflows/maven.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,7 @@ jobs:
117117
runs-on: ubuntu-latest
118118
strategy:
119119
matrix:
120-
# groupId depends on GWT version, so no need to use it in cache keys and other identifiers
121-
include:
122-
- gwt: "2.9.0"
123-
groupId: "com.google.gwt"
124-
- gwt: "HEAD-SNAPSHOT"
125-
groupId: "org.gwtproject"
120+
gwt: ["2.10.0", "HEAD-SNAPSHOT"]
126121
continue-on-error: ${{ matrix.gwt == 'HEAD-SNAPSHOT' }}
127122
steps:
128123
- uses: actions/checkout@v4
@@ -146,7 +141,7 @@ jobs:
146141
147142
- name: Build with Maven
148143
id: maven-build
149-
run: mvn -B -U -ntp verify --fail-at-end -DgwtVersion=${{ matrix.gwt }} -DgwtGroupId=${{ matrix.groupId }}
144+
run: mvn -B -U -ntp verify --fail-at-end -DgwtVersion=${{ matrix.gwt }}
150145

151146
- name: Store reports
152147
if: always() && (steps.maven-build.outcome == 'success' || steps.maven-build.outcome == 'failure')

‎pom.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@
7171
<project.build.outputEncoding>UTF-8</project.build.outputEncoding>
7272
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
7373

74-
<gwtGroupId>org.gwtproject</gwtGroupId>
75-
<gwtVersion>2.10.0</gwtVersion>
74+
<gwtVersion>2.11.0</gwtVersion>
7675
</properties>
7776

7877
<dependencies>
@@ -182,19 +181,19 @@
182181
<!-- Some artifacts used by invoker tests, declared here so they're resolved early -->
183182
<!-- Actually because invoker plugin cannot install snapshots through extraArtifacts -->
184183
<dependency>
185-
<groupId>${gwtGroupId}</groupId>
184+
<groupId>org.gwtproject</groupId>
186185
<artifactId>gwt-user</artifactId>
187186
<version>${gwtVersion}</version>
188187
<scope>test</scope>
189188
</dependency>
190189
<dependency>
191-
<groupId>${gwtGroupId}</groupId>
190+
<groupId>org.gwtproject</groupId>
192191
<artifactId>gwt-dev</artifactId>
193192
<version>${gwtVersion}</version>
194193
<scope>test</scope>
195194
</dependency>
196195
<dependency>
197-
<groupId>${gwtGroupId}</groupId>
196+
<groupId>org.gwtproject</groupId>
198197
<artifactId>gwt-servlet</artifactId>
199198
<version>${gwtVersion}</version>
200199
<scope>test</scope>
@@ -260,7 +259,6 @@
260259
<localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
261260
<settingsFile>src/it/settings.xml</settingsFile>
262261
<filterProperties>
263-
<gwtGroupId>${gwtGroupId}</gwtGroupId>
264262
<gwtVersion>${gwtVersion}</gwtVersion>
265263
</filterProperties>
266264
<extraArtifacts>

‎src/it/e2e/e2e-client/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
<type>gwt-lib</type>
2121
</dependency>
2222
<dependency>
23-
<groupId>@gwtGroupId@</groupId>
23+
<groupId>org.gwtproject</groupId>
2424
<artifactId>gwt-user</artifactId>
2525
</dependency>
2626
<dependency>
27-
<groupId>@gwtGroupId@</groupId>
27+
<groupId>org.gwtproject</groupId>
2828
<artifactId>gwt-dev</artifactId>
2929
</dependency>
3030
<dependency>

‎src/it/e2e/e2e-model/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<dependencies>
1414
<dependency>
15-
<groupId>@gwtGroupId@</groupId>
15+
<groupId>org.gwtproject</groupId>
1616
<artifactId>gwt-servlet</artifactId>
1717
<!-- Needed for the CustomFieldSerializer; can be provided by gwt-servlet or gwt-user -->
1818
<scope>provided</scope>

‎src/it/e2e/e2e-server/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<scope>runtime</scope>
2727
</dependency>
2828
<dependency>
29-
<groupId>@gwtGroupId@</groupId>
29+
<groupId>org.gwtproject</groupId>
3030
<artifactId>gwt-servlet</artifactId>
3131
</dependency>
3232
<dependency>

‎src/it/e2e/e2e-shared-gwt/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<type>gwt-lib</type>
3232
</dependency>
3333
<dependency>
34-
<groupId>@gwtGroupId@</groupId>
34+
<groupId>org.gwtproject</groupId>
3535
<artifactId>gwt-servlet</artifactId>
3636
<scope>provided</scope>
3737
</dependency>

‎src/it/e2e/e2e-shared/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<version>${project.version}</version>
1818
</dependency>
1919
<dependency>
20-
<groupId>@gwtGroupId@</groupId>
20+
<groupId>org.gwtproject</groupId>
2121
<artifactId>gwt-servlet</artifactId>
2222
<scope>provided</scope>
2323
</dependency>

‎src/it/e2e/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<dependencyManagement>
1515
<dependencies>
1616
<dependency>
17-
<groupId>@gwtGroupId@</groupId>
17+
<groupId>org.gwtproject</groupId>
1818
<artifactId>gwt</artifactId>
1919
<version>@gwtVersion@</version>
2020
<type>pom</type>

‎src/it/forceCompilation/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<dependencyManagement>
1111
<dependencies>
1212
<dependency>
13-
<groupId>@gwtGroupId@</groupId>
13+
<groupId>org.gwtproject</groupId>
1414
<artifactId>gwt</artifactId>
1515
<version>@gwtVersion@</version>
1616
<type>pom</type>
@@ -20,11 +20,11 @@
2020
</dependencyManagement>
2121
<dependencies>
2222
<dependency>
23-
<groupId>@gwtGroupId@</groupId>
23+
<groupId>org.gwtproject</groupId>
2424
<artifactId>gwt-user</artifactId>
2525
</dependency>
2626
<dependency>
27-
<groupId>@gwtGroupId@</groupId>
27+
<groupId>org.gwtproject</groupId>
2828
<artifactId>gwt-dev</artifactId>
2929
</dependency>
3030
</dependencies>

‎src/it/gwt-app/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<dependencyManagement>
1111
<dependencies>
1212
<dependency>
13-
<groupId>@gwtGroupId@</groupId>
13+
<groupId>org.gwtproject</groupId>
1414
<artifactId>gwt</artifactId>
1515
<version>@gwtVersion@</version>
1616
<type>pom</type>
@@ -20,11 +20,11 @@
2020
</dependencyManagement>
2121
<dependencies>
2222
<dependency>
23-
<groupId>@gwtGroupId@</groupId>
23+
<groupId>org.gwtproject</groupId>
2424
<artifactId>gwt-user</artifactId>
2525
</dependency>
2626
<dependency>
27-
<groupId>@gwtGroupId@</groupId>
27+
<groupId>org.gwtproject</groupId>
2828
<artifactId>gwt-dev</artifactId>
2929
</dependency>
3030
<dependency>

‎src/it/gwt-lib/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<dependencyManagement>
1111
<dependencies>
1212
<dependency>
13-
<groupId>@gwtGroupId@</groupId>
13+
<groupId>org.gwtproject</groupId>
1414
<artifactId>gwt</artifactId>
1515
<version>@gwtVersion@</version>
1616
<type>pom</type>
@@ -20,11 +20,11 @@
2020
</dependencyManagement>
2121
<dependencies>
2222
<dependency>
23-
<groupId>@gwtGroupId@</groupId>
23+
<groupId>org.gwtproject</groupId>
2424
<artifactId>gwt-user</artifactId>
2525
</dependency>
2626
<dependency>
27-
<groupId>@gwtGroupId@</groupId>
27+
<groupId>org.gwtproject</groupId>
2828
<artifactId>gwt-dev</artifactId>
2929
</dependency>
3030
<dependency>

‎src/it/skipCompilation/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<dependencyManagement>
1111
<dependencies>
1212
<dependency>
13-
<groupId>@gwtGroupId@</groupId>
13+
<groupId>org.gwtproject</groupId>
1414
<artifactId>gwt</artifactId>
1515
<version>@gwtVersion@</version>
1616
<type>pom</type>
@@ -20,11 +20,11 @@
2020
</dependencyManagement>
2121
<dependencies>
2222
<dependency>
23-
<groupId>@gwtGroupId@</groupId>
23+
<groupId>org.gwtproject</groupId>
2424
<artifactId>gwt-user</artifactId>
2525
</dependency>
2626
<dependency>
27-
<groupId>@gwtGroupId@</groupId>
27+
<groupId>org.gwtproject</groupId>
2828
<artifactId>gwt-dev</artifactId>
2929
</dependency>
3030
</dependencies>

‎src/it/staleness-check-2/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<dependencyManagement>
1111
<dependencies>
1212
<dependency>
13-
<groupId>@gwtGroupId@</groupId>
13+
<groupId>org.gwtproject</groupId>
1414
<artifactId>gwt</artifactId>
1515
<version>@gwtVersion@</version>
1616
<type>pom</type>
@@ -20,11 +20,11 @@
2020
</dependencyManagement>
2121
<dependencies>
2222
<dependency>
23-
<groupId>@gwtGroupId@</groupId>
23+
<groupId>org.gwtproject</groupId>
2424
<artifactId>gwt-user</artifactId>
2525
</dependency>
2626
<dependency>
27-
<groupId>@gwtGroupId@</groupId>
27+
<groupId>org.gwtproject</groupId>
2828
<artifactId>gwt-dev</artifactId>
2929
</dependency>
3030
</dependencies>

‎src/it/staleness-check/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<dependencyManagement>
1111
<dependencies>
1212
<dependency>
13-
<groupId>@gwtGroupId@</groupId>
13+
<groupId>org.gwtproject</groupId>
1414
<artifactId>gwt</artifactId>
1515
<version>@gwtVersion@</version>
1616
<type>pom</type>
@@ -20,11 +20,11 @@
2020
</dependencyManagement>
2121
<dependencies>
2222
<dependency>
23-
<groupId>@gwtGroupId@</groupId>
23+
<groupId>org.gwtproject</groupId>
2424
<artifactId>gwt-user</artifactId>
2525
</dependency>
2626
<dependency>
27-
<groupId>@gwtGroupId@</groupId>
27+
<groupId>org.gwtproject</groupId>
2828
<artifactId>gwt-dev</artifactId>
2929
</dependency>
3030
</dependencies>

0 commit comments

Comments
 (0)