diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1c36cc..daa3b21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ### Changed
 
 - Switched dependency management to gcube-bom 2.0.0
+[#19500#note-2] Fixing GWT import issue 
 
 ## [v1.3.0] [r4.24.0] - 2020-06-19
 
diff --git a/pom.xml b/pom.xml
index bf2c301..4f5d514 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,6 +81,22 @@
 	</dependencies>
 
 	<build>
+
+		<resources>
+			<resource>
+				<directory>src/main/java</directory>
+				<includes>
+					<include>**/*.*</include>
+				</includes>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+				<includes>
+					<include>**/*.*</include>
+				</includes>
+			</resource>
+		</resources>
+		
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/org/gcube/datacatalogue/common/GRSFCommon.gwt.xml b/src/main/java/org/gcube/datacatalogue/common/GRSFCommon.gwt.xml
new file mode 100644
index 0000000..b99cb7f
--- /dev/null
+++ b/src/main/java/org/gcube/datacatalogue/common/GRSFCommon.gwt.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module rename-to='GRSFCommon'>
+	<!-- Inherit the core Web Toolkit stuff. -->
+	<inherits name='com.google.gwt.user.User' />
+
+	<!-- Inherit the default GWT style sheet. You can change -->
+	<!-- the theme of your GWT application by uncommenting -->
+	<!-- any one of the following lines. -->
+	<!-- <inherits name='com.google.gwt.user.theme.standard.Standard' /> -->
+	<!-- <inherits name='com.google.gwt.user.theme.chrome.Chrome'/> -->
+	<!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/> -->
+
+	<!-- Other module inherits -->
+
+	<!-- Specify the app entry point class. -->
+	<entry-point class='org.gcube.datacatalogue.common.GRSFCommon' />
+
+	<!-- Specify the paths for translatable code -->
+	<source path='' />
+
+</module>