You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by el...@apache.org on 2015/01/29 18:23:49 UTC

[1/6] incubator-slider git commit: SLIDER-745 patching in some XML intermediate files to ignore

Repository: incubator-slider
Updated Branches:
  refs/heads/branches/branch-0.6 1de089a7a -> f916ef8c2


SLIDER-745 patching in some XML intermediate files to ignore


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/b37d3f63
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b37d3f63
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b37d3f63

Branch: refs/heads/branches/branch-0.6
Commit: b37d3f6326982eb191269866a795a96df2395a2c
Parents: 1de089a
Author: Steve Loughran <st...@apache.org>
Authored: Mon Jan 19 14:56:59 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Jan 19 14:56:59 2015 +0000

----------------------------------------------------------------------
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b37d3f63/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 6e8763e..5141a27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,6 @@ release.properties
 *.versionsBackup
 slider-test.xml
 build.properties
+pom.xml.tag
+pom.xml.next
+pom.xml.releaseBackup


[5/6] incubator-slider git commit: [maven-release-plugin] prepare release slider-0.61.0-incubating

Posted by el...@apache.org.
[maven-release-plugin] prepare release slider-0.61.0-incubating


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/64a8bac0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/64a8bac0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/64a8bac0

Branch: refs/heads/branches/branch-0.6
Commit: 64a8bac068e6801748fb973dbfb590bc62c60935
Parents: 39755ca
Author: Steve Loughran <st...@hortonworks.com>
Authored: Tue Jan 27 18:21:08 2015 +0000
Committer: Steve Loughran <st...@hortonworks.com>
Committed: Tue Jan 27 18:21:08 2015 +0000

----------------------------------------------------------------------
 app-packages/accumulo/pom.xml                              | 6 +++---
 app-packages/command-logger/application-pkg/pom.xml        | 2 +-
 app-packages/command-logger/slider-pkg/pom.xml             | 5 ++---
 app-packages/hbase/pom.xml                                 | 7 +++----
 app-packages/pom.xml                                       | 5 ++---
 app-packages/storm/pom.xml                                 | 5 ++---
 pom.xml                                                    | 2 +-
 slider-agent/pom.xml                                       | 2 +-
 slider-assembly/pom.xml                                    | 6 +++---
 slider-core/pom.xml                                        | 2 +-
 slider-funtest/pom.xml                                     | 4 ++--
 slider-providers/accumulo/accumulo-funtests/pom.xml        | 2 +-
 slider-providers/accumulo/slider-accumulo-provider/pom.xml | 2 +-
 slider-providers/hbase/hbase-funtests/pom.xml              | 2 +-
 slider-providers/hbase/slider-hbase-provider/pom.xml       | 2 +-
 15 files changed, 25 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/64a8bac0/app-packages/accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml
index 611940c..524853d 100644
--- a/app-packages/accumulo/pom.xml
+++ b/app-packages/accumulo/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.slider.packages</groupId>
     <artifactId>slider-app-packages</artifactId>
-    <version>0.61.0-SNAPSHOT</version>
+    <version>0.61.0-incubating</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -48,8 +48,8 @@
     <app.user>yarn</app.user>
     <app.user.group>hadoop</app.user.group>
     <!-- these are for accumulo processes -->
-    <accumulo.keytab></accumulo.keytab>
-    <accumulo.principal></accumulo.principal>
+    <accumulo.keytab />
+    <accumulo.principal />
     <!-- these are for the AM -->
     <accumulo.headless.keytab>${accumulo.keytab}</accumulo.headless.keytab>
     <accumulo.headless.principal>${accumulo.principal}</accumulo.headless.principal>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/64a8bac0/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 14577f8..0f209d9 100644
--- a/app-packages/command-logger/application-pkg/pom.xml
+++ b/app-packages/command-logger/application-pkg/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.slider</groupId>
     <artifactId>slider</artifactId>
-    <version>0.61.0-SNAPSHOT</version>
+    <version>0.61.0-incubating</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/64a8bac0/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 9979cd3..36c9ac8 100644
--- a/app-packages/command-logger/slider-pkg/pom.xml
+++ b/app-packages/command-logger/slider-pkg/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -20,7 +19,7 @@
   <parent>
     <groupId>org.apache.slider</groupId>
     <artifactId>slider</artifactId>
-    <version>0.61.0-SNAPSHOT</version>
+    <version>0.61.0-incubating</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/64a8bac0/app-packages/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase/pom.xml b/app-packages/hbase/pom.xml
index aad3fef..49e73ea 100644
--- a/app-packages/hbase/pom.xml
+++ b/app-packages/hbase/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -20,7 +19,7 @@
   <parent>
     <groupId>org.apache.slider.packages</groupId>
     <artifactId>slider-app-packages</artifactId>
-    <version>0.61.0-SNAPSHOT</version>
+    <version>0.61.0-incubating</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -48,7 +47,7 @@
                 <phase>validate</phase>
                 <configuration>
                   <target name="copy and rename file">
-                    <copy file="${pkg.src}/${pkg.name}" tofile="${project.build.directory}/${pkg.name}"/>
+                    <copy file="${pkg.src}/${pkg.name}" tofile="${project.build.directory}/${pkg.name}" />
                   </target>
                 </configuration>
                 <goals>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/64a8bac0/app-packages/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/pom.xml b/app-packages/pom.xml
index 7550692..953d698 100644
--- a/app-packages/pom.xml
+++ b/app-packages/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -20,7 +19,7 @@
   <parent>
     <groupId>org.apache.slider</groupId>
     <artifactId>slider</artifactId>
-    <version>0.61.0-SNAPSHOT</version>
+    <version>0.61.0-incubating</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/64a8bac0/app-packages/storm/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm/pom.xml b/app-packages/storm/pom.xml
index 94870ab..e6af2dc 100644
--- a/app-packages/storm/pom.xml
+++ b/app-packages/storm/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -20,7 +19,7 @@
   <parent>
     <groupId>org.apache.slider.packages</groupId>
     <artifactId>slider-app-packages</artifactId>
-    <version>0.61.0-SNAPSHOT</version>
+    <version>0.61.0-incubating</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/64a8bac0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1ed9f4c..0f935f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
   <groupId>org.apache.slider</groupId>
   <artifactId>slider</artifactId>
   <name>Slider</name>
-  <version>0.61.0-SNAPSHOT</version>
+  <version>0.61.0-incubating</version>
   <packaging>pom</packaging>
 
   <description>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/64a8bac0/slider-agent/pom.xml
