From 398fb62003a846968e0a3817adfe088ecd5ef75a Mon Sep 17 00:00:00 2001 From: DmytroShkvyra Date: Mon, 27 Feb 2017 13:53:00 +0200 Subject: [PATCH 1/3] [ZEPPELIN-791] Build infra: move all RAT to root pom.xml --- pom.xml | 66 +++++++++++++++++++++++++++++++++----------- r/pom.xml | 37 ------------------------- zeppelin-web/pom.xml | 46 ------------------------------ 3 files changed, 50 insertions(+), 99 deletions(-) diff --git a/pom.xml b/pom.xml index de2717848e7..ea66b20f3d6 100644 --- a/pom.xml +++ b/pom.xml @@ -898,6 +898,38 @@ **/interpreter-setting.json **/constants.json scripts/** + **/**/*.log + **/**/logs/** + + + **/test/karma.conf.js + **/test/spec/** + **/.babelrc + **/.bowerrc + .editorconfig + .eslintrc + **/.tmp/** + **/target/** + **/node/** + **/node_modules/** + **/bower_components/** + **/dist/** + **/.buildignore + **/.npmignore + **/.jshintrc + **/yarn.lock + **/bower.json + **/src/fonts/Patua-One* + **/src/fonts/patua-one* + **/src/fonts/Roboto* + **/src/fonts/roboto* + **/src/fonts/fontawesome* + **/src/fonts/font-awesome* + **/src/styles/font-awesome* + **/src/fonts/Simple-Line* + **/src/fonts/simple-line* + **/src/fonts/Source-Code-Pro* + **/src/fonts/source-code-pro* **/src/main/java/org/apache/zeppelin/jdbc/SqlCompleter.java @@ -947,22 +979,24 @@ **/package.json - R/lib/** - r/lib/** - - - r/R/rzeppelin/R/globals.R - r/R/rzeppelin/R/common.R - r/R/rzeppelin/R/protocol.R - r/R/rzeppelin/R/rServer.R - r/R/rzeppelin/R/scalaInterpreter.R - r/R/rzeppelin/R/zzz.R - r/src/main/scala/scala/Console.scala - r/src/main/scala/org/apache/zeppelin/rinterpreter/rscala/Package.scala - r/src/main/scala/org/apache/zeppelin/rinterpreter/rscala/RClient.scala - - r/R/rzeppelin/DESCRIPTION - r/R/rzeppelin/NAMESPACE + **/R/lib/** + r/lib/** + + + + **/R/rzeppelin/R/globals.R + **/R/rzeppelin/R/common.R + **/R/rzeppelin/R/protocol.R + **/R/rzeppelin/R/rServer.R + **/R/rzeppelin/R/scalaInterpreter.R + **/R/rzeppelin/R/zzz.R + **/src/main/scala/scala/Console.scala + **/src/main/scala/org/apache/zeppelin/rinterpreter/rscala/Package.scala + **/src/main/scala/org/apache/zeppelin/rinterpreter/rscala/RClient.scala + + + **/R/rzeppelin/DESCRIPTION + **/R/rzeppelin/NAMESPACE diff --git a/r/pom.xml b/r/pom.xml index 6fbebcdf5e2..4c1b218335d 100644 --- a/r/pom.xml +++ b/r/pom.xml @@ -190,43 +190,6 @@ - - org.apache.rat - apache-rat-plugin - - - lib/** - **/r/lib/** - - **/R/rzeppelin/R/globals.R - **/R/rzeppelin/R/common.R - **/R/rzeppelin/R/protocol.R - **/R/rzeppelin/R/rServer.R - **/R/rzeppelin/R/scalaInterpreter.R - **/R/rzeppelin/R/zzz.R - **/scala/Console.scala - **/zeppelin/rinterpreter/rscala/Package.scala - **/zeppelin/rinterpreter/rscala/RClient.scala - - **/.idea/ - - **/R/rzeppelin/DESCRIPTION - **/R/rzeppelin/NAMESPACE - - **/*.iml - .gitignore - **/.settings/* - **/.classpath - **/.project - **/target/** - **/derby.log - **/metastore_db/ - **/README.md - **/dependency-reduced-pom.xml - - - maven-enforcer-plugin diff --git a/zeppelin-web/pom.xml b/zeppelin-web/pom.xml index d5bbb8da69d..8c114dd10ce 100644 --- a/zeppelin-web/pom.xml +++ b/zeppelin-web/pom.xml @@ -58,52 +58,6 @@ - - org.apache.rat - apache-rat-plugin - - - **/.idea/ - **/*.iml - .git/ - .gitignore - .babelrc - .bowerrc - .editorconfig - .jscsrc - .eslintrc - .tmp/** - **/.settings/* - **/.classpath - **/.project - **/target/** - node/** - node_modules/** - bower_components/** - src/**/*.test.js - reports/** - dist/** - src/.buildignore - src/fonts/fontawesome* - src/fonts/font-awesome* - src/styles/font-awesome* - src/fonts/Simple-Line* - src/fonts/simple-line* - src/fonts/Patua-One* - src/fonts/patua-one* - src/fonts/Roboto* - src/fonts/roboto* - src/fonts/Source-Code-Pro* - src/fonts/source-code-pro* - bower.json - **/package.json - **/.npmignore - yarn.lock - *.md - - - - com.github.eirslett frontend-maven-plugin From 2c273428ce05d5217e18b3cbc29e4d66b67d5805 Mon Sep 17 00:00:00 2001 From: DmytroShkvyra Date: Mon, 27 Feb 2017 14:22:37 +0200 Subject: [PATCH 2/3] [ZEPPELIN-791] Exclude **.test.js --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ea66b20f3d6..9597ad665cd 100644 --- a/pom.xml +++ b/pom.xml @@ -929,7 +929,8 @@ **/src/fonts/Simple-Line* **/src/fonts/simple-line* **/src/fonts/Source-Code-Pro* - **/src/fonts/source-code-pro* + **/src/fonts/source-code-pro* + **/src/**/**.test.js **/src/main/java/org/apache/zeppelin/jdbc/SqlCompleter.java From 296662a31f6253b01ff773ff27cd17bf7f7fa897 Mon Sep 17 00:00:00 2001 From: DmytroShkvyra Date: Thu, 2 Mar 2017 11:34:53 +0200 Subject: [PATCH 3/3] [ZEPPELIN-791] add widcard --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9597ad665cd..aef1e82085c 100644 --- a/pom.xml +++ b/pom.xml @@ -981,7 +981,7 @@ **/R/lib/** - r/lib/** + **/r/lib/**