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 2018/09/19 07:16:14 UTC
[flink] 06/06: [FLINK-10366] [s3] Update build script shading
checks to new patterns.
This is an automated email from the ASF dual-hosted git repository.
sewen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 9d56e69d8fa3d583e816980db853a6c9de5e1f6b
Author: kkloudas <kk...@gmail.com>
AuthorDate: Fri Sep 14 14:46:50 2018 +0200
[FLINK-10366] [s3] Update build script shading checks to new patterns.
---
tools/travis_mvn_watchdog.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/travis_mvn_watchdog.sh b/tools/travis_mvn_watchdog.sh
index ae5e58c..9382ec9 100755
--- a/tools/travis_mvn_watchdog.sh
+++ b/tools/travis_mvn_watchdog.sh
@@ -411,7 +411,7 @@ check_shaded_artifacts_s3_fs() {
VARIANT=$1
jar tf flink-filesystems/flink-s3-fs-${VARIANT}/target/flink-s3-fs-${VARIANT}*.jar > allClasses
- UNSHADED_CLASSES=`cat allClasses | grep -v -e '^META-INF' -e '^assets' -e "^org/apache/flink/fs/s3${VARIANT}/" | grep '\.class$'`
+ UNSHADED_CLASSES=`cat allClasses | grep -v -e '^META-INF' -e "^org/apache/flink/fs/" | grep '\.class$'`
if [ "$?" == "0" ]; then
echo "=============================================================================="
echo "${VARIANT}: Detected unshaded dependencies in fat jar:"
@@ -427,7 +427,7 @@ check_shaded_artifacts_s3_fs() {
return 1
fi
- UNSHADED_SERVICES=`cat allClasses | grep '^META-INF/services/' | grep -v -e '^META-INF/services/org\.apache\.flink\.core\.fs\.FileSystemFactory$' -e "^META-INF/services/org\.apache\.flink\.fs\.s3${VARIANT}\.shaded" -e '^META-INF/services/'`
+ UNSHADED_SERVICES=`cat allClasses | grep '^META-INF/services/' | grep -v -e '^META-INF/services/org\.apache\.flink\.core\.fs\.FileSystemFactory$' -e "^META-INF/services/org\.apache\.flink\.fs.*shaded" -e '^META-INF/services/'`
if [ "$?" == "0" ]; then
echo "=============================================================================="
echo "${VARIANT}: Detected unshaded service files in fat jar:"