flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmetz...@apache.org
Subject flink git commit: [FLINK-4861][hotfix] Fix change-scala-version script for opt assembly
Date Tue, 03 Jan 2017 09:06:22 GMT
Repository: flink
Updated Branches:
  refs/heads/master 98a6dcd97 -> 1358753dd


[FLINK-4861][hotfix] Fix change-scala-version script for opt assembly


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/1358753d
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/1358753d
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/1358753d

Branch: refs/heads/master
Commit: 1358753dd9b830034593902531ed30e5557644f0
Parents: 98a6dcd
Author: Robert Metzger <rmetzger@apache.org>
Authored: Tue Jan 3 10:05:54 2017 +0100
Committer: Robert Metzger <rmetzger@apache.org>
Committed: Tue Jan 3 10:05:54 2017 +0100

----------------------------------------------------------------------
 tools/change-scala-version.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/1358753d/tools/change-scala-version.sh
----------------------------------------------------------------------
diff --git a/tools/change-scala-version.sh b/tools/change-scala-version.sh
index cfe355d..56c48c6 100755
--- a/tools/change-scala-version.sh
+++ b/tools/change-scala-version.sh
@@ -77,12 +77,18 @@ find "$BASEDIR/flink-examples/flink-examples-streaming" -name 'pom.xml'
-not -pa
 find "$BASEDIR/flink-quickstart" -name 'pom.xml' -not -path '*target*' -print \
   -exec bash -c "sed_i 's/\(<exclude>org\.apache\.flink:flink-.*\)'$FROM_SUFFIX'<\/exclude>/\1'$TO_SUFFIX'<\/exclude>/g'
{}" \;
 
-# fix for flink-dist
+# 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'
{}" \;
 
+# fix for flink-dist (opt.xml)
+find "$BASEDIR/flink-dist" -name 'opt.xml' -not -path '*target*' -print \
+  -exec bash -c "sed_i 's/\(<source>.*flink-.*\)'$FROM_SUFFIX'/\1'$TO_SUFFIX'/g' {}"
\;
+find "$BASEDIR/flink-dist" -name 'opt.xml' -not -path '*target*' -print \
+  -exec bash -c "sed_i 's/\(<destName>flink-.*\)'$FROM_SUFFIX'/\1'$TO_SUFFIX'/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'
{}" \;


Mime
View raw message