From c41a5222e838fb0e015ca1a2b7cbcf70935d9f7f Mon Sep 17 00:00:00 2001 From: whitelilis Date: Sun, 25 Dec 2016 21:40:38 +0800 Subject: [PATCH 1/2] change-scala-version.sh forget changing scala version in flink-dist/src/main/assemblies/opt.xml, build faild --- tools/change-scala-version.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/change-scala-version.sh b/tools/change-scala-version.sh index cfe355dacd593..2a6d7f2a8a961 100755 --- a/tools/change-scala-version.sh +++ b/tools/change-scala-version.sh @@ -87,6 +87,10 @@ find "$BASEDIR/flink-dist" -name 'bin.xml' -not -path '*target*' -print \ find "$BASEDIR/flink-runtime" -name 'pom.xml' -not -path '*target*' -print \ -exec bash -c "sed_i 's/\(org\.apache\.flink:flink-shaded-curator.*\)'$FROM_SUFFIX'<\/include>/\1'$TO_SUFFIX'<\/include>/g' {}" \; +# fix for flink-dist +find "$BASEDIR/flink-dist" -name 'opt.xml' -not -path '*target*' -print \ + -exec bash -c "sed_i 's/_2\...\(-\${project.version}\)/'$TO_SUFFIX'\1/g' {}" \; + if [ "$TO_VERSION" == "2.11" ]; then # set the profile activation to !scala-2.11 in parent pom, so that it activates by default bash -c "sed_i 's/scala-2.11<\/name>/!scala-2.11<\/name>/g' $BASEDIR/pom.xml" \; @@ -96,6 +100,7 @@ if [ "$TO_VERSION" == "2.11" ]; then # set the name of the shading artifact properly bash -c "sed_i 's/\(shading-artifact.name>flink-shaded[a-z0-9\-]*\)'$FROM_SUFFIX'<\/shading-artifact.name>/\1'$TO_SUFFIX'<\/shading-artifact.name>/g' $BASEDIR/pom.xml" \; + fi if [ "$TO_VERSION" == "2.10" ]; then From bacad6577274799906375397e57af7988b051f14 Mon Sep 17 00:00:00 2001 From: whitelilis Date: Sun, 25 Dec 2016 21:43:44 +0800 Subject: [PATCH 2/2] clear blank line --- tools/change-scala-version.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/change-scala-version.sh b/tools/change-scala-version.sh index 2a6d7f2a8a961..c08ef3aa03271 100755 --- a/tools/change-scala-version.sh +++ b/tools/change-scala-version.sh @@ -100,7 +100,6 @@ if [ "$TO_VERSION" == "2.11" ]; then # set the name of the shading artifact properly bash -c "sed_i 's/\(shading-artifact.name>flink-shaded[a-z0-9\-]*\)'$FROM_SUFFIX'<\/shading-artifact.name>/\1'$TO_SUFFIX'<\/shading-artifact.name>/g' $BASEDIR/pom.xml" \; - fi if [ "$TO_VERSION" == "2.10" ]; then