----------------------------------------------------------------------
diff --git a/slider-agent/pom.xml b/slider-agent/pom.xml
index 4256b1b..adddb8d 100644
--- a/slider-agent/pom.xml
+++ b/slider-agent/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.slider</groupId>
     <artifactId>slider</artifactId>
-    <version>0.61.0-SNAPSHOT</version>
+    <version>0.61.0-incubating</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>slider-agent</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/64a8bac0/slider-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/slider-assembly/pom.xml b/slider-assembly/pom.xml
index 01a8209..ef5b5bf 100644
--- a/slider-assembly/pom.xml
+++ b/slider-assembly/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.slider</groupId>
     <artifactId>slider</artifactId>
-    <version>0.61.0-SNAPSHOT</version>
+    <version>0.61.0-incubating</version>
   </parent>
 
 
@@ -302,8 +302,8 @@
 <!--
               <release>${project.version}</release>
 -->
-              <!---->
-              <distribution></distribution>
+              
+              <distribution />
               <group>Applications/Engineering</group>
               <!--<icon>src/main/resources/icon.gif</icon>-->
               <!--<packager>ASF</packager>-->

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/64a8bac0/slider-core/pom.xml
----------------------------------------------------------------------
diff --git a/slider-core/pom.xml b/slider-core/pom.xml
index 65daf39..57e0d3c 100644
--- a/slider-core/pom.xml
+++ b/slider-core/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.slider</groupId>
     <artifactId>slider</artifactId>
-    <version>0.61.0-SNAPSHOT</version>
+    <version>0.61.0-incubating</version>
   </parent>
 
   <build>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/64a8bac0/slider-funtest/pom.xml
----------------------------------------------------------------------
diff --git a/slider-funtest/pom.xml b/slider-funtest/pom.xml
index 8b88a61..6f56c07 100644
--- a/slider-funtest/pom.xml
+++ b/slider-funtest/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.slider</groupId>
     <artifactId>slider</artifactId>
-    <version>0.61.0-SNAPSHOT</version>
+    <version>0.61.0-incubating</version>
   </parent>
   <properties>
     <work.dir>package-tmp</work.dir>
@@ -123,7 +123,7 @@
             <test.app.pkg.name>CMD_LOGGER</test.app.pkg.name>
             <test.app.resource>../slider-core/src/test/app_packages/test_command_log/resources.json</test.app.resource>
             <test.app.template>../slider-core/src/test/app_packages/test_command_log/appConfig.json</test.app.template>
-            <vagrant.current.working.dir></vagrant.current.working.dir>
+            <vagrant.current.working.dir />
           </systemPropertyVariables>
         </configuration>
       </plugin>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/64a8bac0/slider-providers/accumulo/accumulo-funtests/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/accumulo-funtests/pom.xml b/slider-providers/accumulo/accumulo-funtests/pom.xml
index bd57687..51ada33 100644
--- a/slider-providers/accumulo/accumulo-funtests/pom.xml
+++ b/slider-providers/accumulo/accumulo-funtests/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.slider</groupId>
     <artifactId>slider</artifactId>
-    <version>0.61.0-SNAPSHOT</version>
+    <version>0.61.0-incubating</version>
     <relativePath>../../../</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/64a8bac0/slider-providers/accumulo/slider-accumulo-provider/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/slider-accumulo-provider/pom.xml b/slider-providers/accumulo/slider-accumulo-provider/pom.xml
index 6fc8323..1c749f0 100644
--- a/slider-providers/accumulo/slider-accumulo-provider/pom.xml
+++ b/slider-providers/accumulo/slider-accumulo-provider/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.slider</groupId>
     <artifactId>slider</artifactId>
-    <version>0.61.0-SNAPSHOT</version>
+    <version>0.61.0-incubating</version>
     <relativePath>../../../</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/64a8bac0/slider-providers/hbase/hbase-funtests/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/hbase-funtests/pom.xml b/slider-providers/hbase/hbase-funtests/pom.xml
index df0f7eb..da90c56 100644
--- a/slider-providers/hbase/hbase-funtests/pom.xml
+++ b/slider-providers/hbase/hbase-funtests/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.slider</groupId>
     <artifactId>slider</artifactId>
-    <version>0.61.0-SNAPSHOT</version>
+    <version>0.61.0-incubating</version>
     <relativePath>../../../</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/64a8bac0/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 e6f46d8..ce9ab0f 100644
--- a/slider-providers/hbase/slider-hbase-provider/pom.xml
+++ b/slider-providers/hbase/slider-hbase-provider/pom.xml
@@ -29,7 +29,7 @@
   <parent>
     <groupId>org.apache.slider</groupId>
     <artifactId>slider</artifactId>
-    <version>0.61.0-SNAPSHOT</version>
+    <version>0.61.0-incubating</version>
     <relativePath>../../../</relativePath>
   </parent>
 


[2/6] incubator-slider git commit: SLIDER-759 slider tarball doesn't always contain slider-agent.tar.gz

Posted by el...@apache.org.
SLIDER-759 slider tarball doesn't always contain slider-agent.tar.gz


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/0381932e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/0381932e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/0381932e

Branch: refs/heads/branches/branch-0.6
Commit: 0381932e4754ad53f3e8136693d04c7a666c20a1
Parents: b37d3f6
Author: Steve Loughran <st...@apache.org>
Authored: Mon Jan 19 16:26:59 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Jan 19 16:26:59 2015 +0000

----------------------------------------------------------------------
 pom.xml                                        |  1 +
 slider-assembly/pom.xml                        | 26 ++++++++++--
 slider-assembly/src/assembly/slider-bin.xml    | 46 ++++++++-------------
 slider-assembly/src/assembly/verifications.xml | 34 +++++++++++++++
 4 files changed, 74 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0381932e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c6595a5..b6e1e19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -223,6 +223,7 @@
     <maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
     <maven-surefire-report-plugin.version>${maven-surefire-plugin.version}</maven-surefire-report-plugin.version>
     <maven-failsafe-plugin.version>${maven-surefire-plugin.version}</maven-failsafe-plugin.version>
+    <maven-verifier-plugin.version>1.0</maven-verifier-plugin.version>
     <apache-rat-plugin.version>0.11</apache-rat-plugin.version>
 
     <!-- build options-->

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0381932e/slider-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/slider-assembly/pom.xml b/slider-assembly/pom.xml
index a7ce994..654bb86 100644
--- a/slider-assembly/pom.xml
+++ b/slider-assembly/pom.xml
@@ -102,7 +102,7 @@
         <executions>
           <execution>
             <id>copy-dependencies</id>
-            <phase>package</phase>
+            <phase>prepare-package</phase>
             <goals>
               <goal>copy-dependencies</goal>
             </goals>
