From 3cef7b82b78c7eeaf6603153cb9d569b5842cf95 Mon Sep 17 00:00:00 2001
From: Fabio Sinibaldi <fabio.sinibaldi@isti.cnr.it>
Date: Fri, 24 Sep 2021 12:09:33 +0200
Subject: [PATCH] Fixed dependency tree

---
 geoportal-common/pom.xml  | 24 ++++++++++++-----------
 geoportal-service/pom.xml | 40 +++++++++++----------------------------
 pom.xml                   | 34 ++++++++++++++++++++++++++-------
 3 files changed, 51 insertions(+), 47 deletions(-)

diff --git a/geoportal-common/pom.xml b/geoportal-common/pom.xml
index 7517504..c2c1396 100644
--- a/geoportal-common/pom.xml
+++ b/geoportal-common/pom.xml
@@ -20,17 +20,6 @@
 
 	</properties>
 
-<!--	<dependencyManagement>-->
-<!--		<dependencies>-->
-<!--			<dependency>-->
-<!--				<groupId>org.gcube.distribution</groupId>-->
-<!--				<artifactId>gcube-bom</artifactId>-->
-<!--				<version>2.0.1</version>-->
-<!--				<type>pom</type>-->
-<!--				<scope>import</scope>-->
-<!--			</dependency>-->
-<!--		</dependencies>-->
-<!--	</dependencyManagement>-->
 
 	<scm>
 		<connection>scm:git:${gitBaseUrl}/${project.artifactId}.git</connection>
@@ -68,6 +57,19 @@
 			<artifactId>logback-classic</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.media</groupId>
+			<artifactId>jersey-media-json-jackson</artifactId>
+		</dependency>
+		<!-- STORAGE -->
+		<dependency>
+			<groupId>org.gcube.contentmanagement</groupId>
+			<artifactId>storage-manager-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.gcube.contentmanagement</groupId>
+			<artifactId>storage-manager-wrapper</artifactId>
+		</dependency>
 
 
 	</dependencies>
diff --git a/geoportal-service/pom.xml b/geoportal-service/pom.xml
index eeaa3c6..2cd67b8 100644
--- a/geoportal-service/pom.xml
+++ b/geoportal-service/pom.xml
@@ -30,17 +30,17 @@
 
 
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.gcube.distribution</groupId>
-				<artifactId>gcube-smartgears-bom</artifactId>
-				<version>2.1.0</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
+<!--	<dependencyManagement>-->
+<!--		<dependencies>-->
+<!--			<dependency>-->
+<!--				<groupId>org.gcube.distribution</groupId>-->
+<!--				<artifactId>gcube-smartgears-bom</artifactId>-->
+<!--				<version>2.1.0</version>-->
+<!--				<type>pom</type>-->
+<!--				<scope>import</scope>-->
+<!--			</dependency>-->
+<!--		</dependencies>-->
+<!--	</dependencyManagement>-->
 
 	<dependencies>
 
@@ -179,7 +179,6 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.14.8</version>
 		</dependency>
 
 		<!-- TEST -->
@@ -190,9 +189,6 @@
 			<scope>test</scope>
 		</dependency>
 
-
-		<!-- <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>eclipselink</artifactId> 
-			<version>2.5.0</version> <scope>test</scope> </dependency> -->
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
@@ -216,19 +212,5 @@
 			<artifactId>cms-test-commons</artifactId>
 			<scope>test</scope>
 		</dependency>
-
-		<!-- <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> 
-			<version>10.8.3.0</version> <scope>test</scope> </dependency> -->
-
 	</dependencies>
-<!--	<repositories>-->
-<!--		<repository>-->
-<!--			<id>GeoSolutions</id>-->
-<!--			<url>https://nexus.d4science.org/nexus/content/repositories/geo-solutions-snapshots/</url>-->
-<!--		</repository>-->
-<!--		<repository>-->
-<!--			<id>GeoToolkit</id>-->
-<!--			<url>https://nexus.d4science.org/nexus/content/repositories/geotoolkit/</url>-->
-<!--		</repository>-->
-<!--	</repositories>-->
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a022e70..36ce0c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,6 +12,8 @@
 	<version>1.0.0-SNAPSHOT</version>
 	<name>Gcube CMS Suite</name>
 
+	<description>gCube CMS Suite is a set of components designed to manage complex space-temporal Documents defined by metadata Profiles.</description>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<geotools.version>8.0-M4</geotools.version>
@@ -20,6 +22,8 @@
 		<gitBaseUrl>https://code-repo.d4science.org/gCubeSystem</gitBaseUrl>
 	</properties>
 
+
+
 	<scm>
 		<connection>scm:git:${gitBaseUrl}/${project.artifactId}.git</connection>
 		<developerConnection>scm:git:${gitBaseUrl}/${project.artifactId}.git</developerConnection>
@@ -50,6 +54,15 @@
 				<scope>import</scope>
 			</dependency>
 
+			<dependency>
+				<groupId>org.gcube.distribution</groupId>
+				<artifactId>gcube-smartgears-bom</artifactId>
+				<version>2.1.0</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
+
 			<!-- modules -->
 			<dependency>
 				<groupId>org.gcube.application</groupId>
@@ -83,23 +96,30 @@
 				<version>1.14.8</version>
 			</dependency>
 
-			<dependency>
-				<groupId>org.projectlombok</groupId>
-				<artifactId>lombok</artifactId>
-				<version>1.14.8</version>
-			</dependency>
-
 			<dependency>
 				<groupId>junit</groupId>
 				<artifactId>junit</artifactId>
 				<version>4.11</version>
 			</dependency>
 
+
+			<!-- STORAGE -->
+			<dependency>
+				<groupId>org.gcube.contentmanagement</groupId>
+				<artifactId>storage-manager-core</artifactId>
+				<version>[2.0.0, 3.0.0-SNAPSHOT)</version>
+			</dependency>
+			<dependency>
+				<groupId>org.gcube.contentmanagement</groupId>
+				<artifactId>storage-manager-wrapper</artifactId>
+				<version>[2.0.0, 3.0.0-SNAPSHOT)</version>
+			</dependency>
+
 		</dependencies>
 	</dependencyManagement>
 
 
-	<description>gCube CMS Suite is a set of components designed to manage complex space-temporal Documents defined by metadata Profiles.</description>
+
 
 		<build>
 		<pluginManagement>