You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2017/10/14 23:31:01 UTC
[6/8] flink git commit: [FLINK-7842] [build] Shade
org.codehouse.jackson in Hadoop
[FLINK-7842] [build] Shade org.codehouse.jackson in Hadoop
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/438ee260
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/438ee260
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/438ee260
Branch: refs/heads/master
Commit: 438ee260dea61d28968dd6ea5f02142ea2f7c533
Parents: e17730c
Author: Stephan Ewen <se...@apache.org>
Authored: Sat Oct 14 19:19:32 2017 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Sat Oct 14 23:18:44 2017 +0200
----------------------------------------------------------------------
flink-shaded-hadoop/pom.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/438ee260/flink-shaded-hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/flink-shaded-hadoop/pom.xml b/flink-shaded-hadoop/pom.xml
index 26e6077..f4b0816 100644
--- a/flink-shaded-hadoop/pom.xml
+++ b/flink-shaded-hadoop/pom.xml
@@ -124,6 +124,7 @@ under the License.
<include>net.java.dev.jets3t:jets3t</include>
<include>org.apache.httpcomponents:*</include>
<include>commons-httpclient:commons-httpclient</include>
+ <include>org.codehaus.jackson:*</include>
</includes>
<excludes>
<exclude>org.slf4j:*</exclude>
@@ -162,6 +163,10 @@ under the License.
<pattern>org.htrace</pattern>
<shadedPattern>org.apache.flink.hadoop.shaded.org.htrace</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>org.codehaus.jackson</pattern>
+ <shadedPattern>org.apache.flink.hadoop.shaded.org.codehaus.jackson</shadedPattern>
+ </relocation>
</relocations>
</configuration>
</execution>