From 9800edede58685cd40c6b069ce56cd55e3ef744d Mon Sep 17 00:00:00 2001
From: Yeser Amer <yeser.amer@ibm.com>
Date: Wed, 24 Jul 2024 11:52:06 +0200
Subject: [PATCH 1/6] Update to GWT 2.10.0

---
 .../client/editors/types/DataTypePickerWidgetTest.java |  2 +-
 .../grid/model/BaseHasDynamicHeightCellTest.java       |  4 ++--
 .../management/client/widget/CustomGroupItemTest.java  |  8 ++++----
 .../entrypoint/DefaultWorkbenchEntryPointTest.java     |  2 +-
 .../editor/DiagramEditorMenuSessionItemsTest.java      |  6 +++---
 .../editor/ProjectEditorMenuSessionItemsTest.java      |  6 +++---
 .../stunner/bpmn/client/forms/util/StringUtils.java    | 10 ++++++----
 .../bpmn/client/forms/util/StringUtilsTest.java        |  8 +++++++-
 .../widgets/client/handlers/PackageListBoxTest.java    |  2 +-
 9 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/kie-wb-common-dmn/kie-wb-common-dmn-client/src/test/java/org/kie/workbench/common/dmn/client/editors/types/DataTypePickerWidgetTest.java b/kie-wb-common-dmn/kie-wb-common-dmn-client/src/test/java/org/kie/workbench/common/dmn/client/editors/types/DataTypePickerWidgetTest.java
index 6f962700019..25f359a9c98 100644
--- a/kie-wb-common-dmn/kie-wb-common-dmn-client/src/test/java/org/kie/workbench/common/dmn/client/editors/types/DataTypePickerWidgetTest.java
+++ b/kie-wb-common-dmn/kie-wb-common-dmn-client/src/test/java/org/kie/workbench/common/dmn/client/editors/types/DataTypePickerWidgetTest.java
@@ -20,8 +20,8 @@
 import java.util.List;
 import java.util.Optional;
 
+import com.google.common.collect.Ordering;
 import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.thirdparty.guava.common.collect.Ordering;
 import com.google.gwtmockito.GwtMock;
 import com.google.gwtmockito.GwtMockitoTestRunner;
 import org.gwtbootstrap3.extras.select.client.ui.OptGroup;
diff --git a/kie-wb-common-dmn/kie-wb-common-dmn-client/src/test/java/org/kie/workbench/common/dmn/client/widgets/grid/model/BaseHasDynamicHeightCellTest.java b/kie-wb-common-dmn/kie-wb-common-dmn-client/src/test/java/org/kie/workbench/common/dmn/client/widgets/grid/model/BaseHasDynamicHeightCellTest.java
index ea96a2a34db..2be186c1116 100644
--- a/kie-wb-common-dmn/kie-wb-common-dmn-client/src/test/java/org/kie/workbench/common/dmn/client/widgets/grid/model/BaseHasDynamicHeightCellTest.java
+++ b/kie-wb-common-dmn/kie-wb-common-dmn-client/src/test/java/org/kie/workbench/common/dmn/client/widgets/grid/model/BaseHasDynamicHeightCellTest.java
@@ -25,8 +25,8 @@
 import org.uberfire.ext.wires.core.grids.client.model.impl.BaseGridCell;
 import org.uberfire.ext.wires.core.grids.client.model.impl.BaseGridCellValue;
 
-import static com.ibm.icu.impl.Assert.fail;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.fail;
 import static org.kie.workbench.common.dmn.client.editors.expressions.util.RendererUtils.EXPRESSION_TEXT_PADDING;
 import static org.kie.workbench.common.dmn.client.widgets.grid.model.BaseHasDynamicHeightCell.DEFAULT_HEIGHT;
 
@@ -143,7 +143,7 @@ protected void setValue(final CELL cell,
             m.setAccessible(true);
             m.invoke(cell, value);
         } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-            fail(e);
+            fail(e.getMessage());
         }
     }
 }
diff --git a/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/src/test/java/org/kie/workbench/common/screens/server/management/client/widget/CustomGroupItemTest.java b/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/src/test/java/org/kie/workbench/common/screens/server/management/client/widget/CustomGroupItemTest.java
index c41c176205a..59c5d09bf72 100644
--- a/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/src/test/java/org/kie/workbench/common/screens/server/management/client/widget/CustomGroupItemTest.java
+++ b/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/src/test/java/org/kie/workbench/common/screens/server/management/client/widget/CustomGroupItemTest.java
@@ -17,10 +17,10 @@
 package org.kie.workbench.common.screens.server.management.client.widget;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.google.gwt.dev.util.collect.HashSet;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.event.shared.HandlerRegistration;
@@ -41,9 +41,9 @@
 @WithClassesToStub({ Anchor.class })
 public class CustomGroupItemTest {
 
-    public Set<String> styles = new HashSet<String>();
-    public List<String> text = new ArrayList<String>();
-    public List<IconType> icon = new ArrayList<IconType>();
+    public Set<String> styles = new HashSet<>();
+    public List<String> text = new ArrayList<>();
+    public List<IconType> icon = new ArrayList<>();
     public ClickHandler clickHandler = null;
     final Command command = mock( Command.class );
 
diff --git a/kie-wb-common-screens/kie-wb-common-workbench/kie-wb-common-workbench-client/src/test/java/org/kie/workbench/common/workbench/client/entrypoint/DefaultWorkbenchEntryPointTest.java b/kie-wb-common-screens/kie-wb-common-workbench/kie-wb-common-workbench-client/src/test/java/org/kie/workbench/common/workbench/client/entrypoint/DefaultWorkbenchEntryPointTest.java
index a0b3231f5c2..4e7e46c95f1 100644
--- a/kie-wb-common-screens/kie-wb-common-workbench/kie-wb-common-workbench-client/src/test/java/org/kie/workbench/common/workbench/client/entrypoint/DefaultWorkbenchEntryPointTest.java
+++ b/kie-wb-common-screens/kie-wb-common-workbench/kie-wb-common-workbench-client/src/test/java/org/kie/workbench/common/workbench/client/entrypoint/DefaultWorkbenchEntryPointTest.java
@@ -16,9 +16,9 @@
 
 package org.kie.workbench.common.workbench.client.entrypoint;
 
+import java.util.HashMap;
 import java.util.Map;
 
-import com.google.gwt.dev.util.collect.HashMap;
 import com.google.gwtmockito.GwtMockitoTestRunner;
 import org.guvnor.common.services.shared.config.AppConfigService;
 import org.jboss.errai.bus.client.api.messaging.Message;
diff --git a/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-project/kie-wb-common-stunner-project-client/src/test/java/org/kie/workbench/common/stunner/project/client/editor/DiagramEditorMenuSessionItemsTest.java b/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-project/kie-wb-common-stunner-project-client/src/test/java/org/kie/workbench/common/stunner/project/client/editor/DiagramEditorMenuSessionItemsTest.java
index 5fc47405aef..17d1a5b266b 100644
--- a/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-project/kie-wb-common-stunner-project-client/src/test/java/org/kie/workbench/common/stunner/project/client/editor/DiagramEditorMenuSessionItemsTest.java
+++ b/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-project/kie-wb-common-stunner-project-client/src/test/java/org/kie/workbench/common/stunner/project/client/editor/DiagramEditorMenuSessionItemsTest.java
@@ -29,9 +29,9 @@
 import org.uberfire.workbench.model.menu.MenuItem;
 import org.uberfire.workbench.model.menu.impl.BaseMenuCustom;
 
-import static com.ibm.icu.impl.Assert.fail;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -110,7 +110,7 @@ public void testEnableItemWithUnknownMenuItem() {
         try {
             editorMenuSessionItems.setItemEnabled(ClientSessionCommand.class, true);
         } catch (Exception e) {
-            fail(e);
+            fail(e.getMessage());
         }
     }
 
@@ -146,7 +146,7 @@ public void testIsEnabledWithUnknownMenuItem() {
         try {
             assertFalse(editorMenuSessionItems.isItemEnabled(ClearSessionCommand.class));
         } catch (Exception e) {
-            fail(e);
+            fail(e.getMessage());
         }
     }
 }
