From f77888f0375cc276df1cfcfc607ad0cf91ed21ad Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Tue, 25 Jul 2023 15:32:58 +0200
Subject: [PATCH] Moved to GWT 2.10.0

---
 .classpath                                    |  9 +-
 .../com.gwtplugins.gdt.eclipse.core.prefs     |  2 +-
 .settings/org.eclipse.wst.common.component    | 90 +++++++------------
 CHANGELOG.md                                  |  1 +
 pom.xml                                       | 11 +--
 5 files changed, 35 insertions(+), 78 deletions(-)

diff --git a/.classpath b/.classpath
index 7826cdd..78a5c21 100644
--- a/.classpath
+++ b/.classpath
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/gcube-ckan-datacatalog-2.2.5-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/gcube-ckan-datacatalog-2.2.6-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/gcube-ckan-datacatalog-2.2.5-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="test" value="true"/>
@@ -35,5 +30,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/gcube-ckan-datacatalog-2.2.5-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/gcube-ckan-datacatalog-2.2.6-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
index 7e5f92e..e15f0c9 100644
--- a/.settings/com.gwtplugins.gdt.eclipse.core.prefs
+++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
@@ -1,6 +1,6 @@
 >>>>>>>=refs/heads/task_20699
 eclipse.preferences.version=1
 jarsExcludedFromWebInfLib=
-lastWarOutDir=/home/francescomangiacrapa/git/gcube-ckan-datacatalog/target/gcube-ckan-datacatalog-2.2.5-SNAPSHOT
+lastWarOutDir=/home/francescomangiacrapa/git/gcube-ckan-datacatalog/target/gcube-ckan-datacatalog-2.2.6-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index dab635e..3ab0df6 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-                                                                                                                                                                                                
+                                                                                                                                                                                                            
     
     
     
@@ -46,8 +46,14 @@
     
     
     
-    <wb-module deploy-name="gcube-ckan-datacatalog-2.2.5-SNAPSHOT">
-                                                                                                                                                                                                                                                                                                                                                                                                
+    
+    
+    
+    <wb-module deploy-name="gcube-ckan-datacatalog-2.2.6-SNAPSHOT">
+                                                                                                                                                                                                                                                                                                                                                                                                                        
+        
+        
+        
         
         
         
@@ -95,7 +101,10 @@
         
         
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                                                                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                        
+        
+        
+        
         
         
         
@@ -143,7 +152,10 @@
         
         
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                                                                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                        
+        
+        
+        
         
         
         
@@ -191,7 +203,7 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                                                                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                        
         
         
         
@@ -217,57 +229,6 @@
         
         
         
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="ckan-content-moderator-widget-1.2.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ckan-content-moderator-widget/ckan-content-moderator-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="ckan-metadata-publisher-widget-2.1.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ckan-metadata-publisher-widget/ckan-metadata-publisher-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-                                                                                                                                                                                                                                                                                                                                                                                                
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
         
         
         
@@ -293,7 +254,10 @@
         
         
         <property name="context-root" value="gcube-ckan-datacatalog"/>
-                                                                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                        
+        
+        
+        
         
         
         
@@ -341,7 +305,10 @@
         
         
         <property name="java-output-path" value="/gcube-ckan-datacatalog/target/gcube-ckan-datacatalog-1.0.0-SNAPSHOT/WEB-INF/classes"/>
-                                                                                                                                                                                                                                                                                                                                                                                            
+                                                                                                                                                                                                                                                                                                                                                                                                                    
+    
+    
+    
     
     
     
@@ -389,7 +356,10 @@
     
     
     </wb-module>
-                                                                                                                                                                                            
+                                                                                                                                                                                                        
+
+
+
 
 
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a06933..0d31cf7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ## [v2.2.6-SNAPSHOT] - 2023-07-25
 
 - Just rebuilt the Portlet, fixing issue [#25275]
+- Moved to GWT 2.10.0
 
 ## [v2.2.5] - 2023-03-02
 
diff --git a/pom.xml b/pom.xml
index 4241228..5c70a8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 
 	<properties>
 		<!-- Convenience property to set the GWT version -->
-		<gwtVersion>2.9.0</gwtVersion>
+		<gwtVersion>2.10.0</gwtVersion>
 		<!-- GWT needs at least java 1.6 -->
 		<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -132,15 +132,6 @@
 			<version>[2.1.0,3.0.0)</version>
 			<scope>compile</scope>
 		</dependency>
-
-		<!--  fixing issue [#25275] -->
-		<dependency>
-			<groupId>org.gcube.data.publishing</groupId>
-			<artifactId>ckan2zenodo-library</artifactId>
-			<version>[1.0.0-SNAPSHOT, 1.0.3-SNAPSHOT]</version>
-			<scope>compile</scope>
-		</dependency>
-		<!-- to be removed -->
 		
 		<dependency>
 			<groupId>org.gcube.portlets.widgets</groupId>