Skip to content

Commit

Permalink
[ZEPPELIN-3441] Fix license check failure in r
Browse files Browse the repository at this point in the history
### 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 <[email protected]>

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

1d4ae6c [Mina Lee] Add rat check for r in travis
c323c4a [Mina Lee] Fix rat check exclude directory for r
  • Loading branch information
minahlee authored and jongyoul committed May 9, 2018
1 parent b922238 commit 3712ce6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 3 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 3712ce6

Please sign in to comment.