diff --git a/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-project/kie-wb-common-stunner-project-client/src/test/java/org/kie/workbench/common/stunner/project/client/editor/ProjectEditorMenuSessionItemsTest.java b/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-project/kie-wb-common-stunner-project-client/src/test/java/org/kie/workbench/common/stunner/project/client/editor/ProjectEditorMenuSessionItemsTest.java
index c854fa183f5..3e862efae75 100644
--- a/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-project/kie-wb-common-stunner-project-client/src/test/java/org/kie/workbench/common/stunner/project/client/editor/ProjectEditorMenuSessionItemsTest.java
+++ b/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-project/kie-wb-common-stunner-project-client/src/test/java/org/kie/workbench/common/stunner/project/client/editor/ProjectEditorMenuSessionItemsTest.java
@@ -30,9 +30,9 @@
 import org.uberfire.workbench.model.menu.MenuItem;
 import org.uberfire.workbench.model.menu.impl.BaseMenuCustom;
 
-import static com.ibm.icu.impl.Assert.fail;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -111,7 +111,7 @@ public void testEnableItemWithUnknownMenuItem() {
         try {
             editorMenuSessionItems.setItemEnabled(ClientSessionCommand.class, true);
         } catch (Exception e) {
-            fail(e);
+            fail(e.getMessage());
         }
     }
 
@@ -147,7 +147,7 @@ public void testIsEnabledWithUnknownMenuItem() {
         try {
             assertFalse(editorMenuSessionItems.isItemEnabled(ClearSessionCommand.class));
         } catch (Exception e) {
-            fail(e);
+            fail(e.getMessage());
         }
     }
 }
