Repository: flink
Updated Branches:
  refs/heads/release-1.4 ee4420f4b -> 257032807


[FLINK-8110][dist] Relocate jackson services in flink-dist


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

Branch: refs/heads/release-1.4
Commit: 257032807e62879581508a353cf8fbb6f6076543
Parents: ee4420f
Author: zentol <[email protected]>
Authored: Mon Nov 20 13:58:21 2017 +0100
Committer: zentol <[email protected]>
Committed: Mon Nov 20 15:47:51 2017 +0100

----------------------------------------------------------------------
 flink-dist/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/25703280/flink-dist/pom.xml
----------------------------------------------------------------------
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index 6696294..95b244c 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -462,6 +462,11 @@ under the License.
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-shade-plugin</artifactId>
+
+                               <!-- we need to explicitly override this 
version, because the -->
+                               <!-- earlier versions of the shade plugin have 
a bug relocating services -->
+                               <version>3.0.0</version>
+
                                <executions>
                                        <execution>
                                                <phase>package</phase>
@@ -496,6 +501,11 @@ under the License.
                                                                        
<pattern>org.codehaus.jackson</pattern>
                                                                        
<shadedPattern>org.apache.flink.formats.avro.shaded.org.codehaus.jackson</shadedPattern>
                                                                </relocation>
+                                                               <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">

Reply via email to