From b46b2bc1d4dd6f23841071ff5ea5bc8a42c33c73 Mon Sep 17 00:00:00 2001
From: Fabio Sinibaldi <fabio.sinibaldi@isti.cnr.it>
Date: Tue, 15 Dec 2020 18:32:47 +0100
Subject: [PATCH] Fixed dependencies

---
 DataMinerAlgorithmsCrawler/pom.xml                        | 5 +++--
 .../gCatFeeder/collectors/dm/TranslationTest.java         | 8 ++++----
 catalogue-plugin-framework/pom.xml                        | 2 +-
 collectors-plugin-framework/pom.xml                       | 2 +-
 gCat-Controller/pom.xml                                   | 4 ++--
 gCat-Feeder/pom.xml                                       | 6 +++---
 oai-harvester/pom.xml                                     | 2 +-
 pom.xml                                                   | 8 ++++----
 test-commons/pom.xml                                      | 4 ++--
 9 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/DataMinerAlgorithmsCrawler/pom.xml b/DataMinerAlgorithmsCrawler/pom.xml
index 19e1a9a..2884f83 100644
--- a/DataMinerAlgorithmsCrawler/pom.xml
+++ b/DataMinerAlgorithmsCrawler/pom.xml
@@ -37,7 +37,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
+			<groupId>org.gcube.data-publishing.gFeed</groupId>
 			<artifactId>collectors-plugin-framework</artifactId>
 		</dependency>
 
@@ -61,7 +61,7 @@
 		</dependency>
 		<!-- TEST -->
 		<dependency>
-			<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
+			<groupId>org.gcube.data-publishing.gFeed</groupId>
 			<artifactId>test-commons</artifactId>
 			<scope>test</scope>
 		</dependency>
@@ -93,4 +93,5 @@
 		</plugins>
 	</build>
 
+
 </project>
\ No newline at end of file
diff --git a/DataMinerAlgorithmsCrawler/src/test/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/TranslationTest.java b/DataMinerAlgorithmsCrawler/src/test/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/TranslationTest.java
index 513e7c4..bccf28d 100644
--- a/DataMinerAlgorithmsCrawler/src/test/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/TranslationTest.java
+++ b/DataMinerAlgorithmsCrawler/src/test/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/TranslationTest.java
@@ -4,9 +4,6 @@ import java.io.IOException;
 import java.util.Collection;
 import java.util.Set;
 
-import org.codehaus.jackson.JsonGenerationException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
 import org.gcube.data.publishing.gCatFeeder.collectors.dm.model.InternalAlgorithmDescriptor;
 import org.gcube.data.publishing.gCatFeeder.model.CatalogueFormatData;
 import org.gcube.data.publishing.gCatFeeder.model.InternalConversionException;
@@ -16,10 +13,13 @@ import org.gcube.data.publishing.gCatfeeder.collectors.DataCollector;
 import org.gcube.data.publishing.gCatfeeder.collectors.DataTransformer;
 import org.gcube.data.publishing.gCatfeeder.collectors.model.faults.CatalogueNotSupportedException;
 import org.gcube.data.publishing.gCatfeeder.collectors.model.faults.CollectorFault;
