This is an automated email from the ASF dual-hosted git repository.
nacx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jclouds.git
The following commit(s) were added to refs/heads/master by this push:
new 51da020 JCLOUDS-1500: Update gson to 2.8.5 (#29)
51da020 is described below
commit 51da020d2e4a82c59bb25986db6140c26c406122
Author: Olaf Flebbe <[email protected]>
AuthorDate: Wed Jul 3 09:11:26 2019 +0200
JCLOUDS-1500: Update gson to 2.8.5 (#29)
---
.../DeserializationConstructorAndReflectiveTypeAdapterFactory.java | 4 +++-
gson/gson-shaded/pom.xml | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
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 1df3f5a..e20112e 100644
---
a/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java
+++
b/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java
@@ -26,6 +26,7 @@ import java.lang.reflect.Modifier;
import java.util.List;
import java.util.Map;
+import
org.jclouds.json.gson.internal.bind.JsonAdapterAnnotationTypeAdapterFactory;
import org.jclouds.json.gson.internal.ConstructorConstructor;
import org.jclouds.json.gson.internal.Excluder;
import org.jclouds.json.gson.internal.bind.ReflectiveTypeAdapterFactory;
@@ -115,7 +116,8 @@ public final class
DeserializationConstructorAndReflectiveTypeAdapterFactory imp
this.constructorFieldNamingPolicy =
checkNotNull(deserializationFieldNamingPolicy,
"deserializationFieldNamingPolicy");
this.delegateFactory = new
ReflectiveTypeAdapterFactory(constructorConstructor, checkNotNull(
- serializationFieldNamingPolicy, "fieldNamingPolicy"),
checkNotNull(excluder, "excluder"));
+ serializationFieldNamingPolicy, "fieldNamingPolicy"),
checkNotNull(excluder, "excluder"),
+ new
JsonAdapterAnnotationTypeAdapterFactory(constructorConstructor));
}
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
diff --git a/gson/gson-shaded/pom.xml b/gson/gson-shaded/pom.xml
index 47ebd21..df125e5 100644
--- a/gson/gson-shaded/pom.xml
+++ b/gson/gson-shaded/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.5</version>
+ <version>2.8.5</version>
</dependency>
</dependencies>