Repository: bigtop Updated Branches: refs/heads/master ebcdedf3d -> c22a2d484
BIGTOP-2727. fix deployment tasks Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/c22a2d48 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/c22a2d48 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/c22a2d48 Branch: refs/heads/master Commit: c22a2d4848c3fa074f12a2d4afe1d636e04cb672 Parents: ebcdedf Author: Roman Shaposhnik <[email protected]> Authored: Tue Mar 28 17:11:19 2017 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Tue Mar 28 17:11:19 2017 -0700 ---------------------------------------------------------------------- bigtop-tests/test-artifacts/crunch/pom.xml | 11 ----------- bigtop-tests/test-artifacts/datafu/pom.xml | 11 ----------- bigtop-tests/test-artifacts/flume/pom.xml | 11 ----------- bigtop-tests/test-artifacts/hadoop/pom.xml | 14 -------------- bigtop-tests/test-artifacts/hbase/pom.xml | 11 ----------- bigtop-tests/test-artifacts/hcatalog/pom.xml | 12 ------------ bigtop-tests/test-artifacts/httpfs/pom.xml | 11 ----------- bigtop-tests/test-artifacts/package/pom.xml | 9 --------- bigtop-tests/test-artifacts/spark/pom.xml | 11 ----------- bigtop-tests/test-artifacts/sqoop/pom.xml | 13 ------------- release.gradle | 8 +++++--- 11 files changed, 5 insertions(+), 117 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/c22a2d48/bigtop-tests/test-artifacts/crunch/pom.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/crunch/pom.xml b/bigtop-tests/test-artifacts/crunch/pom.xml index deec265..a9eb2fd 100644 --- a/bigtop-tests/test-artifacts/crunch/pom.xml +++ b/bigtop-tests/test-artifacts/crunch/pom.xml @@ -31,17 +31,6 @@ <name>crunchsmoke</name> <build> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/resources/crunch-examples/**</exclude> - </excludes> - </configuration> - </plugin> - </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/bigtop/blob/c22a2d48/bigtop-tests/test-artifacts/datafu/pom.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/datafu/pom.xml b/bigtop-tests/test-artifacts/datafu/pom.xml index 0704307..89e2bb6 100644 --- a/bigtop-tests/test-artifacts/datafu/pom.xml +++ b/bigtop-tests/test-artifacts/datafu/pom.xml @@ -63,17 +63,6 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/resources/datafu/**/*.pig</exclude> - </excludes> - </configuration> - </plugin> - </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/bigtop/blob/c22a2d48/bigtop-tests/test-artifacts/flume/pom.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/flume/pom.xml b/bigtop-tests/test-artifacts/flume/pom.xml index 61e06dd..40b1cdc 100644 --- a/bigtop-tests/test-artifacts/flume/pom.xml +++ b/bigtop-tests/test-artifacts/flume/pom.xml @@ -38,17 +38,6 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/resources/events.txt</exclude> - </excludes> - </configuration> - </plugin> - </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/bigtop/blob/c22a2d48/bigtop-tests/test-artifacts/hadoop/pom.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/hadoop/pom.xml b/bigtop-tests/test-artifacts/hadoop/pom.xml index d62f8f6..244a2c5 100644 --- a/bigtop-tests/test-artifacts/hadoop/pom.xml +++ b/bigtop-tests/test-artifacts/hadoop/pom.xml @@ -53,20 +53,6 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/clitest_data/**</exclude> - <exclude>**/ints/file*.txt</exclude> - <exclude>**/text/file*.txt</exclude> - <exclude>**/resources/**</exclude> - </excludes> - </configuration> - </plugin> - </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/bigtop/blob/c22a2d48/bigtop-tests/test-artifacts/hbase/pom.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/hbase/pom.xml b/bigtop-tests/test-artifacts/hbase/pom.xml index f1d4075..0cb2acc 100644 --- a/bigtop-tests/test-artifacts/hbase/pom.xml +++ b/bigtop-tests/test-artifacts/hbase/pom.xml @@ -60,17 +60,6 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/resources/movies.*</exclude> - </excludes> - </configuration> - </plugin> - </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/bigtop/blob/c22a2d48/bigtop-tests/test-artifacts/hcatalog/pom.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/hcatalog/pom.xml b/bigtop-tests/test-artifacts/hcatalog/pom.xml index f5cfc65..b25edff 100644 --- a/bigtop-tests/test-artifacts/hcatalog/pom.xml +++ b/bigtop-tests/test-artifacts/hcatalog/pom.xml @@ -31,18 +31,6 @@ <name>hcatalogsmoke</name> <build> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/resources/data/*</exclude> - <exclude>**/resources/*.expected</exclude> - </excludes> - </configuration> - </plugin> - </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/bigtop/blob/c22a2d48/bigtop-tests/test-artifacts/httpfs/pom.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/httpfs/pom.xml b/bigtop-tests/test-artifacts/httpfs/pom.xml index 7b880f8..3c8d840 100644 --- a/bigtop-tests/test-artifacts/httpfs/pom.xml +++ b/bigtop-tests/test-artifacts/httpfs/pom.xml @@ -33,17 +33,6 @@ <name>httpfssmokes</name> <build> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/resources/text-files/helloworld.txt</exclude> - </excludes> - </configuration> - </plugin> - </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/bigtop/blob/c22a2d48/bigtop-tests/test-artifacts/package/pom.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/package/pom.xml b/bigtop-tests/test-artifacts/package/pom.xml index 40a0219..d5935fb 100644 --- a/bigtop-tests/test-artifacts/package/pom.xml +++ b/bigtop-tests/test-artifacts/package/pom.xml @@ -50,15 +50,6 @@ <build> <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/main/resources/**/*.xml</exclude> - </excludes> - </configuration> - </plugin> <plugin> <groupId>org.codehaus.groovy.maven</groupId> <artifactId>gmaven-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/bigtop/blob/c22a2d48/bigtop-tests/test-artifacts/spark/pom.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/spark/pom.xml b/bigtop-tests/test-artifacts/spark/pom.xml index 66895e5..0292d71 100644 --- a/bigtop-tests/test-artifacts/spark/pom.xml +++ b/bigtop-tests/test-artifacts/spark/pom.xml @@ -62,16 +62,5 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/resources/**</exclude> - </excludes> - </configuration> - </plugin> - </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/bigtop/blob/c22a2d48/bigtop-tests/test-artifacts/sqoop/pom.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/sqoop/pom.xml b/bigtop-tests/test-artifacts/sqoop/pom.xml index e6ffeb9..2874d6a 100644 --- a/bigtop-tests/test-artifacts/sqoop/pom.xml +++ b/bigtop-tests/test-artifacts/sqoop/pom.xml @@ -41,19 +41,6 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/resources/**/*.hxt</exclude> - <exclude>**/resources/**/*.txt</exclude> - <exclude>**/resources/**/*.out</exclude> - </excludes> - </configuration> - </plugin> - </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/bigtop/blob/c22a2d48/release.gradle ---------------------------------------------------------------------- diff --git a/release.gradle b/release.gradle index 6b9afca..bbeb3ca 100644 --- a/release.gradle +++ b/release.gradle @@ -29,22 +29,24 @@ task doassembly (type: Exec) { commandLine "mvn -P$mvnProfile package assembly:assembly".split(" ") } +// deployTop has to run first and deploy/install root pom.xml +// hence all the other Maven tasks depend on it task deployTop (type: Exec, dependsOn: ["bigtop-tests:assembleDist"]) { workingDir "." commandLine "mvn -P$mvnProfile -Pattach-smokes deploy -f pom.xml".split(" ") standardInput System.in } -task deployITest (type: Exec) { +task deployITest (type: Exec, dependsOn: [deployTop]) { workingDir "." commandLine "mvn -P$mvnProfile -DskipTests deploy -f bigtop-test-framework/pom.xml".split(" ") standardInput System.in } -task deployTestArtifacts (type: Exec) { +task deployTestArtifacts (type: Exec, dependsOn: [deployTop]) { workingDir "." commandLine "mvn -P$mvnProfile deploy -f bigtop-tests/test-artifacts/pom.xml".split(" ") standardInput System.in } -task deployTestExecutors (type: Exec) { +task deployTestExecutors (type: Exec, dependsOn: [deployTop]) { workingDir "." commandLine "mvn -P$mvnProfile deploy -f bigtop-tests/test-execution/pom.xml".split(" ") environment HADOOP_CONF_DIR: "", HADOOP_HOME: ""
