From aba32f1ee145f704ccb1a1a8d6f45d6914b31d25 Mon Sep 17 00:00:00 2001
From: Thomas Broyer <t.broyer@ltgt.net>
Date: Wed, 24 Jan 2024 12:15:14 +0100
Subject: [PATCH] Update to GWT 2.11.0

Remove testing with the com.google.gwt groupId.
---
 .github/workflows/maven.yml       |  9 ++-------
 pom.xml                           | 10 ++++------
 src/it/e2e/e2e-client/pom.xml     |  4 ++--
 src/it/e2e/e2e-model/pom.xml      |  2 +-
 src/it/e2e/e2e-server/pom.xml     |  2 +-
 src/it/e2e/e2e-shared-gwt/pom.xml |  2 +-
 src/it/e2e/e2e-shared/pom.xml     |  2 +-
 src/it/e2e/pom.xml                |  2 +-
 src/it/forceCompilation/pom.xml   |  6 +++---
 src/it/gwt-app/pom.xml            |  6 +++---
 src/it/gwt-lib/pom.xml            |  6 +++---
 src/it/skipCompilation/pom.xml    |  6 +++---
 src/it/staleness-check-2/pom.xml  |  6 +++---
 src/it/staleness-check/pom.xml    |  6 +++---
 14 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 88ba3bf..5005281 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -117,12 +117,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # 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"
-            groupId: "org.gwtproject"
+        gwt: ["2.10.0", "HEAD-SNAPSHOT"]
     continue-on-error: ${{ matrix.gwt == 'HEAD-SNAPSHOT' }}
     steps:
       - uses: actions/checkout@v4
@@ -146,7 +141,7 @@ jobs:
 
       - name: Build with Maven
         id: maven-build
-        run: mvn -B -U -ntp verify --fail-at-end -DgwtVersion=${{ matrix.gwt }} -DgwtGroupId=${{ matrix.groupId }}
+        run: mvn -B -U -ntp verify --fail-at-end -DgwtVersion=${{ matrix.gwt }}
 
       - name: Store reports
         if: always() && (steps.maven-build.outcome == 'success' || steps.maven-build.outcome == 'failure')
diff --git a/pom.xml b/pom.xml
index a0c6f6a..d6eb7f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,8 +71,7 @@
     <project.build.outputEncoding>UTF-8</project.build.outputEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-    <gwtGroupId>org.gwtproject</gwtGroupId>
-    <gwtVersion>2.10.0</gwtVersion>
+    <gwtVersion>2.11.0</gwtVersion>
   </properties>
 
   <dependencies>
@@ -182,19 +181,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>${gwtGroupId}</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <version>${gwtVersion}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${gwtGroupId}</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-dev</artifactId>
       <version>${gwtVersion}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${gwtGroupId}</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-servlet</artifactId>
       <version>${gwtVersion}</version>
       <scope>test</scope>
@@ -260,7 +259,6 @@
           <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
index dada3b0..0899c65 100644
--- 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>@gwtGroupId@</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
     <dependency>
-      <groupId>@gwtGroupId@</groupId>
+      <groupId>org.gwtproject</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
index c094b1c..30e2a7a 100644
--- a/src/it/e2e/e2e-model/pom.xml
+++ b/src/it/e2e/e2e-model/pom.xml
@@ -12,7 +12,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>@gwtGroupId@</groupId>
+      <groupId>org.gwtproject</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
index 7ab42d7..1c2d02a 100644
--- 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>@gwtGroupId@</groupId>
+      <groupId>org.gwtproject</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
index d55e430..e49a71f 100644
--- 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>@gwtGroupId@</groupId>
+      <groupId>org.gwtproject</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
index 8670ae3..805d7b6 100644
--- 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>@gwtGroupId@</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-servlet</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/src/it/e2e/pom.xml b/src/it/e2e/pom.xml
index 4bb0faf..d858973 100644
--- a/src/it/e2e/pom.xml
+++ b/src/it/e2e/pom.xml
@@ -14,7 +14,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>@gwtGroupId@</groupId>
+        <groupId>org.gwtproject</groupId>
         <artifactId>gwt</artifactId>
         <version>@gwtVersion@</version>
         <type>pom</type>
