From 3c328f54b8fa76e39a5ad7c1f204c3631ca474e7 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Thu, 6 Aug 2020 14:55:28 +0200
Subject: [PATCH] Switching JSON management to gcube-jackson

---
 .settings/.gitignore                          |  1 +
 pom.xml                                       | 84 ++++++++++---------
 .../persistence/ckan/CKANLicenseTest.java     |  1 -
 .../gcat/persistence/ckan/CKANUserTest.java   |  2 -
 .../persistence/ckan/CKANUtilityTest.java     |  1 -
 .../org/gcube/gcat/rest/NamespaceTest.java    |  1 -
 6 files changed, 44 insertions(+), 46 deletions(-)
 create mode 100644 .settings/.gitignore

diff --git a/.settings/.gitignore b/.settings/.gitignore
new file mode 100644
index 0000000..3b1537c
--- /dev/null
+++ b/.settings/.gitignore
@@ -0,0 +1 @@
+/org.eclipse.jdt.core.prefs
diff --git a/pom.xml b/pom.xml
index f23f09a..b65f817 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.gcube.data-publishing</groupId>
 	<artifactId>gcat</artifactId>
 	<packaging>war</packaging>
-	<version>1.5.0-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<name>gCube Catalogue (gCat) Service</name>
 	<description>
 		This service allows any client to publish on the gCube Catalogue.
@@ -35,7 +35,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-smartgears-bom</artifactId>
-				<version>1.1.0</version>
+				<version>2.0.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -46,21 +46,22 @@
 		<dependency>
 			<groupId>org.gcube.data-publishing</groupId>
 			<artifactId>gcat-api</artifactId>
-			<version>[1.2.0, 2.0.0-SNAPSHOT)</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tika</groupId>
-			<artifactId>tika-core</artifactId>
-			<version>1.20</version>
+			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
 		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.apache.tika</groupId> -->
+<!-- 			<artifactId>tika-core</artifactId> -->
+<!-- 			<version>1.20</version> -->
+<!-- 		</dependency> -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.gcube.core</groupId>
-			<artifactId>common-encryption</artifactId>
-		</dependency>
+		
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.gcube.core</groupId> -->
+<!-- 			<artifactId>common-encryption</artifactId> -->
+<!-- 		</dependency> -->
 		
 		<dependency>
 			<groupId>org.gcube.data-catalogue</groupId>
@@ -86,22 +87,26 @@
 		<!-- Required with jersey 2.27 <dependency> <groupId>org.glassfish.jersey.inject</groupId> 
 			<artifactId>jersey-hk2</artifactId> </dependency> -->
 
-		<dependency>
-			<groupId>org.glassfish.jersey.media</groupId>
-			<artifactId>jersey-media-multipart</artifactId>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.glassfish.jersey.media</groupId> -->
+<!-- 			<artifactId>jersey-media-multipart</artifactId> -->
+<!-- 		</dependency> -->
 
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>storagehub-client-library</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.gcube.common</groupId> -->
+<!-- 			<artifactId>storagehub-client-library</artifactId> -->
+<!-- 			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> -->
+<!-- 		</dependency> -->
 
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>gxHTTP</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.gcube.core</groupId>
+			<artifactId>common-smartgears</artifactId>
+		</dependency>
 
 		<!-- ehCAChe -->
 		<dependency>
@@ -117,34 +122,31 @@
 		</dependency>
 		<!-- END ehCAChe -->
 
-		<dependency>
-			<groupId>org.gcube.core</groupId>
-			<artifactId>common-smartgears</artifactId>
-		</dependency>
-
+		<!-- Used for validation in oldutils. TO BE REMOVED ASAP -->
 		<dependency>
 			<groupId>de.grundid.opendatalab</groupId>
 			<artifactId>geojson-jackson</artifactId>
 			<version>1.8</version>
 		</dependency>
+		
 
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>2.3</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>2.6</version>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>commons-lang</groupId> -->
+<!-- 			<artifactId>commons-lang</artifactId> -->
+<!-- 			<version>2.3</version> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>commons-io</groupId> -->
+<!-- 			<artifactId>commons-io</artifactId> -->
+<!-- 			<version>2.6</version> -->
+<!-- 		</dependency> -->
 
 		<!-- Used to automatically convert XML to JSON -->
-		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-			<version>20140107</version>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.json</groupId> -->
+<!-- 			<artifactId>json</artifactId> -->
+<!-- 			<version>20140107</version> -->
+<!-- 		</dependency> -->
 
 		<dependency>
 			<groupId>org.gcube.data-publishing</groupId>
diff --git a/src/test/java/org/gcube/gcat/persistence/ckan/CKANLicenseTest.java b/src/test/java/org/gcube/gcat/persistence/ckan/CKANLicenseTest.java
index d0eb4f4..84c8f26 100644
--- a/src/test/java/org/gcube/gcat/persistence/ckan/CKANLicenseTest.java
+++ b/src/test/java/org/gcube/gcat/persistence/ckan/CKANLicenseTest.java
@@ -7,7 +7,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.gcube.gcat.ContextTest;
-import org.gcube.gcat.persistence.ckan.CKANLicense;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
diff --git a/src/test/java/org/gcube/gcat/persistence/ckan/CKANUserTest.java b/src/test/java/org/gcube/gcat/persistence/ckan/CKANUserTest.java
index 93ab333..9873718 100644
--- a/src/test/java/org/gcube/gcat/persistence/ckan/CKANUserTest.java
+++ b/src/test/java/org/gcube/gcat/persistence/ckan/CKANUserTest.java
@@ -1,8 +1,6 @@
 package org.gcube.gcat.persistence.ckan;
 
 import org.gcube.gcat.ContextTest;
-import org.gcube.gcat.persistence.ckan.CKANUser;
-import org.gcube.gcat.persistence.ckan.CKANUtility;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/test/java/org/gcube/gcat/persistence/ckan/CKANUtilityTest.java b/src/test/java/org/gcube/gcat/persistence/ckan/CKANUtilityTest.java
index c909526..03767b2 100644
--- a/src/test/java/org/gcube/gcat/persistence/ckan/CKANUtilityTest.java
+++ b/src/test/java/org/gcube/gcat/persistence/ckan/CKANUtilityTest.java
@@ -1,7 +1,6 @@
 package org.gcube.gcat.persistence.ckan;
 
 import org.gcube.gcat.ContextTest;
-import org.gcube.gcat.persistence.ckan.CKANUtility;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/test/java/org/gcube/gcat/rest/NamespaceTest.java b/src/test/java/org/gcube/gcat/rest/NamespaceTest.java
index 4bebb54..7331c21 100644
--- a/src/test/java/org/gcube/gcat/rest/NamespaceTest.java
+++ b/src/test/java/org/gcube/gcat/rest/NamespaceTest.java
@@ -1,7 +1,6 @@
 package org.gcube.gcat.rest;
 
 import org.gcube.gcat.ContextTest;
-import org.gcube.gcat.rest.Namespace;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;