diff --git a/.settings/.gitignore b/.settings/.gitignore
new file mode 100644
index 0000000..57d3934
--- /dev/null
+++ b/.settings/.gitignore
@@ -0,0 +1,2 @@
+/org.eclipse.jdt.core.prefs
+/org.eclipse.core.resources.prefs
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..96698ad
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,31 @@
+This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+# Changelog for gCube Catalogue (gCat) Client
+
+
+## [v2.0.0-SNAPSHOT] [r5.0.0] -
+
+- Switched JSON management to gcube-jackson [#19735]
+
+
+## [v1.2.1] [r4.18.0] - 2019-12-20
+
+- Fixed distro files and pom according to new release procedure
+
+
+## [v1.2.0] [r4.15.0] - 2019-11-06
+
+- Enforce Content-Type in requests [#16774]
+
+
+## [v1.1.0] [r4.14.0] - 2019-05-27
+
+- Added the possibility to enforce gCat service URL
+- Added the possibility to disable social post [#13335]
+- Added the possibility to get a profile as JSON
+
+
+## [v1.0.0] [rX.X.0] - 2019-02-26
+
+- First Release
+
diff --git a/changelog.xml b/changelog.xml
deleted file mode 100644
index 61ed105..0000000
--- a/changelog.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
- Fixed distro files and pom according to new release procedure
-
-
- Enforce Content-Type in requests #16774
-
-
- Added the possibility to enforce gCat service URL
- Added the possibility to disable social post #16322
- Added the possibility to get a porfile as JSON
-
-
- First Release
-
-
diff --git a/pom.xml b/pom.xml
index d84b7a3..77c146f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,16 +7,16 @@
maven-parent
1.1.0
- org.gcube.data-publishing
+ org.gcube.data-catalogue
gcat-client
- 1.2.2-SNAPSHOT
+ 2.0.0-SNAPSHOT
gCube Catalogue (gCat) Client
gCube Catalogue (gCat) Client is a library designed to interact with gCat Service exposed REST API
UTF-8
${project.basedir}/distro
- DataPublishing
+ data-catalogue
@@ -30,7 +30,7 @@
org.gcube.distribution
gcube-bom
- 1.4.0
+ 2.0.0-SNAPSHOT
pom
import
@@ -41,7 +41,7 @@
org.gcube.data-publishing
gcat-api
- [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)
+ [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)
org.gcube.resources.discovery
@@ -61,8 +61,8 @@
- com.fasterxml.jackson.core
- jackson-databind
+ org.gcube.common
+ gcube-jackson-databind
test
@@ -77,19 +77,4 @@
test
-
-
-
-
- org.apache.maven.plugins
- maven-assembly-plugin
-
-
- make-servicearchive
- package
-
-
-
-
-
\ No newline at end of file
diff --git a/src/test/java/org/gcube/gcat/client/GroupTest.java b/src/test/java/org/gcube/gcat/client/GroupTest.java
index a27c610..4339f4c 100644
--- a/src/test/java/org/gcube/gcat/client/GroupTest.java
+++ b/src/test/java/org/gcube/gcat/client/GroupTest.java
@@ -6,15 +6,14 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.gcube.com.fasterxml.jackson.databind.JavaType;
+import org.gcube.com.fasterxml.jackson.databind.JsonNode;
+import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
/**
* @author Luca Frosini (ISTI - CNR)
*/
diff --git a/src/test/java/org/gcube/gcat/client/ItemTest.java b/src/test/java/org/gcube/gcat/client/ItemTest.java
index b0d455a..b82d943 100644
--- a/src/test/java/org/gcube/gcat/client/ItemTest.java
+++ b/src/test/java/org/gcube/gcat/client/ItemTest.java
@@ -8,16 +8,15 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
+import org.gcube.com.fasterxml.jackson.databind.JavaType;
+import org.gcube.com.fasterxml.jackson.databind.JsonNode;
+import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
import org.gcube.gcat.api.GCatConstants;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
/**
* @author Luca Frosini (ISTI - CNR)
*/
diff --git a/src/test/java/org/gcube/gcat/client/LicenseTest.java b/src/test/java/org/gcube/gcat/client/LicenseTest.java
index 58ebcec..daf8762 100644
--- a/src/test/java/org/gcube/gcat/client/LicenseTest.java
+++ b/src/test/java/org/gcube/gcat/client/LicenseTest.java
@@ -4,15 +4,14 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import org.gcube.com.fasterxml.jackson.databind.JavaType;
+import org.gcube.com.fasterxml.jackson.databind.JsonNode;
+import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
/**
* @author Luca Frosini (ISTI - CNR)
*/
diff --git a/src/test/java/org/gcube/gcat/client/NamespaceTest.java b/src/test/java/org/gcube/gcat/client/NamespaceTest.java
index 0dc36cc..ad516d9 100644
--- a/src/test/java/org/gcube/gcat/client/NamespaceTest.java
+++ b/src/test/java/org/gcube/gcat/client/NamespaceTest.java
@@ -4,15 +4,14 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import org.gcube.com.fasterxml.jackson.databind.JavaType;
+import org.gcube.com.fasterxml.jackson.databind.JsonNode;
+import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
/**
* @author Luca Frosini (ISTI - CNR)
*/
diff --git a/src/test/java/org/gcube/gcat/client/OrganizationTest.java b/src/test/java/org/gcube/gcat/client/OrganizationTest.java
index c0ca9e3..d838097 100644
--- a/src/test/java/org/gcube/gcat/client/OrganizationTest.java
+++ b/src/test/java/org/gcube/gcat/client/OrganizationTest.java
@@ -6,15 +6,14 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.gcube.com.fasterxml.jackson.databind.JavaType;
+import org.gcube.com.fasterxml.jackson.databind.JsonNode;
+import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
/**
* @author Luca Frosini (ISTI - CNR)
*/
diff --git a/src/test/java/org/gcube/gcat/client/ProfileTest.java b/src/test/java/org/gcube/gcat/client/ProfileTest.java
index c2c1525..cd4f25a 100644
--- a/src/test/java/org/gcube/gcat/client/ProfileTest.java
+++ b/src/test/java/org/gcube/gcat/client/ProfileTest.java
@@ -9,14 +9,13 @@ import javax.ws.rs.NotFoundException;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import org.gcube.com.fasterxml.jackson.databind.JavaType;
+import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.InputSource;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
/**
* @author Luca Frosini (ISTI - CNR)
*/
diff --git a/src/test/java/org/gcube/gcat/client/ResourceTest.java b/src/test/java/org/gcube/gcat/client/ResourceTest.java
index 111bc87..f45d710 100644
--- a/src/test/java/org/gcube/gcat/client/ResourceTest.java
+++ b/src/test/java/org/gcube/gcat/client/ResourceTest.java
@@ -6,15 +6,14 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.gcube.com.fasterxml.jackson.databind.JavaType;
+import org.gcube.com.fasterxml.jackson.databind.JsonNode;
+import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
/**
* @author Luca Frosini (ISTI - CNR)
*/
diff --git a/src/test/java/org/gcube/gcat/client/SaveAndRestoreProfiles.java b/src/test/java/org/gcube/gcat/client/SaveAndRestoreProfiles.java
index 9b4cf53..259a127 100644
--- a/src/test/java/org/gcube/gcat/client/SaveAndRestoreProfiles.java
+++ b/src/test/java/org/gcube/gcat/client/SaveAndRestoreProfiles.java
@@ -13,14 +13,13 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.List;
+import org.gcube.com.fasterxml.jackson.databind.JavaType;
+import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
import org.gcube.common.authorization.library.provider.UserInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
public class SaveAndRestoreProfiles {
private static Logger logger = LoggerFactory.getLogger(SaveAndRestoreProfiles.class);
diff --git a/src/test/java/org/gcube/gcat/client/UserTest.java b/src/test/java/org/gcube/gcat/client/UserTest.java
index 5c7a169..3c60d12 100644
--- a/src/test/java/org/gcube/gcat/client/UserTest.java
+++ b/src/test/java/org/gcube/gcat/client/UserTest.java
@@ -4,15 +4,14 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import org.gcube.com.fasterxml.jackson.databind.JavaType;
+import org.gcube.com.fasterxml.jackson.databind.JsonNode;
+import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
/**
* @author Luca Frosini (ISTI - CNR)
*/