You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/09/11 19:17:21 UTC
[07/28] git commit: SLIDER-414 RAT is creating a dir that cannot be
deleted
SLIDER-414 RAT is creating a dir that cannot be deleted
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/be57d7a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/be57d7a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/be57d7a1
Branch: refs/heads/feature/SLIDER-280_Restart_AM_fun_tests
Commit: be57d7a11c8cc26273dc9ada64e934c5055874ef
Parents: 65d17d8
Author: Steve Loughran <st...@apache.org>
Authored: Tue Sep 9 18:26:52 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Sep 9 18:26:52 2014 +0100
----------------------------------------------------------------------
.../command-logger/application-pkg/pom.xml | 38 ++++---
app-packages/command-logger/slider-pkg/pom.xml | 38 ++++---
pom.xml | 67 ++++++------
slider-agent/pom.xml | 62 ++++++-----
slider-core/pom.xml | 102 +++++--------------
slider-funtest/pom.xml | 48 +++++----
.../hbase/slider-hbase-provider/pom.xml | 49 +++++----
src/test/clusters/script.md | 2 +-
8 files changed, 208 insertions(+), 198 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/be57d7a1/app-packages/command-logger/application-pkg/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/command-logger/application-pkg/pom.xml b/app-packages/command-logger/application-pkg/pom.xml
index 77f0fc9..051ac84 100644
--- a/app-packages/command-logger/application-pkg/pom.xml
+++ b/app-packages/command-logger/application-pkg/pom.xml
@@ -54,20 +54,8 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${apache-rat-plugin.version}</version>
- <executions>
- <execution>
- <id>check-licenses</id>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
+
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
@@ -75,4 +63,28 @@
</extension>
</extensions>
</build>
+
+ <profiles>
+ <profile>
+ <id>rat</id>
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${apache-rat-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>check-licenses</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/be57d7a1/app-packages/command-logger/slider-pkg/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/command-logger/slider-pkg/pom.xml b/app-packages/command-logger/slider-pkg/pom.xml
index b9bbf06..4550ae1 100644
--- a/app-packages/command-logger/slider-pkg/pom.xml
+++ b/app-packages/command-logger/slider-pkg/pom.xml
@@ -93,20 +93,6 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${apache-rat-plugin.version}</version>
- <executions>
- <execution>
- <id>check-licenses</id>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
</plugins>
</build>
@@ -118,5 +104,29 @@
<type>tar</type>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${apache-rat-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>check-licenses</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/be57d7a1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 167b9ef..df8599f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -349,36 +349,7 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${apache-rat-plugin.version}</version>
- <executions>
- <execution>
- <id>check-licenses</id>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <exclude>**/*.json</exclude>
- <exclude>**/*.tar</exclude>
- <exclude>**/build.properties</exclude>
- <exclude>**/regionservers</exclude>
- <exclude>**/slaves</exclude>
- <exclude>**/httpfs-signature.secret</exclude>
- <exclude>**/dfs.exclude</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/rat.txt</exclude>
- <exclude>DISCLAIMER</exclude>
- <exclude>app-packages/hbase/target/**</exclude>
- <exclude>target/*</exclude>
- </excludes>
- </configuration>
- </plugin>
-
+
</plugins>
</build>
@@ -1263,6 +1234,42 @@
<profiles>
<profile>
+ <id>rat</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${apache-rat-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>check-licenses</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludes>
+ <exclude>**/*.json</exclude>
+ <exclude>**/*.tar</exclude>
+ <exclude>**/build.properties</exclude>
+ <exclude>**/regionservers</exclude>
+ <exclude>**/slaves</exclude>
+ <exclude>**/httpfs-signature.secret</exclude>
+ <exclude>**/dfs.exclude</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/rat.txt</exclude>
+ <exclude>DISCLAIMER</exclude>
+ <exclude>app-packages/hbase/target/**</exclude>
+ <exclude>target/*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>apache-release</id>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/be57d7a1/slider-agent/pom.xml
----------------------------------------------------------------------
diff --git a/slider-agent/pom.xml b/slider-agent/pom.xml
index 48dd301..61c2e67 100644
--- a/slider-agent/pom.xml
+++ b/slider-agent/pom.xml
@@ -82,32 +82,9 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${apache-rat-plugin.version}</version>
- <executions>
- <execution>
- <id>check-licenses</id>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <exclude>src/test/python/agent/dummy_output_error.txt</exclude>
- <exclude>src/test/python/agent/dummy_output_good.txt</exclude>
- <!-- jinja2 files (BSD license) -->
- <exclude>src/main/python/jinja2/**</exclude>
- <!-- mock files (BSD license) -->
- <exclude>src/test/python/mock/**</exclude>
- <!-- kazoo files (Apache License, Version 2.0) -->
- <exclude>src/main/python/kazoo/**</exclude>
- </excludes>
- </configuration>
- </plugin>
+
</plugins>
+
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
@@ -115,4 +92,39 @@
</extension>
</extensions>
</build>
+
+ <profiles>
+ <profile>
+ <id>rat</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${apache-rat-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>check-licenses</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludes>
+ <exclude>src/test/python/agent/dummy_output_error.txt</exclude>
+ <exclude>src/test/python/agent/dummy_output_good.txt</exclude>
+ <!-- jinja2 files (BSD license) -->
+ <exclude>src/main/python/jinja2/**</exclude>
+ <!-- mock files (BSD license) -->
+ <exclude>src/test/python/mock/**</exclude>
+ <!-- kazoo files (Apache License, Version 2.0) -->
+ <exclude>src/main/python/kazoo/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/be57d7a1/slider-core/pom.xml
----------------------------------------------------------------------
diff --git a/slider-core/pom.xml b/slider-core/pom.xml
index 326af88..97a70ab 100644
--- a/slider-core/pom.xml
+++ b/slider-core/pom.xml
@@ -188,43 +188,6 @@
<shortRevisionLength>10</shortRevisionLength>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${apache-rat-plugin.version}</version>
- <executions>
- <execution>
- <id>check-licenses</id>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <exclude>**/*.json</exclude>
- <exclude>src/test/python/agent.ini</exclude>
- <exclude>src/test/python/version</exclude>
- <exclude>src/main/resources/webapps/slideram/.keep</exclude>
- <exclude>src/main/resources/webapps/slideragent/.keep</exclude>
- <exclude>src/main/resources/webapps/static/yarn.dt.plugins.js</exclude>
- <!-- jQuery DataTables files (BSD license) -->
- <exclude>src/main/resources/webapps/static/dt-1.9.4/**</exclude>
- <!-- jQuery (MIT license) -->
- <exclude>src/main/resources/webapps/static/jquery/jquery-1.8.2.min.js</exclude>
- <!-- jQuery UI (MIT license) -->
- <exclude>src/main/resources/webapps/static/jquery/jquery-ui-1.9.1.custom.min.js</exclude>
- <exclude>src/main/resources/webapps/static/jquery/themes-1.9.1/base/jquery-ui.css</exclude>
- <!-- jQuery jsTree (MIT license) -->
- <exclude>src/main/resources/webapps/static/jt/jquery.jstree.js</exclude>
- <!-- protobuf generated classes -->
- <exclude>src/main/java/org/apache/slider/api/proto/Messages.java</exclude>
- <exclude>src/main/java/org/apache/slider/api/proto/SliderClusterAPI.java</exclude>
- </excludes>
- </configuration>
- </plugin>
-
</plugins>
</build>
@@ -527,54 +490,45 @@
</build>
</profile>
- <!--
- a test run, currently hard-coded for stevel's secure
- VM cluster
- -->
- <profile>
- <id>testrun</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>${maven-exec-plugin.version}</version>
- <configuration>
- <executable>java</executable>
- <arguments>
- <argument>-Xms512m</argument>
- <argument>-Xmx512m</argument>
- <argument>-classpath</argument>
- <classpath/>
- <argument>org.apache.slider.Slider</argument>
- <argument>list</argument>
- </arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
+
<profile>
- <id>list</id>
+ <id>rat</id>
<build>
<plugins>
+
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>${maven-exec-plugin.version}</version>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${apache-rat-plugin.version}</version>
<executions>
<execution>
+ <id>check-licenses</id>
<goals>
- <goal>java</goal>
+ <goal>check</goal>
</goals>
</execution>
</executions>
<configuration>
- <mainClass>org.apache.slider.Slider</mainClass>
- <arguments>
- <argument>list</argument>
- </arguments>
+ <excludes>
+ <exclude>**/*.json</exclude>
+ <exclude>src/test/python/agent.ini</exclude>
+ <exclude>src/test/python/version</exclude>
+ <exclude>src/main/resources/webapps/slideram/.keep</exclude>
+ <exclude>src/main/resources/webapps/slideragent/.keep</exclude>
+ <exclude>src/main/resources/webapps/static/yarn.dt.plugins.js</exclude>
+ <!-- jQuery DataTables files (BSD license) -->
+ <exclude>src/main/resources/webapps/static/dt-1.9.4/**</exclude>
+ <!-- jQuery (MIT license) -->
+ <exclude>src/main/resources/webapps/static/jquery/jquery-1.8.2.min.js</exclude>
+ <!-- jQuery UI (MIT license) -->
+ <exclude>src/main/resources/webapps/static/jquery/jquery-ui-1.9.1.custom.min.js</exclude>
+ <exclude>src/main/resources/webapps/static/jquery/themes-1.9.1/base/jquery-ui.css</exclude>
+ <!-- jQuery jsTree (MIT license) -->
+ <exclude>src/main/resources/webapps/static/jt/jquery.jstree.js</exclude>
+ <!-- protobuf generated classes -->
+ <exclude>src/main/java/org/apache/slider/api/proto/Messages.java</exclude>
+ <exclude>src/main/java/org/apache/slider/api/proto/SliderClusterAPI.java</exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/be57d7a1/slider-funtest/pom.xml
----------------------------------------------------------------------
diff --git a/slider-funtest/pom.xml b/slider-funtest/pom.xml
index 8657878..124251f 100644
--- a/slider-funtest/pom.xml
+++ b/slider-funtest/pom.xml
@@ -126,27 +126,6 @@
</plugin>
<plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${apache-rat-plugin.version}</version>
- <executions>
- <execution>
- <id>check-licenses</id>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <exclude>**/*.json</exclude>
- <exclude>**/httpfs-signature.secret</exclude>
- <exclude>**/regionservers</exclude>
- </excludes>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>${maven-dependency-plugin.version}</version>
@@ -345,7 +324,34 @@
<maven.test.skip>true</maven.test.skip>
</properties>
</profile>
+ <profile>
+ <id>rat</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${apache-rat-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>check-licenses</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludes>
+ <exclude>**/*.json</exclude>
+ <exclude>**/httpfs-signature.secret</exclude>
+ <exclude>**/regionservers</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/be57d7a1/slider-providers/hbase/slider-hbase-provider/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/slider-hbase-provider/pom.xml b/slider-providers/hbase/slider-hbase-provider/pom.xml
index cef1231..a3d9d4b 100644
--- a/slider-providers/hbase/slider-hbase-provider/pom.xml
+++ b/slider-providers/hbase/slider-hbase-provider/pom.xml
@@ -106,25 +106,7 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${apache-rat-plugin.version}</version>
- <executions>
- <execution>
- <id>check-licenses</id>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <exclude>**/*.json</exclude>
- <exclude>src/main/resources/org/apache/slider/providers/hbase/conf/regionservers</exclude>
- </excludes>
- </configuration>
- </plugin>
+
</plugins>
</build>
@@ -243,5 +225,32 @@
</dependencies>
-
+ <profiles>
+ <profile>
+ <id>rat</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${apache-rat-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>check-licenses</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludes>
+ <exclude>**/*.json</exclude>
+ <exclude>src/main/resources/org/apache/slider/providers/hbase/conf/regionservers</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/be57d7a1/src/test/clusters/script.md
----------------------------------------------------------------------
diff --git a/src/test/clusters/script.md b/src/test/clusters/script.md
index 634658a..1e9f567 100644
--- a/src/test/clusters/script.md
+++ b/src/test/clusters/script.md
@@ -53,5 +53,5 @@
./zookeeper-3.4.5/bin/zkServer.sh stop
-
+## Windows