@@ -117,7 +117,7 @@
           <execution>
             <!-- copy in the agent tar file -->
             <id>copy</id>
-            <phase>package</phase>
+            <phase>prepare-package</phase>
             <goals>
               <goal>copy</goal>
             </goals>
@@ -137,7 +137,7 @@
           <execution>
             <!-- copy in the agent tar file -->
             <id>copy-to-lib</id>
-            <phase>package</phase>
+            <phase>prepare-package</phase>
             <goals>
               <goal>copy</goal>
             </goals>
@@ -222,7 +222,25 @@
           </execution>
         </executions>
       </plugin>
-
+      
+      <!-- verification phase checks for files in the target assembly -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-verifier-plugin</artifactId>
+        <version>${maven-verifier-plugin.version}</version>
+        <configuration>
+          <verificationFile>src/assembly/verifications.xml</verificationFile>
+        </configuration>
+        <executions>
+          <execution>
+            <id>main</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
  
     </plugins>
     

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0381932e/slider-assembly/src/assembly/slider-bin.xml
----------------------------------------------------------------------
diff --git a/slider-assembly/src/assembly/slider-bin.xml b/slider-assembly/src/assembly/slider-bin.xml
index c5611f8..f13f5df 100644
--- a/slider-assembly/src/assembly/slider-bin.xml
+++ b/slider-assembly/src/assembly/slider-bin.xml
@@ -18,9 +18,9 @@
 
   
 <assembly
-  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
   <id>all</id>
   <formats>
     <format>tar.gz</format>
@@ -43,35 +43,9 @@
     </fileSet>
     
     <fileSet>
-      <directory>
-        src/conf
-      </directory>
+      <directory>src/conf</directory>
       <outputDirectory>conf</outputDirectory>
     </fileSet>
-    
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>lib</outputDirectory>
-      <includes>
-        <include>*.jar</include>
-      </includes>
-    </fileSet>
-
-    <fileSet>
-      <directory>${project.build.directory}/agent</directory>
-      <outputDirectory>lib</outputDirectory>
-      <includes>
-        <include>slider-agent.tar.gz</include>
-      </includes>
-    </fileSet>
-
-    <fileSet>
-      <directory>${project.build.directory}/agent</directory>
-      <outputDirectory>agent</outputDirectory>
-      <includes>
-        <include>slider-agent.tar.gz</include>
-      </includes>
-    </fileSet>
 
     <fileSet>
       <directory>${project.build.directory}/../../slider-agent/conf</directory>
@@ -97,6 +71,20 @@
     </fileSet>
 
   </fileSets>
+
+  <files>
+
+    <file>
+      <source>${project.build.directory}/agent/slider-agent.tar.gz</source>
+      <outputDirectory>lib</outputDirectory>
+    </file>
+
+    <file>
+      <source>${project.build.directory}/agent/slider-agent.tar.gz</source>
+      <outputDirectory>agent</outputDirectory>
+    </file>
+    
+  </files>
   <dependencySets>
     <dependencySet>
       <scope>runtime</scope>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0381932e/slider-assembly/src/assembly/verifications.xml
----------------------------------------------------------------------
diff --git a/slider-assembly/src/assembly/verifications.xml b/slider-assembly/src/assembly/verifications.xml
new file mode 100644
index 0000000..920fedb
--- /dev/null
+++ b/slider-assembly/src/assembly/verifications.xml
@@ -0,0 +1,34 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing, software
+  ~  distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~  See the License for the specific language governing permissions and
+  ~  limitations under the License.
+  -->
+
+<verifications>
+  <!-- These checks verify that the tarfile is in place.
+  However, they don't check that the tarfile has made it through to the -all tarball, as the name of
+  that file is not known & the verifier plugin doesn't do property expansion
+  -->
+  <files>
+    <file>
+      <location>target/lib/slider-agent.tar.gz</location>
+      <exists>true</exists>
+    </file>
+    <file>
+      <location>target/agent/slider-agent.tar.gz</location>
+      <exists>true</exists>
+    </file>
+  </files>
+</verifications>
\ No newline at end of file


[3/6] incubator-slider git commit: SLIDER-766 binary releases don't include license/3rd party metadata: work on core

Posted by el...@apache.org.
SLIDER-766 binary releases don't include license/3rd party metadata: work on core


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/af780363
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/af780363
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/af780363

Branch: refs/heads/branches/branch-0.6
Commit: af780363ccb8e8548ca2fa50cce4da8d71386a38
Parents: 0381932
Author: Steve Loughran <st...@apache.org>
Authored: Mon Jan 26 15:38:44 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Jan 26 17:05:46 2015 +0000

----------------------------------------------------------------------
 .../accumulo/src/license/THIRD-PARTY.properties |  35 ++++++
 .../src/packages/tarball/all.xml                |  19 +++
 .../slider-pkg/src/assembly/command-logger.xml  |  17 +++
 pom.xml                                         |  33 ++++++
 slider-agent/DEPENDENCIES                       | 116 +++++++++++++++++++
 slider-agent/pom.xml                            |   1 +
 slider-agent/src/packages/tarball/all.xml       |  22 ++++
 slider-assembly/pom.xml                         |   4 +-
 slider-assembly/src/assembly/slider-bin.xml     |  28 +++--
 slider-core/pom.xml                             |   1 +
 slider-core/src/license/THIRD-PARTY.properties  |  33 ++++++
 slider-funtest/pom.xml                          |   1 +
 .../src/license/THIRD-PARTY.properties          |  29 +++++
 13 files changed, 327 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/app-packages/accumulo/src/license/THIRD-PARTY.properties
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/src/license/THIRD-PARTY.properties b/app-packages/accumulo/src/license/THIRD-PARTY.properties
new file mode 100644
index 0000000..9322b8f
--- /dev/null
+++ b/app-packages/accumulo/src/license/THIRD-PARTY.properties
@@ -0,0 +1,35 @@
+# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
+#-------------------------------------------------------------------------------
+# Already used licenses in project :
+# - Apache License
+# - Apache License 2.0
+# - Apache License Version 2
+# - Apache License, Version 2.0
+# - Apache Software License - Version 2.0
+# - BSD
+# - CDDL + GPLv2 with classpath exception
+# - CDDL 1.1
+# - CDDL License
+# - Common Public License Version 1.0
+# - Eclipse Public License - Version 1.0
+# - GNU Lesser General Public License (LGPL), Version 2.1
+# - GPL2 w/ CPE
+# - MIT License
+# - New BSD License
+# - New BSD license
+# - Public Domain
+# - Revised BSD
+# - The Apache Software License, Version 2.0
+# - The BSD 3-Clause License
+# - The BSD License
+#-------------------------------------------------------------------------------
+# Please fill the missing licenses for dependencies :
+#
+#
+#Mon Jan 26 16:00:07 GMT 2015
+asm--asm--3.1=The BSD 3-Clause License
+commons-beanutils--commons-beanutils--1.7.0=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.5=CDDL License
+javax.servlet.jsp--jsp-api--2.1=CDDL License
+org.apache.zookeeper--zookeeper--3.4.6=The Apache Software License, Version 2.0
+org.codehaus.jettison--jettison--1.1=The Apache Software License, Version 2.0

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/app-packages/command-logger/application-pkg/src/packages/tarball/all.xml
----------------------------------------------------------------------
diff --git a/app-packages/command-logger/application-pkg/src/packages/tarball/all.xml b/app-packages/command-logger/application-pkg/src/packages/tarball/all.xml
index 5c6080b..4538d57 100644
--- a/app-packages/command-logger/application-pkg/src/packages/tarball/all.xml
+++ b/app-packages/command-logger/application-pkg/src/packages/tarball/all.xml
@@ -32,4 +32,23 @@
       <outputDirectory>command-logger-app</outputDirectory>
     </fileSet>
   </fileSets>
