Repository: zeppelin Updated Branches: refs/heads/master 2acb62e51 -> fca7d4001
ZEPPELIN-3325: R interpreter build bugfix ### What is this PR for? Failing to build R interpreter (-Pr) after Spark refactoring ### What type of PR is it? Bug Fix ### What is the Jira issue? * https://issues.apache.org/jira/browse/ZEPPELIN-3325 ### How should this be tested? * mvn clean package \ --batch-mode package \ -Phelium-dev \ -Pscala-2.11 \ -Dscala.version=2.11.8 \ -Dscala.binary.version=2.11 \ -Pbuild-distr \ -Pspark-2.1 \ -Dspark.version=2.1.1 \ -Pr \ -Phadoop-2.7 \ -Dhadoop.version=2.7.3 \ -Dmaven.findbugs.enable=false \ -Drat.skip=true \ -Dcheckstyle.skip=true \ -DskipTests ### Questions: * Does the licenses files need update? N * Is there breaking changes for older versions? N * Does this needs documentation? N Author: Nelson Costa <nelson.cost...@gmail.com> Closes #2864 from necosta/ZEPPELIN-3325 and squashes the following commits: 7149c33 [Nelson Costa] Enable tests a033a9d [Nelson Costa] Final adjustments 4c6d972 [Nelson Costa] ZEPPELIN-3325 R interpreter build bugfix Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/fca7d400 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/fca7d400 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/fca7d400 Branch: refs/heads/master Commit: fca7d40019cb11137a124e3bf7075c93cc9568d9 Parents: 2acb62e Author: Nelson Costa <nelson.cost...@gmail.com> Authored: Tue Apr 17 07:52:55 2018 +0100 Committer: Jeff Zhang <zjf...@apache.org> Committed: Thu Apr 19 18:24:35 2018 +0800 ---------------------------------------------------------------------- .travis.yml | 6 +++--- r/pom.xml | 12 +++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/fca7d400/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 29ad600..b86de55 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,7 +81,7 @@ matrix: env: BUILD_PLUGINS="false" PYTHON="3" SCALA_VER="2.10" PROFILE="-Pscalding" BUILD_FLAG="package -DskipTests -DskipRat -Pr" TEST_FLAG="test -DskipRat" MODULES="-pl $(echo .,zeppelin-interpreter,${INTERPRETERS} | sed 's/!//g')" TEST_PROJECTS="" # Run ZeppelinSparkClusterTest & SparkIntegrationTest in one build would exceed the time limitation of travis, so running them separately - + # Integration test of spark interpreter with different spark versions under python2, only run ZeppelinSparkClusterTest. Also run spark unit test of spark 2.2 in this build. - sudo: required jdk: "oraclejdk8" @@ -97,12 +97,12 @@ matrix: # Test spark module for 2.1.0 with scala 2.11 - jdk: "openjdk7" dist: trusty - env: BUILD_PLUGINS="false" PYTHON="2" SCALA_VER="2.11" PROFILE="-Pspark-2.1 -Phadoop2 -Pscala-2.11" SPARKR="true" BUILD_FLAG="package -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" MODULES="-pl spark/interpreter,spark/spark-dependencies" TEST_PROJECTS="-Dtest=org.apache.zeppelin.spark.* -DfailIfNoTests=false" + env: BUILD_PLUGINS="false" PYTHON="2" SCALA_VER="2.11" PROFILE="-Pspark-2.1 -Phadoop2 -Pscala-2.11 -Pr" SPARKR="true" BUILD_FLAG="package -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" MODULES="-pl spark/interpreter,spark/spark-dependencies,r" TEST_PROJECTS="-Dtest=org.apache.zeppelin.spark.*,org.apache.zeppelin.rinterpreter.*,org.apache.spark.api.r.* -DfailIfNoTests=false" # Test spark module for 2.0.2 with scala 2.11 - jdk: "oraclejdk8" dist: trusty - env: BUILD_PLUGINS="false" PYTHON="2" SCALA_VER="2.11" PROFILE="-Pspark-2.0 -Phadoop3 -Pscala-2.11" SPARKR="true" BUILD_FLAG="package -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" MODULES="-pl spark/interpreter,spark/spark-dependencies" TEST_PROJECTS="-Dtest=org.apache.zeppelin.spark.* -DfailIfNoTests=false" + env: BUILD_PLUGINS="false" PYTHON="2" SCALA_VER="2.11" PROFILE="-Pspark-2.0 -Phadoop3 -Pscala-2.11 -Pr" SPARKR="true" BUILD_FLAG="package -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" MODULES="-pl spark/interpreter,spark/spark-dependencies,r" TEST_PROJECTS="-Dtest=org.apache.zeppelin.spark.*,org.apache.zeppelin.rinterpreter.*,org.apache.spark.api.r.* -DfailIfNoTests=false" # Test python/pyspark with python 2, livy 0.5 - sudo: required http://git-wip-us.apache.org/repos/asf/zeppelin/blob/fca7d400/r/pom.xml ---------------------------------------------------------------------- diff --git a/r/pom.xml b/r/pom.xml index fef12e3..182c682 100644 --- a/r/pom.xml +++ b/r/pom.xml @@ -21,16 +21,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>zeppelin</artifactId> + <artifactId>interpreter-parent</artifactId> <groupId>org.apache.zeppelin</groupId> <version>0.9.0-SNAPSHOT</version> - <relativePath>..</relativePath> + <relativePath>../interpreter-parent</relativePath> </parent> - <artifactId>zeppelin-zrinterpreter_2.10</artifactId> + <groupId>org.apache.zeppelin</groupId> + <artifactId>zeppelin-zrinterpreter_${scala.binary.version}</artifactId> <packaging>jar</packaging> + <version>0.9.0-SNAPSHOT</version> <name>Zeppelin: R Interpreter</name> <description>R Interpreter for Zeppelin</description> + <url>http://zeppelin.apache.org</url> <properties> <script.extension>.sh</script.extension> @@ -77,7 +80,7 @@ <dependency> <groupId>${project.groupId}</groupId> - <artifactId>zeppelin-spark_${scala.binary.version}</artifactId> + <artifactId>spark-interpreter</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -352,7 +355,6 @@ </plugins> </build> - <profiles> <profile> <id>scala-2.10</id>
