From d225c389c93b3258c9f09b34a625a2c394ed16ce Mon Sep 17 00:00:00 2001
From: "lucio.lelii" <lucio.leliiisti.cnr.it>
Date: Thu, 29 Apr 2021 13:29:57 +0200
Subject: [PATCH] Fixed version of jackson libs to 2.8.11 to resolve conflict

---
 CHANGELOG.md |  6 +++++-
 pom.xml      | 26 ++++++++++++++++++--------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27d1d64..7eeaa70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,11 @@
 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.26.0-SNAPSHOT] - 2021-04-12
+## [v6.27.0-SNAPSHOT] - 2021-04-29
+
+Fixed version of jackson libs to 2.8.11 to resolve conflict
+
+## [v6.26.0] - 2021-04-12
 
 #### Enhancements
 
diff --git a/pom.xml b/pom.xml
index ed6d48d..959bce1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>workspace</artifactId>
 	<packaging>war</packaging>
-	<version>6.26.0-SNAPSHOT</version>
+	<version>6.27.0-SNAPSHOT</version>
 	<name>gCube Workspace Portlet</name>
 	<description>
 		gCube Workspace Portlet is a web-gui to manage the gCube workspace, a collaborative area where users can exchange and organize information objects (workspace items) according to their specific needs. 
@@ -157,7 +157,23 @@
 			<scope>compile</scope>
 		</dependency>
 		<!-- END FWS -->
-
+		
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>2.8.11</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.8.11</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>2.8.11</version>
+		</dependency>
+		
 		<dependency>
 			<groupId>org.gcube.portlets.widgets</groupId>
 			<artifactId>session-checker</artifactId>
@@ -207,12 +223,6 @@
 			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 		</dependency>
 
-		<!-- Force jackson-annotation dependency to 2.7 version -->
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
-			<version>2.7.0</version>
-		</dependency>
 
 		<dependency>
 			<groupId>javax.portlet</groupId>