Update to GWT 2.10.0

Keep testing against com.google.gwt snapshots until org.gwtproject are deployed.
tbroyer · Jul 22, 2022 · 3f742b3 · 3f742b3
1 parent c601662
commit 3f742b3
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 34 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -114,7 +114,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        gwt: [ "2.8.2", "HEAD-SNAPSHOT" ]
+        # groupId depends on GWT version, so no need to use it in cache keys and other identifiers
+        include:
+          - gwt: "2.9.0"
+            groupId: "com.google.gwt"
+          - gwt: "HEAD-SNAPSHOT"
+            # TODO: move to org.gwtproject once they're deployed
+            groupId: "com.google.gwt"
     steps:
       - uses: actions/checkout@v3
 
@@ -135,7 +141,7 @@ jobs:
 
       - name: Build with Maven
         id: maven-build
-        run: mvn -B -U -ntp verify --fail-at-end -DgwtVersion=${{ matrix.gwt }}
+        run: mvn -B -U -ntp verify --fail-at-end -DgwtVersion=${{ matrix.gwt }} -DgwtGroupId=${{ matrix.groupId }}
 
       - name: Store reports
         if: steps.maven-build.outcome == 'success' || steps.maven-build.outcome == 'failure'

diff --git a/pom.xml b/pom.xml
@@ -52,6 +52,7 @@
 
   <repositories>
     <repository>
+      <!-- TODO: move to ossrh once org.gwtproject snapshots are deployed there -->
       <id>google-snapshots</id>
       <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url>
       <releases>
@@ -71,7 +72,8 @@
     <project.build.outputEncoding>UTF-8</project.build.outputEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-    <gwtVersion>2.9.0</gwtVersion>
+    <gwtGroupId>org.gwtproject</gwtGroupId>
+    <gwtVersion>2.10.0</gwtVersion>
   </properties>
 
   <dependencies>
@@ -147,19 +149,19 @@
     <!-- Some artifacts used by invoker tests, declared here so they're resolved early -->
     <!-- Actually because invoker plugin cannot install snapshots through extraArtifacts -->
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>${gwtGroupId}</groupId>
       <artifactId>gwt-user</artifactId>
       <version>${gwtVersion}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>${gwtGroupId}</groupId>
       <artifactId>gwt-dev</artifactId>
       <version>${gwtVersion}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>${gwtGroupId}</groupId>
       <artifactId>gwt-servlet</artifactId>
       <version>${gwtVersion}</version>
       <scope>test</scope>
@@ -229,6 +231,7 @@
           <localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
           <settingsFile>src/it/settings.xml</settingsFile>
           <filterProperties>
+            <gwtGroupId>${gwtGroupId}</gwtGroupId>
             <gwtVersion>${gwtVersion}</gwtVersion>
           </filterProperties>
           <extraArtifacts>

diff --git a/src/it/e2e/e2e-client/pom.xml b/src/it/e2e/e2e-client/pom.xml
@@ -20,11 +20,11 @@
       <type>gwt-lib</type>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>@gwtGroupId@</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>@gwtGroupId@</groupId>
       <artifactId>gwt-dev</artifactId>
     </dependency>
     <dependency>

diff --git a/src/it/e2e/e2e-model/pom.xml b/src/it/e2e/e2e-model/pom.xml
@@ -12,7 +12,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>@gwtGroupId@</groupId>
       <artifactId>gwt-servlet</artifactId>
       <!-- Needed for the CustomFieldSerializer; can be provided by gwt-servlet or gwt-user -->
       <scope>provided</scope>

diff --git a/src/it/e2e/e2e-server/pom.xml b/src/it/e2e/e2e-server/pom.xml
@@ -26,7 +26,7 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>@gwtGroupId@</groupId>
       <artifactId>gwt-servlet</artifactId>
     </dependency>
     <dependency>

diff --git a/src/it/e2e/e2e-shared-gwt/pom.xml b/src/it/e2e/e2e-shared-gwt/pom.xml
@@ -31,7 +31,7 @@
       <type>gwt-lib</type>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>@gwtGroupId@</groupId>
       <artifactId>gwt-servlet</artifactId>
       <scope>provided</scope>
     </dependency>

diff --git a/src/it/e2e/e2e-shared/pom.xml b/src/it/e2e/e2e-shared/pom.xml
@@ -17,7 +17,7 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>@gwtGroupId@</groupId>
       <artifactId>gwt-servlet</artifactId>
       <scope>provided</scope>
     </dependency>

