From 8daf7fecb27d257eb3e90fbcf5a8276dd876a630 Mon Sep 17 00:00:00 2001
From: Fabio Sinibaldi <fabio.sinibaldi@isti.cnr.it>
Date: Tue, 15 Dec 2020 17:43:52 +0100
Subject: [PATCH] fixed dependencies

---
 DataMinerAlgorithmsCrawler/pom.xml            | 12 +++----
 commons/pom.xml                               |  6 ++--
 gCat-Controller/pom.xml                       |  7 ++--
 gCat-Feeder/pom.xml                           | 10 ------
 .../engine/impl/persistence/StorageImpl.java  |  3 +-
 oai-harvester/pom.xml                         | 11 ++-----
 .../gfeed/oai/TranslationTest.java            |  7 ++--
 pom.xml                                       | 32 +++++++++++++++++++
 8 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/DataMinerAlgorithmsCrawler/pom.xml b/DataMinerAlgorithmsCrawler/pom.xml
index f2e851b..19e1a9a 100644
--- a/DataMinerAlgorithmsCrawler/pom.xml
+++ b/DataMinerAlgorithmsCrawler/pom.xml
@@ -47,12 +47,14 @@
 			<version>[1.6.0,2.0.0-SNAPSHOT)</version>
 		</dependency>
 
+		
 		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
+			<groupId>org.glassfish.jersey.media</groupId>
+			<artifactId>jersey-media-json-jackson</artifactId>
 		</dependency>
 
 
+
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
@@ -65,11 +67,7 @@
 		</dependency>
 
 
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-mapper-asl</artifactId>
-			<scope>test</scope>
-		</dependency>
+
 
 
 	</dependencies>
diff --git a/commons/pom.xml b/commons/pom.xml
index 4e3cb54..66b4ec7 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -47,12 +47,14 @@
 			<artifactId>jersey-client</artifactId>
 		</dependency>
 
+		
 		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
+			<groupId>org.glassfish.jersey.media</groupId>
+			<artifactId>jersey-media-json-jackson</artifactId>
 		</dependency>
 
 
+
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
diff --git a/gCat-Controller/pom.xml b/gCat-Controller/pom.xml
index 53f75e5..9201041 100644
--- a/gCat-Controller/pom.xml
+++ b/gCat-Controller/pom.xml
@@ -49,9 +49,10 @@
   		</dependency>
   
   
-  		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
+  		
+		<dependency>
+			<groupId>org.glassfish.jersey.media</groupId>
+			<artifactId>jersey-media-json-jackson</artifactId>
 		</dependency>
 
 
diff --git a/gCat-Feeder/pom.xml b/gCat-Feeder/pom.xml
index 30b3ba2..066952c 100644
--- a/gCat-Feeder/pom.xml
+++ b/gCat-Feeder/pom.xml
@@ -14,7 +14,6 @@
 	<properties>
 		<webappDirectory>${project.basedir}/src/main/webapp/WEB-INF</webappDirectory>
 		<distroDirectory>${project.basedir}/distro</distroDirectory>
-<!--         <gitBaseUrl>https://code-repo.d4science.org/gCubeSystem</gitBaseUrl> -->
 	</properties>
 
 	<scm>
@@ -72,17 +71,9 @@
 		<dependency>
 			<groupId>org.glassfish.jersey.media</groupId>
 			<artifactId>jersey-media-json-jackson</artifactId>
-			<version>2.14</version>
 		</dependency>
 
 
