From 81c65937eec081e0a7e4e14ca6f359130e8d0f21 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Wed, 28 Sep 2022 13:50:12 +0200
Subject: [PATCH] Testing building on jenkins with JDK_11

---
 .classpath                                    |  6 ++--
 .../com.gwtplugins.gdt.eclipse.core.prefs     |  2 +-
 .settings/org.eclipse.wst.common.component    | 32 ++++++++++++-------
 ....eclipse.wst.common.project.facet.core.xml |  2 +-
 CHANGELOG.md                                  |  6 ++++
 pom.xml                                       | 20 +++++++-----
 6 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/.classpath b/.classpath
index a827b37..e34d66e 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/geoportal-data-viewer-app-2.3.0/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/geoportal-data-viewer-app-2.4.0/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/geoportal-data-viewer-app-2.3.0/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/geoportal-data-viewer-app-2.4.0/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -35,5 +35,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/geoportal-data-viewer-app-2.3.0/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/geoportal-data-viewer-app-2.4.0/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
index ad74a6c..8e0f42e 100644
--- a/.settings/com.gwtplugins.gdt.eclipse.core.prefs
+++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
@@ -1,4 +1,4 @@
 eclipse.preferences.version=1
-lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-viewer-app/target/geoportal-data-viewer-app-2.3.0
+lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-viewer-app/target/geoportal-data-viewer-app-2.4.0
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index b09b3fd..052cbcb 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">
-                                                                    	
+                                                                        	
     
     
     
@@ -16,8 +16,10 @@
     
     
     
-    <wb-module deploy-name="geoportal-data-viewer-app-2.3.0">
-                                                                                                                                        		
+    
+    <wb-module deploy-name="geoportal-data-viewer-app-2.4.0">
+                                                                                                                                                		
+        
         
         
         
@@ -35,7 +37,8 @@
         
         
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                                                                                                                                        		
+                                                                                                                                                		
+        
         
         
         
@@ -53,7 +56,8 @@
         
         
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                                                                                                                                        		
+                                                                                                                                                		
+        
         
         
         
@@ -71,7 +75,8 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
-                                                                                                                                        		
+                                                                                                                                                		
+        
         
         
         
@@ -89,7 +94,8 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                                                                                                                                        		
+                                                                                                                                                		
+        
         
         
         
@@ -107,7 +113,8 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-                                                                                                                                        		
+                                                                                                                                                		
+        
         
         
         
@@ -125,7 +132,8 @@
         
         
         <property name="java-output-path" value="/geoportal-data-viewer-app/target/geoportal-data-viewer-app-0.0.1-SNAPSHOT/WEB-INF/classes"/>
-                                                                                                                                        		
+                                                                                                                                                		
+        
         
         
         
@@ -143,7 +151,8 @@
         
         
         <property name="context-root" value="geoportal-data-viewer-app"/>
-                                                                                                                                        	
+                                                                                                                                                	
+    
     
     
     
@@ -161,7 +170,8 @@
     
     
     </wb-module>
-                                                                    
+                                                                        
+
 
 
 
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index cd892cb..cfff38b 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <installed facet="jst.web" version="3.0"/>
   <installed facet="com.gwtplugins.gwt.facet" version="1.0"/>
   <installed facet="jst.jaxrs" version="2.0"/>
   <installed facet="java" version="1.8"/>
+  <installed facet="jst.web" version="3.0"/>
 </faceted-project>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc247d3..c80c64e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v2.4.1-SNAPSHOT] - 2022-09-28
+
+
+- [#23906] Tested building on jenkins with JDK_11
+
+
 ## [v2.4.0] - 2022-09-07
 
 #### Enhancement
diff --git a/pom.xml b/pom.xml
index 275f7c8..e1f4333 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>geoportal-data-viewer-app</artifactId>
 	<packaging>war</packaging>
-	<version>2.4.0</version>
+	<version>2.4.1-SNAPSHOT</version>
 	<name>GeoPortal Data Viewer App</name>
 	<description>The GeoPortal Data Viewer App is an application to access, discovery and navigate the GeoNa products by a Web-Map Interface</description>
 
@@ -54,7 +54,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>
 			</dependency>
@@ -63,12 +63,12 @@
 
 	<dependencies>
 
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.1.0</version>
-			<scope>provided</scope>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>javax.servlet</groupId> -->
+<!-- 			<artifactId>javax.servlet-api</artifactId> -->
+<!-- 			<version>3.1.0</version> -->
+<!-- 			<scope>provided</scope> -->
+<!-- 		</dependency> -->
 
 		<dependency>
 			<groupId>xml-apis</groupId>
@@ -175,6 +175,10 @@
 					<groupId>org.ow2.asm</groupId>
 					<artifactId>asm</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>javax.servlet</groupId>
+					<artifactId>servlet-api</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<!-- END FORCING -->