From 7851d09cfb089aaab27dfb2c16791f5ceff5ab2b Mon Sep 17 00:00:00 2001
From: Fabio Sinibaldi <fabio.sinibaldi@isti.cnr.it>
Date: Wed, 16 Mar 2022 12:11:05 +0100
Subject: [PATCH] Poms coherence

---
 cms-plugin-framework/pom.xml                  |   1 -
 .../cms/plugins/PluginsReflections.java       |   1 +
 cms-test-commons/pom.xml                      |   4 +-
 geoportal-client/pom.xml                      |   1 +
 .../clients/ProfiledConcessioniTest.java      |   2 +-
 geoportal-service/pom.xml                     | 158 ++++++------------
 pom.xml                                       |  36 ++--
 use-cases/pom.xml                             |   4 +-
 8 files changed, 84 insertions(+), 123 deletions(-)

diff --git a/cms-plugin-framework/pom.xml b/cms-plugin-framework/pom.xml
index 54f8814..1c80712 100644
--- a/cms-plugin-framework/pom.xml
+++ b/cms-plugin-framework/pom.xml
@@ -16,7 +16,6 @@
     <properties>
         <gitBaseUrl>https://code-repo.d4science.org/gCubeSystem</gitBaseUrl>
         <sis.version>1.0</sis.version>
-
     </properties>
 
 
diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/PluginsReflections.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/PluginsReflections.java
index 18c45a7..5616df3 100644
--- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/PluginsReflections.java
+++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/PluginsReflections.java
@@ -27,6 +27,7 @@ public class PluginsReflections {
 
         reflections.getSubTypesOf(Plugin.class).iterator().forEachRemaining(pluginClass->{
             if(!pluginClass.isInterface() && !Modifier.isAbstract(pluginClass.getModifiers())){
+                log.trace("Evaluating class ");
                 try {
                     Plugin plugin = pluginClass.newInstance();
                     log.debug("Loading {} description : {}", plugin, plugin.getDescriptor());
diff --git a/cms-test-commons/pom.xml b/cms-test-commons/pom.xml
index 98d1e72..c03f2f4 100644
--- a/cms-test-commons/pom.xml
+++ b/cms-test-commons/pom.xml
@@ -33,14 +33,14 @@
                 <dependency>
                     <groupId>org.gcube.distribution</groupId>
                     <artifactId>gcube-bom</artifactId>
-                    <version>2.0.1</version>
+                    <version>2.0.2</version>
                     <type>pom</type>
                     <scope>import</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.gcube.distribution</groupId>
                     <artifactId>gcube-smartgears-bom</artifactId>
-                    <version>2.1.0</version>
+                    <version>2.1.1</version>
                     <type>pom</type>
                     <scope>import</scope>
                 </dependency>
diff --git a/geoportal-client/pom.xml b/geoportal-client/pom.xml
index a435eb6..f37d5ae 100644
--- a/geoportal-client/pom.xml
+++ b/geoportal-client/pom.xml
@@ -34,6 +34,7 @@
 		<dependency>
 			<groupId>org.gcube.application.cms</groupId>
 			<artifactId>geoportal-common</artifactId>
+			<scope>compile</scope>
 		</dependency>
 
 		<dependency>
diff --git a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/ProfiledConcessioniTest.java b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/ProfiledConcessioniTest.java
index 2ae40ba..04a929e 100644
--- a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/ProfiledConcessioniTest.java
+++ b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/ProfiledConcessioniTest.java
@@ -2,7 +2,7 @@ package org.gcube.application.geoportal.clients;
 
 import lombok.Data;
 import org.bson.Document;
-import org.gcube.application.cms.serialization.Serialization;
+import org.gcube.application.geoportal.client.utils.Serialization;
 import org.gcube.application.geoportal.common.model.useCaseDescriptor.HandlerDeclaration;
 import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor;
 
diff --git a/geoportal-service/pom.xml b/geoportal-service/pom.xml
index 4c600fe..519aa72 100644
--- a/geoportal-service/pom.xml
+++ b/geoportal-service/pom.xml
@@ -35,7 +35,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-smartgears-bom</artifactId>
-				<version>2.1.0</version>
+				<version>2.1.1</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -44,15 +44,64 @@
 
 	<dependencies>
 
-
-
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-smartgears</artifactId>
 		</dependency>
 
+		<!-- INTERNAL LOGIC -->
+		<dependency>
+			<groupId>org.gcube.application.cms</groupId>
+			<artifactId>geoportal-common</artifactId>
+			<scope>compile</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.gcube.application.cms</groupId>
+			<artifactId>cms-plugin-framework</artifactId>
+			<scope>compile</scope>
+		</dependency>
 
 
+		<!-- MONGO -->
+		<!-- https://mvnrepository.com/artifact/org.mongodb/mongo-java-driver -->
+		<dependency>
+			<groupId>org.mongodb</groupId>
+			<artifactId>mongo-java-driver</artifactId>
+			<version>3.6.0</version>
+		</dependency>
+
+		<!-- Common - basic -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.reflections</groupId>
+			<artifactId>reflections</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>
+
+		<!-- Storage HUB -->
+		<dependency>
+			<groupId>org.gcube.common</groupId>
+			<artifactId>storagehub-client-library</artifactId>
+		</dependency>
 
 
 		<!-- JERSEY -->
@@ -80,18 +129,7 @@
 		</dependency>
 
 
-
-		<!-- INTERNAL LOGIC -->
-		<dependency>
-			<groupId>org.gcube.application.cms</groupId>
-			<artifactId>geoportal-common</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.gcube.application.cms</groupId>
-			<artifactId>cms-plugin-framework</artifactId>
-		</dependency>
-
+		<!-- DEPRECATED LEGACY LOGIC SUPPORT -->
 
 		<!-- POSTGRES DRIVERS -->
 		<dependency>
@@ -108,13 +146,6 @@
 		</dependency>
 
 
-		<!-- GS communication -->
-<!--		<dependency>-->
-<!--			<groupId>org.gcube.spatial.data</groupId>-->
-<!--			<artifactId>gcube-geoserver-client</artifactId>-->
-<!--			<version>[1.0.0-SNAPSHOT,)</version>-->
-<!--		</dependency>-->
-
 		<!-- DT -->
 		<dependency>
 			<groupId>org.gcube.data.transfer</groupId>
@@ -122,89 +153,6 @@
 			<version>[1.2.1,2.0.0]</version>
 		</dependency>
 
-		<!-- Storage HUB -->
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>storagehub-client-library</artifactId>
-		</dependency>
-
-
-		<!-- MONGO -->
-		<!-- https://mvnrepository.com/artifact/org.mongodb/mongo-java-driver -->
-		<dependency>
-			<groupId>org.mongodb</groupId>
-			<artifactId>mongo-java-driver</artifactId>
-			<version>3.6.0</version>
-		</dependency>
-
-
-
-
-
-
-		<!-- GPKG -->
-		<!-- Read Geopackage -->
-		<!-- <dependency> <groupId>mil.nga.geopackage</groupId> <artifactId>geopackage</artifactId> 
-			<version>3.5.0</version> </dependency> -->
-
-
-
-
-
-		<!-- gCube SW -->
-
-		<!-- <dependency> <groupId>org.gcube.spatial.data</groupId> <artifactId>sdi-library</artifactId> 
-			<version>[1.0.0,2.0.0)</version> </dependency> <dependency> <groupId>org.gcube.data.transfer</groupId> 
-			<artifactId>data-transfer-library</artifactId> <version>[1.2.1,2.0.0]</version> 
-			</dependency> <dependency> <groupId>org.gcube.spatial.data</groupId> <artifactId>gis-interface</artifactId> 
-			<version>[2.4.0,3.0.0)</version> </dependency> <dependency> <groupId>org.gcube.spatial.data</groupId> 
-			<artifactId>geonetwork</artifactId> <version>[3.4.3,4.0.0)</version> </dependency> 
-			<dependency> <groupId>org.gcube.common</groupId> <artifactId>storagehub-client-library</artifactId> 
-			<version>[1.0.0,2.0.0)</version> </dependency> -->
-
-
-		<!-- HIBERNATE -->
-		<!-- <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> 
-			<version>5.3.1.Final</version> </dependency> -->
-
-
-		<!-- SIS -->
-
-
-		<!-- <dependency> <groupId>org.apache.sis.core</groupId> <artifactId>sis-referencing</artifactId> 
-			<version>${sis.version}</version> </dependency> -->
-
-		<!-- Common - basic -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-		</dependency>
-
-
-
-
-		<dependency>
-			<groupId>org.reflections</groupId>
-			<artifactId>reflections</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>
-
-
-
 
 		<!-- TEST -->
 
diff --git a/pom.xml b/pom.xml
index ec3ca72..4f9887b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-bom</artifactId>
-				<version>2.0.1</version>
+				<version>2.0.2</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -79,7 +79,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-smartgears-bom</artifactId>
-				<version>2.1.0</version>
+				<version>2.1.1</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -96,6 +96,7 @@
 				<groupId>org.gcube.application.cms</groupId>
 				<artifactId>cms-plugin-framework</artifactId>
 				<version>[1.0.0-SNAPSHOT,2.0.0)</version>
+				<scope>provided</scope>
 			</dependency>
 
 
@@ -127,6 +128,8 @@
 			</dependency>
 
 
+
+			<!-- CLIENT -->
 			<dependency>
 				<groupId>org.gcube.application</groupId>
 				<artifactId>geoportal-client</artifactId>
@@ -136,17 +139,11 @@
 				<groupId>org.gcube.application.cms</groupId>
 				<artifactId>geoportal-common</artifactId>
 				<version>[1.0.7-SNAPSHOT,2.0.0)</version>
+				<scope>provided</scope>
 			</dependency>
-			<dependency>
-				<groupId>org.gcube.application.cms</groupId>
-				<artifactId>cms-test-commons</artifactId>
-				<version>[1.0.0-SNAPSHOT,2.0.0)</version>
-			</dependency>
-			<dependency>
-				<groupId>org.gcube.application.cms</groupId>
-				<artifactId>use-cases</artifactId>
-				<version>[1.0.0-SNAPSHOT,2.0.0)</version>
-			</dependency>
+
+
+			<!-- CUSTOM : CONCESSIONI-->
 
 			<dependency>
 				<groupId>org.gcube.application.cms</groupId>
@@ -160,6 +157,21 @@
 				<version>[1.0.0-SNAPSHOT,2.0.0)</version>
 			</dependency>
 
+
+			<dependency>
+				<groupId>org.gcube.application.cms</groupId>
+				<artifactId>cms-test-commons</artifactId>
+				<version>[1.0.0-SNAPSHOT,2.0.0)</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.gcube.application.cms</groupId>
+				<artifactId>use-cases</artifactId>
+				<version>[1.0.0-SNAPSHOT,2.0.0)</version>
+			</dependency>
+
+
+
 			<dependency>
 				<groupId>org.reflections</groupId>
 				<artifactId>reflections</artifactId>
diff --git a/use-cases/pom.xml b/use-cases/pom.xml
index 993aea5..5579278 100644
--- a/use-cases/pom.xml
+++ b/use-cases/pom.xml
@@ -30,14 +30,14 @@
             <dependency>
                 <groupId>org.gcube.distribution</groupId>
                 <artifactId>gcube-bom</artifactId>
-                <version>2.0.1</version>
+                <version>2.0.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.gcube.distribution</groupId>
                 <artifactId>gcube-smartgears-bom</artifactId>
-                <version>2.1.0</version>
+                <version>2.1.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>