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/08 19:38:14 UTC
[04/10] flink git commit: [hotfix] [build] Properly exclude
flink-python artifact from fat dist jar
[hotfix] [build] Properly exclude flink-python artifact from fat dist jar
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/774e7f79
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/774e7f79
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/774e7f79
Branch: refs/heads/master
Commit: 774e7f797bf1601a0e9c5971f71336020895fba6
Parents: 77e3701
Author: Stephan Ewen <se...@apache.org>
Authored: Fri Oct 6 13:22:19 2017 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Fri Oct 6 20:12:51 2017 +0200
----------------------------------------------------------------------
flink-dist/pom.xml | 2 +-
tools/travis_mvn_watchdog.sh | 11 +++++++++--
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/774e7f79/flink-dist/pom.xml
----------------------------------------------------------------------
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index 8120cd8..0490dcc 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -506,7 +506,7 @@ under the License.
<exclude>org.apache.flink:flink-examples-batch</exclude>
<exclude>org.apache.flink:flink-examples-streaming</exclude>
<exclude>org.apache.flink:flink-examples-table</exclude>
- <exclude>org.apache.flink:flink-python</exclude>
+ <exclude>org.apache.flink:flink-python_${scala.binary.version}</exclude>
<exclude>org.slf4j:slf4j-log4j12</exclude>
<exclude>log4j:log4j</exclude>
</excludes>
http://git-wip-us.apache.org/repos/asf/flink/blob/774e7f79/tools/travis_mvn_watchdog.sh
----------------------------------------------------------------------
diff --git a/tools/travis_mvn_watchdog.sh b/tools/travis_mvn_watchdog.sh
index dd75d36..3ecc268 100755
--- a/tools/travis_mvn_watchdog.sh
+++ b/tools/travis_mvn_watchdog.sh
@@ -301,11 +301,18 @@ check_shaded_artifacts() {
return 1
fi
+ FLINK_PYTHON=`cat allClasses | grep '^org/apache/flink/python' | wc -l`
+ if [ "$FLINK_PYTHON" != "0" ]; then
+ echo "=============================================================================="
+ echo "Detected that the Flink Python artifact is in the dist jar"
+ echo "=============================================================================="
+ return 1
+ fi
HADOOP=`cat allClasses | grep '^org/apache/hadoop' | wc -l`
if [ "$HADOOP" != "0" ]; then
echo "=============================================================================="
- echo "Detected '$HADOOP' Hadoop classes in the dist jar
+ echo "Detected '$HADOOP' Hadoop classes in the dist jar"
echo "=============================================================================="
return 1
fi
@@ -313,7 +320,7 @@ check_shaded_artifacts() {
MAPR=`cat allClasses | grep '^com/mapr' | wc -l`
if [ "$MAPR" != "0" ]; then
echo "=============================================================================="
- echo "Detected '$MAPR' MapR classes in the dist jar
+ echo "Detected '$MAPR' MapR classes in the dist jar"
echo "=============================================================================="
return 1
fi