You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2019/11/25 12:27:04 UTC
[flink] branch release-1.8 updated: [FLINK-14104][build] Use
flink-shaded-jackson 9.0
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch release-1.8
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.8 by this push:
new b4c387b [FLINK-14104][build] Use flink-shaded-jackson 9.0
b4c387b is described below
commit b4c387b8bde32c2649b35ec7a6ee5df3fefa3286
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Sun Nov 24 18:21:12 2019 +0100
[FLINK-14104][build] Use flink-shaded-jackson 9.0
---
.../java/org/apache/flink/runtime/rest/handler/AbstractHandler.java | 3 ++-
pom.xml | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/AbstractHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/AbstractHandler.java
index 1325d01..1d2aa0f 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/AbstractHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/AbstractHandler.java
@@ -51,6 +51,7 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.io.IOException;
+import java.io.InputStream;
import java.util.Arrays;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
@@ -122,7 +123,7 @@ public abstract class AbstractHandler<T extends RestfulGateway, R extends Reques
}
} else {
try {
- ByteBufInputStream in = new ByteBufInputStream(msgContent);
+ InputStream in = new ByteBufInputStream(msgContent);
request = MAPPER.readValue(in, untypedResponseMessageHeaders.getRequestClass());
} catch (JsonParseException | JsonMappingException je) {
throw new RestHandlerException(
diff --git a/pom.xml b/pom.xml
index f125628..3d9e9e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@ under the License.
<chill.version>0.7.6</chill.version>
<zookeeper.version>3.4.10</zookeeper.version>
<curator.version>2.12.0</curator.version>
- <jackson.version>2.7.9</jackson.version>
+ <jackson.version>2.10.1</jackson.version>
<metrics.version>3.1.5</metrics.version>
<prometheus.version>0.3.0</prometheus.version>
<avro.version>1.8.2</avro.version>
@@ -260,13 +260,13 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-jackson</artifactId>
- <version>${jackson.version}-${flink.shaded.version}</version>
+ <version>${jackson.version}-9.0</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-jackson-module-jsonSchema</artifactId>
- <version>${jackson.version}-${flink.shaded.version}</version>
+ <version>${jackson.version}-9.0</version>
</dependency>
<dependency>