You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2017/11/14 20:04:32 UTC
[1/2] flink git commit: [FLINK-8071][build] Bump shade-plugin asm
version to 5.1
Repository: flink
Updated Branches:
refs/heads/master 408e18699 -> fe98cb77c
[FLINK-8071][build] Bump shade-plugin asm version to 5.1
This closes #5014.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/e1647295
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/e1647295
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/e1647295
Branch: refs/heads/master
Commit: e16472953cef75743791c91f17e8114f2f045054
Parents: 408e186
Author: zentol <ch...@apache.org>
Authored: Tue Nov 14 14:47:00 2017 +0100
Committer: zentol <ch...@apache.org>
Committed: Tue Nov 14 21:03:08 2017 +0100
----------------------------------------------------------------------
pom.xml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/e1647295/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8741901..4aa5031 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1317,6 +1317,24 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.1</version>
+ <dependencies>
+ <!-- bump asm to 5.1 to avoid a bug in the shading of akka -->
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <version>5.1</version>
+ </dependency>
+ </dependencies>
</plugin>
<!-- Disable certain plugins in Eclipse -->
[2/2] flink git commit: [FLINK-7419][build][avro] Shade jackson
dependency in flink-dist
Posted by ch...@apache.org.
[FLINK-7419][build][avro] Shade jackson dependency in flink-dist
This closes #4981.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/fe98cb77
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/fe98cb77
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/fe98cb77
Branch: refs/heads/master
Commit: fe98cb77c4fcf2ff0e2840c2254fb8b517274917
Parents: e164729
Author: zentol <ch...@apache.org>
Authored: Wed Nov 8 11:58:38 2017 +0100
Committer: zentol <ch...@apache.org>
Committed: Tue Nov 14 21:03:41 2017 +0100
----------------------------------------------------------------------
flink-dist/pom.xml | 6 ++++++
flink-formats/flink-avro/pom.xml | 29 -----------------------------
tools/travis_mvn_watchdog.sh | 16 ++++++++++++++++
3 files changed, 22 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/fe98cb77/flink-dist/pom.xml
----------------------------------------------------------------------
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index 4768d9d..3098131 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -491,6 +491,12 @@ under the License.
<exclude>log4j:log4j</exclude>
</excludes>
</artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>org.codehaus.jackson</pattern>
+ <shadedPattern>org.apache.flink.formats.avro.shaded.org.codehaus.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/fe98cb77/flink-formats/flink-avro/pom.xml
----------------------------------------------------------------------
diff --git a/flink-formats/flink-avro/pom.xml b/flink-formats/flink-avro/pom.xml
index 126da54..5676813 100644
--- a/flink-formats/flink-avro/pom.xml
+++ b/flink-formats/flink-avro/pom.xml
@@ -171,35 +171,6 @@ under the License.
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <id>shade-flink</id>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration combine.self="override">
- <dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <artifactSet>
- <includes>
- <include>org.codehaus.jackson:*</include>
- </includes>
- </artifactSet>
- <relocations>
- <relocation>
- <pattern>org.codehaus.jackson</pattern>
- <shadedPattern>org.apache.flink.avro.shaded.org.codehaus.jackson</shadedPattern>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
<pluginManagement>
http://git-wip-us.apache.org/repos/asf/flink/blob/fe98cb77/tools/travis_mvn_watchdog.sh
----------------------------------------------------------------------
diff --git a/tools/travis_mvn_watchdog.sh b/tools/travis_mvn_watchdog.sh
index 8e315fb..42f7ae3 100755
--- a/tools/travis_mvn_watchdog.sh
+++ b/tools/travis_mvn_watchdog.sh
@@ -301,6 +301,22 @@ check_shaded_artifacts() {
return 1
fi
+ CODEHAUS_JACKSON=`cat allClasses | grep '^org/codehaus/jackson' | wc -l`
+ if [ "$CODEHAUS_JACKSON" != "0" ]; then
+ echo "=============================================================================="
+ echo "Detected '$CODEHAUS_JACKSON' unshaded org.codehaus.jackson classes in fat jar"
+ echo "=============================================================================="
+ return 1
+ fi
+
+ FASTERXML_JACKSON=`cat allClasses | grep '^com/fasterxml/jackson' | wc -l`
+ if [ "$FASTERXML_JACKSON" != "0" ]; then
+ echo "=============================================================================="
+ echo "Detected '$FASTERXML_JACKSON' unshaded com.fasterxml.jackson classes in fat jar"
+ echo "=============================================================================="
+ return 1
+ fi
+
SNAPPY=`cat allClasses | grep '^org/xerial/snappy' | wc -l`
if [ "$SNAPPY" == "0" ]; then
echo "=============================================================================="