From b46b2bc1d4dd6f23841071ff5ea5bc8a42c33c73 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi 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 @@ - org.gcube.data-publishing.gCat-Feeder + org.gcube.data-publishing.gFeed collectors-plugin-framework @@ -61,7 +61,7 @@ - org.gcube.data-publishing.gCat-Feeder + org.gcube.data-publishing.gFeed test-commons test @@ -93,4 +93,5 @@ + \ 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 @@ - org.gcube.data-publishing.gCat-Feeder + org.gcube.data-publishing.gFeed commons 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 @@ - org.gcube.data-publishing.gCat-Feeder + org.gcube.data-publishing.gFeed commons 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 @@ - org.gcube.data-publishing.gCat-Feeder + org.gcube.data-publishing.gFeed catalogue-plugin-framework @@ -44,7 +44,7 @@ - org.gcube.data-publishing.gCat-Feeder + org.gcube.data-publishing.gFeed test-commons 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 @@ gFeed-Suite 1.0.4-SNAPSHOT - gFeed-service + gCat-Feeder gFeed Service 1.0.4-SNAPSHOT Service implementation @@ -27,13 +27,13 @@ - org.gcube.data-publishing.gCat-Feeder + org.gcube.data-publishing.gFeed collectors-plugin-framework - org.gcube.data-publishing.gCat-Feeder + org.gcube.data-publishing.gFeed catalogue-plugin-framework 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 @@ - org.gcube.data-publishing.gCat-Feeder + org.gcube.data-publishing.gFeed test-commons test diff --git a/pom.xml b/pom.xml index b3734a0..fa47d03 100644 --- a/pom.xml +++ b/pom.xml @@ -56,25 +56,25 @@ - org.gcube.data-publishing.gCat-Feeder + org.gcube.data-publishing.gFeed collectors-plugin-framework [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) provided - org.gcube.data-publishing.gCat-Feeder + org.gcube.data-publishing.gFeed test-commons [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) test - org.gcube.data-publishing.gCat-Feeder + org.gcube.data-publishing.gFeed commons [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) provided - org.gcube.data-publishing.gCat-Feeder + org.gcube.data-publishing.gFeed catalogue-plugin-framework [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) provided 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 @@ - org.gcube.data-publishing.gCat-Feeder + org.gcube.data-publishing.gFeed collectors-plugin-framework - org.gcube.data-publishing.gCat-Feeder + org.gcube.data-publishing.gFeed catalogue-plugin-framework