gCubeSystem
/
gcat
16
0
Fork 0
Code Issues Pull Requests Releases 13 Wiki Activity

Switching JSON management to gcube-jackson

This commit is contained in:
Luca Frosini 2020-08-06 14:55:28 +02:00
parent a7962d5f79
commit 3c328f54b8
6 changed files with 44 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.settings/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/org.eclipse.jdt.core.prefs

84
pom.xml
View File

@ -12,7 +12,7 @@
<groupId>org.gcube.data-publishing</groupId> <groupId>org.gcube.data-publishing</groupId>
<artifactId>gcat</artifactId> <artifactId>gcat</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>1.5.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
<name>gCube Catalogue (gCat) Service</name> <name>gCube Catalogue (gCat) Service</name>
<description> <description>
This service allows any client to publish on the gCube Catalogue. This service allows any client to publish on the gCube Catalogue.
@ -35,7 +35,7 @@
<dependency> <dependency>
<groupId>org.gcube.distribution</groupId> <groupId>org.gcube.distribution</groupId>
<artifactId>gcube-smartgears-bom</artifactId> <artifactId>gcube-smartgears-bom</artifactId>
<version>1.1.0</version> <version>2.0.0-SNAPSHOT</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
@ -46,21 +46,22 @@
<dependency> <dependency>
<groupId>org.gcube.data-publishing</groupId> <groupId>org.gcube.data-publishing</groupId>
<artifactId>gcat-api</artifactId> <artifactId>gcat-api</artifactId>
<version>[1.2.0, 2.0.0-SNAPSHOT)</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>
<!-- <dependency> -->
<!-- <groupId>org.apache.tika</groupId> -->
<!-- <artifactId>tika-core</artifactId> -->
<!-- <version>1.20</version> -->
<!-- </dependency> -->
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.gcube.core</groupId> <!-- <dependency> -->
<artifactId>common-encryption</artifactId> <!-- <groupId>org.gcube.core</groupId> -->
</dependency> <!-- <artifactId>common-encryption</artifactId> -->
<!-- </dependency> -->
<dependency> <dependency>
<groupId>org.gcube.data-catalogue</groupId> <groupId>org.gcube.data-catalogue</groupId>
@ -86,22 +87,26 @@
<!-- Required with jersey 2.27 <dependency> <groupId>org.glassfish.jersey.inject</groupId> <!-- Required with jersey 2.27 <dependency> <groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId> </dependency> --> <artifactId>jersey-hk2</artifactId> </dependency> -->
<dependency> <!-- <dependency> -->
<groupId>org.glassfish.jersey.media</groupId> <!-- <groupId>org.glassfish.jersey.media</groupId> -->
<artifactId>jersey-media-multipart</artifactId> <!-- <artifactId>jersey-media-multipart</artifactId> -->
</dependency> <!-- </dependency> -->
<dependency> <!-- <dependency> -->
<groupId>org.gcube.common</groupId> <!-- <groupId>org.gcube.common</groupId> -->
<artifactId>storagehub-client-library</artifactId> <!-- <artifactId>storagehub-client-library</artifactId> -->
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> <!-- <version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> -->
</dependency> <!-- </dependency> -->
<dependency> <dependency>
<groupId>org.gcube.common</groupId> <groupId>org.gcube.common</groupId>
<artifactId>gxHTTP</artifactId> <artifactId>gxHTTP</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.gcube.core</groupId>
<artifactId>common-smartgears</artifactId>
</dependency>
<!-- ehCAChe --> <!-- ehCAChe -->
<dependency> <dependency>
@ -117,34 +122,31 @@
</dependency> </dependency>
<!-- END ehCAChe --> <!-- END ehCAChe -->
<dependency> <!-- Used for validation in oldutils. TO BE REMOVED ASAP -->
<groupId>org.gcube.core</groupId>
<artifactId>common-smartgears</artifactId>
</dependency>
<dependency> <dependency>
<groupId>de.grundid.opendatalab</groupId> <groupId>de.grundid.opendatalab</groupId>
<artifactId>geojson-jackson</artifactId> <artifactId>geojson-jackson</artifactId>
<version>1.8</version> <version>1.8</version>
</dependency> </dependency>
<dependency> <!-- <dependency> -->
<groupId>commons-lang</groupId> <!-- <groupId>commons-lang</groupId> -->
<artifactId>commons-lang</artifactId> <!-- <artifactId>commons-lang</artifactId> -->
<version>2.3</version> <!-- <version>2.3</version> -->
</dependency> <!-- </dependency> -->
<dependency> <!-- <dependency> -->
<groupId>commons-io</groupId> <!-- <groupId>commons-io</groupId> -->
<artifactId>commons-io</artifactId> <!-- <artifactId>commons-io</artifactId> -->
<version>2.6</version> <!-- <version>2.6</version> -->
</dependency> <!-- </dependency> -->
<!-- Used to automatically convert XML to JSON --> <!-- Used to automatically convert XML to JSON -->
<dependency> <!-- <dependency> -->
<groupId>org.json</groupId> <!-- <groupId>org.json</groupId> -->
<artifactId>json</artifactId> <!-- <artifactId>json</artifactId> -->
<version>20140107</version> <!-- <version>20140107</version> -->
</dependency> <!-- </dependency> -->
<dependency> <dependency>
<groupId>org.gcube.data-publishing</groupId> <groupId>org.gcube.data-publishing</groupId>

1
src/test/java/org/gcube/gcat/persistence/ckan/CKANLicenseTest.java
View File

@ -7,7 +7,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.gcube.gcat.ContextTest; import org.gcube.gcat.ContextTest;
import org.gcube.gcat.persistence.ckan.CKANLicense;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.slf4j.Logger; import org.slf4j.Logger;

2
src/test/java/org/gcube/gcat/persistence/ckan/CKANUserTest.java
View File

@ -1,8 +1,6 @@
package org.gcube.gcat.persistence.ckan; package org.gcube.gcat.persistence.ckan;
import org.gcube.gcat.ContextTest; 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.junit.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

1
src/test/java/org/gcube/gcat/persistence/ckan/CKANUtilityTest.java
View File

@ -1,7 +1,6 @@
package org.gcube.gcat.persistence.ckan; package org.gcube.gcat.persistence.ckan;
import org.gcube.gcat.ContextTest; import org.gcube.gcat.ContextTest;
import org.gcube.gcat.persistence.ckan.CKANUtility;
import org.junit.Test; import org.junit.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

1
src/test/java/org/gcube/gcat/rest/NamespaceTest.java
View File

@ -1,7 +1,6 @@
package org.gcube.gcat.rest; package org.gcube.gcat.rest;
import org.gcube.gcat.ContextTest; import org.gcube.gcat.ContextTest;
import org.gcube.gcat.rest.Namespace;
import org.junit.Test; import org.junit.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;