distributedlog-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From si...@apache.org
Subject [4/5] incubator-distributedlog git commit: Remove commented script
Date Sat, 10 Sep 2016 07:34:19 GMT
Remove commented script


Project: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/commit/8ac6fbe2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/tree/8ac6fbe2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/diff/8ac6fbe2

Branch: refs/heads/sijie/support_scala_2.10_and_2.11
Commit: 8ac6fbe245400a3bff7fb275b327ca7125eb48e7
Parents: a8aa66c
Author: Sijie Guo <sijieg@twitter.com>
Authored: Mon Jul 11 23:16:41 2016 -0700
Committer: Sijie Guo <sijieg@twitter.com>
Committed: Mon Jul 11 23:16:41 2016 -0700

----------------------------------------------------------------------
 scripts/change-scala-version.sh | 50 ------------------------------------
 1 file changed, 50 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/8ac6fbe2/scripts/change-scala-version.sh
----------------------------------------------------------------------
diff --git a/scripts/change-scala-version.sh b/scripts/change-scala-version.sh
index f68d7a9..89c8a70 100755
--- a/scripts/change-scala-version.sh
+++ b/scripts/change-scala-version.sh
@@ -90,53 +90,3 @@ find "$BASEDIR" -name 'pom.xml' -not -path '*target*' -print \
 echo "sed_i 's/\(module>distributedlog.*\)'$FROM_SUFFIX'<\/module>/\1'$TO_SUFFIX'<\/module>/g'
{}"
 find "$BASEDIR" -name 'pom.xml' -not -path '*target*' -print \
   -exec bash -c "sed_i 's/\(module>distributedlog.*\)'$FROM_SUFFIX'<\/module>/\1'$TO_SUFFIX'<\/module>/g'
{}" \;
-
-#echo "sed_i 's/\(artifactId>flink.*'$FROM_SUFFIX'\)<\/artifactId>/\1'$TO_SUFFIX'<\/artifactId>/g'
{}";
-
-#BASEDIR=$(dirname $0)/..
-#find "$BASEDIR" -name 'pom.xml' -not -path '*target*' -print \
-#  -exec bash -c "sed_i 's/\(artifactId>flink.*\)'$FROM_SUFFIX'<\/artifactId>/\1'$TO_SUFFIX'<\/artifactId>/g'
{}" \;
-#
-## fix for examples
-#find "$BASEDIR/flink-examples/flink-examples-batch" -name 'pom.xml' -not -path '*target*'
-print \
-#  -exec bash -c "sed_i 's/\(<copy file=\".*flink-examples-batch\)'$FROM_SUFFIX'/\1'$TO_SUFFIX'/g'
{}" \;
-#
-#find "$BASEDIR/flink-examples/flink-examples-streaming" -name 'pom.xml' -not -path '*target*'
-print \
-#  -exec bash -c "sed_i 's/\(<copy file=\".*flink-examples-streaming\)'$FROM_SUFFIX'/\1'$TO_SUFFIX'/g'
{}" \;
-#
-## fix for quickstart
-#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
-#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 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
-#  bash -c "sed_i 's/<name>scala-2.11<\/name>/<name>!scala-2.11<\/name>/g'
$BASEDIR/pom.xml" \;
-#  # set the profile activation in all sub modules to scala-2.11 (so that they are disabled
by default)
-#  find $BASEDIR/flink-* -name 'pom.xml' -not -path '*target*' -print \
-#    -exec bash -c "sed_i 's/<name>!scala-2.11<\/name>/<name>scala-2.11<\/name>/g'
{}" \;
-#
-#  # 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
-#  # do the opposite as above
-#  bash -c "sed_i 's/<name>!scala-2.11<\/name>/<name>scala-2.11<\/name>/g'
$BASEDIR/pom.xml" \;
-#  # also for the other files
-#  find $BASEDIR/flink-* -name 'pom.xml' -not -path '*target*' -print \
-#    -exec bash -c "sed_i 's/<name>scala-2.11<\/name>/<name>!scala-2.11<\/name>/g'
{}" \;
-#
-#  # unset shading artifact name
-#  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
-#


Mime
View raw message