This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new 84c8287 KNOX-2050 - Upgrade jackson to 2.10.0
84c8287 is described below
commit 84c8287e1152aa347505ef6d0d92736c69072898
Author: Kevin Risden <[email protected]>
AuthorDate: Thu Oct 3 10:38:22 2019 -0400
KNOX-2050 - Upgrade jackson to 2.10.0
Signed-off-by: Kevin Risden <[email protected]>
---
.../src/main/java/org/apache/knox/gateway/util/JsonUtils.java | 3 +--
pom.xml | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git
a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonUtils.java
b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonUtils.java
index 28feea2..af13728 100644
---
a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonUtils.java
+++
b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonUtils.java
@@ -62,8 +62,7 @@ public class JsonUtils {
Map<String, String> obj = null;
JsonFactory factory = new JsonFactory();
ObjectMapper mapper = new ObjectMapper(factory);
- TypeReference<Object> typeRef
- = new TypeReference<Object>() {};
+ TypeReference<Map<String, String>> typeRef = new TypeReference<Map<String,
String>>() {};
try {
obj = mapper.readValue(json, typeRef);
} catch (IOException e) {
diff --git a/pom.xml b/pom.xml
index c04bf02..920d5b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,7 +185,7 @@
<httpclient.version>4.5.6</httpclient.version>
<httpcore.version>4.4.11</httpcore.version>
<j2e-pac4j.version>4.1.0</j2e-pac4j.version>
- <jackson.version>2.9.10</jackson.version>
+ <jackson.version>2.10.0</jackson.version>
<jacoco-maven-plugin.version>0.8.4</jacoco-maven-plugin.version>
<jansi.version>1.18</jansi.version>
<javax.activation.version>1.2.0</javax.activation.version>
