From 45c178579b39877fe3a73714badd12a6d73dd8c3 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Fri, 27 Jan 2023 15:16:52 +0100
Subject: [PATCH] removed commented servlets

---
 .settings/org.eclipse.wst.common.component | 47 +++++++++++++++++-----
 CHANGELOG.md                               |  1 +
 pom.xml                                    | 13 ++++--
 src/main/webapp/WEB-INF/web.xml            | 17 --------
 4 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index a5e1088..be08aff 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-                                                                                                                                                
+                                                                                                                                                            
+    
+    
+    
     
     
     
@@ -35,7 +38,10 @@
     
     
     <wb-module deploy-name="gcube-ckan-datacatalog-2.2.5-SNAPSHOT">
-                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                        
+        
+        
+        
         
         
         
@@ -71,7 +77,10 @@
         
         
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                        
+        
+        
+        
         
         
         
@@ -107,7 +116,10 @@
         
         
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                        
+        
+        
+        
         
         
         
@@ -143,7 +155,10 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                        
+        
+        
+        
         
         
         
@@ -179,10 +194,13 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="catalogue-util-library-1.3.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/catalogue-util-library/catalogue-util-library">
+        <dependent-module archiveName="ckan-content-moderator-widget-1.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ckan-content-moderator-widget/ckan-content-moderator-widget">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                        
+        
+        
+        
         
         
         
@@ -218,7 +236,10 @@
         
         
         <property name="context-root" value="gcube-ckan-datacatalog"/>
-                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                        
+        
+        
+        
         
         
         
@@ -254,7 +275,10 @@
         
         
         <property name="java-output-path" value="/gcube-ckan-datacatalog/target/gcube-ckan-datacatalog-1.0.0-SNAPSHOT/WEB-INF/classes"/>
-                                                                                                                                                                                                                                                                                            
+                                                                                                                                                                                                                                                                                                                    
+    
+    
+    
     
     
     
@@ -290,7 +314,10 @@
     
     
     </wb-module>
-                                                                                                                                            
+                                                                                                                                                        
+
+
+
 
 
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8edc215..3e9c83b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 #### Enhancements
 
 - [#23903] Catalogue Moderation: allow to send a message to the moderators
+- Moved to gwt 2.10.0
 
 ## [v2.2.4] - 2022-10-27
 
diff --git a/pom.xml b/pom.xml
index 4442e9a..5c80528 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>
@@ -40,7 +40,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>3.6.4</version>
+				<version>3.7.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 				<exclusions>
@@ -59,6 +59,13 @@
 	</dependencyManagement>
 
 	<dependencies>
+
+<!-- 		<dependency> -->
+<!-- 			<groupId>javax.servlet</groupId> -->
+<!-- 			<artifactId>javax.servlet-api</artifactId> -->
+<!-- 			<version>3.0.1</version> -->
+<!-- 			<scope>compile</scope> -->
+<!-- 		</dependency> -->
 		<dependency>
 			<groupId>com.google.gwt</groupId>
 			<artifactId>gwt-user</artifactId>
@@ -75,7 +82,7 @@
 			<groupId>com.google.gwt</groupId>
 			<artifactId>gwt-servlet</artifactId>
 			<version>${gwtVersion}</version>
-			<scope>runtime</scope>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.github.gwtbootstrap</groupId>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 3d0747d..748e3fb 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -11,13 +11,6 @@
 		<param-value>/gcube/service/connect</param-value>
 	</context-param>
 
-	<!-- <context-param> -->
-	<!-- <description>Used like GET parameter in order to hide header section 
-		of CKAN template from gCube Portal</description> -->
-	<!-- <param-name>CkanHideHeader</param-name> -->
-	<!-- <param-value>hh</param-value> -->
-	<!-- </context-param> -->
-
 	<context-param>
 		<description>ckan connector logout from CKAN</description>
 		<param-name>CkanConnectorLogout</param-name>
@@ -30,16 +23,6 @@
 		<servlet-class>org.gcube.portlets.gcubeckan.gcubeckandatacatalog.server.GcubeCkanDataCatalogServiceImpl</servlet-class>
 	</servlet>
 
-	<!-- <servlet> -->
-	<!-- <servlet-name>gcubeckanlogout</servlet-name> -->
-	<!-- <servlet-class>org.gcube.portlets.gcubeckan.gcubeckandatacatalog.server.CkanLogout</servlet-class> -->
-	<!-- </servlet> -->
-
-	<!-- <servlet> -->
-	<!-- <servlet-name>checkServlet</servlet-name> -->
-	<!-- <servlet-class>org.gcube.portlets.widgets.sessionchecker.server.SessionCheckerServiceImpl</servlet-class> -->
-	<!-- </servlet> -->
-
 	<servlet>
 		<servlet-name>ckanpublisherservices</servlet-name>
 		<servlet-class>org.gcube.portlets.widgets.ckandatapublisherwidget.server.CKANPublisherServicesImpl</servlet-class>