Repository: zeppelin Updated Branches: refs/heads/master 80997e8e6 -> 6bb4b5ba8
[ZEPPELIN-1179] Append scala version to maven artifacts ### What is this PR for? Now that we have support for both Scala 2.10 and 2.11 we need to append Scala version to the maven artifact id in order to properly publish artifacts for both Scala releases. ### What type of PR is it? [Improvement] ### What is the Jira issue? [ZEPPELIN-1179](https://issues.apache.org/jira/browse/ZEPPELIN-1179) Author: Luciano Resende <[email protected]> Closes #1186 from lresende/scala-version and squashes the following commits: 27ec9fe [Luciano Resende] [ZEPPELIN-1179] Properly set scala version during builds 4594607 [Luciano Resende] [ZEPPELIN-1179] Append scala version to remaining maven artifacts 7bed3ec [Luciano Resende] [ZEPPELIN-1179] Append scala version to maven artifacts Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/6bb4b5ba Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/6bb4b5ba Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/6bb4b5ba Branch: refs/heads/master Commit: 6bb4b5ba8e7ecd6274dd437c6ec5c4a9b178e4d1 Parents: 80997e8 Author: Luciano Resende <[email protected]> Authored: Thu Jul 21 12:34:13 2016 -0700 Committer: Mina Lee <[email protected]> Committed: Fri Jul 22 17:12:03 2016 +0900 ---------------------------------------------------------------------- .travis.yml | 17 +++++----- cassandra/pom.xml | 2 +- dev/change-scala-version.sh | 67 ++++++++++++++++++++++++++++++++++++++ flink/pom.xml | 2 +- ignite/pom.xml | 2 +- r/pom.xml | 6 ++-- scalding/pom.xml | 2 +- spark-dependencies/pom.xml | 2 +- spark/pom.xml | 4 +-- zeppelin-display/pom.xml | 2 +- zeppelin-distribution/pom.xml | 2 +- zeppelin-server/pom.xml | 2 +- 12 files changed, 89 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/6bb4b5ba/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index fab4c79..d4adc0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,35 +35,35 @@ matrix: include: # Test all modules with scala 2.10 - jdk: "oraclejdk7" - env: SPARK_VER="1.6.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.6 -Pr -Phadoop-2.3 -Ppyspark -Psparkr -Pscalding -Pexamples" BUILD_FLAG="package -Dscala-2.10 -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS="" + env: SCALA_VER="2.10" SPARK_VER="1.6.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.6 -Pr -Phadoop-2.3 -Ppyspark -Psparkr -Pscalding -Pexamples" BUILD_FLAG="package -Dscala-2.10 -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS="" # Test all modules with scala 2.11 - jdk: "oraclejdk7" - env: SPARK_VER="1.6.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.6 -Pr -Phadoop-2.3 -Ppyspark -Psparkr -Pscalding -Pexamples -Pscala-2.11" BUILD_FLAG="package -Dscala-2.11 -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS="" + env: SCALA_VER="2.11" SPARK_VER="1.6.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.6 -Pr -Phadoop-2.3 -Ppyspark -Psparkr -Pscalding -Pexamples -Pscala-2.11" BUILD_FLAG="package -Dscala-2.11 -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS="" # Test spark module for 1.5.2 - jdk: "oraclejdk7" - env: SPARK_VER="1.5.2" HADOOP_VER="2.3" PROFILE="-Pspark-1.5 -Pr -Phadoop-2.3 -Ppyspark -Psparkr" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify" TEST_PROJECTS="-pl zeppelin-interpreter,zeppelin-zengine,zeppelin-server,zeppelin-display,spark-dependencies,spark,r -Dtest=org.apache.zeppelin.rest.*Test,org.apache.zeppelin.spark* -DfailIfNoTests=false" + env: SCALA_VER="2.10" SPARK_VER="1.5.2" HADOOP_VER="2.3" PROFILE="-Pspark-1.5 -Pr -Phadoop-2.3 -Ppyspark -Psparkr" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify" TEST_PROJECTS="-pl zeppelin-interpreter,zeppelin-zengine,zeppelin-server,zeppelin-display,spark-dependencies,spark,r -Dtest=org.apache.zeppelin.rest.*Test,org.apache.zeppelin.spark* -DfailIfNoTests=false" # Test spark module for 1.4.1 - jdk: "oraclejdk7" - env: SPARK_VER="1.4.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.4 -Pr -Phadoop-2.3 -Ppyspark -Psparkr" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify" TEST_PROJECTS="-pl zeppelin-interpreter,zeppelin-zengine,zeppelin-server,zeppelin-display,spark-dependencies,spark,r -Dtest=org.apache.zeppelin.rest.*Test,org.apache.zeppelin.spark* -DfailIfNoTests=false" + env: SCALA_VER="2.10" SPARK_VER="1.4.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.4 -Pr -Phadoop-2.3 -Ppyspark -Psparkr" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify" TEST_PROJECTS="-pl zeppelin-interpreter,zeppelin-zengine,zeppelin-server,zeppelin-display,spark-dependencies,spark,r -Dtest=org.apache.zeppelin.rest.*Test,org.apache.zeppelin.spark* -DfailIfNoTests=false" # Test spark module for 1.3.1 - jdk: "oraclejdk7" - env: SPARK_VER="1.3.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.3 -Phadoop-2.3 -Ppyspark" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify" TEST_PROJECTS="-pl zeppelin-interpreter,zeppelin-zengine,zeppelin-server,zeppelin-display,spark-dependencies,spark -Dtest=org.apache.zeppelin.rest.*Test,org.apache.zeppelin.spark* -DfailIfNoTests=false" + env: SCALA_VER="2.10" SPARK_VER="1.3.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.3 -Phadoop-2.3 -Ppyspark" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify" TEST_PROJECTS="-pl zeppelin-interpreter,zeppelin-zengine,zeppelin-server,zeppelin-display,spark-dependencies,spark -Dtest=org.apache.zeppelin.rest.*Test,org.apache.zeppelin.spark* -DfailIfNoTests=false" # Test spark module for 1.2.2 - jdk: "oraclejdk7" - env: SPARK_VER="1.2.2" HADOOP_VER="2.3" PROFILE="-Pspark-1.2 -Phadoop-2.3 -Ppyspark" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify" TEST_PROJECTS="-pl zeppelin-interpreter,zeppelin-zengine,zeppelin-server,zeppelin-display,spark-dependencies,spark -Dtest=org.apache.zeppelin.rest.*Test,org.apache.zeppelin.spark* -DfailIfNoTests=false" + env: SCALA_VER="2.10" SPARK_VER="1.2.2" HADOOP_VER="2.3" PROFILE="-Pspark-1.2 -Phadoop-2.3 -Ppyspark" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify" TEST_PROJECTS="-pl zeppelin-interpreter,zeppelin-zengine,zeppelin-server,zeppelin-display,spark-dependencies,spark -Dtest=org.apache.zeppelin.rest.*Test,org.apache.zeppelin.spark* -DfailIfNoTests=false" # Test spark module for 1.1.1 - jdk: "oraclejdk7" - env: SPARK_VER="1.1.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.1 -Phadoop-2.3 -Ppyspark" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify" TEST_PROJECTS="-pl zeppelin-interpreter,zeppelin-zengine,zeppelin-server,zeppelin-display,spark-dependencies,spark -Dtest=org.apache.zeppelin.rest.*Test,org.apache.zeppelin.spark* -DfailIfNoTests=false" + env: SCALA_VER="2.10" SPARK_VER="1.1.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.1 -Phadoop-2.3 -Ppyspark" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify" TEST_PROJECTS="-pl zeppelin-interpreter,zeppelin-zengine,zeppelin-server,zeppelin-display,spark-dependencies,spark -Dtest=org.apache.zeppelin.rest.*Test,org.apache.zeppelin.spark* -DfailIfNoTests=false" # Test selenium with spark module for 1.6.1 - jdk: "oraclejdk7" - env: TEST_SELENIUM="true" SPARK_VER="1.6.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.6 -Phadoop-2.3 -Ppyspark -Pexamples" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify" TEST_PROJECTS="-pl zeppelin-interpreter,zeppelin-zengine,zeppelin-server,zeppelin-display,spark-dependencies,spark -Dtest=org.apache.zeppelin.AbstractFunctionalSuite -DfailIfNoTests=false" + env: TEST_SELENIUM="true" SCALA_VER="2.10" SPARK_VER="1.6.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.6 -Phadoop-2.3 -Ppyspark -Pexamples" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify" TEST_PROJECTS="-pl zeppelin-interpreter,zeppelin-zengine,zeppelin-server,zeppelin-display,spark-dependencies,spark -Dtest=org.apache.zeppelin.AbstractFunctionalSuite -DfailIfNoTests=false" before_install: - "ls -la .spark-dist ${HOME}/.m2/repository/.cache/maven-download-plugin" @@ -72,6 +72,7 @@ before_install: - R -e "install.packages('knitr', repos = 'http://cran.us.r-project.org', lib='~/R')" - export R_LIBS='~/R' - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1600x1024x16" + - ./dev/change-scala-version.sh $SCALA_VER install: - mvn $BUILD_FLAG $PROFILE -B http://git-wip-us.apache.org/repos/asf/zeppelin/blob/6bb4b5ba/cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/cassandra/pom.xml b/cassandra/pom.xml index dc071e3..bc4b171 100644 --- a/cassandra/pom.xml +++ b/cassandra/pom.xml @@ -27,7 +27,7 @@ </parent> <groupId>org.apache.zeppelin</groupId> - <artifactId>zeppelin-cassandra</artifactId> + <artifactId>zeppelin-cassandra_2.10</artifactId> <packaging>jar</packaging> <version>0.7.0-SNAPSHOT</version> <name>Zeppelin: Apache Cassandra interpreter</name> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/6bb4b5ba/dev/change-scala-version.sh ---------------------------------------------------------------------- diff --git a/dev/change-scala-version.sh b/dev/change-scala-version.sh new file mode 100755 index 0000000..cb2c842 --- /dev/null +++ b/dev/change-scala-version.sh @@ -0,0 +1,67 @@ +#!/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. +# + +set -e + +VALID_VERSIONS=( 2.10 2.11 ) + +usage() { + echo "Usage: $(basename $0) [-h|--help] <version> +where : + -h| --help Display this help text + valid 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_VERSION="2.10" +else + FROM_VERSION="2.11" +fi + +sed_i() { + sed -e "$1" "$2" > "$2.tmp" && mv "$2.tmp" "$2" +} + +export -f sed_i + +BASEDIR=$(dirname $0)/.. +find "$BASEDIR" -name 'pom.xml' -not -path '*target*' -print \ + -exec bash -c "sed_i 's/\(artifactId.*\)_'$FROM_VERSION'/\1_'$TO_VERSION'/g' {}" \; + +# Also update <scala.binary.version> in parent POM +# Match any scala binary version to ensure idempotency +sed_i '1,/<scala\.binary\.version>[0-9]*\.[0-9]*</s/<scala\.binary\.version>[0-9]*\.[0-9]*</<scala.binary.version>'$TO_VERSION'</' \ + "$BASEDIR/pom.xml" + http://git-wip-us.apache.org/repos/asf/zeppelin/blob/6bb4b5ba/flink/pom.xml ---------------------------------------------------------------------- diff --git a/flink/pom.xml b/flink/pom.xml index 7355141..15ddf7f 100644 --- a/flink/pom.xml +++ b/flink/pom.xml @@ -27,7 +27,7 @@ </parent> <groupId>org.apache.zeppelin</groupId> - <artifactId>zeppelin-flink</artifactId> + <artifactId>zeppelin-flink_2.10</artifactId> <packaging>jar</packaging> <version>0.7.0-SNAPSHOT</version> <name>Zeppelin: Flink</name> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/6bb4b5ba/ignite/pom.xml ---------------------------------------------------------------------- diff --git a/ignite/pom.xml b/ignite/pom.xml index 66e6765..2df0750 100644 --- a/ignite/pom.xml +++ b/ignite/pom.xml @@ -26,7 +26,7 @@ <relativePath>..</relativePath> </parent> - <artifactId>zeppelin-ignite</artifactId> + <artifactId>zeppelin-ignite_2.10</artifactId> <packaging>jar</packaging> <version>0.7.0-SNAPSHOT</version> <name>Zeppelin: Apache Ignite interpreter</name> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/6bb4b5ba/r/pom.xml ---------------------------------------------------------------------- diff --git a/r/pom.xml b/r/pom.xml index b14424b..1b71b7e 100644 --- a/r/pom.xml +++ b/r/pom.xml @@ -27,7 +27,7 @@ <relativePath>..</relativePath> </parent> - <artifactId>zeppelin-zrinterpreter</artifactId> + <artifactId>zeppelin-zrinterpreter_2.10</artifactId> <packaging>jar</packaging> <name>Zeppelin: R Interpreter</name> <description>R Interpreter for Zeppelin</description> @@ -56,7 +56,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>zeppelin-spark-dependencies</artifactId> + <artifactId>zeppelin-spark-dependencies_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -68,7 +68,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>zeppelin-spark</artifactId> + <artifactId>zeppelin-spark_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/6bb4b5ba/scalding/pom.xml ---------------------------------------------------------------------- diff --git a/scalding/pom.xml b/scalding/pom.xml index c561732..dde163d 100644 --- a/scalding/pom.xml +++ b/scalding/pom.xml @@ -27,7 +27,7 @@ </parent> <groupId>org.apache.zeppelin</groupId> - <artifactId>zeppelin-scalding</artifactId> + <artifactId>zeppelin-scalding_2.10</artifactId> <packaging>jar</packaging> <version>0.7.0-SNAPSHOT</version> <name>Zeppelin: Scalding interpreter</name> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/6bb4b5ba/spark-dependencies/pom.xml ---------------------------------------------------------------------- diff --git a/spark-dependencies/pom.xml b/spark-dependencies/pom.xml index c2edf68..754935d 100644 --- a/spark-dependencies/pom.xml +++ b/spark-dependencies/pom.xml @@ -28,7 +28,7 @@ </parent> <groupId>org.apache.zeppelin</groupId> - <artifactId>zeppelin-spark-dependencies</artifactId> + <artifactId>zeppelin-spark-dependencies_2.10</artifactId> <packaging>jar</packaging> <version>0.7.0-SNAPSHOT</version> <name>Zeppelin: Spark dependencies</name> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/6bb4b5ba/spark/pom.xml ---------------------------------------------------------------------- diff --git a/spark/pom.xml b/spark/pom.xml index 712691e..3e94cf0 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -27,7 +27,7 @@ </parent> <groupId>org.apache.zeppelin</groupId> - <artifactId>zeppelin-spark</artifactId> + <artifactId>zeppelin-spark_2.10</artifactId> <packaging>jar</packaging> <version>0.7.0-SNAPSHOT</version> <name>Zeppelin: Spark</name> @@ -54,7 +54,7 @@ <!-- dependency> <groupId>${project.groupId}</groupId> - <artifactId>zeppelin-display</artifactId> + <artifactId>zeppelin-display_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency --> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/6bb4b5ba/zeppelin-display/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-display/pom.xml b/zeppelin-display/pom.xml index 5cec0d1..f409b36 100644 --- a/zeppelin-display/pom.xml +++ b/zeppelin-display/pom.xml @@ -27,7 +27,7 @@ </parent> <groupId>org.apache.zeppelin</groupId> - <artifactId>zeppelin-display</artifactId> + <artifactId>zeppelin-display_2.10</artifactId> <packaging>jar</packaging> <version>0.7.0-SNAPSHOT</version> <name>Zeppelin: Display system apis</name> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/6bb4b5ba/zeppelin-distribution/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-distribution/pom.xml b/zeppelin-distribution/pom.xml index f65044e..d8c0f51 100644 --- a/zeppelin-distribution/pom.xml +++ b/zeppelin-distribution/pom.xml @@ -75,7 +75,7 @@ <dependencies> <dependency> - <artifactId>zeppelin-server</artifactId> + <artifactId>zeppelin-server_2.10</artifactId> <groupId>${project.groupId}</groupId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/6bb4b5ba/zeppelin-server/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml index 97b4c66..e7e95b8 100644 --- a/zeppelin-server/pom.xml +++ b/zeppelin-server/pom.xml @@ -27,7 +27,7 @@ </parent> <groupId>org.apache.zeppelin</groupId> - <artifactId>zeppelin-server</artifactId> + <artifactId>zeppelin-server_2.10</artifactId> <packaging>jar</packaging> <version>0.7.0-SNAPSHOT</version> <name>Zeppelin: Server</name>
