You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by zj...@apache.org on 2018/08/16 01:08:02 UTC
zeppelin git commit: ZEPPELIN-3717. Bring back r profile
Repository: zeppelin
Updated Branches:
refs/heads/master 839db5ec5 -> b94d144ce
ZEPPELIN-3717. Bring back r profile
### What is this PR for?
This PR just bring back r profile to make travis pass
### What type of PR is it?
[Hot Fix | Refactoring]
### Todos
* [ ] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-3717
### How should this be tested?
* CI pass
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Jeff Zhang <zj...@apache.org>
Closes #3142 from zjffdu/ZEPPELIN-3717 and squashes the following commits:
f0a422cf1 [Jeff Zhang] ZEPPELIN-3717. Bring back r profile
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/b94d144c
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/b94d144c
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/b94d144c
Branch: refs/heads/master
Commit: b94d144cee344ce689171006f7046bf6f952c6fc
Parents: 839db5e
Author: Jeff Zhang <zj...@apache.org>
Authored: Wed Aug 15 15:52:00 2018 +0800
Committer: Jeff Zhang <zj...@apache.org>
Committed: Thu Aug 16 09:07:57 2018 +0800
----------------------------------------------------------------------
.travis.yml | 6 +++---
pom.xml | 8 +++++++-
2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b94d144c/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 5692b3c..6f7f6b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,7 +41,7 @@ addons:
env:
global:
# Interpreters does not required by zeppelin-server integration tests
- - INTERPRETERS='!beam,!hbase,!pig,!jdbc,!file,!ignite,!kylin,!lens,!cassandra,!elasticsearch,!bigquery,!alluxio,!scio,!livy,!groovy,!sap,!r,!java,!geode'
+ - INTERPRETERS='!beam,!hbase,!pig,!jdbc,!file,!ignite,!kylin,!lens,!cassandra,!elasticsearch,!bigquery,!alluxio,!scio,!livy,!groovy,!sap,!java,!geode'
matrix:
include:
@@ -101,12 +101,12 @@ matrix:
# Test spark module for 2.1.0 with scala 2.11
- jdk: "oraclejdk8"
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,r" TEST_PROJECTS="-Dtest=org.apache.zeppelin.spark.*,org.apache.zeppelin.rinterpreter.*,org.apache.spark.api.r.* -DfailIfNoTests=false"
+ 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.*,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,r" TEST_PROJECTS="-Dtest=org.apache.zeppelin.spark.*,org.apache.zeppelin.rinterpreter.*,org.apache.spark.api.r.* -DfailIfNoTests=false"
+ 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.*,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/b94d144c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8ad70e0..60af8bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,6 @@
<module>scio</module>
<module>neo4j</module>
<module>sap</module>
- <module>r</module>
<module>scalding</module>
<module>java</module>
<module>beam</module>
@@ -771,6 +770,13 @@
</profile>
<profile>
+ <id>r</id>
+ <modules>
+ <module>r</module>
+ </modules>
+ </profile>
+
+ <profile>
<id>vendor-repo</id>
<repositories>
<repository>