-		<!-- FORCE JACKSON 2.8 <dependency> <groupId>com.fasterxml.jackson.core</groupId> 
-			<artifactId>jackson-core</artifactId> <version>2.8.4</version> <scope>compile</scope> 
-			</dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> 
-			<artifactId>jackson-databind</artifactId> <version>2.8.4</version> <scope>compile</scope> 
-			</dependency> -->
-
-
 		<!-- Persistence -->
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -117,7 +108,6 @@
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>1.0.13</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/gCat-Feeder/src/main/java/org/gcube/data/publishing/gCatFeeder/service/engine/impl/persistence/StorageImpl.java b/gCat-Feeder/src/main/java/org/gcube/data/publishing/gCatFeeder/service/engine/impl/persistence/StorageImpl.java
index 420af28..85ee25a 100644
--- a/gCat-Feeder/src/main/java/org/gcube/data/publishing/gCatFeeder/service/engine/impl/persistence/StorageImpl.java
+++ b/gCat-Feeder/src/main/java/org/gcube/data/publishing/gCatFeeder/service/engine/impl/persistence/StorageImpl.java
@@ -10,7 +10,6 @@ import java.util.UUID;
 
 import javax.inject.Inject;
 
-import org.codehaus.jackson.map.ObjectMapper;
 import org.gcube.contentmanagement.blobstorage.service.IClient;
 import org.gcube.contentmanagement.blobstorage.transport.backend.RemoteBackendException;
 import org.gcube.contentmanager.storageclient.wrapper.AccessType;
@@ -23,6 +22,8 @@ import org.gcube.data.publishing.gCatFeeder.service.model.reports.ExecutionRepor
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 public class StorageImpl implements Storage{
 
 	private static final Logger log= LoggerFactory.getLogger(StorageImpl.class);
diff --git a/oai-harvester/pom.xml b/oai-harvester/pom.xml
index c2c7d72..0ecef8f 100644
--- a/oai-harvester/pom.xml
+++ b/oai-harvester/pom.xml
@@ -35,10 +35,10 @@
 
 
 		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
+			<groupId>org.glassfish.jersey.media</groupId>
+			<artifactId>jersey-media-json-jackson</artifactId>
 		</dependency>
-
+		
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
@@ -59,11 +59,6 @@
 		</dependency>
 
 
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-mapper-asl</artifactId>
-			<scope>test</scope>
-		</dependency>
 
 
 	</dependencies>
diff --git a/oai-harvester/src/test/java/org/gcube/application/gfeed/oai/TranslationTest.java b/oai-harvester/src/test/java/org/gcube/application/gfeed/oai/TranslationTest.java
index 383ee4d..55c739a 100644
--- a/oai-harvester/src/test/java/org/gcube/application/gfeed/oai/TranslationTest.java
+++ b/oai-harvester/src/test/java/org/gcube/application/gfeed/oai/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.model.CatalogueFormatData;
 import org.gcube.data.publishing.gCatFeeder.model.InternalConversionException;
 import org.gcube.data.publishing.gCatFeeder.tests.BaseCollectorTest;
@@ -20,6 +17,10 @@ import org.gcube.data.publishing.gFeed.collectors.oai.model.OAIRecord;
 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{
 
 	@Test
diff --git a/pom.xml b/pom.xml
index 7374e45..b3734a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,6 +103,36 @@
 	</dependencies>
 
 	<build>
+		<pluginManagement>
+         <plugins>
+             <plugin>
+                <groupId>org.eclipse.m2e</groupId>
+                <artifactId>lifecycle-mapping</artifactId>
+                <version>1.0.0</version>
+                <configuration>
+                    <lifecycleMappingMetadata>
+                        <pluginExecutions>
+                            <pluginExecution>
+                                <pluginExecutionFilter>
+                                    <groupId>org.codehaus.mojo</groupId>
+                                    <artifactId>flatten-maven-plugin</artifactId>
+                                    <versionRange>[1.0.0,)</versionRange>
+                                    <goals>
+                                        <goal>flatten</goal>
+                                    </goals>
+                                </pluginExecutionFilter>
+                                <action>
+                                    <execute>
+                                        <runOnIncremental>false</runOnIncremental>
+                                    </execute>
+                                </action>
+                            </pluginExecution>
+                        </pluginExecutions>
+                    </lifecycleMappingMetadata>
+                </configuration>
+            </plugin>
+        </plugins>
+    </pluginManagement>
 		<plugins>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
@@ -125,4 +155,6 @@
 		</plugins>
 	</build>
 
+	    
+
 </project>
\ No newline at end of file