zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jongy...@apache.org
Subject zeppelin git commit: [ZEPPELIN-3441] Fix license check failure in r
Date Wed, 09 May 2018 05:45:10 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/master b9222381b -> 3712ce697


[ZEPPELIN-3441] Fix license check failure in r

### What is this PR for?
rat plugin for r interpreter fail, seems to be related with #2089
It doesn't need to be included in 0.8.0 release, but want it to be cherry-picked into `branch-0.8`
for 0.8.x releases, so release manager doesn't have issue with running `dev/publish_release.sh`

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

### What is the Jira issue?
[ZEPPELIN-3441](https://issues.apache.org/jira/browse/ZEPPELIN-3441)

### How should this be tested?
Run `mvn verify -Pr` should pass
In CI, first matrix should pass. (https://travis-ci.org/minahlee/zeppelin/builds/374917837)

### 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: Mina Lee <minalee@apache.org>

Closes #2957 from minahlee/hotfix/ratR and squashes the following commits:

1d4ae6c91 [Mina Lee] Add rat check for r in travis
c323c4a8b [Mina Lee] Fix rat check exclude directory for r


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

Branch: refs/heads/master
Commit: 3712ce697e5dd5df217280134968155c5d0b1276
Parents: b922238
Author: Mina Lee <minalee@apache.org>
Authored: Fri May 4 23:29:29 2018 +0900
Committer: Jongyoul Lee <jongyoul@apache.org>
Committed: Wed May 9 14:45:05 2018 +0900

----------------------------------------------------------------------
 .travis.yml |  2 +-
 pom.xml     | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/3712ce69/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index b86de55..636845e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,7 +44,7 @@ matrix:
     # Test License compliance using RAT tool
     - jdk: "openjdk7"
       dist: trusty
-      env: BUILD_PLUGINS="false" SCALA_VER="2.11" PROFILE="-Prat" BUILD_FLAG="clean" TEST_FLAG="org.apache.rat:apache-rat-plugin:check"
TEST_PROJECTS=""
+      env: BUILD_PLUGINS="false" SCALA_VER="2.11" PROFILE="-Prat -Pr" BUILD_FLAG="clean"
TEST_FLAG="org.apache.rat:apache-rat-plugin:check" TEST_PROJECTS=""
 
     # Run e2e tests (in zeppelin-web)
     # chrome dropped the support for precise (ubuntu 12.04), so need to use trusty

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/3712ce69/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2f06f82..89c11d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1087,16 +1087,11 @@
 
               <!-- compiled R packages (binaries) -->
               <exclude>**/R/lib/**</exclude>
-              <exclude>**/r/lib/**</exclude>
+              <exclude>**/lib/rzeppelin/**</exclude>
 
-               <!--R-related files with alternative licenses-->
+              <!--R-related files with alternative licenses-->
 
-              <exclude>**/R/rzeppelin/R/globals.R</exclude>
-              <exclude>**/R/rzeppelin/R/common.R</exclude>
-              <exclude>**/R/rzeppelin/R/protocol.R</exclude>
-              <exclude>**/R/rzeppelin/R/rServer.R</exclude>
-              <exclude>**/R/rzeppelin/R/scalaInterpreter.R</exclude>
-              <exclude>**/R/rzeppelin/R/zzz.R</exclude>
+              <exclude>**/R/rzeppelin/R/*.R</exclude>
               <exclude>**/src/main/scala/scala/Console.scala</exclude>
               <exclude>**/src/main/scala/org/apache/zeppelin/rinterpreter/rscala/Package.scala</exclude>
               <exclude>**/src/main/scala/org/apache/zeppelin/rinterpreter/rscala/RClient.scala</exclude>


Mime
View raw message