You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by mx...@apache.org on 2015/10/30 12:49:55 UTC
flink git commit: [release][scripts] shade away curator correctly
with different Scala versions
Repository: flink
Updated Branches:
refs/heads/master 676854b92 -> 7fdaa4e2f
[release][scripts] shade away curator correctly with different Scala versions
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7fdaa4e2
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7fdaa4e2
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7fdaa4e2
Branch: refs/heads/master
Commit: 7fdaa4e2fb88169539cfe314b46e6ee7cdb108b3
Parents: 676854b
Author: Maximilian Michels <mx...@apache.org>
Authored: Fri Oct 30 12:48:04 2015 +0100
Committer: Maximilian Michels <mx...@apache.org>
Committed: Fri Oct 30 12:48:04 2015 +0100
----------------------------------------------------------------------
tools/change-scala-version.sh | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/7fdaa4e2/tools/change-scala-version.sh
----------------------------------------------------------------------
diff --git a/tools/change-scala-version.sh b/tools/change-scala-version.sh
index 2c124a9..1319ac7 100755
--- a/tools/change-scala-version.sh
+++ b/tools/change-scala-version.sh
@@ -80,6 +80,9 @@ find "$BASEDIR/flink-dist" -name 'bin.xml' -not -path '*target*' -print \
find "$BASEDIR/flink-dist" -name 'bin.xml' -not -path '*target*' -print \
-exec bash -c "sed_i 's/\(<include>org\.apache\.flink:flink-.*\)'$FROM_SUFFIX'<\/include>/\1'$TO_SUFFIX'<\/include>/g' {}" \;
+# fix for shading curator with Scala 2.11
+find "$BASEDIR/flink-runtime" -name 'pom.xml' -not -path '*target*' -print \
+ -exec bash -c "sed_i 's/\(<include>org\.apache\.flink:flink-shaded-curator.*\)'$FROM_SUFFIX'<\/include>/\1'$TO_SUFFIX'<\/include>/g' {}" \;
if [ "$TO_VERSION" == "2.11" ]; then
# set the profile activation to !scala-2.11 in parent pom, so that it activates by default