diff --git a/src/it/forceCompilation/pom.xml b/src/it/forceCompilation/pom.xml
index c9dcacf..87fa2d5 100644
--- a/src/it/forceCompilation/pom.xml
+++ b/src/it/forceCompilation/pom.xml
@@ -10,7 +10,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>@gwtGroupId@</groupId>
+        <groupId>org.gwtproject</groupId>
         <artifactId>gwt</artifactId>
         <version>@gwtVersion@</version>
         <type>pom</type>
@@ -20,11 +20,11 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>@gwtGroupId@</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
     <dependency>
-      <groupId>@gwtGroupId@</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-dev</artifactId>
     </dependency>
   </dependencies>
diff --git a/src/it/gwt-app/pom.xml b/src/it/gwt-app/pom.xml
index f24c6db..6d43aed 100644
--- a/src/it/gwt-app/pom.xml
+++ b/src/it/gwt-app/pom.xml
@@ -10,7 +10,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>@gwtGroupId@</groupId>
+        <groupId>org.gwtproject</groupId>
         <artifactId>gwt</artifactId>
         <version>@gwtVersion@</version>
         <type>pom</type>
@@ -20,11 +20,11 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>@gwtGroupId@</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
     <dependency>
-      <groupId>@gwtGroupId@</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-dev</artifactId>
     </dependency>
     <dependency>
diff --git a/src/it/gwt-lib/pom.xml b/src/it/gwt-lib/pom.xml
index 630a713..cbd81f4 100644
--- a/src/it/gwt-lib/pom.xml
+++ b/src/it/gwt-lib/pom.xml
@@ -10,7 +10,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>@gwtGroupId@</groupId>
+        <groupId>org.gwtproject</groupId>
         <artifactId>gwt</artifactId>
         <version>@gwtVersion@</version>
         <type>pom</type>
@@ -20,11 +20,11 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>@gwtGroupId@</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
     <dependency>
-      <groupId>@gwtGroupId@</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-dev</artifactId>
     </dependency>
     <dependency>
diff --git a/src/it/skipCompilation/pom.xml b/src/it/skipCompilation/pom.xml
index 7f4a58a..c1134bd 100644
--- a/src/it/skipCompilation/pom.xml
+++ b/src/it/skipCompilation/pom.xml
@@ -10,7 +10,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>@gwtGroupId@</groupId>
+        <groupId>org.gwtproject</groupId>
         <artifactId>gwt</artifactId>
         <version>@gwtVersion@</version>
         <type>pom</type>
@@ -20,11 +20,11 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>@gwtGroupId@</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
     <dependency>
-      <groupId>@gwtGroupId@</groupId>
+      <groupId>org.gwtproject</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
index 1e82724..7ecd71d 100644
--- a/src/it/staleness-check-2/pom.xml
+++ b/src/it/staleness-check-2/pom.xml
@@ -10,7 +10,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>@gwtGroupId@</groupId>
+        <groupId>org.gwtproject</groupId>
         <artifactId>gwt</artifactId>
         <version>@gwtVersion@</version>
         <type>pom</type>
@@ -20,11 +20,11 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>@gwtGroupId@</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
     <dependency>
-      <groupId>@gwtGroupId@</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-dev</artifactId>
     </dependency>
   </dependencies>
diff --git a/src/it/staleness-check/pom.xml b/src/it/staleness-check/pom.xml
index 50dd786..ff7bfd0 100644
--- a/src/it/staleness-check/pom.xml
+++ b/src/it/staleness-check/pom.xml
@@ -10,7 +10,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>@gwtGroupId@</groupId>
+        <groupId>org.gwtproject</groupId>
         <artifactId>gwt</artifactId>
         <version>@gwtVersion@</version>
         <type>pom</type>
@@ -20,11 +20,11 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>@gwtGroupId@</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
     <dependency>
-      <groupId>@gwtGroupId@</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-dev</artifactId>
     </dependency>
   </dependencies>