Repository: incubator-slider Updated Branches: refs/heads/develop 342061f7c -> 012e59b18
SLIDER-937 updating development POMs to 0.90.0-incubating-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/012e59b1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/012e59b1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/012e59b1 Branch: refs/heads/develop Commit: 012e59b18d69cfe22b8f7cf62be8aee909e09fb8 Parents: 342061f Author: Jon Maron <[email protected]> Authored: Fri Oct 16 13:26:49 2015 -0400 Committer: Jon Maron <[email protected]> Committed: Fri Oct 16 13:26:49 2015 -0400 ---------------------------------------------------------------------- app-packages/accumulo/pom.xml | 2 +- app-packages/accumulo/src/license/THIRD-PARTY.properties | 9 ++------- app-packages/command-logger/application-pkg/pom.xml | 2 +- app-packages/command-logger/slider-pkg/pom.xml | 2 +- app-packages/hbase-win/pom.xml | 2 +- app-packages/hbase/pom.xml | 2 +- app-packages/pom.xml | 2 +- app-packages/storm-win/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-core/src/license/THIRD-PARTY.properties | 4 ++-- slider-funtest/pom.xml | 2 +- slider-funtest/src/license/THIRD-PARTY.properties | 4 ++-- src/test/clusters/remote/slider/slider-client.xml | 7 ++++++- 17 files changed, 25 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/012e59b1/app-packages/accumulo/pom.xml ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml index 11d04b7..8744741 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.81.0-incubating-SNAPSHOT</version> + <version>0.90.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/012e59b1/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 index 9322b8f..fb20f7e 100644 --- a/app-packages/accumulo/src/license/THIRD-PARTY.properties +++ b/app-packages/accumulo/src/license/THIRD-PARTY.properties @@ -2,10 +2,6 @@ #------------------------------------------------------------------------------- # 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 @@ -13,10 +9,10 @@ # - Common Public License Version 1.0 # - Eclipse Public License - Version 1.0 # - GNU Lesser General Public License (LGPL), Version 2.1 +# - GNU Lesser General Public License, 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 @@ -26,8 +22,7 @@ # Please fill the missing licenses for dependencies : # # -#Mon Jan 26 16:00:07 GMT 2015 -asm--asm--3.1=The BSD 3-Clause License +#Thu Oct 15 16:45:03 EDT 2015 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 http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/012e59b1/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 23d355c..82a4c81 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.81.0-incubating-SNAPSHOT</version> + <version>0.90.0-incubating-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/012e59b1/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 ea66881..0699a80 100644 --- a/app-packages/command-logger/slider-pkg/pom.xml +++ b/app-packages/command-logger/slider-pkg/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.slider</groupId> <artifactId>slider</artifactId> - <version>0.81.0-incubating-SNAPSHOT</version> + <version>0.90.0-incubating-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/012e59b1/app-packages/hbase-win/pom.xml ---------------------------------------------------------------------- diff --git a/app-packages/hbase-win/pom.xml b/app-packages/hbase-win/pom.xml index e641006..424b2c2 100644 --- a/app-packages/hbase-win/pom.xml +++ b/app-packages/hbase-win/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.slider.packages</groupId> <artifactId>slider-app-packages</artifactId> - <version>0.81.0-incubating-SNAPSHOT</version> + <version>0.90.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/012e59b1/app-packages/hbase/pom.xml ---------------------------------------------------------------------- diff --git a/app-packages/hbase/pom.xml b/app-packages/hbase/pom.xml index 3188d60..4d1cea0 100644 --- a/app-packages/hbase/pom.xml +++ b/app-packages/hbase/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.slider.packages</groupId> <artifactId>slider-app-packages</artifactId> - <version>0.81.0-incubating-SNAPSHOT</version> + <version>0.90.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/012e59b1/app-packages/pom.xml ---------------------------------------------------------------------- diff --git a/app-packages/pom.xml b/app-packages/pom.xml index 6f9d0d1..f32e71c 100644 --- a/app-packages/pom.xml +++ b/app-packages/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.slider</groupId> <artifactId>slider</artifactId> - <version>0.81.0-incubating-SNAPSHOT</version> + <version>0.90.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/012e59b1/app-packages/storm-win/pom.xml ---------------------------------------------------------------------- diff --git a/app-packages/storm-win/pom.xml b/app-packages/storm-win/pom.xml index b6e97c2..d8219db 100644 --- a/app-packages/storm-win/pom.xml +++ b/app-packages/storm-win/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.slider.packages</groupId> <artifactId>slider-app-packages</artifactId> - <version>0.81.0-incubating-SNAPSHOT</version> + <version>0.90.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/012e59b1/app-packages/storm/pom.xml ---------------------------------------------------------------------- diff --git a/app-packages/storm/pom.xml b/app-packages/storm/pom.xml index 6bc95ac..75e918a 100644 --- a/app-packages/storm/pom.xml +++ b/app-packages/storm/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.slider.packages</groupId> <artifactId>slider-app-packages</artifactId> - <version>0.81.0-incubating-SNAPSHOT</version> + <version>0.90.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/012e59b1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7f8ff5e..04bbc17 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ <groupId>org.apache.slider</groupId> <artifactId>slider</artifactId> <name>Slider</name> - <version>0.81.0-incubating-SNAPSHOT</version> + <version>0.90.0-incubating-SNAPSHOT</version> <packaging>pom</packaging> <description> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/012e59b1/slider-agent/pom.xml ---------------------------------------------------------------------- diff --git a/slider-agent/pom.xml b/slider-agent/pom.xml index c494b77..009a864 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.81.0-incubating-SNAPSHOT</version> + <version>0.90.0-incubating-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>slider-agent</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/012e59b1/slider-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/slider-assembly/pom.xml b/slider-assembly/pom.xml index acf2954..e6a9401 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.81.0-incubating-SNAPSHOT</version> + <version>0.90.0-incubating-SNAPSHOT</version> </parent> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/012e59b1/slider-core/pom.xml ---------------------------------------------------------------------- diff --git a/slider-core/pom.xml b/slider-core/pom.xml index 70003c7..201a26e 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.81.0-incubating-SNAPSHOT</version> + <version>0.90.0-incubating-SNAPSHOT</version> </parent> <build> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/012e59b1/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 index 662fde5..1abd56e 100644 --- a/slider-core/src/license/THIRD-PARTY.properties +++ b/slider-core/src/license/THIRD-PARTY.properties @@ -10,6 +10,7 @@ # - Common Public License Version 1.0 # - Eclipse Public License - Version 1.0 # - GNU Lesser General Public License (LGPL), Version 2.1 +# - GNU Lesser General Public License, Version 2.1 # - GPL2 w/ CPE # - MIT License # - MPL 1.1 @@ -24,8 +25,7 @@ # Please fill the missing licenses for dependencies : # # -#Mon Jan 26 15:27:00 GMT 2015 -asm--asm--3.1=The BSD 3-Clause License +#Thu Oct 15 16:45:02 EDT 2015 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 http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/012e59b1/slider-funtest/pom.xml ---------------------------------------------------------------------- diff --git a/slider-funtest/pom.xml b/slider-funtest/pom.xml index cfbc401..2d0ac58 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.81.0-incubating-SNAPSHOT</version> + <version>0.90.0-incubating-SNAPSHOT</version> </parent> <properties> <work.dir>package-tmp</work.dir> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/012e59b1/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 index 2279ca6..4a2ba24 100644 --- a/slider-funtest/src/license/THIRD-PARTY.properties +++ b/slider-funtest/src/license/THIRD-PARTY.properties @@ -8,6 +8,7 @@ # - Common Public License Version 1.0 # - Eclipse Public License - Version 1.0 # - GNU Lesser General Public License (LGPL), Version 2.1 +# - GNU Lesser General Public License, Version 2.1 # - GPL2 w/ CPE # - MIT License # - New BSD License @@ -20,8 +21,7 @@ # Please fill the missing licenses for dependencies : # # -#Mon Jan 26 15:56:57 GMT 2015 -asm--asm--3.1=The BSD 3-Clause License +#Thu Oct 15 16:45:03 EDT 2015 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 http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/012e59b1/src/test/clusters/remote/slider/slider-client.xml ---------------------------------------------------------------------- diff --git a/src/test/clusters/remote/slider/slider-client.xml b/src/test/clusters/remote/slider/slider-client.xml index 41dc32e..d77ccab 100644 --- a/src/test/clusters/remote/slider/slider-client.xml +++ b/src/test/clusters/remote/slider/slider-client.xml @@ -23,6 +23,11 @@ <configuration> <property> + <name>HADOOP_CONF_DIR</name> + <value>/Users/jmaron/dev/workspaces/slider-asf/incubator-slider/src/test/clusters/remote/conf</value> + </property> +<!-- + <property> <name>yarn.application.classpath</name> <value> /etc/hadoop/conf,/usr/lib/hadoop/*,/usr/lib/hadoop/lib/*,/usr/lib/hadoop-hdfs/*,/usr/lib/hadoop-hdfs/lib/*,/usr/lib/hadoop-yarn/*,/usr/lib/hadoop-yarn/lib/*,/usr/lib/hadoop-mapreduce/*,/usr/lib/hadoop-mapreduce/lib/* @@ -76,5 +81,5 @@ <name>slider.test.agent.tar</name> <value>hdfs://c6401.ambari.apache.org:8020/slider/agent/slider-agent.tar.gz</value> </property> - +--> </configuration>
