From a9d1e9cb3812e6b9d789871faa1ab45a1ba3f022 Mon Sep 17 00:00:00 2001
From: Stanislav Melnichuk <melnichuk.stas@gmail.com>
Date: Wed, 29 Jan 2025 15:29:44 +0300
Subject: [PATCH] core: update GWT to the newer version

In new releases there are small fixes and possibility
to build it with newer versions of java (up to 21).

Signed-off-by: Stanislav Melnichuk <melnichuk.stas@gmail.com>
---
 frontend/webadmin/modules/frontend/pom.xml    |  6 +++---
 frontend/webadmin/modules/gwt-aop/pom.xml     |  4 ++--
 frontend/webadmin/modules/gwt-common/pom.xml  |  4 ++--
 .../webadmin/modules/gwt-extension/pom.xml    |  2 +-
 frontend/webadmin/modules/pom.xml             |  2 +-
 frontend/webadmin/modules/uicommonweb/pom.xml |  2 +-
 frontend/webadmin/modules/uicompat/pom.xml    |  2 +-
 frontend/webadmin/modules/webadmin/pom.xml    |  6 +++---
 pom.xml                                       | 19 ++++++++++---------
 9 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/frontend/webadmin/modules/frontend/pom.xml b/frontend/webadmin/modules/frontend/pom.xml
index 8512f29f7f2..3d7a699acb8 100644
--- a/frontend/webadmin/modules/frontend/pom.xml
+++ b/frontend/webadmin/modules/frontend/pom.xml
@@ -15,7 +15,7 @@
       <artifactId>activation</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-servlet</artifactId>
     </dependency>
     <dependency>
@@ -27,7 +27,7 @@
       <artifactId>jboss-jaxb-api_2.3_spec</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
     <!-- Guice and GIN -->
@@ -47,7 +47,7 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-dev</artifactId>
     </dependency>
     <dependency>
diff --git a/frontend/webadmin/modules/gwt-aop/pom.xml b/frontend/webadmin/modules/gwt-aop/pom.xml
index 233c7906a75..474689f01e2 100644
--- a/frontend/webadmin/modules/gwt-aop/pom.xml
+++ b/frontend/webadmin/modules/gwt-aop/pom.xml
@@ -11,11 +11,11 @@
   <name>AOP tweaks for GWT compiler</name>
   <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>
     <dependency>
diff --git a/frontend/webadmin/modules/gwt-common/pom.xml b/frontend/webadmin/modules/gwt-common/pom.xml
index c95ab0560b7..e3d60b74030 100644
--- a/frontend/webadmin/modules/gwt-common/pom.xml
+++ b/frontend/webadmin/modules/gwt-common/pom.xml
@@ -12,11 +12,11 @@
   <dependencies>
     <!-- Google Web Toolkit 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>
     <!-- GWT wrapper for Bootstrap framework -->
diff --git a/frontend/webadmin/modules/gwt-extension/pom.xml b/frontend/webadmin/modules/gwt-extension/pom.xml
index 64686485c81..95e0e1950e2 100644
--- a/frontend/webadmin/modules/gwt-extension/pom.xml
+++ b/frontend/webadmin/modules/gwt-extension/pom.xml
@@ -14,7 +14,7 @@
   </properties>
   <dependencies>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
     <dependency>
diff --git a/frontend/webadmin/modules/pom.xml b/frontend/webadmin/modules/pom.xml
index c80f4a096cc..e24fa167990 100644
--- a/frontend/webadmin/modules/pom.xml
+++ b/frontend/webadmin/modules/pom.xml
@@ -187,7 +187,7 @@
               <artifactId>gwt-maven-plugin</artifactId>
               <dependencies>
                 <dependency>
-                  <groupId>com.google.gwt</groupId>
+                  <groupId>org.gwtproject</groupId>
                   <artifactId>gwt-codeserver</artifactId>
                   <version>${gwt.version}</version>
                 </dependency>
diff --git a/frontend/webadmin/modules/uicommonweb/pom.xml b/frontend/webadmin/modules/uicommonweb/pom.xml
index cafad00888b..179f12ec13e 100644
--- a/frontend/webadmin/modules/uicommonweb/pom.xml
+++ b/frontend/webadmin/modules/uicommonweb/pom.xml
@@ -32,7 +32,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.google.gwt</groupId>
+            <groupId>org.gwtproject</groupId>
             <artifactId>gwt-user</artifactId>
         </dependency>
         <dependency>
diff --git a/frontend/webadmin/modules/uicompat/pom.xml b/frontend/webadmin/modules/uicompat/pom.xml
index d575fffacb6..808fa208006 100644
--- a/frontend/webadmin/modules/uicompat/pom.xml
+++ b/frontend/webadmin/modules/uicompat/pom.xml
@@ -34,7 +34,7 @@
       <version>${engine.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
   </dependencies>
diff --git a/frontend/webadmin/modules/webadmin/pom.xml b/frontend/webadmin/modules/webadmin/pom.xml
index 768d96c6d89..f9cb1a6c7bf 100644
--- a/frontend/webadmin/modules/webadmin/pom.xml
+++ b/frontend/webadmin/modules/webadmin/pom.xml
@@ -16,15 +16,15 @@
   <dependencies>
     <!-- Google Web Toolkit 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>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-servlet</artifactId>
     </dependency>
     <!-- GWT wrapper for Bootstrap framework -->
diff --git a/pom.xml b/pom.xml
index e4cf23878a5..e5cd61aa94f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,8 @@
     <eddsa.version>0.3.0</eddsa.version>
     <gin.version>3.0.0</gin.version>
     <guice.version>4.2.3</guice.version>
-    <gwt.version>2.9.0</gwt.version>
+    <gwt.version>2.12.1</gwt.version>
+    <gwt-maven-plugin.version>2.10.0</gwt-maven-plugin.version>
     <gwtbootstrap3.version>0.9.4</gwtbootstrap3.version>
     <gwtp.version>1.6</gwtp.version>
     <hamcrest.version>1.3</hamcrest.version>
@@ -538,26 +539,26 @@
         <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>com.google.gwt</groupId>
+        <groupId>org.gwtproject</groupId>
         <artifactId>gwt</artifactId>
         <version>${gwt.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
-        <groupId>com.google.gwt</groupId>
+        <groupId>org.gwtproject</groupId>
         <artifactId>gwt-user</artifactId>
         <version>${gwt.version}</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>com.google.gwt</groupId>
+        <groupId>org.gwtproject</groupId>
         <artifactId>gwt-dev</artifactId>
         <version>${gwt.version}</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>com.google.gwt</groupId>
+        <groupId>org.gwtproject</groupId>
         <artifactId>gwt-servlet</artifactId>
         <version>${gwt.version}</version>
         <scope>runtime</scope>
@@ -962,20 +963,20 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>gwt-maven-plugin</artifactId>
-          <version>${gwt.version}</version>
+          <version>${gwt-maven-plugin.version}</version>
           <dependencies>
             <dependency>
-              <groupId>com.google.gwt</groupId>
+              <groupId>org.gwtproject</groupId>
               <artifactId>gwt-user</artifactId>
               <version>${gwt.version}</version>
             </dependency>
             <dependency>
-              <groupId>com.google.gwt</groupId>
+              <groupId>org.gwtproject</groupId>
               <artifactId>gwt-dev</artifactId>
               <version>${gwt.version}</version>
             </dependency>
             <dependency>
-              <groupId>com.google.gwt</groupId>
+              <groupId>org.gwtproject</groupId>
               <artifactId>gwt-servlet</artifactId>
               <version>${gwt.version}</version>
             </dependency>