+
+  <files>
+    <file>
+      <source>${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
+    <file>
+      <source>${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
+    <file>
+      <source>${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
+    <file>
+      <source>${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
+  </files>
 </assembly>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/app-packages/command-logger/slider-pkg/src/assembly/command-logger.xml
----------------------------------------------------------------------
diff --git a/app-packages/command-logger/slider-pkg/src/assembly/command-logger.xml b/app-packages/command-logger/slider-pkg/src/assembly/command-logger.xml
index cad468a..e283404 100644
--- a/app-packages/command-logger/slider-pkg/src/assembly/command-logger.xml
+++ b/app-packages/command-logger/slider-pkg/src/assembly/command-logger.xml
@@ -46,6 +46,21 @@
       <filtered>true</filtered>
       <fileMode>0755</fileMode>
     </file>
+
+    <file>
+      <source>../../../LICENSE</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
+  
+    <file>
+      <source>../../../NOTICE</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
+
+    <file>
+      <source>${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
   </files>
 
   <fileSets>
@@ -75,4 +90,6 @@
     </fileSet>
 
   </fileSets>
+
+
 </assembly>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b6e1e19..1ed9f4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -211,6 +211,7 @@
     <maven-groovydoc-plugin.version>1.3</maven-groovydoc-plugin.version>
     <maven-jar-plugin.version>2.5</maven-jar-plugin.version>
     <maven.javadoc.version>2.10.1</maven.javadoc.version>
+    <maven.license.version>1.8</maven.license.version>
     <maven.project.version>2.4</maven.project.version>
     <maven.properties.version>1.0-alpha-2</maven.properties.version>
     <maven-project-info-reports-plugin.version>2.7</maven-project-info-reports-plugin.version>
@@ -380,6 +381,37 @@
         </executions>
       </plugin>
 
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>license-maven-plugin</artifactId>
+        <version>${maven.license.version}</version>
+        <executions>
+<!--
+          <execution>
+            <id>download-licenses</id>
+            <goals>
+              <goal>download-licenses</goal>
+            </goals>
+          </execution>
+-->
+          <execution>
+            <id>default-cli</id>
+            <configuration>
+              <licenseMerges>
+                <licenseMerge>The Apache Software License, Version 2.0|Apache License, Version 2.0</licenseMerge>
+                <licenseMerge>The Apache Software License, Version 2.0|Apache License 2.0</licenseMerge>
+                <licenseMerge>The Apache Software License, Version 2.0|Apache Public License 2.0</licenseMerge>
+                <licenseMerge>The Apache Software License, Version 2.0|Apache 2</licenseMerge>
+                <licenseMerge>The Apache Software License, Version 2.0|ASF 2.0</licenseMerge>
+                <licenseMerge>The Apache Software License, Version 2.0|Apache License Version 2</licenseMerge>
+                <licenseMerge>The Apache Software License, Version 2.0|Apache Software License - Version 2.0</licenseMerge>
+                <licenseMerge>New BSD License|New BSD license</licenseMerge>
+                <licenseMerge>GNU Lesser General Public License (LGPL), Version 2.1|LGPL 2.1</licenseMerge>
+              </licenseMerges>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
   </plugins>
   </build>
 
@@ -1347,6 +1379,7 @@
               <excludes>
                 <exclude>**/*.json</exclude>
                 <exclude>**/*.tar</exclude>
+                <exclude>**/THIRD-PARTY.properties</exclude>
                 <exclude>**/build.properties</exclude>
                 <exclude>**/regionservers</exclude>
                 <exclude>**/slaves</exclude>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/slider-agent/DEPENDENCIES
----------------------------------------------------------------------
diff --git a/slider-agent/DEPENDENCIES b/slider-agent/DEPENDENCIES
new file mode 100644
index 0000000..c4e65da
--- /dev/null
+++ b/slider-agent/DEPENDENCIES
@@ -0,0 +1,116 @@
+// ------------------------------------------------------------------
+// Transitive dependencies of this project determined from the
+// maven pom organized by organization.
+// ------------------------------------------------------------------
+
+Slider Agent
+
+APACHE SLIDER SUBCOMPONENTS:
+
+The Apache Slider project contains subcomponents with separate copyright
+notices and license terms. Your use of the source code for the these
+subcomponents is subject to the terms and conditions of the following
+licenses.
+
+For Python Mock unit test framework,
+ at slider-agent/src/test/python/mock, the BSD license:
+
+  Copyright (c) 2003-2012, Michael Foord
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+      * Redistributions in binary form must reproduce the above
+        copyright notice, this list of conditions and the following
+        disclaimer in the documentation and/or other materials provided
+        with the distribution.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+For Kokki, resource management library,
+ which slider-agent/src/main/python/resource_management is derived from,
+ the BSD license:
+
+Copyright (c) 2009 Samuel Stauffer <sa...@descolada.com>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    3. Neither the name of Samuel Stauffer nor the names of its contributors may be used
+       to endorse or promote products derived from this software without
+       specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+For jinja2, used by resource management library as a templating engine,
+ at slider-agent/src/main/python/jinja2, the BSD license:
+
+Copyright (c) 2009 by the Jinja Team, see AUTHORS for more details.
+
+Some rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * The names of the contributors may not be used to endorse or
+      promote products derived from this software without specific
+      prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+
+

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/slider-agent/pom.xml
----------------------------------------------------------------------
diff --git a/slider-agent/pom.xml b/slider-agent/pom.xml
index 04993bc..4256b1b 100644
--- a/slider-agent/pom.xml
+++ b/slider-agent/pom.xml
@@ -134,6 +134,7 @@
             </executions>
             <configuration>
               <excludes>
+                <exclude>DEPENDENCIES</exclude>
                 <exclude>src/test/python/agent/dummy_output_error.txt</exclude>
                 <exclude>src/test/python/agent/dummy_output_good.txt</exclude>
                 <!-- jinja2 files (BSD license) -->

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/slider-agent/src/packages/tarball/all.xml
----------------------------------------------------------------------
diff --git a/slider-agent/src/packages/tarball/all.xml b/slider-agent/src/packages/tarball/all.xml
index 72afb75..91bd0a8 100644
--- a/slider-agent/src/packages/tarball/all.xml
+++ b/slider-agent/src/packages/tarball/all.xml
@@ -37,4 +37,26 @@
       </excludes>
     </fileSet>
   </fileSets>
+
+  <files>
+    <file>
+      <source>../README.md</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
+    <file>
+      <source>../LICENSE</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
+  
+    <file>
+      <source>DEPENDENCIES</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
+
+    <file>
+      <source>${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
+
+  </files>
 </assembly>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/slider-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/slider-assembly/pom.xml b/slider-assembly/pom.xml
index 654bb86..01a8209 100644
--- a/slider-assembly/pom.xml
+++ b/slider-assembly/pom.xml
@@ -17,9 +17,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>slider-assembly</artifactId>
-  <name>Slider Assembly</name>
+  <name>Apache Slider Binary Distributione</name>
   <packaging>pom</packaging>
-  <description>Apache Slider is a tool for dynamically deploying distributed applications to an Apache YARN cluster</description>
+  <description>Apache Slider is a tool for dynamically deploying distributed applications to an Apache YARN cluster. This module provides the binary redistributable.</description>
   <parent>
     <groupId>org.apache.slider</groupId>
     <artifactId>slider</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/slider-assembly/src/assembly/slider-bin.xml
----------------------------------------------------------------------
diff --git a/slider-assembly/src/assembly/slider-bin.xml b/slider-assembly/src/assembly/slider-bin.xml
index f13f5df..832b58e 100644
--- a/slider-assembly/src/assembly/slider-bin.xml
+++ b/slider-assembly/src/assembly/slider-bin.xml
@@ -56,16 +56,6 @@
     </fileSet>
 
     <fileSet>
-      <directory>..</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>README*</include>
-        <include>LICENSE*</include>
-      </includes>
-    </fileSet>
-
-
-    <fileSet>
       <directory>../target/staging</directory>
       <outputDirectory>/doc</outputDirectory>
     </fileSet>
@@ -73,6 +63,14 @@
   </fileSets>
 
   <files>
+    <file>
+      <source>../README.md</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
+    <file>
+      <source>../LICENSE</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
 
     <file>
       <source>${project.build.directory}/agent/slider-agent.tar.gz</source>
@@ -84,7 +82,17 @@
       <outputDirectory>agent</outputDirectory>
     </file>
     
+    <file>
+      <source>${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
+    <file>
+      <source>${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
+
   </files>
+
   <dependencySets>
     <dependencySet>
       <scope>runtime</scope>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/slider-core/pom.xml
----------------------------------------------------------------------
diff --git a/slider-core/pom.xml b/slider-core/pom.xml
index 370539a..65daf39 100644
--- a/slider-core/pom.xml
+++ b/slider-core/pom.xml
@@ -547,6 +547,7 @@
                 <exclude>**/*.json</exclude>
                 <exclude>src/test/python/agent.ini</exclude>
                 <exclude>src/test/python/version</exclude>
+                <exclude>**/THIRD-PARTY.properties</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>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/slider-core/src/license/THIRD-PARTY.properties
----------------------------------------------------------------------
diff --git a/slider-core/src/license/THIRD-PARTY.properties b/slider-core/src/license/THIRD-PARTY.properties
new file mode 100644
index 0000000..662fde5
--- /dev/null
+++ b/slider-core/src/license/THIRD-PARTY.properties
@@ -0,0 +1,33 @@
+# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
+#-------------------------------------------------------------------------------
+# Already used licenses in project :
+# - Apache License
+# - BSD
+# - CDDL + GPLv2 with classpath exception
+# - CDDL 1.1
+# - CDDL License
+# - CDDL+GPL
+# - Common Public License Version 1.0
+# - Eclipse Public License - Version 1.0
+# - GNU Lesser General Public License (LGPL), Version 2.1
+# - GPL2 w/ CPE
+# - MIT License
+# - MPL 1.1
+# - New BSD License
+# - Public Domain
+# - Revised BSD
+# - The Apache Software License, Version 2.0
+# - The BSD 3-Clause License
+# - The BSD License
+# - The MIT License
+#-------------------------------------------------------------------------------
+# Please fill the missing licenses for dependencies :
+#
+#
+#Mon Jan 26 15:27:00 GMT 2015
+asm--asm--3.1=The BSD 3-Clause License
+commons-beanutils--commons-beanutils--1.7.0=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.5=CDDL License
+javax.servlet.jsp--jsp-api--2.1=CDDL License
+org.apache.zookeeper--zookeeper--3.4.6=The Apache Software License, Version 2.0
+org.codehaus.jettison--jettison--1.1=The Apache Software License, Version 2.0

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/slider-funtest/pom.xml
----------------------------------------------------------------------
diff --git a/slider-funtest/pom.xml b/slider-funtest/pom.xml
index af08d1c..708317c 100644
--- a/slider-funtest/pom.xml
+++ b/slider-funtest/pom.xml
@@ -313,6 +313,7 @@
                   <exclude>**/*.json</exclude>
                   <exclude>**/httpfs-signature.secret</exclude>
                   <exclude>**/regionservers</exclude>
+                  <exclude>**/THIRD-PARTY.properties</exclude>
                 </excludes>
               </configuration>
             </plugin>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/af780363/slider-funtest/src/license/THIRD-PARTY.properties
----------------------------------------------------------------------
diff --git a/slider-funtest/src/license/THIRD-PARTY.properties b/slider-funtest/src/license/THIRD-PARTY.properties
new file mode 100644
index 0000000..2279ca6
--- /dev/null
+++ b/slider-funtest/src/license/THIRD-PARTY.properties
@@ -0,0 +1,29 @@
+# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
+#-------------------------------------------------------------------------------
+# Already used licenses in project :
+# - Apache License
+# - BSD
+# - CDDL 1.1
+# - CDDL License
+# - Common Public License Version 1.0
+# - Eclipse Public License - Version 1.0
+# - GNU Lesser General Public License (LGPL), Version 2.1
+# - GPL2 w/ CPE
+# - MIT License
+# - New BSD License
+# - Public Domain
+# - Revised BSD
+# - The Apache Software License, Version 2.0
+# - The BSD 3-Clause License
+# - The BSD License
+#-------------------------------------------------------------------------------
+# Please fill the missing licenses for dependencies :
+#
+#
+#Mon Jan 26 15:56:57 GMT 2015
+asm--asm--3.1=The BSD 3-Clause License
+commons-beanutils--commons-beanutils--1.7.0=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.5=CDDL License
+javax.servlet.jsp--jsp-api--2.1=CDDL License
+org.apache.zookeeper--zookeeper--3.4.6=The Apache Software License, Version 2.0
+org.codehaus.jettison--jettison--1.1=The Apache Software License, Version 2.0


[4/6] incubator-slider git commit: SLIDER-767 rename "apache-slider-command-logger" and "command-logger" modules

Posted by el...@apache.org.
SLIDER-767 rename "apache-slider-command-logger" and "command-logger" modules


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/39755ca1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/39755ca1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/39755ca1

Branch: refs/heads/branches/branch-0.6
Commit: 39755ca15612b93e275d5fd565a81e3e7289cb96
Parents: af78036
Author: Steve Loughran <st...@apache.org>
Authored: Tue Jan 27 13:32:57 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Jan 27 13:34:46 2015 +0000

----------------------------------------------------------------------
 app-packages/command-logger/application-pkg/README.txt  |  2 +-
 app-packages/command-logger/application-pkg/pom.xml     | 12 ++++++++----
 .../application-pkg/src/packages/tarball/all.xml        |  2 +-
 app-packages/command-logger/slider-pkg/appConfig.json   |  2 +-
 app-packages/command-logger/slider-pkg/pom.xml          | 12 ++++++------
 .../test/app_packages/test_command_log/appConfig.json   |  2 +-
 .../test_command_log/appConfig_fast_no_reg.json         |  2 +-
 .../app_packages/test_command_log/appConfig_no_hb.json  |  2 +-
 slider-funtest/pom.xml                                  |  8 ++++----
 9 files changed, 24 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/39755ca1/app-packages/command-logger/application-pkg/README.txt
----------------------------------------------------------------------
diff --git a/app-packages/command-logger/application-pkg/README.txt b/app-packages/command-logger/application-pkg/README.txt
index 5596f30..ea5b2e8 100644
--- a/app-packages/command-logger/application-pkg/README.txt
+++ b/app-packages/command-logger/application-pkg/README.txt
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-Command logger is a simple application that does not have any moving parts yet.
+Command logger is a simple application that does not have any moving parts.
 Its sole purpose is to get packaged as a tarball that includes some static files
 suggesting how commands may be logged.
 

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/39755ca1/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 ec7f3fa..14577f8 100644
--- a/app-packages/command-logger/application-pkg/pom.xml
+++ b/app-packages/command-logger/application-pkg/pom.xml
@@ -23,12 +23,16 @@
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>command-logger</artifactId>
+  <artifactId>command-logger-sample</artifactId>
   <packaging>pom</packaging>
-  <name>Command Logger</name>
-  <description>Command Logger</description>
+  <name>Command Logger Sample Application</name>
+  <description>
+    Command logger is a simple application that does not have any moving parts.
+    Its sole purpose is to get packaged as a tarball that includes some static files
+    suggesting how commands may be logged, for use in test deployments.  
+  </description>
   <properties>
-    <app.package.name>command-logger</app.package.name>
+    <app.package.name>command-logger-sample</app.package.name>
   </properties>
 
   <build>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/39755ca1/app-packages/command-logger/application-pkg/src/packages/tarball/all.xml
----------------------------------------------------------------------
diff --git a/app-packages/command-logger/application-pkg/src/packages/tarball/all.xml b/app-packages/command-logger/application-pkg/src/packages/tarball/all.xml
index 4538d57..b1a0e93 100644
--- a/app-packages/command-logger/application-pkg/src/packages/tarball/all.xml
+++ b/app-packages/command-logger/application-pkg/src/packages/tarball/all.xml
@@ -18,7 +18,7 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
-  <!--This 'agent-all' id is not appended to the produced bundle because we do this:
+  <!--This 'command-logger' id is not appended to the produced bundle because we do this:
     http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers
   -->
   <id>command-logger</id>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/39755ca1/app-packages/command-logger/slider-pkg/appConfig.json
----------------------------------------------------------------------
diff --git a/app-packages/command-logger/slider-pkg/appConfig.json b/app-packages/command-logger/slider-pkg/appConfig.json
index d4082a8..09e9252 100644
--- a/app-packages/command-logger/slider-pkg/appConfig.json
+++ b/app-packages/command-logger/slider-pkg/appConfig.json
@@ -3,7 +3,7 @@
     "metadata": {
     },
     "global": {
-        "application.def": ".slider/package/CMD_LOGGER/apache-slider-command-logger.zip",
+        "application.def": ".slider/package/CMD_LOGGER/command-logger-slider-package.zip",
         "java_home": "/usr/jdk64/jdk1.7.0_67",
         "site.global.application_id": "CommandLogger",
         "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/command-logger",

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/39755ca1/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 6e8f979..9979cd3 100644
--- a/app-packages/command-logger/slider-pkg/pom.xml
+++ b/app-packages/command-logger/slider-pkg/pom.xml
@@ -24,13 +24,13 @@
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>apache-slider-command-logger</artifactId>
+  <artifactId>command-logger-slider-package</artifactId>
   <packaging>pom</packaging>
-  <name>Slider Command Logger App Package</name>
+  <name>Slider Command Logger Slider App Package</name>
   <description>Slider Command Logger App Package</description>
   <properties>
     <work.dir>package-tmp</work.dir>
-    <app.package.name>apache-slider-command-logger</app.package.name>
+    <app.package.name>command-logger-slider-package</app.package.name>
   </properties>
 
   <build>
@@ -67,7 +67,7 @@
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <includeArtifactIds>command-logger</includeArtifactIds>
+              <includeArtifactIds>command-logger-sample</includeArtifactIds>
               <includeTypes>tar</includeTypes>
               <outputDirectory>${project.build.directory}/${work.dir}</outputDirectory>
             </configuration>
@@ -82,7 +82,7 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>org.apache.slider</groupId>
-                  <artifactId>command-logger</artifactId>
+                  <artifactId>command-logger-sample</artifactId>
                   <type>tar</type>
                   <overWrite>false</overWrite>
                   <outputDirectory>${project.build.directory}/${work.dir}</outputDirectory>
@@ -100,7 +100,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.slider</groupId>
-      <artifactId>command-logger</artifactId>
+      <artifactId>command-logger-sample</artifactId>
       <version>${project.version}</version>
       <type>tar</type>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/39755ca1/slider-core/src/test/app_packages/test_command_log/appConfig.json
----------------------------------------------------------------------
diff --git a/slider-core/src/test/app_packages/test_command_log/appConfig.json b/slider-core/src/test/app_packages/test_command_log/appConfig.json
index a8d3d4b..b9383ec 100644
--- a/slider-core/src/test/app_packages/test_command_log/appConfig.json
+++ b/slider-core/src/test/app_packages/test_command_log/appConfig.json
@@ -3,7 +3,7 @@
     "metadata": {
     },
     "global": {
-        "application.def": ".slider/package/CMD_LOGGER/apache-slider-command-logger.zip",
+        "application.def": ".slider/package/CMD_LOGGER/command-logger-slider-package.zip",
         "java_home": "/usr/jdk64/jdk1.7.0_67",
         "site.global.application_id": "CommandLogger",
         "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/command-logger",

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/39755ca1/slider-core/src/test/app_packages/test_command_log/appConfig_fast_no_reg.json
----------------------------------------------------------------------
diff --git a/slider-core/src/test/app_packages/test_command_log/appConfig_fast_no_reg.json b/slider-core/src/test/app_packages/test_command_log/appConfig_fast_no_reg.json
index ac11c08..fa7312a 100644
--- a/slider-core/src/test/app_packages/test_command_log/appConfig_fast_no_reg.json
+++ b/slider-core/src/test/app_packages/test_command_log/appConfig_fast_no_reg.json
@@ -5,7 +5,7 @@
     "global": {
         "heartbeat.monitor.interval": "20000",
         "agent.instance.debug.data": "ANY:DO_NOT_REGISTER:NONE",
-        "application.def": ".slider/package/CMD_LOGGER/apache-slider-command-logger.zip",
+        "application.def": ".slider/package/CMD_LOGGER/command-logger-slider-package.zip",
         "java_home": "/usr/jdk64/jdk1.7.0_67",
         "site.global.application_id": "CommandLogger",
         "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/command-logger",

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/39755ca1/slider-core/src/test/app_packages/test_command_log/appConfig_no_hb.json
----------------------------------------------------------------------
diff --git a/slider-core/src/test/app_packages/test_command_log/appConfig_no_hb.json b/slider-core/src/test/app_packages/test_command_log/appConfig_no_hb.json
index 9d70879..eae57e7 100644
--- a/slider-core/src/test/app_packages/test_command_log/appConfig_no_hb.json
+++ b/slider-core/src/test/app_packages/test_command_log/appConfig_no_hb.json
@@ -5,7 +5,7 @@
     "global": {
         "heartbeat.monitor.interval": "20000",
         "agent.instance.debug.data": "ANY:DO_NOT_HEARTBEAT:DO_NOT_HEARTBEAT:NONE",
-        "application.def": ".slider/package/CMD_LOGGER/apache-slider-command-logger.zip",
+        "application.def": ".slider/package/CMD_LOGGER/command-logger-slider-package.zip",
         "java_home": "/usr/jdk64/jdk1.7.0_67",
         "site.global.application_id": "CommandLogger",
         "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/command-logger",

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/39755ca1/slider-funtest/pom.xml
----------------------------------------------------------------------
diff --git a/slider-funtest/pom.xml b/slider-funtest/pom.xml
index 708317c..8b88a61 100644
--- a/slider-funtest/pom.xml
+++ b/slider-funtest/pom.xml
@@ -119,7 +119,7 @@
             <slider.conf.dir>${slider.conf.dir}</slider.conf.dir>
             <slider.bin.dir>../slider-assembly/target/slider-${project.version}-all/slider-${project.version}</slider.bin.dir>
             <test.app.pkg.dir>../app-packages/command-logger/slider-pkg/target</test.app.pkg.dir>
-            <test.app.pkg.file>apache-slider-command-logger.zip</test.app.pkg.file>
+            <test.app.pkg.file>command-logger-slider-package.zip</test.app.pkg.file>
             <test.app.pkg.name>CMD_LOGGER</test.app.pkg.name>
             <test.app.resource>../slider-core/src/test/app_packages/test_command_log/resources.json</test.app.resource>
             <test.app.template>../slider-core/src/test/app_packages/test_command_log/appConfig.json</test.app.template>
@@ -155,11 +155,11 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>org.apache.slider</groupId>
-                  <artifactId>apache-slider-command-logger</artifactId>
+                  <artifactId>command-logger-slider-package</artifactId>
                   <type>zip</type>
                   <overWrite>false</overWrite>
                   <outputDirectory>${project.build.directory}/${work.dir}</outputDirectory>
-                  <destFileName>apache-slider-command-logger.zip</destFileName>
+                  <destFileName>command-logger-slider-package.zip</destFileName>
                 </artifactItem>
               </artifactItems>
             </configuration>
@@ -221,7 +221,7 @@
 
     <dependency>
       <groupId>org.apache.slider</groupId>
-      <artifactId>apache-slider-command-logger</artifactId>
+      <artifactId>command-logger-slider-package</artifactId>
       <version>${project.version}</version>
       <type>zip</type>
     </dependency>


[6/6] incubator-slider git commit: [maven-release-plugin] prepare for next development iteration

Posted by el...@apache.org.
[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/f916ef8c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f916ef8c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f916ef8c

Branch: refs/heads/branches/branch-0.6
Commit: f916ef8c246b77be8d0157a6d8e3a6d12f11fb68
Parents: 64a8bac
Author: Steve Loughran <st...@hortonworks.com>
Authored: Tue Jan 27 18:21:18 2015 +0000
Committer: Steve Loughran <st...@hortonworks.com>
Committed: Tue Jan 27 18:21:18 2015 +0000

----------------------------------------------------------------------
 app-packages/accumulo/pom.xml                              | 2 +-
 app-packages/command-logger/application-pkg/pom.xml        | 2 +-
 app-packages/command-logger/slider-pkg/pom.xml             | 2 +-
 app-packages/hbase/pom.xml                                 | 2 +-
 app-packages/pom.xml                                       | 2 +-
 app-packages/storm/pom.xml                                 | 2 +-
 pom.xml                                                    | 2 +-
 slider-agent/pom.xml                                       | 2 +-
 slider-assembly/pom.xml                                    | 2 +-
 slider-core/pom.xml                                        | 2 +-
 slider-funtest/pom.xml                                     | 2 +-
 slider-providers/accumulo/accumulo-funtests/pom.xml        | 2 +-
 slider-providers/accumulo/slider-accumulo-provider/pom.xml | 2 +-
 slider-providers/hbase/hbase-funtests/pom.xml              | 2 +-
 slider-providers/hbase/slider-hbase-provider/pom.xml       | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f916ef8c/app-packages/accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml
index 524853d..4531c3e 100644
--- a/app-packages/accumulo/pom.xml
+++ b/app-packages/accumulo/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.slider.packages</groupId>
     <artifactId>slider-app-packages</artifactId>
-    <version>0.61.0-incubating</version>
+    <version>0.61.1-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f916ef8c/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 0f209d9..1c96093 100644
--- a/app-packages/command-logger/application-pkg/pom.xml
+++ b/app-packages/command-logger/application-pkg/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.slider</groupId>
     <artifactId>slider</artifactId>
-    <version>0.61.0-incubating</version>
+    <version>0.61.1-incubating-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f916ef8c/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 36c9ac8..cc4ce87 100644
--- a/app-packages/command-logger/slider-pkg/pom.xml
+++ b/app-packages/command-logger/slider-pkg/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.slider</groupId>
     <artifactId>slider</artifactId>
-    <version>0.61.0-incubating</version>
+    <version>0.61.1-incubating-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f916ef8c/app-packages/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase/pom.xml b/app-packages/hbase/pom.xml
index 49e73ea..dab3138 100644
--- a/app-packages/hbase/pom.xml
+++ b/app-packages/hbase/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.slider.packages</groupId>
     <artifactId>slider-app-packages</artifactId>
-    <version>0.61.0-incubating</version>
+    <version>0.61.1-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f916ef8c/app-packages/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/pom.xml b/app-packages/pom.xml
index 953d698..8cea8c1 100644
--- a/app-packages/pom.xml
+++ b/app-packages/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.slider</groupId>
     <artifactId>slider</artifactId>
-    <version>0.61.0-incubating</version>
+    <version>0.61.1-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f916ef8c/app-packages/storm/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm/pom.xml b/app-packages/storm/pom.xml
index e6af2dc..6a6822d 100644
--- a/app-packages/storm/pom.xml
+++ b/app-packages/storm/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.slider.packages</groupId>
     <artifactId>slider-app-packages</artifactId>
-    <version>0.61.0-incubating</version>
+    <version>0.61.1-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f916ef8c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0f935f6..3453314 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
   <groupId>org.apache.slider</groupId>
   <artifactId>slider</artifactId>
   <name>Slider</name>
-  <version>0.61.0-incubating</version>
+  <version>0.61.1-incubating-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <description>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f916ef8c/slider-agent/pom.xml
----------------------------------------------------------------------
diff --git a/slider-agent/pom.xml b/slider-agent/pom.xml
index adddb8d..0904ff4 100644
--- a/slider-agent/pom.xml
+++ b/slider-agent/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.slider</groupId>
     <artifactId>slider</artifactId>
-    <version>0.61.0-incubating</version>
+    <version>0.61.1-incubating-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>slider-agent</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f916ef8c/slider-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/slider-assembly/pom.xml b/slider-assembly/pom.xml
index ef5b5bf..cfff589 100644
--- a/slider-assembly/pom.xml
+++ b/slider-assembly/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.slider</groupId>
     <artifactId>slider</artifactId>
-    <version>0.61.0-incubating</version>
+    <version>0.61.1-incubating-SNAPSHOT</version>
   </parent>
 
 

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f916ef8c/slider-core/pom.xml
----------------------------------------------------------------------
diff --git a/slider-core/pom.xml b/slider-core/pom.xml
index 57e0d3c..7fbb398 100644
--- a/slider-core/pom.xml
+++ b/slider-core/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.slider</groupId>
     <artifactId>slider</artifactId>
-    <version>0.61.0-incubating</version>
+    <version>0.61.1-incubating-SNAPSHOT</version>
   </parent>
 
   <build>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f916ef8c/slider-funtest/pom.xml
----------------------------------------------------------------------
diff --git a/slider-funtest/pom.xml b/slider-funtest/pom.xml
index 6f56c07..d84c54d 100644
--- a/slider-funtest/pom.xml
+++ b/slider-funtest/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.slider</groupId>
     <artifactId>slider</artifactId>
-    <version>0.61.0-incubating</version>
+    <version>0.61.1-incubating-SNAPSHOT</version>
   </parent>
   <properties>
     <work.dir>package-tmp</work.dir>

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f916ef8c/slider-providers/accumulo/accumulo-funtests/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/accumulo-funtests/pom.xml b/slider-providers/accumulo/accumulo-funtests/pom.xml
index 51ada33..cd91d52 100644
--- a/slider-providers/accumulo/accumulo-funtests/pom.xml
+++ b/slider-providers/accumulo/accumulo-funtests/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.slider</groupId>
     <artifactId>slider</artifactId>
-    <version>0.61.0-incubating</version>
+    <version>0.61.1-incubating-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f916ef8c/slider-providers/accumulo/slider-accumulo-provider/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/slider-accumulo-provider/pom.xml b/slider-providers/accumulo/slider-accumulo-provider/pom.xml
index 1c749f0..7ad3dfb 100644
--- a/slider-providers/accumulo/slider-accumulo-provider/pom.xml
+++ b/slider-providers/accumulo/slider-accumulo-provider/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.slider</groupId>
     <artifactId>slider</artifactId>
-    <version>0.61.0-incubating</version>
+    <version>0.61.1-incubating-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f916ef8c/slider-providers/hbase/hbase-funtests/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/hbase-funtests/pom.xml b/slider-providers/hbase/hbase-funtests/pom.xml
index da90c56..8a643d6 100644
--- a/slider-providers/hbase/hbase-funtests/pom.xml
+++ b/slider-providers/hbase/hbase-funtests/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.slider</groupId>
     <artifactId>slider</artifactId>
-    <version>0.61.0-incubating</version>
+    <version>0.61.1-incubating-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f916ef8c/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 ce9ab0f..3206b00 100644
--- a/slider-providers/hbase/slider-hbase-provider/pom.xml
+++ b/slider-providers/hbase/slider-hbase-provider/pom.xml
@@ -29,7 +29,7 @@
   <parent>
     <groupId>org.apache.slider</groupId>
     <artifactId>slider</artifactId>
-    <version>0.61.0-incubating</version>
+    <version>0.61.1-incubating-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>