From 77456a2b68dcae5567f60f594718782f76e954d8 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Tue, 11 May 2021 15:50:07 +0200
Subject: [PATCH] [#21387] Harmonized version of jackson libs to 2.8.11

---
 .classpath                                    | 30 +++++++++----------
 .../com.gwtplugins.gdt.eclipse.core.prefs     |  2 +-
 .settings/org.eclipse.wst.common.component    | 12 +++++---
 CHANGELOG.md                                  |  5 ++--
 pom.xml                                       | 15 ++++------
 5 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/.classpath b/.classpath
index 7ab3f22..f5abf1a 100644
--- a/.classpath
+++ b/.classpath
@@ -1,20 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/workspace-6.26.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry excluding="**" kind="src" output="target/workspace-6.27.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/workspace-6.26.0-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"/>
-			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
@@ -35,5 +22,18 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/workspace-6.26.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="src" output="target/workspace-6.27.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/workspace-6.27.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
index a4b015a..1d3611e 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/workspace/target/workspace-6.26.0-SNAPSHOT
+lastWarOutDir=/home/francesco-mangiacrapa/git/workspace/target/workspace-6.27.0-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 36b616f..6cfe198 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
       
-    <wb-module deploy-name="workspace-6.25.4-SNAPSHOT">
+    <wb-module deploy-name="workspace-6.27.0-SNAPSHOT">
                 
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
             
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
                 
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <dependent-module archiveName="workspace-tree-widget-6.32.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/WorkspaceTree/WorkspaceTree">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="catalogue-util-library-1.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/catalogue-util-library/catalogue-util-library">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
             
         <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
                 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7eeaa70..deaedc5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,10 @@
 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).
 
-## [v6.27.0-SNAPSHOT] - 2021-04-29
+## [v6.27.0-SNAPSHOT] - 2021-05-10
+
+[#21387] Harmonized version of jackson libs to 2.8.11 to resolve conflict
 
-Fixed version of jackson libs to 2.8.11 to resolve conflict
 
 ## [v6.26.0] - 2021-04-12
 
diff --git a/pom.xml b/pom.xml
index 959bce1..15e9f28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,6 +29,7 @@
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
 		<additionalparam>-Xdoclint:none</additionalparam>
+		<jackson.version>2.8.11</jackson.version>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -141,10 +142,6 @@
 			<scope>compile</scope>
 		</dependency>
 
-		<!-- WebSocket dep (does not work on Jetty) <dependency> <groupId>org.realityforge.gwt.websockets</groupId> 
-			<artifactId>gwt-websockets</artifactId> <version>1.1.2</version> <scope>provided</scope> 
-			</dependency> <dependency> <groupId>javax.websocket</groupId> <artifactId>javax.websocket-api</artifactId> 
-			<version>1.1</version> <scope>provided</scope> </dependency> -->
 		<!-- FWS -->
 		<dependency>
 			<groupId>org.gcube.resources.discovery</groupId>
@@ -157,23 +154,23 @@
 			<scope>compile</scope>
 		</dependency>
 		<!-- END FWS -->
-		
+
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
-			<version>2.8.11</version>
+			<version>${jackson.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.8.11</version>
+			<version>${jackson.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
-			<version>2.8.11</version>
+			<version>${jackson.version}</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.gcube.portlets.widgets</groupId>
 			<artifactId>session-checker</artifactId>