zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kha...@apache.org
Subject zeppelin git commit: [ZEPPELIN-2606] Fix compilation with R interpreter enabled
Date Thu, 08 Jun 2017 13:53:14 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/master 7213f8f95 -> 32d8afaff


[ZEPPELIN-2606] Fix compilation with R interpreter enabled

### What is this PR for?
`mvn -DskipTests clean package -Pr` fails

### What type of PR is it?
Bug Fix

### What is the Jira issue?
 [ZEPPELIN-2606]

### How should this be tested?
`mvn -DskipTests clean package -Pr`

Author: andrea <andrea.peruffo1982@gmail.com>

Closes #2383 from andreaTP/rInterpreterFix and squashes the following commits:

6ef05953e [andrea] included R interpreter in travis
b237615c8 [andrea]  [ZEPPELIN-2606] Fix compilation with R interpreter enabled


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/32d8afaf
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/32d8afaf
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/32d8afaf

Branch: refs/heads/master
Commit: 32d8afafffa98838376f427d533b0a0368020aad
Parents: 7213f8f
Author: andrea <andrea.peruffo1982@gmail.com>
Authored: Thu Jun 1 12:41:50 2017 +0100
Committer: Khalid Huseynov <khalidhnv@gmail.com>
Committed: Thu Jun 8 22:55:43 2017 +0900

----------------------------------------------------------------------
 .travis.yml                                                      | 4 ++--
 .../scala/org/apache/zeppelin/rinterpreter/RInterpreter.scala    | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/32d8afaf/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 7b365af..c8d3aa8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,7 +60,7 @@ matrix:
 
     # Test interpreter modules
     - jdk: "oraclejdk7"
-      env: SCALA_VER="2.10" PROFILE="-Pscalding" BUILD_FLAG="package -DskipTests -DskipRat"
TEST_FLAG="test -DskipRat" MODULES="-pl $(echo .,zeppelin-interpreter,${INTERPRETERS} | sed
's/!//g')" TEST_PROJECTS=""
+      env: 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=""
 
     # Test spark module for 2.1.0 with scala 2.11, livy
     - jdk: "oraclejdk7"
@@ -94,7 +94,7 @@ before_install:
   - changedfiles=$(git diff --name-only $TRAVIS_COMMIT_RANGE 2>/dev/null) || changedfiles=""
   - echo $changedfiles
   - hasbowerchanged=$(echo $changedfiles | grep -c "bower.json" || true);
-  - gitlog=$(git log $TRAVIS_COMMIT_RANGE 2>/dev/null) || gitlog="" 
+  - gitlog=$(git log $TRAVIS_COMMIT_RANGE 2>/dev/null) || gitlog=""
   - clearcache=$(echo $gitlog | grep -c -E "clear bower|bower clear" || true)
   - if [ "$hasbowerchanged" -gt 0 ] || [ "$clearcache" -gt 0 ]; then echo "Clearing bower_components
cache"; rm -r zeppelin-web/bower_components; npm cache clear; else echo "Using cached bower_components.";
fi
   - echo "MAVEN_OPTS='-Xms1024M -Xmx2048M -XX:MaxPermSize=1024m -XX:-UseGCOverheadLimit -Dorg.slf4j.simpleLogger.defaultLogLevel=warn'"
>> ~/.mavenrc

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/32d8afaf/r/src/main/scala/org/apache/zeppelin/rinterpreter/RInterpreter.scala
----------------------------------------------------------------------
diff --git a/r/src/main/scala/org/apache/zeppelin/rinterpreter/RInterpreter.scala b/r/src/main/scala/org/apache/zeppelin/rinterpreter/RInterpreter.scala
index 6da923e..9f5181d 100644
--- a/r/src/main/scala/org/apache/zeppelin/rinterpreter/RInterpreter.scala
+++ b/r/src/main/scala/org/apache/zeppelin/rinterpreter/RInterpreter.scala
@@ -23,7 +23,6 @@ import java.util._
 
 import org.apache.commons.codec.binary.{Base64, StringUtils}
 import org.apache.zeppelin.interpreter.Interpreter.FormType
-import org.apache.zeppelin.interpreter.remote.RemoteInterpreter
 import org.apache.zeppelin.interpreter.{InterpreterContext, _}
 import org.apache.zeppelin.scheduler.Scheduler
 import org.apache.zeppelin.spark.SparkInterpreter


Mime
View raw message