[FLINK-8804][build] Bump flink-shaded-jackson version to 3.0

This closes #5596.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/df719e76
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/df719e76
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/df719e76

Branch: refs/heads/master
Commit: df719e76d3d5ca90e38c26fce0085c861acb935d
Parents: 83fffdf
Author: zentol <ches...@apache.org>
Authored: Wed Feb 28 11:42:21 2018 +0100
Committer: zentol <ches...@apache.org>
Committed: Wed Apr 4 09:23:03 2018 +0200

----------------------------------------------------------------------
 flink-dist/pom.xml                              |  7 ---
 flink-docs/pom.xml                              | 18 +-------
 .../flink/docs/rest/RestAPIDocGenerator.java    | 14 +++---
 flink-libraries/flink-sql-client/pom.xml        | 11 +----
 .../flink/table/client/config/ConfigUtil.java   | 10 ++--
 pom.xml                                         | 48 +++++++++++++++++++-
 6 files changed, 63 insertions(+), 45 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/df719e76/flink-dist/pom.xml
----------------------------------------------------------------------
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index 44ce9df..24a514a 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -506,13 +506,6 @@ under the License.
                                                                        
<exclude>log4j:log4j</exclude>
                                                                </excludes>
                                                        </artifactSet>
-                                                       <relocations>
-                                                               <relocation>
-                                                                       <!-- 
relocate jackson services, which isn't done by flink-shaded-jackson -->
-                                                                       
<pattern>com.fasterxml.jackson</pattern>
-                                                                       
<shadedPattern>org.apache.flink.shaded.jackson2.com.fasterxml.jackson</shadedPattern>
-                                                               </relocation>
-                                                       </relocations>
                                                        <transformers>
                                                                <transformer 
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                                                        
<resource>reference.conf</resource>

http://git-wip-us.apache.org/repos/asf/flink/blob/df719e76/flink-docs/pom.xml
----------------------------------------------------------------------
diff --git a/flink-docs/pom.xml b/flink-docs/pom.xml
index 4132066..33d1a2c 100644
--- a/flink-docs/pom.xml
+++ b/flink-docs/pom.xml
@@ -63,23 +63,9 @@ under the License.
                        <groupId>org.apache.flink</groupId>
                        <artifactId>flink-shaded-netty</artifactId>
                </dependency>
-
-               <dependency>
-                       <!-- We use standard jackson since 
jackson-module-jsonSchema isn't part of flink-shaded-jackson -->
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-core</artifactId>
-                       <version>${jackson.version}</version>
-               </dependency>
                <dependency>
