Repository: jclouds Updated Branches: refs/heads/master dacd9825f -> 4c9276366
Upgrade to Gson 2.5 instead of Gson 2.7 Related issues: JCLOUDS-1166, JCLOUDS-1160, JCLOUDS-1169 This change reverts commit da4614e and upgrades from Gson 2.3.1 to 2.5, which is the last version that exports the internal packages, used in jclouds-core, in the OSGi bundle. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/4c927636 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/4c927636 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/4c927636 Branch: refs/heads/master Commit: 4c9276366383cff415bbb4ea6130396f370993ea Parents: dacd982 Author: Ignasi Barrera <[email protected]> Authored: Thu Sep 1 16:13:06 2016 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Fri Sep 2 08:33:21 2016 +0200 ---------------------------------------------------------------------- core/pom.xml | 2 +- ...eserializationConstructorAndReflectiveTypeAdapterFactory.java | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/4c927636/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 96fe420..791a874 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -80,7 +80,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.7</version> + <version>2.5</version> </dependency> <dependency> <groupId>com.google.guava</groupId> http://git-wip-us.apache.org/repos/asf/jclouds/blob/4c927636/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java b/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java index 603a436..852a1a1 100644 --- a/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java +++ b/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java @@ -41,7 +41,6 @@ import com.google.gson.TypeAdapter; import com.google.gson.TypeAdapterFactory; import com.google.gson.internal.ConstructorConstructor; import com.google.gson.internal.Excluder; -import com.google.gson.internal.bind.JsonAdapterAnnotationTypeAdapterFactory; import com.google.gson.internal.bind.ReflectiveTypeAdapterFactory; import com.google.gson.reflect.TypeToken; import com.google.gson.stream.JsonReader; @@ -115,8 +114,7 @@ public final class DeserializationConstructorAndReflectiveTypeAdapterFactory imp this.constructorFieldNamingPolicy = checkNotNull(deserializationFieldNamingPolicy, "deserializationFieldNamingPolicy"); this.delegateFactory = new ReflectiveTypeAdapterFactory(constructorConstructor, checkNotNull( - serializationFieldNamingPolicy, "fieldNamingPolicy"), checkNotNull(excluder, "excluder"), - new JsonAdapterAnnotationTypeAdapterFactory(constructorConstructor)); + serializationFieldNamingPolicy, "fieldNamingPolicy"), checkNotNull(excluder, "excluder")); } public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
