[FLINK-7418][build] Integrate flink-shaded-jackson2

This closes apache#4923.
amuraru · Oct 31, 2017 · 95847f4 · 95847f4
1 parent 600e9fc
commit 95847f4
Show file tree

Hide file tree

Showing 130 changed files with 376 additions and 305 deletions.
diff --git a/flink-connectors/flink-connector-kafka-base/pom.xml b/flink-connectors/flink-connector-kafka-base/pom.xml
@@ -44,6 +44,12 @@ under the License.
 
  <!-- core dependencies -->
 
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-shaded-jackson</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
  <dependency>
  <groupId>org.apache.flink</groupId>
  <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>

diff --git a/...rc/main/java/org/apache/flink/streaming/util/serialization/JSONDeserializationSchema.java b/...rc/main/java/org/apache/flink/streaming/util/serialization/JSONDeserializationSchema.java
@@ -17,8 +17,8 @@
 
 package org.apache.flink.streaming.util.serialization;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ObjectNode;
 
 import java.io.IOException;
 

diff --git a/...java/org/apache/flink/streaming/util/serialization/JSONKeyValueDeserializationSchema.java b/...java/org/apache/flink/streaming/util/serialization/JSONKeyValueDeserializationSchema.java
@@ -19,9 +19,9 @@
 
 import org.apache.flink.api.common.typeinfo.TypeInformation;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ObjectNode;
 
 import java.io.IOException;
 

diff --git a/...main/java/org/apache/flink/streaming/util/serialization/JsonRowDeserializationSchema.java b/...main/java/org/apache/flink/streaming/util/serialization/JsonRowDeserializationSchema.java
@@ -23,8 +23,8 @@
 import org.apache.flink.types.Row;
 import org.apache.flink.util.Preconditions;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.io.IOException;
 

