diff --git a/CHANGELOG.md b/CHANGELOG.md index 0faf851..aaac2b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,40 @@ -# Changelog for gx-Rest +This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +# Changelog for gxREST + + +## [v2.0.0-SNAPSHOT] [r5.0.0] - + +- Switched JSON management to gcube-jackson [#19737] + + +## [v1.1.3] [r4.20.0] - 2019-10-19 + +- Allow clients to set secure protocol +- Switch from TLSv1 to TLSv1.2 -## [v1.1.3] 2019-10-19 - * Allow clients to set secure protocol - * Switch rom TLSv1 to TLSv1.2 -## [v1.1.2] 2019-10-19 - * Migration to Git +## [v1.1.2] [r4.20.0] - 2019-10-19 + +- Migration to Git + + +## [v1.1.1] [r4.0.0] - 2019-03-30 + +- Allow to set the media type for the returned entity in the Error Response. + + +## [v1.1.0] [r4.13.1] - 2019-02-26 + +- ... + + +## [v1.0.1] [r4.13.0] - 2018-11-20 + +- ... + + +## [v1.0.0] [r4.12.0] - 2018-06-20 + +- First Release -## [v1.1.1] 2019-03-30 - * Allow to set the media type for the returned entity in the Error Response. \ No newline at end of file diff --git a/README.md b/README.md index 9e28d10..ffa42e9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ -gxRest ----- +# gxREST + + The gCube eXtensions to the Rest Protocol (gxRest) is a set of Java libraries designed to provide convenient round-trip interaction between a Restful web application (also known as "service") and its clients. gxRest has the flexibility for different degrees of exploitation: diff --git a/gxHTTP/CHANGELOG.md b/gxHTTP/CHANGELOG.md index 9d61614..12442cc 100644 --- a/gxHTTP/CHANGELOG.md +++ b/gxHTTP/CHANGELOG.md @@ -1,11 +1,39 @@ +This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + # Changelog for gxHTTP -## [v1.1.3] [rxxx] 2019-10-19 - * Allow clients to set secure protocol - * Switch rom TLSv1 to TLSv1.2 - -## [v1.1.2] [r4.15.0] 2019-10-19 - * Migration to Git -## [v1.1.1] [r4.0.0] 2019-03-30 - * Allow tw to set the media type for the returned entity in the Error Response. \ No newline at end of file +## [v2.0.0-SNAPSHOT] [r5.0.0] - + +- Switched JSON management to gcube-jackson [#19737] + + +## [v1.1.3] [r4.20.0] - 2019-10-19 + +- Allow clients to set secure protocol +- Switch from TLSv1 to TLSv1.2 + + +## [v1.1.2] [r4.20.0] - 2019-10-19 + +- Migration to Git + + +## [v1.1.1] [r4.0.0] - 2019-03-30 + +- Allow to set the media type for the returned entity in the Error Response. + + +## [v1.1.0] [r4.13.1] - 2019-02-26 + +- ... + + +## [v1.0.1] [r4.13.0] - 2018-11-20 + +- ... + + +## [v1.0.0] [r4.12.0] - 2018-06-20 + +- First Release \ No newline at end of file diff --git a/gxHTTP/pom.xml b/gxHTTP/pom.xml index 210102e..86f8527 100644 --- a/gxHTTP/pom.xml +++ b/gxHTTP/pom.xml @@ -7,11 +7,11 @@ org.gcube.common gxREST - 1.1.3 + 2.0.0-SNAPSHOT - org.gcube.common + gxHTTP - + jar gCube eXtensions to REST with HTTP gCube eXtensions to REST based on HTTP @@ -46,18 +46,5 @@ - - - - org.apache.maven.plugins - maven-assembly-plugin - - - make-servicearchive - package - - - - - + diff --git a/gxJRS/CHANGELOG.md b/gxJRS/CHANGELOG.md index 1a6e17a..5e290e2 100644 --- a/gxJRS/CHANGELOG.md +++ b/gxJRS/CHANGELOG.md @@ -1,11 +1,39 @@ +This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + # Changelog for gxJRS -## [v1.1.3] [rxxx] 2019-10-19 - * Allow clients to set secure protocol - * Switch rom TLSv1 to TLSv1.2 - -## [v1.1.2] [r4.15.0] 2019-10-19 - * Migration to Git -## [v1.1.1] [r4.0.0] 2019-03-30 - * Allow to set the media type for the returned entity in the Error Response. \ No newline at end of file +## [v2.0.0-SNAPSHOT] [r5.0.0] - + +- Switched JSON management to gcube-jackson [#19737] + + +## [v1.1.3] [r4.20.0] - 2019-10-19 + +- Allow clients to set secure protocol +- Switch from TLSv1 to TLSv1.2 + + +## [v1.1.2] [r4.20.0] - 2019-10-19 + +- Migration to Git + + +## [v1.1.1] [r4.0.0] - 2019-03-30 + +- Allow to set the media type for the returned entity in the Error Response. + + +## [v1.1.0] [r4.13.1] - 2019-02-26 + +- ... + + +## [v1.0.1] [r4.13.0] - 2018-11-20 + +- ... + + +## [v1.0.0] [r4.12.0] - 2018-06-20 + +- First Release \ No newline at end of file diff --git a/gxJRS/pom.xml b/gxJRS/pom.xml index c9732cc..0760499 100644 --- a/gxJRS/pom.xml +++ b/gxJRS/pom.xml @@ -5,7 +5,7 @@ org.gcube.common gxREST - 1.1.3 + 2.0.0-SNAPSHOT gxJRS @@ -37,7 +37,7 @@ org.gcube.distribution gcube-bom - 1.3.1 + 2.0.0-SNAPSHOT pom import @@ -49,32 +49,34 @@ javax.ws.rs javax.ws.rs-api - ${jaxrs.version} org.gcube.common gxHTTP - ${project.version} org.gcube.common authorization-client + + + org.gcube.common + gcube-jackson-databind + + + org.gcube.common + gcube-jackson-core + + + + + + + + + + - - org.slf4j - slf4j-api - provided - - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - @@ -97,7 +99,6 @@ ch.qos.logback logback-classic - 1.0.13 test diff --git a/gxJRS/src/main/java/org/gcube/common/gxrest/response/inbound/JsonUtils.java b/gxJRS/src/main/java/org/gcube/common/gxrest/response/inbound/JsonUtils.java index 9f23c95..a7cec06 100644 --- a/gxJRS/src/main/java/org/gcube/common/gxrest/response/inbound/JsonUtils.java +++ b/gxJRS/src/main/java/org/gcube/common/gxrest/response/inbound/JsonUtils.java @@ -1,6 +1,6 @@ package org.gcube.common.gxrest.response.inbound; -import com.fasterxml.jackson.databind.ObjectMapper; +import org.gcube.com.fasterxml.jackson.databind.ObjectMapper; /** * Manipulation of an {@link GXInboundResponse}'s content. diff --git a/gxJRS/src/test/java/org/gcube/common/gxrest/request/GXHTTPStringRequestTest.java b/gxJRS/src/test/java/org/gcube/common/gxrest/request/GXHTTPStringRequestTest.java index 2f797fd..6c3e8ce 100644 --- a/gxJRS/src/test/java/org/gcube/common/gxrest/request/GXHTTPStringRequestTest.java +++ b/gxJRS/src/test/java/org/gcube/common/gxrest/request/GXHTTPStringRequestTest.java @@ -1,6 +1,7 @@ package org.gcube.common.gxrest.request; -import static org.junit.Assert.*; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.IOException; import java.io.InputStream; @@ -8,6 +9,7 @@ import java.util.Map; import java.util.Properties; import java.util.WeakHashMap; +import org.gcube.com.fasterxml.jackson.databind.JsonMappingException; import org.gcube.common.authorization.client.Constants; import org.gcube.common.authorization.client.exceptions.ObjectNotFound; import org.gcube.common.authorization.library.AuthorizationEntry; @@ -20,8 +22,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.BlockJUnit4ClassRunner; -import com.fasterxml.jackson.databind.JsonMappingException; - /** * Test cases for {@link GXHTTPStringRequest} * @@ -122,7 +122,7 @@ public class GXHTTPStringRequestTest { } } - @Test(expected=com.fasterxml.jackson.databind.JsonMappingException.class) + @Test(expected=org.gcube.com.fasterxml.jackson.databind.JsonMappingException.class) public void testPostNoBody() throws Exception { if (skipTest) throw new JsonMappingException(""); diff --git a/pom.xml b/pom.xml index ca0cd3a..81786da 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.gcube.common gxREST - 1.1.3 + 2.0.0-SNAPSHOT pom gCube eXtensions to REST gCube eXtensions to REST @@ -47,7 +47,7 @@ org.gcube.distribution gcube-bom - 1.3.1 + 2.0.0-SNAPSHOT pom import