Repository: incubator-distributedlog Updated Branches: refs/heads/sijie/support_scala_2.10_and_2.11 [created] 08cd8642c
Support publishing artifactory for both scala 2.10 and 2.11 Project: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/commit/433f8a46 Tree: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/tree/433f8a46 Diff: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/diff/433f8a46 Branch: refs/heads/sijie/support_scala_2.10_and_2.11 Commit: 433f8a46c36be310eeedd9eca90853922ca22723 Parents: 3ff9e33 Author: Sijie Guo <[email protected]> Authored: Sat Jun 4 18:15:21 2016 -0700 Committer: Sijie Guo <[email protected]> Committed: Sat Jun 4 18:17:58 2016 -0700 ---------------------------------------------------------------------- .../distributedlog/basic/AtomicWriter.java | 4 +- .../basic/ConsoleProxyMultiWriter.java | 4 +- .../basic/ConsoleProxyWriter.java | 4 +- .../distributedlog/basic/RecordGenerator.java | 4 +- .../ConsoleProxyPartitionedMultiWriter.java | 4 +- .../messaging/ConsoleProxyRRMultiWriter.java | 4 +- scripts/change-scala-version.sh | 142 +++++++++++++++++++ 7 files changed, 154 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/433f8a46/distributedlog-tutorials/distributedlog-basic/src/main/java/com/twitter/distributedlog/basic/AtomicWriter.java ---------------------------------------------------------------------- diff --git a/distributedlog-tutorials/distributedlog-basic/src/main/java/com/twitter/distributedlog/basic/AtomicWriter.java b/distributedlog-tutorials/distributedlog-basic/src/main/java/com/twitter/distributedlog/basic/AtomicWriter.java index 92f5d46..1f9cc9e 100644 --- a/distributedlog-tutorials/distributedlog-basic/src/main/java/com/twitter/distributedlog/basic/AtomicWriter.java +++ b/distributedlog-tutorials/distributedlog-basic/src/main/java/com/twitter/distributedlog/basic/AtomicWriter.java @@ -24,7 +24,7 @@ import com.twitter.distributedlog.io.CompressionCodec.Type; import com.twitter.distributedlog.service.DistributedLogClient; import com.twitter.distributedlog.service.DistributedLogClientBuilder; import com.twitter.distributedlog.util.FutureUtils; -import com.twitter.finagle.thrift.ClientId; +import com.twitter.finagle.thrift.ClientId$; import com.twitter.util.Future; import com.twitter.util.FutureEventListener; import com.twitter.util.Promise; @@ -53,7 +53,7 @@ public class AtomicWriter { System.arraycopy(args, 2, messages, 0, messages.length); DistributedLogClient client = DistributedLogClientBuilder.newBuilder() - .clientId(ClientId.apply("atomic-writer")) + .clientId(ClientId$.MODULE$.apply("atomic-writer")) .name("atomic-writer") .thriftmux(true) .finagleNameStr(finagleNameStr) http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/433f8a46/distributedlog-tutorials/distributedlog-basic/src/main/java/com/twitter/distributedlog/basic/ConsoleProxyMultiWriter.java ---------------------------------------------------------------------- diff --git a/distributedlog-tutorials/distributedlog-basic/src/main/java/com/twitter/distributedlog/basic/ConsoleProxyMultiWriter.java b/distributedlog-tutorials/distributedlog-basic/src/main/java/com/twitter/distributedlog/basic/ConsoleProxyMultiWriter.java index 42d0490..3d379b4 100644 --- a/distributedlog-tutorials/distributedlog-basic/src/main/java/com/twitter/distributedlog/basic/ConsoleProxyMultiWriter.java +++ b/distributedlog-tutorials/distributedlog-basic/src/main/java/com/twitter/distributedlog/basic/ConsoleProxyMultiWriter.java @@ -22,7 +22,7 @@ import com.twitter.distributedlog.DLSN; import com.twitter.distributedlog.client.DistributedLogMultiStreamWriter; import com.twitter.distributedlog.service.DistributedLogClient; import com.twitter.distributedlog.service.DistributedLogClientBuilder; -import com.twitter.finagle.thrift.ClientId; +import com.twitter.finagle.thrift.ClientId$; import com.twitter.util.FutureEventListener; import jline.ConsoleReader; import jline.Terminal; @@ -50,7 +50,7 @@ public class ConsoleProxyMultiWriter { final String streamList = args[1]; DistributedLogClient client = DistributedLogClientBuilder.newBuilder() - .clientId(ClientId.apply("console-proxy-writer")) + .clientId(ClientId$.MODULE$.apply("console-proxy-writer")) .name("console-proxy-writer") .thriftmux(true) .finagleNameStr(finagleNameStr) http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/433f8a46/distributedlog-tutorials/distributedlog-basic/src/main/java/com/twitter/distributedlog/basic/ConsoleProxyWriter.java ---------------------------------------------------------------------- diff --git a/distributedlog-tutorials/distributedlog-basic/src/main/java/com/twitter/distributedlog/basic/ConsoleProxyWriter.java b/distributedlog-tutorials/distributedlog-basic/src/main/java/com/twitter/distributedlog/basic/ConsoleProxyWriter.java index 51d5eb3..5089e27 100644 --- a/distributedlog-tutorials/distributedlog-basic/src/main/java/com/twitter/distributedlog/basic/ConsoleProxyWriter.java +++ b/distributedlog-tutorials/distributedlog-basic/src/main/java/com/twitter/distributedlog/basic/ConsoleProxyWriter.java @@ -20,7 +20,7 @@ package com.twitter.distributedlog.basic; import com.twitter.distributedlog.*; import com.twitter.distributedlog.service.DistributedLogClient; import com.twitter.distributedlog.service.DistributedLogClientBuilder; -import com.twitter.finagle.thrift.ClientId; +import com.twitter.finagle.thrift.ClientId$; import com.twitter.util.FutureEventListener; import jline.ConsoleReader; import jline.Terminal; @@ -47,7 +47,7 @@ public class ConsoleProxyWriter { final String streamName = args[1]; DistributedLogClient client = DistributedLogClientBuilder.newBuilder() - .clientId(ClientId.apply("console-proxy-writer")) + .clientId(ClientId$.MODULE$.apply("console-proxy-writer")) .name("console-proxy-writer") .thriftmux(true) .finagleNameStr(finagleNameStr) http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/433f8a46/distributedlog-tutorials/distributedlog-basic/src/main/java/com/twitter/distributedlog/basic/RecordGenerator.java ---------------------------------------------------------------------- diff --git a/distributedlog-tutorials/distributedlog-basic/src/main/java/com/twitter/distributedlog/basic/RecordGenerator.java b/distributedlog-tutorials/distributedlog-basic/src/main/java/com/twitter/distributedlog/basic/RecordGenerator.java index e759f12..63b03f5 100644 --- a/distributedlog-tutorials/distributedlog-basic/src/main/java/com/twitter/distributedlog/basic/RecordGenerator.java +++ b/distributedlog-tutorials/distributedlog-basic/src/main/java/com/twitter/distributedlog/basic/RecordGenerator.java @@ -21,7 +21,7 @@ import com.google.common.util.concurrent.RateLimiter; import com.twitter.distributedlog.DLSN; import com.twitter.distributedlog.service.DistributedLogClient; import com.twitter.distributedlog.service.DistributedLogClientBuilder; -import com.twitter.finagle.thrift.ClientId; +import com.twitter.finagle.thrift.ClientId$; import com.twitter.util.FutureEventListener; import java.nio.ByteBuffer; @@ -50,7 +50,7 @@ public class RecordGenerator { RateLimiter limiter = RateLimiter.create(rate); DistributedLogClient client = DistributedLogClientBuilder.newBuilder() - .clientId(ClientId.apply("record-generator")) + .clientId(ClientId$.MODULE$.apply("record-generator")) .name("record-generator") .thriftmux(true) .finagleNameStr(finagleNameStr) http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/433f8a46/distributedlog-tutorials/distributedlog-messaging/src/main/java/com/twitter/distributedlog/messaging/ConsoleProxyPartitionedMultiWriter.java ---------------------------------------------------------------------- diff --git a/distributedlog-tutorials/distributedlog-messaging/src/main/java/com/twitter/distributedlog/messaging/ConsoleProxyPartitionedMultiWriter.java b/distributedlog-tutorials/distributedlog-messaging/src/main/java/com/twitter/distributedlog/messaging/ConsoleProxyPartitionedMultiWriter.java index 79ed576..fcd2e9a 100644 --- a/distributedlog-tutorials/distributedlog-messaging/src/main/java/com/twitter/distributedlog/messaging/ConsoleProxyPartitionedMultiWriter.java +++ b/distributedlog-tutorials/distributedlog-messaging/src/main/java/com/twitter/distributedlog/messaging/ConsoleProxyPartitionedMultiWriter.java @@ -20,7 +20,7 @@ package com.twitter.distributedlog.messaging; import com.twitter.distributedlog.DLSN; import com.twitter.distributedlog.service.DistributedLogClient; import com.twitter.distributedlog.service.DistributedLogClientBuilder; -import com.twitter.finagle.thrift.ClientId; +import com.twitter.finagle.thrift.ClientId$; import com.twitter.util.Future; import com.twitter.util.FutureEventListener; import jline.ConsoleReader; @@ -70,7 +70,7 @@ public class ConsoleProxyPartitionedMultiWriter { final String streamList = args[1]; DistributedLogClient client = DistributedLogClientBuilder.newBuilder() - .clientId(ClientId.apply("console-proxy-writer")) + .clientId(ClientId$.MODULE$.apply("console-proxy-writer")) .name("console-proxy-writer") .thriftmux(true) .finagleNameStr(finagleNameStr) http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/433f8a46/distributedlog-tutorials/distributedlog-messaging/src/main/java/com/twitter/distributedlog/messaging/ConsoleProxyRRMultiWriter.java ---------------------------------------------------------------------- diff --git a/distributedlog-tutorials/distributedlog-messaging/src/main/java/com/twitter/distributedlog/messaging/ConsoleProxyRRMultiWriter.java b/distributedlog-tutorials/distributedlog-messaging/src/main/java/com/twitter/distributedlog/messaging/ConsoleProxyRRMultiWriter.java index 00398c1..938aa86 100644 --- a/distributedlog-tutorials/distributedlog-messaging/src/main/java/com/twitter/distributedlog/messaging/ConsoleProxyRRMultiWriter.java +++ b/distributedlog-tutorials/distributedlog-messaging/src/main/java/com/twitter/distributedlog/messaging/ConsoleProxyRRMultiWriter.java @@ -20,7 +20,7 @@ package com.twitter.distributedlog.messaging; import com.twitter.distributedlog.DLSN; import com.twitter.distributedlog.service.DistributedLogClient; import com.twitter.distributedlog.service.DistributedLogClientBuilder; -import com.twitter.finagle.thrift.ClientId; +import com.twitter.finagle.thrift.ClientId$; import com.twitter.util.FutureEventListener; import jline.ConsoleReader; import jline.Terminal; @@ -44,7 +44,7 @@ public class ConsoleProxyRRMultiWriter { final String streamList = args[1]; DistributedLogClient client = DistributedLogClientBuilder.newBuilder() - .clientId(ClientId.apply("console-proxy-writer")) + .clientId(ClientId$.MODULE$.apply("console-proxy-writer")) .name("console-proxy-writer") .thriftmux(true) .finagleNameStr(finagleNameStr) http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/433f8a46/scripts/change-scala-version.sh ---------------------------------------------------------------------- diff --git a/scripts/change-scala-version.sh b/scripts/change-scala-version.sh new file mode 100755 index 0000000..f68d7a9 --- /dev/null +++ b/scripts/change-scala-version.sh @@ -0,0 +1,142 @@ +#!/usr/bin/env bash + +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This shell script is from Apache Spark with some modification. + +set -e + +VALID_VERSIONS=( 2.10 2.11 ) + +usage() { + echo "Usage: $(basename $0) [-h|--help] <scala version to be used> +where : + -h| --help Display this help text + valid scala version values : ${VALID_VERSIONS[*]} +" 1>&2 + exit 1 +} + +if [[ ($# -ne 1) || ( $1 == "--help") || $1 == "-h" ]]; then + usage +fi + +TO_VERSION=$1 + +check_scala_version() { + for i in ${VALID_VERSIONS[*]}; do [ $i = "$1" ] && return 0; done + echo "Invalid Scala version: $1. Valid versions: ${VALID_VERSIONS[*]}" 1>&2 + exit 1 +} + +check_scala_version "$TO_VERSION" + +if [ $TO_VERSION = "2.11" ]; then + FROM_SUFFIX="_2\.10" + TO_SUFFIX="_2\.11" +else + FROM_SUFFIX="_2\.11" + TO_SUFFIX="_2\.10" +fi + +sed_i() { + sed -e "$1" "$2" > "$2.tmp" && mv "$2.tmp" "$2" +} + +export -f sed_i + +BASEDIR=$(dirname $0)/.. + +# Fix the finagle versions +echo "sed_i 's/\(artifactId>finagle.*'$FROM_SUFFIX'\)<\/artifactId>/\1'$TO_SUFFIX'<\/artifactId>/g' {}"; +find "$BASEDIR" -name 'pom.xml' -not -path '*target*' -print \ + -exec bash -c "sed_i 's/\(artifactId>finagle.*\)'$FROM_SUFFIX'<\/artifactId>/\1'$TO_SUFFIX'<\/artifactId>/g' {}" \; + +# Fix the scrooge versions +echo "sed_i 's/\(artifactId>scrooge.*'$FROM_SUFFIX'\)<\/artifactId>/\1'$TO_SUFFIX'<\/artifactId>/g' {}"; +find "$BASEDIR" -name 'pom.xml' -not -path '*target*' -print \ + -exec bash -c "sed_i 's/\(artifactId>scrooge.*\)'$FROM_SUFFIX'<\/artifactId>/\1'$TO_SUFFIX'<\/artifactId>/g' {}" \; + +# Fix the util versions +echo "sed_i 's/\(artifactId>util.*'$FROM_SUFFIX'\)<\/artifactId>/\1'$TO_SUFFIX'<\/artifactId>/g' {}"; +find "$BASEDIR" -name 'pom.xml' -not -path '*target*' -print \ + -exec bash -c "sed_i 's/\(artifactId>util.*\)'$FROM_SUFFIX'<\/artifactId>/\1'$TO_SUFFIX'<\/artifactId>/g' {}" \; + +# Fix the distributedlog versions +echo "sed_i 's/\(artifactId>distributedlog\)<\/artifactId>/\1'$TO_SUFFIX'<\/artifactId>/g' {}" +find "$BASEDIR" -name 'pom.xml' -not -path '*target*' -print \ + -exec bash -c "sed_i 's/\(artifactId>distributedlog\)<\/artifactId>/\1'$TO_SUFFIX'<\/artifactId>/g' {}" \; +echo "sed_i 's/\(artifactId>distributedlog-[a-z]*\)<\/artifactId>/\1'$TO_SUFFIX'<\/artifactId>/g' {}" +find "$BASEDIR" -name 'pom.xml' -not -path '*target*' -print \ + -exec bash -c "sed_i 's/\(artifactId>distributedlog-[a-z]*\)<\/artifactId>/\1'$TO_SUFFIX'<\/artifactId>/g' {}" \; +echo "sed_i 's/\(artifactId>distributedlog.*\)'$FROM_SUFFIX'<\/artifactId>/\1'$TO_SUFFIX'<\/artifactId>/g' {}" +find "$BASEDIR" -name 'pom.xml' -not -path '*target*' -print \ + -exec bash -c "sed_i 's/\(artifactId>distributedlog.*\)'$FROM_SUFFIX'<\/artifactId>/\1'$TO_SUFFIX'<\/artifactId>/g' {}" \; +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 +#