diff --git a/...c/main/java/org/apache/flink/streaming/util/serialization/JsonRowSerializationSchema.java b/...c/main/java/org/apache/flink/streaming/util/serialization/JsonRowSerializationSchema.java
@@ -20,9 +20,9 @@
 import org.apache.flink.types.Row;
 import org.apache.flink.util.Preconditions;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ObjectNode;
 
 /**
  * Serialization schema that serializes an object into a JSON bytes.

diff --git a/.../test/java/org/apache/flink/streaming/connectors/kafka/JSONDeserializationSchemaTest.java b/.../test/java/org/apache/flink/streaming/connectors/kafka/JSONDeserializationSchemaTest.java
@@ -19,8 +19,9 @@
 
 import org.apache.flink.streaming.util.serialization.JSONDeserializationSchema;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ObjectNode;
+
 import org.junit.Assert;
 import org.junit.Test;
 

diff --git a/...va/org/apache/flink/streaming/connectors/kafka/JSONKeyValueDeserializationSchemaTest.java b/...va/org/apache/flink/streaming/connectors/kafka/JSONKeyValueDeserializationSchemaTest.java
@@ -19,8 +19,9 @@
 
 import org.apache.flink.streaming.util.serialization.JSONKeyValueDeserializationSchema;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ObjectNode;
+
 import org.junit.Assert;
 import org.junit.Test;
 

diff --git a/...st/java/org/apache/flink/streaming/connectors/kafka/JsonRowDeserializationSchemaTest.java b/...st/java/org/apache/flink/streaming/connectors/kafka/JsonRowDeserializationSchemaTest.java
@@ -23,8 +23,9 @@
 import org.apache.flink.table.api.Types;
 import org.apache.flink.types.Row;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ObjectNode;
+
 import org.junit.Test;
 
 import java.io.IOException;

diff --git a/flink-examples/flink-examples-streaming/pom.xml b/flink-examples/flink-examples-streaming/pom.xml
@@ -62,6 +62,11 @@ under the License.
  <version>${project.version}</version>
  </dependency>
 
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-shaded-jackson</artifactId>
+ </dependency>
+
  <!-- test dependencies -->
 
  <dependency>

diff --git a/...s-streaming/src/main/java/org/apache/flink/streaming/examples/twitter/TwitterExample.java b/...s-streaming/src/main/java/org/apache/flink/streaming/examples/twitter/TwitterExample.java
@@ -26,8 +26,8 @@
 import org.apache.flink.streaming.examples.twitter.util.TwitterExampleData;
 import org.apache.flink.util.Collector;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.util.StringTokenizer;
 

diff --git a/flink-libraries/flink-gelly-examples/pom.xml b/flink-libraries/flink-gelly-examples/pom.xml
@@ -61,6 +61,11 @@
  <version>${project.version}</version>
  </dependency>
 
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-shaded-jackson</artifactId>
+ </dependency>
+
  <!-- to be able to execute the examples properly in common IDEs, we need to
  restate these dependencies in 'compile' scope -->
 

diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/Runner.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/Runner.java
@@ -58,9 +58,10 @@
 import org.apache.flink.runtime.util.EnvironmentInformation;
 import org.apache.flink.util.InstantiationUtil;
 
-import com.fasterxml.jackson.core.JsonEncoding;
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonEncoding;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonFactory;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+
 import org.apache.commons.lang3.text.StrBuilder;
 
 import java.io.File;

diff --git a/flink-libraries/flink-table/pom.xml b/flink-libraries/flink-table/pom.xml
@@ -43,6 +43,11 @@ under the License.
  <scope>provided</scope>
  </dependency>
 
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-shaded-jackson</artifactId>
+ </dependency>
+
  <dependency>
  <groupId>commons-configuration</groupId>
  <artifactId>commons-configuration</artifactId>

diff --git a/flink-libraries/flink-table/src/main/java/org/apache/flink/table/explain/PlanJsonParser.java b/flink-libraries/flink-table/src/main/java/org/apache/flink/table/explain/PlanJsonParser.java
@@ -18,9 +18,9 @@
 
 package org.apache.flink.table.explain;
 
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.DeserializationFeature;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.PropertyNamingStrategy;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

diff --git a/flink-mesos/pom.xml b/flink-mesos/pom.xml
@@ -61,6 +61,11 @@ under the License.
  <scope>provided</scope>
  </dependency>
 
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-shaded-jackson</artifactId>
+ </dependency>
+
  <dependency>
  <groupId>com.typesafe.akka</groupId>
  <artifactId>akka-actor_${scala.binary.version}</artifactId>
@@ -105,16 +110,6 @@ under the License.
  <artifactId>flink-shaded-netty</artifactId>
  </dependency>
 
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
-
  <!-- test dependencies -->
 
  <dependency>
@@ -278,13 +273,18 @@ under the License.
  <includes combine.children="append">
  <include>com.google.protobuf:protobuf-java</include>
  <include>org.apache.mesos:mesos</include>
+ <include>com.netflix.fenzo:fenzo-core</include>
  </includes>
  </artifactSet>
  <relocations combine.children="append">
  <relocation>
  <pattern>com.google.protobuf</pattern>
  <shadedPattern>org.apache.flink.mesos.shaded.com.google.protobuf</shadedPattern>
  </relocation>
+ <relocation>
+ <pattern>com.fasterxml.jackson</pattern>
+ <shadedPattern>org.apache.flink.mesos.shaded.com.fasterxml.jackson</shadedPattern>
+ </relocation>
  </relocations>
  </configuration>
  </execution>

diff --git a/flink-mesos/src/main/java/org/apache/flink/mesos/cli/FlinkMesosSessionCli.java b/flink-mesos/src/main/java/org/apache/flink/mesos/cli/FlinkMesosSessionCli.java
@@ -20,9 +20,9 @@
 
 import org.apache.flink.configuration.Configuration;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.type.TypeReference;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.io.IOException;
 import java.util.Map;

diff --git a/flink-metrics/flink-metrics-datadog/pom.xml b/flink-metrics/flink-metrics-datadog/pom.xml
@@ -41,8 +41,8 @@ under the License.
  </dependency>
 
  <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-shaded-jackson</artifactId>
  <scope>provided</scope>
  </dependency>
 

diff --git a/...metrics/flink-metrics-datadog/src/main/java/org/apache/flink/metrics/datadog/DMetric.java b/...metrics/flink-metrics-datadog/src/main/java/org/apache/flink/metrics/datadog/DMetric.java
@@ -18,8 +18,8 @@
 
 package org.apache.flink.metrics.datadog;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonInclude;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...ink-metrics-datadog/src/main/java/org/apache/flink/metrics/datadog/DatadogHttpClient.java b/...ink-metrics-datadog/src/main/java/org/apache/flink/metrics/datadog/DatadogHttpClient.java
@@ -18,8 +18,9 @@
 
 package org.apache.flink.metrics.datadog;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
+
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;

diff --git a/...metrics-datadog/src/test/java/org/apache/flink/metrics/datadog/DatadogHttpClientTest.java b/...metrics-datadog/src/test/java/org/apache/flink/metrics/datadog/DatadogHttpClientTest.java
@@ -22,7 +22,8 @@
 import org.apache.flink.metrics.Gauge;
 import org.apache.flink.metrics.Meter;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/flink-optimizer/pom.xml b/flink-optimizer/pom.xml
@@ -61,6 +61,11 @@ under the License.
  <artifactId>flink-shaded-guava</artifactId>
  </dependency>
 
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-shaded-jackson</artifactId>
+ </dependency>
+
  <!-- test dependencies -->
 
  <dependency>

diff --git a/...k-optimizer/src/main/java/org/apache/flink/optimizer/plantranslate/JobGraphGenerator.java b/...k-optimizer/src/main/java/org/apache/flink/optimizer/plantranslate/JobGraphGenerator.java
@@ -18,7 +18,7 @@
 
 package org.apache.flink.optimizer.plantranslate;
 
-import com.fasterxml.jackson.core.JsonFactory;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonFactory;
 
 import org.apache.flink.api.common.JobID;
 import org.apache.flink.api.common.aggregators.AggregatorRegistry;

diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plantranslate/JsonMapper.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plantranslate/JsonMapper.java
@@ -18,8 +18,6 @@
 
 package org.apache.flink.optimizer.plantranslate;
 
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonGenerator;
 import org.apache.flink.api.common.operators.CompilerHints;
 import org.apache.flink.optimizer.dag.OptimizerNode;
 import org.apache.flink.optimizer.dataproperties.GlobalProperties;
@@ -29,6 +27,9 @@
 import org.apache.flink.runtime.operators.shipping.ShipStrategyType;
 import org.apache.flink.runtime.operators.util.LocalStrategy;
 
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonFactory;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+
 import java.io.IOException;
 import java.io.StringWriter;
 

diff --git a/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
@@ -215,6 +215,7 @@ under the License.
  <exclude>org.apache.flink:flink-metrics-core</exclude>
  <exclude>org.apache.flink:flink-metrics-jmx</exclude>
  <exclude>org.apache.flink:flink-statebackend-rocksdb_${scala.binary.version}</exclude>
+ <exclude>org.apache.flink:flink-shaded-jackson</exclude>
 
  <!-- Also exclude very big transitive dependencies of Flink
 
@@ -256,9 +257,6 @@ under the License.
  <exclude>org.apache.sling:org.apache.sling.commons.json</exclude>
  <exclude>commons-logging:commons-logging</exclude>
  <exclude>commons-codec:commons-codec</exclude>
- <exclude>com.fasterxml.jackson.core:jackson-core</exclude>
- <exclude>com.fasterxml.jackson.core:jackson-databind</exclude>
- <exclude>com.fasterxml.jackson.core:jackson-annotations</exclude>
  <exclude>stax:stax-api</exclude>
  <exclude>com.typesafe:config</exclude>
  <exclude>org.uncommons.maths:uncommons-maths</exclude>

diff --git a/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
@@ -217,6 +217,7 @@ under the License.
  <exclude>org.apache.flink:flink-metrics-core</exclude>
  <exclude>org.apache.flink:flink-metrics-jmx</exclude>
  <exclude>org.apache.flink:flink-statebackend-rocksdb_${scala.binary.version}</exclude>
+ <exclude>org.apache.flink:flink-shaded-jackson</exclude>
 
  <!-- Also exclude very big transitive dependencies of Flink
 
@@ -256,9 +257,6 @@ under the License.
  <exclude>org.apache.sling:org.apache.sling.commons.json</exclude>
  <exclude>commons-logging:commons-logging</exclude>
  <exclude>commons-codec:commons-codec</exclude>
- <exclude>com.fasterxml.jackson.core:jackson-core</exclude>
- <exclude>com.fasterxml.jackson.core:jackson-databind</exclude>
- <exclude>com.fasterxml.jackson.core:jackson-annotations</exclude>
  <exclude>stax:stax-api</exclude>
  <exclude>com.typesafe:config</exclude>
  <exclude>org.uncommons.maths:uncommons-maths</exclude>

diff --git a/flink-runtime-web/pom.xml b/flink-runtime-web/pom.xml
@@ -65,6 +65,11 @@ under the License.
  <artifactId>flink-shaded-guava</artifactId>
  </dependency>
 
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-shaded-jackson</artifactId>
+ </dependency>
+
  <dependency>
  <groupId>org.javassist</groupId>
  <artifactId>javassist</artifactId>

diff --git a/...time-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarActionHandler.java b/...time-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarActionHandler.java
@@ -39,7 +39,7 @@
 import org.apache.flink.runtime.rest.handler.legacy.JsonFactory;
 import org.apache.flink.util.ExceptionUtils;
 
-import com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
 
 import java.io.File;
 import java.io.StringWriter;

diff --git a/...time-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarDeleteHandler.java b/...time-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarDeleteHandler.java
@@ -23,7 +23,7 @@
 import org.apache.flink.runtime.rest.handler.legacy.JsonFactory;
 import org.apache.flink.util.FlinkException;
 
-import com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
 
 import java.io.File;
 import java.io.FilenameFilter;

diff --git a/...untime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarListHandler.java b/...untime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarListHandler.java
@@ -25,7 +25,7 @@
 import org.apache.flink.runtime.webmonitor.RuntimeMonitorHandler;
 import org.apache.flink.util.FlinkException;
 
-import com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
 
 import java.io.File;
 import java.io.FilenameFilter;

diff --git a/...untime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarPlanHandler.java b/...untime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarPlanHandler.java
@@ -23,7 +23,7 @@
 import org.apache.flink.runtime.jobmaster.JobManagerGateway;
 import org.apache.flink.runtime.rest.handler.legacy.JsonFactory;
 
-import com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
 
 import java.io.File;
 import java.io.StringWriter;