-import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Test;
 
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 public class TranslationTest extends BaseCollectorTest{
 
 
diff --git a/catalogue-plugin-framework/pom.xml b/catalogue-plugin-framework/pom.xml
index 91ce0f3..7421d5b 100644
--- a/catalogue-plugin-framework/pom.xml
+++ b/catalogue-plugin-framework/pom.xml
@@ -25,7 +25,7 @@
 
 
 		<dependency>
-			<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
+			<groupId>org.gcube.data-publishing.gFeed</groupId>
 			<artifactId>commons</artifactId>
 		</dependency>
 	</dependencies>
diff --git a/collectors-plugin-framework/pom.xml b/collectors-plugin-framework/pom.xml
index 546a8f2..e54e755 100644
--- a/collectors-plugin-framework/pom.xml
+++ b/collectors-plugin-framework/pom.xml
@@ -31,7 +31,7 @@
 
 
 		<dependency>
-			<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
+			<groupId>org.gcube.data-publishing.gFeed</groupId>
 			<artifactId>commons</artifactId>
 		</dependency>
 	</dependencies>
diff --git a/gCat-Controller/pom.xml b/gCat-Controller/pom.xml
index 9201041..e7d8abb 100644
--- a/gCat-Controller/pom.xml
+++ b/gCat-Controller/pom.xml
@@ -31,7 +31,7 @@
 		</dependency>
   
   		<dependency>
-			<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
+			<groupId>org.gcube.data-publishing.gFeed</groupId>
 			<artifactId>catalogue-plugin-framework</artifactId>
 		</dependency>
   		
@@ -44,7 +44,7 @@
   		
   		
   		<dependency>
-  			<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
+  			<groupId>org.gcube.data-publishing.gFeed</groupId>
     		<artifactId>test-commons</artifactId>
   		</dependency>
   
diff --git a/gCat-Feeder/pom.xml b/gCat-Feeder/pom.xml
index 066952c..670f14b 100644
--- a/gCat-Feeder/pom.xml
+++ b/gCat-Feeder/pom.xml
@@ -6,7 +6,7 @@
     	<artifactId>gFeed-Suite</artifactId>
 		<version>1.0.4-SNAPSHOT</version>
 	</parent>
-	<artifactId>gFeed-service</artifactId>
+	<artifactId>gCat-Feeder</artifactId>
 	<name>gFeed Service</name>
 	<version>1.0.4-SNAPSHOT</version>
 	<description>Service implementation</description>
@@ -27,13 +27,13 @@
 	<dependencies>
 
 		<dependency>
-			<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
+			<groupId>org.gcube.data-publishing.gFeed</groupId>
 			<artifactId>collectors-plugin-framework</artifactId>
 		</dependency>
 
 
 		<dependency>
-			<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
+			<groupId>org.gcube.data-publishing.gFeed</groupId>
 			<artifactId>catalogue-plugin-framework</artifactId>
 		</dependency>
 
diff --git a/oai-harvester/pom.xml b/oai-harvester/pom.xml
index 0ecef8f..7453011 100644
--- a/oai-harvester/pom.xml
+++ b/oai-harvester/pom.xml
@@ -53,7 +53,7 @@
 
 		<!-- TEST -->
 		<dependency>
-			<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
+			<groupId>org.gcube.data-publishing.gFeed</groupId>
 			<artifactId>test-commons</artifactId>
 			<scope>test</scope>
 		</dependency>
diff --git a/pom.xml b/pom.xml
index b3734a0..fa47d03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,25 +56,25 @@
 			
 			
 			<dependency>
-				<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
+				<groupId>org.gcube.data-publishing.gFeed</groupId>
 				<artifactId>collectors-plugin-framework</artifactId>
 				<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
-				<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
+				<groupId>org.gcube.data-publishing.gFeed</groupId>
 				<artifactId>test-commons</artifactId>
 				<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
-  				<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
+  				<groupId>org.gcube.data-publishing.gFeed</groupId>
   				<artifactId>commons</artifactId>
   				<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
   				<scope>provided</scope>
   			</dependency>
   			<dependency>
-				<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
+				<groupId>org.gcube.data-publishing.gFeed</groupId>
 				<artifactId>catalogue-plugin-framework</artifactId>
 				<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 				<scope>provided</scope>
diff --git a/test-commons/pom.xml b/test-commons/pom.xml
index 2d884cd..02b3e6a 100644
--- a/test-commons/pom.xml
+++ b/test-commons/pom.xml
@@ -18,13 +18,13 @@
 	</scm> 
  	 <dependencies>
   		<dependency>
-			<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
+			<groupId>org.gcube.data-publishing.gFeed</groupId>
 			<artifactId>collectors-plugin-framework</artifactId>
 		</dependency>
 
 
 		<dependency>
-			<groupId>org.gcube.data-publishing.gCat-Feeder</groupId>
+			<groupId>org.gcube.data-publishing.gFeed</groupId>
 			<artifactId>catalogue-plugin-framework</artifactId>
 		</dependency>