[FLINK-12775][build] Bump flink-shaded version to 7.0

tongcheng-elong · Jun 7, 2019 · eaaf4fb · eaaf4fb
1 parent 1c3e7a8
commit eaaf4fb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 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
@@ -51,6 +51,7 @@
 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 @@ protected void respondAsLeader(ChannelHandlerContext ctx, RoutedRequest routedRe
  }
  } 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
@@ -102,7 +102,7 @@ under the License.
  <flink.forkCountTestPackage>${flink.forkCount}</flink.forkCountTestPackage>
  <flink.reuseForks>true</flink.reuseForks>
  <log4j.configuration>log4j-test.properties</log4j.configuration>
- <flink.shaded.version>6.0</flink.shaded.version>
+ <flink.shaded.version>7.0</flink.shaded.version>
  <guava.version>18.0</guava.version>
  <akka.version>2.5.21</akka.version>
  <java.version>1.8</java.version>
@@ -121,7 +121,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.9.8</jackson.version>
  <metrics.version>3.1.5</metrics.version>
  <prometheus.version>0.3.0</prometheus.version>
  <avro.version>1.8.2</avro.version>