Skip to content

Commit 3712ce6

Browse files
minahleejongyoul
authored andcommitted
[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 <[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
1 parent b922238 commit 3712ce6

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ matrix:
4444
# Test License compliance using RAT tool
4545
- jdk: "openjdk7"
4646
dist: trusty
47-
env: BUILD_PLUGINS="false" SCALA_VER="2.11" PROFILE="-Prat" BUILD_FLAG="clean" TEST_FLAG="org.apache.rat:apache-rat-plugin:check" TEST_PROJECTS=""
47+
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=""
4848

4949
# Run e2e tests (in zeppelin-web)
5050
# chrome dropped the support for precise (ubuntu 12.04), so need to use trusty

pom.xml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,16 +1087,11 @@
10871087

10881088
<!-- compiled R packages (binaries) -->
10891089
<exclude>**/R/lib/**</exclude>
1090-
<exclude>**/r/lib/**</exclude>
1090+
<exclude>**/lib/rzeppelin/**</exclude>
10911091

1092-
<!--R-related files with alternative licenses-->
1092+
<!--R-related files with alternative licenses-->
10931093

1094-
<exclude>**/R/rzeppelin/R/globals.R</exclude>
1095-
<exclude>**/R/rzeppelin/R/common.R</exclude>
1096-
<exclude>**/R/rzeppelin/R/protocol.R</exclude>
1097-
<exclude>**/R/rzeppelin/R/rServer.R</exclude>
1098-
<exclude>**/R/rzeppelin/R/scalaInterpreter.R</exclude>
1099-
<exclude>**/R/rzeppelin/R/zzz.R</exclude>
1094+
<exclude>**/R/rzeppelin/R/*.R</exclude>
11001095
<exclude>**/src/main/scala/scala/Console.scala</exclude>
11011096
<exclude>**/src/main/scala/org/apache/zeppelin/rinterpreter/rscala/Package.scala</exclude>
11021097
<exclude>**/src/main/scala/org/apache/zeppelin/rinterpreter/rscala/RClient.scala</exclude>

0 commit comments

Comments
 (0)