Repository: zeppelin Updated Branches: refs/heads/branch-0.6 b84fa2e72 -> ccfe98e22
[ZEPPELIN-1179] Append scala version to maven artifacts 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. [Improvement] [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 (cherry picked from commit 6bb4b5ba8e7ecd6274dd437c6ec5c4a9b178e4d1) Signed-off-by: Mina Lee <[email protected]> Conflicts: .travis.yml Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/ccfe98e2 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/ccfe98e2 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/ccfe98e2 Branch: refs/heads/branch-0.6 Commit: ccfe98e22ee71d1021877642a1d4d892991af3d9 Parents: b84fa2e Author: Luciano Resende <[email protected]> Authored: Thu Jul 21 12:34:13 2016 -0700 Committer: Mina Lee <[email protected]> Committed: Fri Jul 22 17:20:16 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/ccfe98e2/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 12e10b9..9bc7b51 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" BUILD_FLAG="package -Dscala-2.10 -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS="-Dpython.test.exclude=''" + 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" BUILD_FLAG="package -Dscala-2.10 -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS="-Dpython.test.exclude=''" # 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 -Pscala-2.11" BUILD_FLAG="package -Dscala-2.11 -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS="-Dpython.test.exclude=''" + 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 -Pscala-2.11" BUILD_FLAG="package -Dscala-2.11 -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS="-Dpython.test.exclude=''" # 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" 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" 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/ccfe98e2/cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/cassandra/pom.xml b/cassandra/pom.xml index 8eda839..c5d65ae 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.6.1-SNAPSHOT</version> <name>Zeppelin: Apache Cassandra interpreter</name> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ccfe98e2/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/ccfe98e2/flink/pom.xml ---------------------------------------------------------------------- diff --git a/flink/pom.xml b/flink/pom.xml index ea8421f..6c4b1bb 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.6.1-SNAPSHOT</version> <name>Zeppelin: Flink</name> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ccfe98e2/ignite/pom.xml ---------------------------------------------------------------------- diff --git a/ignite/pom.xml b/ignite/pom.xml index ade1320..b72f848 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.6.1-SNAPSHOT</version> <name>Zeppelin: Apache Ignite interpreter</name> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ccfe98e2/r/pom.xml ---------------------------------------------------------------------- diff --git a/r/pom.xml b/r/pom.xml index f90192c..9557e89 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/ccfe98e2/scalding/pom.xml ---------------------------------------------------------------------- diff --git a/scalding/pom.xml b/scalding/pom.xml index 78b5f8e..cb35f47 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.6.1-SNAPSHOT</version> <name>Zeppelin: Scalding interpreter</name> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ccfe98e2/spark-dependencies/pom.xml ---------------------------------------------------------------------- diff --git a/spark-dependencies/pom.xml b/spark-dependencies/pom.xml index 2b2f612..f04fab3 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.6.1-SNAPSHOT</version> <name>Zeppelin: Spark dependencies</name> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ccfe98e2/spark/pom.xml ---------------------------------------------------------------------- diff --git a/spark/pom.xml b/spark/pom.xml index 324ebe1..d95bfd8 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.6.1-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/ccfe98e2/zeppelin-display/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-display/pom.xml b/zeppelin-display/pom.xml index 5123e7e..73c5341 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.6.1-SNAPSHOT</version> <name>Zeppelin: Display system apis</name> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ccfe98e2/zeppelin-distribution/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-distribution/pom.xml b/zeppelin-distribution/pom.xml index 9b615fd..0bf6abe 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/ccfe98e2/zeppelin-server/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml index 75ead2f..46fd6fb 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.6.1-SNAPSHOT</version> <name>Zeppelin: Server</name>