diff --git a/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/main/java/org/kie/workbench/common/stunner/bpmn/client/forms/util/StringUtils.java b/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/main/java/org/kie/workbench/common/stunner/bpmn/client/forms/util/StringUtils.java
index 7da0a2944ee..a6d8bcfebc6 100644
--- a/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/main/java/org/kie/workbench/common/stunner/bpmn/client/forms/util/StringUtils.java
+++ b/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/main/java/org/kie/workbench/common/stunner/bpmn/client/forms/util/StringUtils.java
@@ -170,13 +170,15 @@ public static String createDataTypeDisplayName(String dataType) {
      */
     public static Set<String> getSetDataTypes(String value) {
         Set<String> types = new HashSet<>();
-        if (value == null) {
+        if (value == null || value.isEmpty()) {
             return types;
         }
         final String[] split = value.split(",");
-        for (String string : split) {
-            String type = string.substring(string.indexOf(':') + 1, string.lastIndexOf(':'));
-            types.add(type);
+        for (String dataType : split) {
+            if (dataType.chars().filter(ch -> ch == ':').count() == 2) {
+                String type = dataType.substring(dataType.indexOf(':') + 1, dataType.lastIndexOf(':'));
+                types.add(type);
+            }
         }
 
         return types;
diff --git a/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/test/java/org/kie/workbench/common/stunner/bpmn/client/forms/util/StringUtilsTest.java b/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/test/java/org/kie/workbench/common/stunner/bpmn/client/forms/util/StringUtilsTest.java
index 48288532a8a..a581f71aed8 100644
--- a/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/test/java/org/kie/workbench/common/stunner/bpmn/client/forms/util/StringUtilsTest.java
+++ b/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/test/java/org/kie/workbench/common/stunner/bpmn/client/forms/util/StringUtilsTest.java
@@ -217,6 +217,12 @@ public void testGetDataTypes() {
         assertTrue("Data Type not the same", setDataTypes.contains("com.var"));
 
         setDataTypes = StringUtils.getSetDataTypes(null);
-        assertTrue("Data Types must be empty", setDataTypes.size() == 0);
+        assertTrue("Data Types must be empty", setDataTypes.isEmpty());
+
+        setDataTypes = StringUtils.getSetDataTypes("");
+        assertTrue("Data Types must be empty", setDataTypes.isEmpty());
+
+        setDataTypes = StringUtils.getSetDataTypes("var:com.var");
+        assertTrue("Invalid Data Types must be empty", setDataTypes.isEmpty());
     }
 }
diff --git a/kie-wb-common-widgets/kie-wb-common-ui/src/test/java/org/kie/workbench/common/widgets/client/handlers/PackageListBoxTest.java b/kie-wb-common-widgets/kie-wb-common-ui/src/test/java/org/kie/workbench/common/widgets/client/handlers/PackageListBoxTest.java
index c15a61a5d02..88e8ca38a8a 100644
--- a/kie-wb-common-widgets/kie-wb-common-ui/src/test/java/org/kie/workbench/common/widgets/client/handlers/PackageListBoxTest.java
+++ b/kie-wb-common-widgets/kie-wb-common-ui/src/test/java/org/kie/workbench/common/widgets/client/handlers/PackageListBoxTest.java
@@ -17,10 +17,10 @@
 package org.kie.workbench.common.widgets.client.handlers;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
-import com.google.gwt.dev.util.collect.HashSet;
 import com.google.gwtmockito.GwtMockitoTestRunner;
 import org.guvnor.common.services.project.client.context.WorkspaceProjectContext;
 import org.guvnor.common.services.project.model.Module;

From f8ad8519c2c0c1f786619a8e3882e698060db893 Mon Sep 17 00:00:00 2001
From: Yeser Amer <yeser.amer@ibm.com>
Date: Tue, 30 Jul 2024 15:05:21 +0200
Subject: [PATCH 2/6] Update to GWT 2.11.0

---
 .../kie-wb-common-ala-openshift-ui-client/pom.xml             | 2 +-
 .../kie-wb-common-ala-ui/kie-wb-common-ala-ui-client/pom.xml  | 2 +-
 .../kie-wb-common-ala-wildfly-ui-client/pom.xml               | 2 +-
 kie-wb-common-dmn/kie-wb-common-dmn-api/pom.xml               | 2 +-
 kie-wb-common-dmn/kie-wb-common-dmn-client/pom.xml            | 2 +-
 kie-wb-common-dmn/kie-wb-common-dmn-project-client/pom.xml    | 2 +-
 .../kie-wb-common-dmn-webapp-kogito-marshaller/pom.xml        | 2 +-
 kie-wb-common-dmn/kie-wb-common-dmn-webapp-standalone/pom.xml | 2 +-
 .../kie-wb-common-dynamic-forms-client/pom.xml                | 2 +-
 .../kie-wb-common-forms-common-rendering-client/pom.xml       | 2 +-
 .../kie-wb-common-forms-crud-component/pom.xml                | 2 +-
 .../kie-wb-common-forms-processing-engine/pom.xml             | 2 +-
 .../kie-wb-common-forms-editor-client/pom.xml                 | 2 +-
 .../pom.xml                                                   | 2 +-
 .../kie-wb-common-forms-jbpm-integration-client/pom.xml       | 2 +-
 .../kie-wb-common-archetype-mgmt-client/pom.xml               | 2 +-
 .../kie-wb-common-contributors-client/pom.xml                 | 2 +-
 .../kie-wb-common-data-modeller-client/pom.xml                | 2 +-
 .../kie-wb-common-datasource-mgmt-client/pom.xml              | 2 +-
 .../kie-wb-common-default-editor-client/pom.xml               | 2 +-
 .../kie-wb-common-home/kie-wb-common-home-client/pom.xml      | 2 +-
 .../kie-wb-common-java-editor-client/pom.xml                  | 2 +-
 .../kie-wb-common-library-client/pom.xml                      | 2 +-
 .../kie-wb-common-project-editor-client/pom.xml               | 2 +-
 .../kie-wb-common-project-explorer-client/pom.xml             | 2 +-
 .../kie-wb-common-project-imports-editor-client/pom.xml       | 2 +-
 .../kie-wb-common-server-ui-client/pom.xml                    | 2 +-
 .../kie-wb-common-workbench-client/pom.xml                    | 2 +-
 .../test/resources/DataModelDependencyExclusionTest1/pom.xml  | 2 +-
 .../kie-wb-common-refactoring-client/pom.xml                  | 2 +-
 .../kie-wb-common-verifier/kie-wb-common-verifier-api/pom.xml | 2 +-
 .../kie-wb-common-verifier-reporting-client/pom.xml           | 2 +-
 .../kie-wb-common-stunner-lienzo/pom.xml                      | 2 +-
 .../kie-wb-common-stunner-shapes-api/pom.xml                  | 2 +-
 .../kie-wb-common-stunner-shapes-client/pom.xml               | 2 +-
 .../kie-wb-common-stunner-widgets/pom.xml                     | 2 +-
 .../kie-wb-common-stunner-client-api/pom.xml                  | 2 +-
 .../kie-wb-common-stunner-core-api/pom.xml                    | 2 +-
 .../kie-wb-common-stunner-client-common/pom.xml               | 2 +-
 .../kie-wb-common-stunner-core-common/pom.xml                 | 2 +-
 .../kie-wb-common-stunner-forms-client/pom.xml                | 2 +-
 .../pom.xml                                                   | 2 +-
 .../kie-wb-common-stunner-lienzo-extensions/pom.xml           | 2 +-
 .../kie-wb-common-stunner-project-client/pom.xml              | 2 +-
 .../kie-wb-common-stunner-svg-client/pom.xml                  | 2 +-
 .../kie-wb-common-stunner-bpmn-api/pom.xml                    | 4 ++--
 .../kie-wb-common-stunner-bpmn-client/pom.xml                 | 2 +-
 .../kie-wb-common-stunner-bpmn-project-client/pom.xml         | 4 ++--
 .../kie-wb-common-stunner-bpmn-project-showcase/pom.xml       | 2 +-
 kie-wb-common-widgets/kie-wb-common-ui/pom.xml                | 2 +-
 kie-wb-common-widgets/kie-wb-config-resource-widget/pom.xml   | 2 +-
 kie-wb-common-widgets/kie-wb-decorated-grid-widget/pom.xml    | 2 +-
 kie-wb-common-widgets/kie-wb-metadata-widget/pom.xml          | 2 +-
 53 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/kie-wb-common-ala/kie-wb-common-ala-openshift/kie-wb-common-ala-openshift-ui/kie-wb-common-ala-openshift-ui-client/pom.xml b/kie-wb-common-ala/kie-wb-common-ala-openshift/kie-wb-common-ala-openshift-ui/kie-wb-common-ala-openshift-ui-client/pom.xml
index 0ca3dbafd7c..ec5d17d53ac 100644
--- a/kie-wb-common-ala/kie-wb-common-ala-openshift/kie-wb-common-ala-openshift-ui/kie-wb-common-ala-openshift-ui-client/pom.xml
+++ b/kie-wb-common-ala/kie-wb-common-ala-openshift/kie-wb-common-ala-openshift-ui/kie-wb-common-ala-openshift-ui-client/pom.xml
@@ -23,7 +23,7 @@
   <dependencies>
 
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
 
diff --git a/kie-wb-common-ala/kie-wb-common-ala-ui/kie-wb-common-ala-ui-client/pom.xml b/kie-wb-common-ala/kie-wb-common-ala-ui/kie-wb-common-ala-ui-client/pom.xml
index ae003ebe0a4..d8cb8148ba9 100644
--- a/kie-wb-common-ala/kie-wb-common-ala-ui/kie-wb-common-ala-ui-client/pom.xml
+++ b/kie-wb-common-ala/kie-wb-common-ala-ui/kie-wb-common-ala-ui-client/pom.xml
@@ -43,7 +43,7 @@
     </dependency>
 
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
 
diff --git a/kie-wb-common-ala/kie-wb-common-ala-wildfly/kie-wb-common-ala-wildfly-ui/kie-wb-common-ala-wildfly-ui-client/pom.xml b/kie-wb-common-ala/kie-wb-common-ala-wildfly/kie-wb-common-ala-wildfly-ui/kie-wb-common-ala-wildfly-ui-client/pom.xml
index c99aaaeb216..ee822c7089c 100644
--- a/kie-wb-common-ala/kie-wb-common-ala-wildfly/kie-wb-common-ala-wildfly-ui/kie-wb-common-ala-wildfly-ui-client/pom.xml
+++ b/kie-wb-common-ala/kie-wb-common-ala-wildfly/kie-wb-common-ala-wildfly-ui/kie-wb-common-ala-wildfly-ui-client/pom.xml
@@ -23,7 +23,7 @@
   <dependencies>
 
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
 
diff --git a/kie-wb-common-dmn/kie-wb-common-dmn-api/pom.xml b/kie-wb-common-dmn/kie-wb-common-dmn-api/pom.xml
index 4f187f944a9..38e4e7e67e4 100644
--- a/kie-wb-common-dmn/kie-wb-common-dmn-api/pom.xml
+++ b/kie-wb-common-dmn/kie-wb-common-dmn-api/pom.xml
@@ -152,7 +152,7 @@
     </dependency>
 
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/kie-wb-common-dmn/kie-wb-common-dmn-client/pom.xml b/kie-wb-common-dmn/kie-wb-common-dmn-client/pom.xml
index f09548d27e4..64104abe5a2 100644
--- a/kie-wb-common-dmn/kie-wb-common-dmn-client/pom.xml
+++ b/kie-wb-common-dmn/kie-wb-common-dmn-client/pom.xml
@@ -146,7 +146,7 @@
 
     <!-- GWT and GWT Extensions -->
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-dmn/kie-wb-common-dmn-project-client/pom.xml b/kie-wb-common-dmn/kie-wb-common-dmn-project-client/pom.xml
index 9f4c4867174..ced9b5cdc6c 100644
--- a/kie-wb-common-dmn/kie-wb-common-dmn-project-client/pom.xml
+++ b/kie-wb-common-dmn/kie-wb-common-dmn-project-client/pom.xml
@@ -106,7 +106,7 @@
 
     <!-- GWT and GWT Extensions -->
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/pom.xml b/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/pom.xml
index 6ca65a54d1b..58e7909fac0 100644
--- a/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/pom.xml
+++ b/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/pom.xml
@@ -54,7 +54,7 @@
       <artifactId>base</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
     <dependency>
diff --git a/kie-wb-common-dmn/kie-wb-common-dmn-webapp-standalone/pom.xml b/kie-wb-common-dmn/kie-wb-common-dmn-webapp-standalone/pom.xml
index 46531448648..49e19220f70 100644
--- a/kie-wb-common-dmn/kie-wb-common-dmn-webapp-standalone/pom.xml
+++ b/kie-wb-common-dmn/kie-wb-common-dmn-webapp-standalone/pom.xml
@@ -741,7 +741,7 @@
 
     <!-- GWT and extensions -->
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
       <exclusions>
diff --git a/kie-wb-common-forms/kie-wb-common-dynamic-forms/kie-wb-common-dynamic-forms-client/pom.xml b/kie-wb-common-forms/kie-wb-common-dynamic-forms/kie-wb-common-dynamic-forms-client/pom.xml
index 5147e6fa89e..5c18f233615 100644
--- a/kie-wb-common-forms/kie-wb-common-dynamic-forms/kie-wb-common-dynamic-forms-client/pom.xml
+++ b/kie-wb-common-forms/kie-wb-common-dynamic-forms/kie-wb-common-dynamic-forms-client/pom.xml
@@ -21,7 +21,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
 
diff --git a/kie-wb-common-forms/kie-wb-common-forms-commons/kie-wb-common-forms-common-rendering/kie-wb-common-forms-common-rendering-client/pom.xml b/kie-wb-common-forms/kie-wb-common-forms-commons/kie-wb-common-forms-common-rendering/kie-wb-common-forms-common-rendering-client/pom.xml
index 095b61bc59f..313d8fe561b 100644
--- a/kie-wb-common-forms/kie-wb-common-forms-commons/kie-wb-common-forms-common-rendering/kie-wb-common-forms-common-rendering-client/pom.xml
+++ b/kie-wb-common-forms/kie-wb-common-forms-commons/kie-wb-common-forms-common-rendering/kie-wb-common-forms-common-rendering-client/pom.xml
@@ -20,7 +20,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
 
diff --git a/kie-wb-common-forms/kie-wb-common-forms-commons/kie-wb-common-forms-crud-component/pom.xml b/kie-wb-common-forms/kie-wb-common-forms-commons/kie-wb-common-forms-crud-component/pom.xml
index 0583ef51726..87a04b8ab9f 100644
--- a/kie-wb-common-forms/kie-wb-common-forms-commons/kie-wb-common-forms-crud-component/pom.xml
+++ b/kie-wb-common-forms/kie-wb-common-forms-commons/kie-wb-common-forms-crud-component/pom.xml
@@ -35,7 +35,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
 
diff --git a/kie-wb-common-forms/kie-wb-common-forms-commons/kie-wb-common-forms-processing-engine/pom.xml b/kie-wb-common-forms/kie-wb-common-forms-commons/kie-wb-common-forms-processing-engine/pom.xml
index 9602013bb13..49c7f597e87 100644
--- a/kie-wb-common-forms/kie-wb-common-forms-commons/kie-wb-common-forms-processing-engine/pom.xml
+++ b/kie-wb-common-forms/kie-wb-common-forms-commons/kie-wb-common-forms-processing-engine/pom.xml
@@ -20,7 +20,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
 
diff --git a/kie-wb-common-forms/kie-wb-common-forms-editor/kie-wb-common-forms-editor-client/pom.xml b/kie-wb-common-forms/kie-wb-common-forms-editor/kie-wb-common-forms-editor-client/pom.xml
index e341cc7924a..7e98f288b45 100644
--- a/kie-wb-common-forms/kie-wb-common-forms-editor/kie-wb-common-forms-editor-client/pom.xml
+++ b/kie-wb-common-forms/kie-wb-common-forms-editor/kie-wb-common-forms-editor-client/pom.xml
@@ -42,7 +42,7 @@
     </dependency>
 
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
 
diff --git a/kie-wb-common-forms/kie-wb-common-forms-integrations/kie-wb-common-forms-data-modeller-integration/kie-wb-common-forms-data-modeller-integration-client/pom.xml b/kie-wb-common-forms/kie-wb-common-forms-integrations/kie-wb-common-forms-data-modeller-integration/kie-wb-common-forms-data-modeller-integration-client/pom.xml
index d4b063593ed..511391b7a93 100644
--- a/kie-wb-common-forms/kie-wb-common-forms-integrations/kie-wb-common-forms-data-modeller-integration/kie-wb-common-forms-data-modeller-integration-client/pom.xml
+++ b/kie-wb-common-forms/kie-wb-common-forms-integrations/kie-wb-common-forms-data-modeller-integration/kie-wb-common-forms-data-modeller-integration-client/pom.xml
@@ -22,7 +22,7 @@
   <dependencies>
 
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
 
diff --git a/kie-wb-common-forms/kie-wb-common-forms-integrations/kie-wb-common-forms-jbpm-integration/kie-wb-common-forms-jbpm-integration-client/pom.xml b/kie-wb-common-forms/kie-wb-common-forms-integrations/kie-wb-common-forms-jbpm-integration/kie-wb-common-forms-jbpm-integration-client/pom.xml
index fd4add5a6ce..eb9ac4103f8 100644
--- a/kie-wb-common-forms/kie-wb-common-forms-integrations/kie-wb-common-forms-jbpm-integration/kie-wb-common-forms-jbpm-integration-client/pom.xml
+++ b/kie-wb-common-forms/kie-wb-common-forms-integrations/kie-wb-common-forms-jbpm-integration/kie-wb-common-forms-jbpm-integration-client/pom.xml
@@ -36,7 +36,7 @@
     </dependency>
 
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
 
diff --git a/kie-wb-common-screens/kie-wb-common-archetype-mgmt/kie-wb-common-archetype-mgmt-client/pom.xml b/kie-wb-common-screens/kie-wb-common-archetype-mgmt/kie-wb-common-archetype-mgmt-client/pom.xml
index 9c29a3fd9f7..548c199d603 100644
--- a/kie-wb-common-screens/kie-wb-common-archetype-mgmt/kie-wb-common-archetype-mgmt-client/pom.xml
+++ b/kie-wb-common-screens/kie-wb-common-archetype-mgmt/kie-wb-common-archetype-mgmt-client/pom.xml
@@ -42,7 +42,7 @@
     </dependency>
 
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-screens/kie-wb-common-contributors/kie-wb-common-contributors-client/pom.xml b/kie-wb-common-screens/kie-wb-common-contributors/kie-wb-common-contributors-client/pom.xml
index 6a84c32b506..a409a025614 100644
--- a/kie-wb-common-screens/kie-wb-common-contributors/kie-wb-common-contributors-client/pom.xml
+++ b/kie-wb-common-screens/kie-wb-common-contributors/kie-wb-common-contributors-client/pom.xml
@@ -113,7 +113,7 @@
 
     <!-- GWT and GWT Extensions -->
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-screens/kie-wb-common-data-modeller/kie-wb-common-data-modeller-client/pom.xml b/kie-wb-common-screens/kie-wb-common-data-modeller/kie-wb-common-data-modeller-client/pom.xml
index 3c906f8e9c2..56691e734d8 100644
--- a/kie-wb-common-screens/kie-wb-common-data-modeller/kie-wb-common-data-modeller-client/pom.xml
+++ b/kie-wb-common-screens/kie-wb-common-data-modeller/kie-wb-common-data-modeller-client/pom.xml
@@ -156,7 +156,7 @@
 
     <!-- GWT and GWT Extensions -->
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-screens/kie-wb-common-datasource-mgmt/kie-wb-common-datasource-mgmt-client/pom.xml b/kie-wb-common-screens/kie-wb-common-datasource-mgmt/kie-wb-common-datasource-mgmt-client/pom.xml
index be8296e490b..2b20414d068 100644
--- a/kie-wb-common-screens/kie-wb-common-datasource-mgmt/kie-wb-common-datasource-mgmt-client/pom.xml
+++ b/kie-wb-common-screens/kie-wb-common-datasource-mgmt/kie-wb-common-datasource-mgmt-client/pom.xml
@@ -27,7 +27,7 @@
     </dependency>
 
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-screens/kie-wb-common-default-editor/kie-wb-common-default-editor-client/pom.xml b/kie-wb-common-screens/kie-wb-common-default-editor/kie-wb-common-default-editor-client/pom.xml
index f25b3a089b9..37da5530c45 100644
--- a/kie-wb-common-screens/kie-wb-common-default-editor/kie-wb-common-default-editor-client/pom.xml
+++ b/kie-wb-common-screens/kie-wb-common-default-editor/kie-wb-common-default-editor-client/pom.xml
@@ -124,7 +124,7 @@
 
     <!-- GWT and GWT Extensions -->
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-screens/kie-wb-common-home/kie-wb-common-home-client/pom.xml b/kie-wb-common-screens/kie-wb-common-home/kie-wb-common-home-client/pom.xml
index b5066e8b77a..3e36b217a40 100644
--- a/kie-wb-common-screens/kie-wb-common-home/kie-wb-common-home-client/pom.xml
+++ b/kie-wb-common-screens/kie-wb-common-home/kie-wb-common-home-client/pom.xml
@@ -84,7 +84,7 @@
 
     <!-- GWT and GWT Extensions -->
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-screens/kie-wb-common-java-editor/kie-wb-common-java-editor-client/pom.xml b/kie-wb-common-screens/kie-wb-common-java-editor/kie-wb-common-java-editor-client/pom.xml
index bf093562bb2..d57427f0c63 100644
--- a/kie-wb-common-screens/kie-wb-common-java-editor/kie-wb-common-java-editor-client/pom.xml
+++ b/kie-wb-common-screens/kie-wb-common-java-editor/kie-wb-common-java-editor-client/pom.xml
@@ -95,7 +95,7 @@
 
     <!-- GWT and GWT Extensions -->
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-screens/kie-wb-common-library/kie-wb-common-library-client/pom.xml b/kie-wb-common-screens/kie-wb-common-library/kie-wb-common-library-client/pom.xml
index 5491361a2ba..607b1ea3eca 100644
--- a/kie-wb-common-screens/kie-wb-common-library/kie-wb-common-library-client/pom.xml
+++ b/kie-wb-common-screens/kie-wb-common-library/kie-wb-common-library-client/pom.xml
@@ -146,7 +146,7 @@
     </dependency>
 
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/pom.xml b/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/pom.xml
index f49026b0fdf..0e96347301e 100644
--- a/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/pom.xml
+++ b/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/pom.xml
@@ -260,7 +260,7 @@
 
     <!-- GWT and GWT Extensions -->
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-screens/kie-wb-common-project-explorer/kie-wb-common-project-explorer-client/pom.xml b/kie-wb-common-screens/kie-wb-common-project-explorer/kie-wb-common-project-explorer-client/pom.xml
index 17b6ad2d5f3..7b0f3f1948a 100644
--- a/kie-wb-common-screens/kie-wb-common-project-explorer/kie-wb-common-project-explorer-client/pom.xml
+++ b/kie-wb-common-screens/kie-wb-common-project-explorer/kie-wb-common-project-explorer-client/pom.xml
@@ -128,7 +128,7 @@
 
     <!-- GWT and GWT Extensions -->
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-screens/kie-wb-common-project-imports-editor/kie-wb-common-project-imports-editor-client/pom.xml b/kie-wb-common-screens/kie-wb-common-project-imports-editor/kie-wb-common-project-imports-editor-client/pom.xml
index 8745cd84dc2..55d74df7af1 100644
--- a/kie-wb-common-screens/kie-wb-common-project-imports-editor/kie-wb-common-project-imports-editor-client/pom.xml
+++ b/kie-wb-common-screens/kie-wb-common-project-imports-editor/kie-wb-common-project-imports-editor-client/pom.xml
@@ -142,7 +142,7 @@
 
     <!-- GWT and GWT Extensions -->
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/pom.xml b/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/pom.xml
index 4b2f145a529..a9b37d6b209 100644
--- a/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/pom.xml
+++ b/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/pom.xml
@@ -51,7 +51,7 @@
       <artifactId>gwtbootstrap3-extras</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-screens/kie-wb-common-workbench/kie-wb-common-workbench-client/pom.xml b/kie-wb-common-screens/kie-wb-common-workbench/kie-wb-common-workbench-client/pom.xml
index bf1f88e950f..0bcd8ee9f96 100644
--- a/kie-wb-common-screens/kie-wb-common-workbench/kie-wb-common-workbench-client/pom.xml
+++ b/kie-wb-common-screens/kie-wb-common-workbench/kie-wb-common-workbench-client/pom.xml
@@ -240,7 +240,7 @@
 
     <!-- GWT and GWT Extensions -->
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-services/kie-wb-common-datamodel/kie-wb-common-datamodel-backend/src/test/resources/DataModelDependencyExclusionTest1/pom.xml b/kie-wb-common-services/kie-wb-common-datamodel/kie-wb-common-datamodel-backend/src/test/resources/DataModelDependencyExclusionTest1/pom.xml
index 174e444ae4a..0d4d1d71c79 100644
--- a/kie-wb-common-services/kie-wb-common-datamodel/kie-wb-common-datamodel-backend/src/test/resources/DataModelDependencyExclusionTest1/pom.xml
+++ b/kie-wb-common-services/kie-wb-common-datamodel/kie-wb-common-datamodel-backend/src/test/resources/DataModelDependencyExclusionTest1/pom.xml
@@ -20,7 +20,7 @@
 
     <!-- Provided scoped dependencies should not be in DMO -->
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <version>2.7.0</version>
       <scope>provided</scope>
diff --git a/kie-wb-common-services/kie-wb-common-refactoring/kie-wb-common-refactoring-client/pom.xml b/kie-wb-common-services/kie-wb-common-refactoring/kie-wb-common-refactoring-client/pom.xml
index 96176b70877..b641b5f9c96 100644
--- a/kie-wb-common-services/kie-wb-common-refactoring/kie-wb-common-refactoring-client/pom.xml
+++ b/kie-wb-common-services/kie-wb-common-refactoring/kie-wb-common-refactoring-client/pom.xml
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
 
diff --git a/kie-wb-common-services/kie-wb-common-verifier/kie-wb-common-verifier-api/pom.xml b/kie-wb-common-services/kie-wb-common-verifier/kie-wb-common-verifier-api/pom.xml
index 642bd7977c6..97ea824abbf 100644
--- a/kie-wb-common-services/kie-wb-common-verifier/kie-wb-common-verifier-api/pom.xml
+++ b/kie-wb-common-services/kie-wb-common-verifier/kie-wb-common-verifier-api/pom.xml
@@ -55,7 +55,7 @@
 
         <!-- GWT and GWT Extensions -->
         <dependency>
-            <groupId>com.google.gwt</groupId>
+            <groupId>org.gwtproject</groupId>
             <artifactId>gwt-user</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/kie-wb-common-services/kie-wb-common-verifier/kie-wb-common-verifier-reporting-client/pom.xml b/kie-wb-common-services/kie-wb-common-verifier/kie-wb-common-verifier-reporting-client/pom.xml
index e634306c957..6773ccbea03 100644
--- a/kie-wb-common-services/kie-wb-common-verifier/kie-wb-common-verifier-reporting-client/pom.xml
+++ b/kie-wb-common-services/kie-wb-common-verifier/kie-wb-common-verifier-reporting-client/pom.xml
@@ -86,7 +86,7 @@
 
     <!-- GWT and GWT Extensions -->
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-lienzo/pom.xml b/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-lienzo/pom.xml
index d37ab11434a..9d08e062e9c 100644
--- a/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-lienzo/pom.xml
+++ b/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-lienzo/pom.xml
@@ -94,7 +94,7 @@
     <!-- GWT and GWT Extensions -->
 
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-shapes/kie-wb-common-stunner-shapes-api/pom.xml b/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-shapes/kie-wb-common-stunner-shapes-api/pom.xml
index 7e961072442..1aedb2c9b99 100644
--- a/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-shapes/kie-wb-common-stunner-shapes-api/pom.xml
+++ b/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-shapes/kie-wb-common-stunner-shapes-api/pom.xml
@@ -68,7 +68,7 @@
     </dependency>
 
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-shapes/kie-wb-common-stunner-shapes-client/pom.xml b/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-shapes/kie-wb-common-stunner-shapes-client/pom.xml
index 97dc3371556..baad5df4232 100644
--- a/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-shapes/kie-wb-common-stunner-shapes-client/pom.xml
+++ b/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-shapes/kie-wb-common-stunner-shapes-client/pom.xml
@@ -84,7 +84,7 @@
     </dependency>
 
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-widgets/pom.xml b/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-widgets/pom.xml
index 720af1e9987..304bbe03cef 100644
--- a/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-widgets/pom.xml
+++ b/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-widgets/pom.xml
@@ -72,7 +72,7 @@
     <!-- GWT and GWT Extensions -->
 
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-stunner/kie-wb-common-stunner-core/kie-wb-common-stunner-api/kie-wb-common-stunner-client-api/pom.xml b/kie-wb-common-stunner/kie-wb-common-stunner-core/kie-wb-common-stunner-api/kie-wb-common-stunner-client-api/pom.xml
index b93c5760c65..6b577d46408 100644
--- a/kie-wb-common-stunner/kie-wb-common-stunner-core/kie-wb-common-stunner-api/kie-wb-common-stunner-client-api/pom.xml
+++ b/kie-wb-common-stunner/kie-wb-common-stunner-core/kie-wb-common-stunner-api/kie-wb-common-stunner-client-api/pom.xml
@@ -44,7 +44,7 @@
     <!-- GWT. -->
 
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-stunner/kie-wb-common-stunner-core/kie-wb-common-stunner-api/kie-wb-common-stunner-core-api/pom.xml b/kie-wb-common-stunner/kie-wb-common-stunner-core/kie-wb-common-stunner-api/kie-wb-common-stunner-core-api/pom.xml
index 85f34c23766..de4eebb468a 100644
--- a/kie-wb-common-stunner/kie-wb-common-stunner-core/kie-wb-common-stunner-api/kie-wb-common-stunner-core-api/pom.xml
+++ b/kie-wb-common-stunner/kie-wb-common-stunner-core/kie-wb-common-stunner-api/kie-wb-common-stunner-core-api/pom.xml
@@ -39,7 +39,7 @@
     <!-- GWT. -->
 
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-stunner/kie-wb-common-stunner-core/kie-wb-common-stunner-commons/kie-wb-common-stunner-client-common/pom.xml b/kie-wb-common-stunner/kie-wb-common-stunner-core/kie-wb-common-stunner-commons/kie-wb-common-stunner-client-common/pom.xml
index 078657ced38..620fe847e65 100644
--- a/kie-wb-common-stunner/kie-wb-common-stunner-core/kie-wb-common-stunner-commons/kie-wb-common-stunner-client-common/pom.xml
+++ b/kie-wb-common-stunner/kie-wb-common-stunner-core/kie-wb-common-stunner-commons/kie-wb-common-stunner-client-common/pom.xml
@@ -63,7 +63,7 @@
     <!-- GWT. -->
 
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-stunner/kie-wb-common-stunner-core/kie-wb-common-stunner-commons/kie-wb-common-stunner-core-common/pom.xml b/kie-wb-common-stunner/kie-wb-common-stunner-core/kie-wb-common-stunner-commons/kie-wb-common-stunner-core-common/pom.xml
index 9013c12f5f2..431fd3e5bc1 100644
--- a/kie-wb-common-stunner/kie-wb-common-stunner-core/kie-wb-common-stunner-commons/kie-wb-common-stunner-core-common/pom.xml
+++ b/kie-wb-common-stunner/kie-wb-common-stunner-core/kie-wb-common-stunner-commons/kie-wb-common-stunner-core-common/pom.xml
@@ -43,7 +43,7 @@
 
     <!-- GWT. -->
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-forms/kie-wb-common-stunner-forms-client/pom.xml b/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-forms/kie-wb-common-stunner-forms-client/pom.xml
index 18476d5445e..d3bf01119a9 100644
--- a/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-forms/kie-wb-common-stunner-forms-client/pom.xml
+++ b/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-forms/kie-wb-common-stunner-forms-client/pom.xml
@@ -37,7 +37,7 @@
   <dependencies>
 
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
 
diff --git a/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-jbpm-designer-integration/kie-wb-common-stunner-jbpm-designer-integration-client/pom.xml b/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-jbpm-designer-integration/kie-wb-common-stunner-jbpm-designer-integration-client/pom.xml
index 45e9015c721..7973f42fdcf 100644
--- a/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-jbpm-designer-integration/kie-wb-common-stunner-jbpm-designer-integration-client/pom.xml
+++ b/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-jbpm-designer-integration/kie-wb-common-stunner-jbpm-designer-integration-client/pom.xml
@@ -32,7 +32,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-lienzo-extensions/pom.xml b/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-lienzo-extensions/pom.xml
index 0e83ccd54de..d6546e429a6 100644
--- a/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-lienzo-extensions/pom.xml
+++ b/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-lienzo-extensions/pom.xml
@@ -40,7 +40,7 @@
     <!-- GWT. -->
 
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-project/kie-wb-common-stunner-project-client/pom.xml b/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-project/kie-wb-common-stunner-project-client/pom.xml
index aeded86f42e..18d4bc4a2c4 100644
--- a/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-project/kie-wb-common-stunner-project-client/pom.xml
+++ b/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-project/kie-wb-common-stunner-project-client/pom.xml
@@ -82,7 +82,7 @@
     <!-- Other deps. -->
 
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
     </dependency>
 
diff --git a/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-svg/kie-wb-common-stunner-svg-client/pom.xml b/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-svg/kie-wb-common-stunner-svg-client/pom.xml
index 01aef11426d..e839074895e 100644
--- a/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-svg/kie-wb-common-stunner-svg-client/pom.xml
+++ b/kie-wb-common-stunner/kie-wb-common-stunner-extensions/kie-wb-common-stunner-svg/kie-wb-common-stunner-svg-client/pom.xml
@@ -108,7 +108,7 @@
     <!-- GWT and GWT Extensions -->
 
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/pom.xml b/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/pom.xml
index 32dbbd8e451..45246b706a5 100644
--- a/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/pom.xml
+++ b/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/pom.xml
@@ -96,7 +96,7 @@
     <!-- GWT. -->
 
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
@@ -242,7 +242,7 @@
     </dependency>
 
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-dev</artifactId>
       <scope>test</scope>
       <exclusions>
diff --git a/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/pom.xml b/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/pom.xml
index c9ec59bf595..5cddab5d356 100644
--- a/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/pom.xml
+++ b/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/pom.xml
@@ -153,7 +153,7 @@
     <!-- GWT and GWT Extensions -->
 
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-project-client/pom.xml b/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-project-client/pom.xml
index 1b5ef20c1d4..e3b1efd5b75 100644
--- a/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-project-client/pom.xml
+++ b/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-project-client/pom.xml
@@ -139,7 +139,7 @@
     <!-- GWT and GWT Extensions -->
 
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
@@ -279,7 +279,7 @@
       <artifactId>lienzo-tests</artifactId>
       <exclusions>
         <exclusion>
-          <groupId>com.google.gwt</groupId>
+          <groupId>org.gwtproject</groupId>
           <artifactId>gwt-dev</artifactId>
         </exclusion>
       </exclusions>
diff --git a/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-project-showcase/pom.xml b/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-project-showcase/pom.xml
index be7c0dd4450..6575a7aaf8d 100644
--- a/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-project-showcase/pom.xml
+++ b/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-project-showcase/pom.xml
@@ -1038,7 +1038,7 @@
 
     <!-- GWT and GWT Extensions -->
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-widgets/kie-wb-common-ui/pom.xml b/kie-wb-common-widgets/kie-wb-common-ui/pom.xml
index 2cb567da58f..57bcb712a37 100644
--- a/kie-wb-common-widgets/kie-wb-common-ui/pom.xml
+++ b/kie-wb-common-widgets/kie-wb-common-ui/pom.xml
@@ -191,7 +191,7 @@
 
     <!-- GWT and GWT Extensions -->
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-widgets/kie-wb-config-resource-widget/pom.xml b/kie-wb-common-widgets/kie-wb-config-resource-widget/pom.xml
index 22ccc7318bc..b81a43ec3fb 100644
--- a/kie-wb-common-widgets/kie-wb-config-resource-widget/pom.xml
+++ b/kie-wb-common-widgets/kie-wb-config-resource-widget/pom.xml
@@ -57,7 +57,7 @@
 
     <!-- GWT and GWT Extensions -->
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-widgets/kie-wb-decorated-grid-widget/pom.xml b/kie-wb-common-widgets/kie-wb-decorated-grid-widget/pom.xml
index 217fb072fec..1fe5fb5c037 100644
--- a/kie-wb-common-widgets/kie-wb-decorated-grid-widget/pom.xml
+++ b/kie-wb-common-widgets/kie-wb-decorated-grid-widget/pom.xml
@@ -54,7 +54,7 @@
 
     <!-- GWT and GWT Extensions -->
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/kie-wb-common-widgets/kie-wb-metadata-widget/pom.xml b/kie-wb-common-widgets/kie-wb-metadata-widget/pom.xml
index 461550e0ae2..3b48ef7c74e 100644
--- a/kie-wb-common-widgets/kie-wb-metadata-widget/pom.xml
+++ b/kie-wb-common-widgets/kie-wb-metadata-widget/pom.xml
@@ -129,7 +129,7 @@
 
     <!-- GWT and GWT Extensions -->
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>

From c960f21e690aaae44677fd4963e99277d25fb82f Mon Sep 17 00:00:00 2001
From: Yeser Amer <yeser.amer@ibm.com>
Date: Tue, 6 Aug 2024 14:09:39 +0200
Subject: [PATCH 3/6] Update to GWT 2.11.0

---
 .../kie-wb-common-stunner-bpmn-api/pom.xml                     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/pom.xml b/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/pom.xml
index 45246b706a5..5142618c149 100644
--- a/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/pom.xml
+++ b/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-api/pom.xml
@@ -33,9 +33,6 @@
   <properties>
     <java.module.name>org.kie.wb.common.stunner.bpmn.api</java.module.name>
     <jacoco.line.coveredratio.minimum>0.0</jacoco.line.coveredratio.minimum>
-
-    <!-- GWTTestCases need this Jetty version to work correctly. -->
-    <version.org.eclipse.jetty>9.2.14.v20151106</version.org.eclipse.jetty>
   </properties>
 
   <dependencies>

From 77eb73cb8cde6989f97c21b2523e35d902f73889 Mon Sep 17 00:00:00 2001
From: Yeser Amer <yeser.amer@ibm.com>
Date: Thu, 8 Aug 2024 08:07:55 +0200
Subject: [PATCH 4/6] Update to GWT 2.11.0

---
 .../backend/allowlist/PackageNameAllowListLoader.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kie-wb-common-services/kie-wb-common-services-backend/src/main/java/org/kie/workbench/common/services/backend/allowlist/PackageNameAllowListLoader.java b/kie-wb-common-services/kie-wb-common-services-backend/src/main/java/org/kie/workbench/common/services/backend/allowlist/PackageNameAllowListLoader.java
index c3d911d1158..b2e02f16768 100644
--- a/kie-wb-common-services/kie-wb-common-services-backend/src/main/java/org/kie/workbench/common/services/backend/allowlist/PackageNameAllowListLoader.java
+++ b/kie-wb-common-services/kie-wb-common-services-backend/src/main/java/org/kie/workbench/common/services/backend/allowlist/PackageNameAllowListLoader.java
@@ -16,8 +16,8 @@
 
 package org.kie.workbench.common.services.backend.allowlist;
 
-import java.io.IOException;
 import java.io.StringReader;
+import java.io.UncheckedIOException;
 import java.util.Collections;
 import java.util.List;
 import javax.inject.Inject;
@@ -80,7 +80,7 @@ private List<String> parsePackages( final String content ) {
         } else {
             try {
                 return IOUtils.readLines( new StringReader( content ) );
-            } catch ( IOException ioe ) {
+            } catch ( UncheckedIOException ioe ) {
                 logger.warn( "Unable to parse package names from '" + content + "'. Falling back to empty list." );
                 return Collections.emptyList();
             }

From efd4b1281e638368f7e3bc3bf33e600fe889dc2b Mon Sep 17 00:00:00 2001
From: Yeser Amer <yeser.amer@ibm.com>
Date: Fri, 6 Sep 2024 10:23:33 +0200
Subject: [PATCH 5/6] Removing hard coded versions

---
 .../test/resources/DataModelDependencyExclusionTest1/pom.xml    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/kie-wb-common-services/kie-wb-common-datamodel/kie-wb-common-datamodel-backend/src/test/resources/DataModelDependencyExclusionTest1/pom.xml b/kie-wb-common-services/kie-wb-common-datamodel/kie-wb-common-datamodel-backend/src/test/resources/DataModelDependencyExclusionTest1/pom.xml
index 0d4d1d71c79..cb45698ba3d 100644
--- a/kie-wb-common-services/kie-wb-common-datamodel/kie-wb-common-datamodel-backend/src/test/resources/DataModelDependencyExclusionTest1/pom.xml
+++ b/kie-wb-common-services/kie-wb-common-datamodel/kie-wb-common-datamodel-backend/src/test/resources/DataModelDependencyExclusionTest1/pom.xml
@@ -14,7 +14,6 @@
     <dependency>
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging</artifactId>
-      <version>3.1.4.GA</version>
       <scope>test</scope>
     </dependency>
 
@@ -22,7 +21,6 @@
     <dependency>
       <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
-      <version>2.7.0</version>
       <scope>provided</scope>
     </dependency>
 

From 13d1062c6ccc24cc45372d61ac643c0bd1b5ea28 Mon Sep 17 00:00:00 2001
From: Yeser Amer <yeser.amer@ibm.com>
Date: Fri, 6 Sep 2024 12:03:12 +0200
Subject: [PATCH 6/6] Revert

---
 .../test/resources/DataModelDependencyExclusionTest1/pom.xml    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kie-wb-common-services/kie-wb-common-datamodel/kie-wb-common-datamodel-backend/src/test/resources/DataModelDependencyExclusionTest1/pom.xml b/kie-wb-common-services/kie-wb-common-datamodel/kie-wb-common-datamodel-backend/src/test/resources/DataModelDependencyExclusionTest1/pom.xml
index cb45698ba3d..0d4d1d71c79 100644
--- a/kie-wb-common-services/kie-wb-common-datamodel/kie-wb-common-datamodel-backend/src/test/resources/DataModelDependencyExclusionTest1/pom.xml
+++ b/kie-wb-common-services/kie-wb-common-datamodel/kie-wb-common-datamodel-backend/src/test/resources/DataModelDependencyExclusionTest1/pom.xml
@@ -14,6 +14,7 @@
     <dependency>
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging</artifactId>
+      <version>3.1.4.GA</version>
       <scope>test</scope>
     </dependency>
 
@@ -21,6 +22,7 @@
     <dependency>
       <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
+      <version>2.7.0</version>
       <scope>provided</scope>
     </dependency>