[hotfix] [build] Properly exclude flink-python artifact from fat dist…

… jar
laubersder · Oct 6, 2017 · 774e7f7 · 774e7f7
1 parent 77e3701
commit 774e7f7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git 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>

diff --git a/tools/travis_mvn_watchdog.sh b/tools/travis_mvn_watchdog.sh
@@ -301,19 +301,26 @@ 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
 
  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