-                       <!-- We use standard jackson since 
jackson-module-jsonSchema isn't part of flink-shaded-jackson -->
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-databind</artifactId>
-                       <version>${jackson.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.module</groupId>
-                       <artifactId>jackson-module-jsonSchema</artifactId>
-                       <version>${jackson.version}</version>
+                       <groupId>org.apache.flink</groupId>
+                       
<artifactId>flink-shaded-jackson-module-jsonSchema</artifactId>
                </dependency>
 
                <dependency>

http://git-wip-us.apache.org/repos/asf/flink/blob/df719e76/flink-docs/src/main/java/org/apache/flink/docs/rest/RestAPIDocGenerator.java
----------------------------------------------------------------------
diff --git 
a/flink-docs/src/main/java/org/apache/flink/docs/rest/RestAPIDocGenerator.java 
b/flink-docs/src/main/java/org/apache/flink/docs/rest/RestAPIDocGenerator.java
index 8ece7b1..2d5ec8f 100644
--- 
a/flink-docs/src/main/java/org/apache/flink/docs/rest/RestAPIDocGenerator.java
+++ 
b/flink-docs/src/main/java/org/apache/flink/docs/rest/RestAPIDocGenerator.java
@@ -41,15 +41,15 @@ import 
org.apache.flink.runtime.webmonitor.retriever.GatewayRetriever;
 import 
org.apache.flink.runtime.webmonitor.retriever.MetricQueryServiceRetriever;
 import org.apache.flink.util.ConfigurationException;
 
+import 
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException;
+import 
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.SerializableString;
+import 
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.io.CharacterEscapes;
+import 
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.io.SerializedString;
+import 
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
+import 
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.module.jsonSchema.JsonSchema;
+import 
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.module.jsonSchema.JsonSchemaGenerator;
 import org.apache.flink.shaded.netty4.io.netty.channel.ChannelInboundHandler;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.SerializableString;
-import com.fasterxml.jackson.core.io.CharacterEscapes;
-import com.fasterxml.jackson.core.io.SerializedString;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.module.jsonSchema.JsonSchema;
-import com.fasterxml.jackson.module.jsonSchema.JsonSchemaGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/flink/blob/df719e76/flink-libraries/flink-sql-client/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-sql-client/pom.xml 
b/flink-libraries/flink-sql-client/pom.xml
index 64ae1be..6bcfc13 100644
--- a/flink-libraries/flink-sql-client/pom.xml
+++ b/flink-libraries/flink-sql-client/pom.xml
@@ -99,15 +99,8 @@ under the License.
 
                <!-- configuration -->
                <dependency>
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-databind</artifactId>
-                       <version>${jackson.version}</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>com.fasterxml.jackson.dataformat</groupId>
-                       <artifactId>jackson-dataformat-yaml</artifactId>
-                       <version>${jackson.version}</version>
+                       <groupId>org.apache.flink</groupId>
+                       <artifactId>flink-shaded-jackson</artifactId>
                </dependency>
 
                <!-- test dependencies -->

http://git-wip-us.apache.org/repos/asf/flink/blob/df719e76/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/ConfigUtil.java
----------------------------------------------------------------------
diff --git 
a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/ConfigUtil.java
 
b/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/ConfigUtil.java
index 87201a6..337d803 100644
--- 
a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/ConfigUtil.java
+++ 
b/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/ConfigUtil.java
@@ -18,11 +18,11 @@
 
 package org.apache.flink.table.client.config;
 
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.core.io.IOContext;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import com.fasterxml.jackson.dataformat.yaml.YAMLParser;
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonToken;
+import 
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.io.IOContext;
+import 
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
+import 
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import 
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.dataformat.yaml.YAMLParser;
 
 import java.io.IOException;
 import java.io.InputStream;

http://git-wip-us.apache.org/repos/asf/flink/blob/df719e76/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a9d190e..de0c259 100644
--- a/pom.xml
+++ b/pom.xml
@@ -247,7 +247,53 @@ under the License.
                        <dependency>
                                <groupId>org.apache.flink</groupId>
                                <artifactId>flink-shaded-jackson</artifactId>
-                               
<version>${jackson.version}-${flink.shaded.version}</version>
+                               <!-- We use a newer version since we didn't 
have to time to do a proper switch to 3.0 -->
+                               <version>${jackson.version}-3.0</version>
+                               <!-- Dependencies aren't properly hidden in 3.0 
-->
+                               <exclusions>
+                                       <exclusion>
+                                               
<groupId>com.fasterxml.jackson.core</groupId>
+                                               
<artifactId>jackson-core</artifactId>
+                                       </exclusion>
+                                       <exclusion>
+                                               
<groupId>com.fasterxml.jackson.core</groupId>
+                                               
<artifactId>jackson-annotations</artifactId>
+                                       </exclusion>
+                                       <exclusion>
+                                               
<groupId>com.fasterxml.jackson.core</groupId>
+                                               
<artifactId>jackson-databind</artifactId>
+                                       </exclusion>
+                                       <exclusion>
+                                               
<groupId>com.fasterxml.jackson.dataformat</groupId>
+                                               
<artifactId>jackson-dataformat-yaml</artifactId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.apache.flink</groupId>
+                               
<artifactId>flink-shaded-jackson-module-jsonSchema</artifactId>
+                               <!-- We use a newer version since we didn't 
have to time to do a proper switch to 3.0 -->
+                               <version>${jackson.version}-3.0</version>
+                               <!-- Dependencies aren't properly hidden in 3.0 
-->
+                               <exclusions>
+                                       <exclusion>
+                                               
<groupId>com.fasterxml.jackson.core</groupId>
+                                               
<artifactId>jackson-core</artifactId>
+                                       </exclusion>
+                                       <exclusion>
+                                               
<groupId>com.fasterxml.jackson.core</groupId>
+                                               
<artifactId>jackson-annotations</artifactId>
+                                       </exclusion>
+                                       <exclusion>
+                                               
<groupId>com.fasterxml.jackson.core</groupId>
+                                               
<artifactId>jackson-databind</artifactId>
+                                       </exclusion>
+                                       <exclusion>
+                                               
<groupId>com.fasterxml.jackson.module</groupId>
+                                               
<artifactId>jackson-module-jsonSchema</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
 
                        <dependency>

Reply via email to