diff --git a/src/it/e2e/pom.xml b/src/it/e2e/pom.xml
@@ -14,7 +14,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>com.google.gwt</groupId>
+        <groupId>@gwtGroupId@</groupId>
         <artifactId>gwt</artifactId>
         <version>@gwtVersion@</version>
         <type>pom</type>

diff --git a/src/it/forceCompilation/pom.xml b/src/it/forceCompilation/pom.xml
@@ -10,7 +10,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>com.google.gwt</groupId>
+        <groupId>@gwtGroupId@</groupId>
         <artifactId>gwt</artifactId>
         <version>@gwtVersion@</version>
         <type>pom</type>
@@ -20,11 +20,11 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>@gwtGroupId@</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>@gwtGroupId@</groupId>
       <artifactId>gwt-dev</artifactId>
     </dependency>
   </dependencies>

diff --git a/src/it/gwt-app/pom.xml b/src/it/gwt-app/pom.xml
@@ -10,7 +10,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>com.google.gwt</groupId>
+        <groupId>@gwtGroupId@</groupId>
         <artifactId>gwt</artifactId>
         <version>@gwtVersion@</version>
         <type>pom</type>
@@ -20,11 +20,11 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>@gwtGroupId@</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>@gwtGroupId@</groupId>
       <artifactId>gwt-dev</artifactId>
     </dependency>
     <dependency>

diff --git a/src/it/gwt-lib/pom.xml b/src/it/gwt-lib/pom.xml
@@ -10,7 +10,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>com.google.gwt</groupId>
+        <groupId>@gwtGroupId@</groupId>
         <artifactId>gwt</artifactId>
         <version>@gwtVersion@</version>
         <type>pom</type>
@@ -20,11 +20,11 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>@gwtGroupId@</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>@gwtGroupId@</groupId>
       <artifactId>gwt-dev</artifactId>
     </dependency>
     <dependency>

diff --git a/src/it/skipCompilation/pom.xml b/src/it/skipCompilation/pom.xml
@@ -10,7 +10,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>com.google.gwt</groupId>
+        <groupId>@gwtGroupId@</groupId>
         <artifactId>gwt</artifactId>
         <version>@gwtVersion@</version>
         <type>pom</type>
@@ -20,11 +20,11 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>@gwtGroupId@</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>@gwtGroupId@</groupId>
       <artifactId>gwt-dev</artifactId>
     </dependency>
   </dependencies>

diff --git a/src/it/staleness-check-2/pom.xml b/src/it/staleness-check-2/pom.xml
@@ -10,7 +10,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>com.google.gwt</groupId>
+        <groupId>@gwtGroupId@</groupId>
         <artifactId>gwt</artifactId>
         <version>@gwtVersion@</version>
         <type>pom</type>
@@ -20,11 +20,11 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>@gwtGroupId@</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>@gwtGroupId@</groupId>
       <artifactId>gwt-dev</artifactId>
     </dependency>
   </dependencies>

diff --git a/src/it/staleness-check/pom.xml b/src/it/staleness-check/pom.xml
@@ -10,7 +10,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>com.google.gwt</groupId>
+        <groupId>@gwtGroupId@</groupId>
         <artifactId>gwt</artifactId>
         <version>@gwtVersion@</version>
         <type>pom</type>
@@ -20,11 +20,11 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>@gwtGroupId@</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>@gwtGroupId@</groupId>
       <artifactId>gwt-dev</artifactId>
     </dependency>
   </dependencies>

diff --git a/src/site/markdown/usage.md.vm b/src/site/markdown/usage.md.vm
@@ -26,7 +26,7 @@ $h2 Basic usage
     <dependencyManagement>
       <dependencies>
         <dependency>
-          <groupId>com.google.gwt</groupId>
+          <groupId>org.gwtproject</groupId>
           <artifactId>gwt</artifactId>
           <version>${gwtVersion}</version>
           <type>pom</type>
@@ -36,11 +36,11 @@ $h2 Basic usage
     </dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>com.google.gwt</groupId>
+        <groupId>org.gwtproject</groupId>
         <artifactId>gwt-user</artifactId>
       </dependency>
       <dependency>
-        <groupId>com.google.gwt</groupId>
+        <groupId>org.gwtproject</groupId>
         <artifactId>gwt-dev</artifactId>
       </dependency>
     </dependencies>