Repository: flink Updated Branches: refs/heads/release-1.3 2455df962 -> 100558b29
[hotfix] Fix change-scala-version.sh to also change gelly examples version The previous sed command for flink-dist/src/main/assemblies/bin.xml was to specific and didn't also fix the Scala version in the gelly examples part. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/100558b2 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/100558b2 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/100558b2 Branch: refs/heads/release-1.3 Commit: 100558b2937dd035c4b655d69505b688e4cd9d12 Parents: 2455df9 Author: Aljoscha Krettek <[email protected]> Authored: Thu Aug 3 12:16:45 2017 +0200 Committer: Aljoscha Krettek <[email protected]> Committed: Thu Aug 3 12:20:47 2017 +0200 ---------------------------------------------------------------------- tools/change-scala-version.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/100558b2/tools/change-scala-version.sh ---------------------------------------------------------------------- diff --git a/tools/change-scala-version.sh b/tools/change-scala-version.sh index 56c48c6..63c36c7 100755 --- a/tools/change-scala-version.sh +++ b/tools/change-scala-version.sh @@ -80,8 +80,8 @@ find "$BASEDIR/flink-quickstart" -name 'pom.xml' -not -path '*target*' -print \ # fix for flink-dist (bin.xml) find "$BASEDIR/flink-dist" -name 'bin.xml' -not -path '*target*' -print \ -exec bash -c "sed_i 's/\(<source>.*flink-dist\)'$FROM_SUFFIX'/\1'$TO_SUFFIX'/g' {}" \; -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' {}" \; + find "$BASEDIR/flink-dist" -name 'bin.xml' -not -path '*target*' -print \ + -exec bash -c "sed_i 's/\(<include>.*\)'$FROM_SUFFIX'\(.*\)<\/include>/\1'$TO_SUFFIX'\2<\/include>/g' {}" \; # fix for flink-dist (opt.xml) find "$BASEDIR/flink-dist" -name 'opt.xml' -not -path '*target*' -print \
