You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/12/03 17:46:22 UTC
[1/5] incubator-slider git commit: SLIDER-671 add -SNAPSHOT tag to
version
Repository: incubator-slider
Updated Branches:
refs/heads/develop 80abe081d -> 9438567b9
SLIDER-671 add -SNAPSHOT tag to version
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/b85b3b22
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b85b3b22
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b85b3b22
Branch: refs/heads/develop
Commit: b85b3b22c7b10403c62815fd3a4cca7ec6d82665
Parents: 3fe140c
Author: Steve Loughran <st...@apache.org>
Authored: Fri Nov 28 17:56:13 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Nov 28 17:56:13 2014 +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-win/pom.xml | 2 +-
app-packages/hbase/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-funtest/pom.xml | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b85b3b22/app-packages/accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml
index 4c22bb1..c19e2ae 100644
--- a/app-packages/accumulo/pom.xml
+++ b/app-packages/accumulo/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.61-incubating</version>
+ <version>0.61.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b85b3b22/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 bc874c9..632483e 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-incubating</version>
+ <version>0.61.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b85b3b22/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 b22dfc6..33219bb 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.61-incubating</version>
+ <version>0.61.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b85b3b22/app-packages/hbase-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase-win/pom.xml b/app-packages/hbase-win/pom.xml
index 6dd041e..c9030dc 100644
--- a/app-packages/hbase-win/pom.xml
+++ b/app-packages/hbase-win/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.61-incubating</version>
+ <version>0.61.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b85b3b22/app-packages/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase/pom.xml b/app-packages/hbase/pom.xml
index 11c3e5d..c81d5bd 100644
--- a/app-packages/hbase/pom.xml
+++ b/app-packages/hbase/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.61-incubating</version>
+ <version>0.61.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b85b3b22/app-packages/storm-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm-win/pom.xml b/app-packages/storm-win/pom.xml
index 48bf3b6..c8e16ee 100644
--- a/app-packages/storm-win/pom.xml
+++ b/app-packages/storm-win/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.61-incubating</version>
+ <version>0.61.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b85b3b22/app-packages/storm/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm/pom.xml b/app-packages/storm/pom.xml
index 8a99aeb..64f2dd2 100644
--- a/app-packages/storm/pom.xml
+++ b/app-packages/storm/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.61-incubating</version>
+ <version>0.61.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b85b3b22/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 991cf1a..de919af 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-incubating</version>
+ <version>0.61.0-SNAPSHOT</version>
<packaging>pom</packaging>
<description>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b85b3b22/slider-agent/pom.xml
----------------------------------------------------------------------
diff --git a/slider-agent/pom.xml b/slider-agent/pom.xml
index f4d50b2..04993bc 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-incubating</version>
+ <version>0.61.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>slider-agent</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b85b3b22/slider-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/slider-assembly/pom.xml b/slider-assembly/pom.xml
index 88c3693..a7ce994 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-incubating</version>
+ <version>0.61.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b85b3b22/slider-core/pom.xml
----------------------------------------------------------------------
diff --git a/slider-core/pom.xml b/slider-core/pom.xml
index a36e915..6b7cba3 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-incubating</version>
+ <version>0.61.0-SNAPSHOT</version>
</parent>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b85b3b22/slider-funtest/pom.xml
----------------------------------------------------------------------
diff --git a/slider-funtest/pom.xml b/slider-funtest/pom.xml
index fbeb11d..0a669af 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-incubating</version>
+ <version>0.61.0-SNAPSHOT</version>
</parent>
<properties>
<work.dir>package-tmp</work.dir>
[2/5] incubator-slider git commit: SLIDER-671 pom fixup: all plugins
have version references, no modules have explicit JAR versions, hbase->0.99.0
Posted by st...@apache.org.
SLIDER-671 pom fixup: all plugins have version references, no modules have explicit JAR versions, hbase->0.99.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/bb591810
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/bb591810
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/bb591810
Branch: refs/heads/develop
Commit: bb59181089154baeaec96690a802bc96d3b6bd5d
Parents: b85b3b2
Author: Steve Loughran <st...@apache.org>
Authored: Fri Nov 28 18:22:23 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Nov 28 18:27:39 2014 +0000
----------------------------------------------------------------------
app-packages/accumulo/pom.xml | 2 +
.../command-logger/application-pkg/pom.xml | 1 +
app-packages/command-logger/slider-pkg/pom.xml | 1 +
app-packages/hbase-win/pom.xml | 3 +-
app-packages/hbase/pom.xml | 4 ++
app-packages/storm/pom.xml | 3 +-
pom.xml | 13 ++++--
slider-funtest/pom.xml | 48 +++-----------------
8 files changed, 28 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bb591810/app-packages/accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml
index c19e2ae..185cfa1 100644
--- a/app-packages/accumulo/pom.xml
+++ b/app-packages/accumulo/pom.xml
@@ -145,6 +145,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
<configuration>
<descriptor>src/assembly/accumulo.xml</descriptor>
<appendAssemblyId>false</appendAssemblyId>
@@ -241,6 +242,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bb591810/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 632483e..ec7f3fa 100644
--- a/app-packages/command-logger/application-pkg/pom.xml
+++ b/app-packages/command-logger/application-pkg/pom.xml
@@ -37,6 +37,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
<configuration>
<tarLongFileMode>gnu</tarLongFileMode>
<descriptor>src/packages/tarball/all.xml</descriptor>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bb591810/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 33219bb..6e8f979 100644
--- a/app-packages/command-logger/slider-pkg/pom.xml
+++ b/app-packages/command-logger/slider-pkg/pom.xml
@@ -38,6 +38,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
<configuration>
<descriptor>src/assembly/command-logger.xml</descriptor>
<appendAssemblyId>false</appendAssemblyId>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bb591810/app-packages/hbase-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase-win/pom.xml b/app-packages/hbase-win/pom.xml
index c9030dc..f494caf 100644
--- a/app-packages/hbase-win/pom.xml
+++ b/app-packages/hbase-win/pom.xml
@@ -42,7 +42,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
+ <version>${maven-antrun-plugin.version}</version>
<executions>
<execution>
<id>copy</id>
@@ -61,6 +61,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
<configuration>
<tarLongFileMode>gnu</tarLongFileMode>
<descriptor>src/assembly/hbase.xml</descriptor>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bb591810/app-packages/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase/pom.xml b/app-packages/hbase/pom.xml
index c81d5bd..513dc02 100644
--- a/app-packages/hbase/pom.xml
+++ b/app-packages/hbase/pom.xml
@@ -99,6 +99,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
<configuration>
<descriptor>src/assembly/hbase.xml</descriptor>
<appendAssemblyId>false</appendAssemblyId>
@@ -139,6 +140,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
+ <version>${maven-failsafe-plugin.version}</version>
<executions>
<execution>
<id>run-integration-tests</id>
@@ -165,6 +167,7 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
@@ -182,6 +185,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>${maven-surefire-plugin.version}</version>
<configuration>
<!-- can't figure out how to get the surefire plugin not to pick up the ITs, so skip it entirely -->
<skip>true</skip>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bb591810/app-packages/storm/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm/pom.xml b/app-packages/storm/pom.xml
index 64f2dd2..e79c381 100644
--- a/app-packages/storm/pom.xml
+++ b/app-packages/storm/pom.xml
@@ -42,7 +42,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
+ <version>${maven-antrun-plugin.version}</version>
<executions>
<execution>
<id>copy</id>
@@ -61,6 +61,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
<configuration>
<tarLongFileMode>gnu</tarLongFileMode>
<descriptor>src/assembly/storm.xml</descriptor>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bb591810/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index de919af..869a090 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,9 +135,8 @@
-->
<hadoop.version>2.6.0</hadoop.version>
- <hbase.version>0.98.4-hadoop2</hbase.version>
+ <hbase.version>0.99.0</hbase.version>
<accumulo.version>1.6.1</accumulo.version>
-
<!--
artifact versions
-->
@@ -166,6 +165,7 @@
<jsr311-api.version>1.1.1</jsr311-api.version>
<jaxb-api.version>2.2.7</jaxb-api.version>
<jsp.version>2.1</jsp.version>
+ <jsch.version>0.1.51</jsch.version>
<junit.version>4.11</junit.version>
<log4j.version>1.2.17</log4j.version>
<metrics.version>3.0.1</metrics.version>
@@ -176,6 +176,7 @@
<protobuf.version>2.5.0</protobuf.version>
<slf4j.version>1.7.5</slf4j.version>
+ <storm.version>0.9.3</storm.version>
<stringtemplate.version>2.4.1</stringtemplate.version>
<zookeeper.version>3.4.6</zookeeper.version>
@@ -1144,7 +1145,7 @@
<version>${slf4j.version}</version>
</dependency>
- <!-- Used for unit testing -->
+ <!-- Used for testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -1157,6 +1158,12 @@
<version>${protobuf.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ <version>${jsch.version}</version>
+ </dependency>
+
<!-- ======================================================== -->
<!-- Jersey and webapp support -->
<!-- ======================================================== -->
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bb591810/slider-funtest/pom.xml
----------------------------------------------------------------------
diff --git a/slider-funtest/pom.xml b/slider-funtest/pom.xml
index 0a669af..af08d1c 100644
--- a/slider-funtest/pom.xml
+++ b/slider-funtest/pom.xml
@@ -67,6 +67,7 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
@@ -212,7 +213,6 @@
<artifactId>hbase-client</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
@@ -227,42 +227,6 @@
</dependency>
<dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-common</artifactId>
- <classifier>tests</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-it</artifactId>
- <classifier>tests</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-hadoop-compat</artifactId>
- <classifier>tests</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-hadoop2-compat</artifactId>
- <classifier>tests</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-server</artifactId>
- <classifier>tests</classifier>
- </dependency>
-
- <dependency>
<groupId>org.apache.bigtop.itest</groupId>
<artifactId>itest-common</artifactId>
</dependency>
@@ -284,14 +248,14 @@
<artifactId>junit</artifactId>
</dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
- <version>0.1.51</version>
</dependency>
</dependencies>
[5/5] incubator-slider git commit: Merge branch
'feature/SLIDER-671-mvn-publish' into develop
Posted by st...@apache.org.
Merge branch 'feature/SLIDER-671-mvn-publish' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/9438567b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/9438567b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/9438567b
Branch: refs/heads/develop
Commit: 9438567b95e79ad49c72d1056d852848206587fc
Parents: 80abe08 619a465
Author: Steve Loughran <st...@apache.org>
Authored: Wed Dec 3 16:30:15 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Dec 3 16:30:15 2014 +0000
----------------------------------------------------------------------
app-packages/accumulo/README.md | 2 +-
app-packages/accumulo/pom.xml | 11 +++--
.../command-logger/application-pkg/pom.xml | 3 +-
app-packages/command-logger/slider-pkg/pom.xml | 3 +-
app-packages/hbase-win/appConfig-default.json | 2 +-
app-packages/hbase-win/pom.xml | 12 ++---
app-packages/hbase/appConfig-default.json | 2 +-
app-packages/hbase/pom.xml | 14 ++++--
app-packages/storm-win/pom.xml | 14 +++---
app-packages/storm/appConfig-default.json | 8 ++--
app-packages/storm/pom.xml | 12 ++---
pom.xml | 15 ++++--
slider-agent/pom.xml | 2 +-
slider-assembly/pom.xml | 2 +-
slider-core/pom.xml | 2 +-
slider-funtest/pom.xml | 50 +++-----------------
16 files changed, 67 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
[4/5] incubator-slider git commit: SLIDER-655: moving app packages to
new base project;
this still (currently) inherits off /slider.pom so versions are the same.
Posted by st...@apache.org.
SLIDER-655: moving app packages to new base project; this still (currently) inherits off /slider.pom so versions are the same.
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/619a4650
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/619a4650
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/619a4650
Branch: refs/heads/develop
Commit: 619a4650b103708765c42fc1588b735e7090b9b8
Parents: d7ec46d
Author: Steve Loughran <st...@apache.org>
Authored: Wed Dec 3 16:28:46 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Dec 3 16:28:46 2014 +0000
----------------------------------------------------------------------
app-packages/accumulo/README.md | 2 +-
app-packages/accumulo/pom.xml | 8 ++++----
app-packages/hbase-win/pom.xml | 7 +++----
app-packages/hbase/pom.xml | 9 ++++-----
app-packages/storm-win/pom.xml | 13 ++++++-------
app-packages/storm/pom.xml | 7 +++----
6 files changed, 21 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/619a4650/app-packages/accumulo/README.md
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/README.md b/app-packages/accumulo/README.md
index 537d769..e44870e 100644
--- a/app-packages/accumulo/README.md
+++ b/app-packages/accumulo/README.md
@@ -53,7 +53,7 @@ applicable for other versions of the app package.
Note also that the sample `appConfig-default.json` provided only works with Accumulo 1.6.
For Accumulo 1.5 the instance.volumes property must be replaced with
-instance.dfs.dir (and it cannot use the provided variable `${DEFAULT_DATA_DIR}`
+`instance.dfs.dir` (and it cannot use the provided variable `${DEFAULT_DATA_DIR}`
which is an HDFS URI).
A less descriptive file name can be specified with
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/619a4650/app-packages/accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml
index b95ebca..611940c 100644
--- a/app-packages/accumulo/pom.xml
+++ b/app-packages/accumulo/pom.xml
@@ -17,13 +17,12 @@
limitations under the License.
-->
<parent>
- <groupId>org.apache.slider</groupId>
- <artifactId>slider</artifactId>
+ <groupId>org.apache.slider.packages</groupId>
+ <artifactId>slider-app-packages</artifactId>
<version>0.61.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.slider.packages</groupId>
<artifactId>slider-accumulo-app-package</artifactId>
<packaging>jar</packaging>
<name>Slider Accumulo App Package</name>
@@ -74,6 +73,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
<configuration>
<descriptor>src/assembly/accumulo.xml</descriptor>
<appendAssemblyId>false</appendAssemblyId>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/619a4650/app-packages/hbase-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase-win/pom.xml b/app-packages/hbase-win/pom.xml
index 20e9e42..171b056 100644
--- a/app-packages/hbase-win/pom.xml
+++ b/app-packages/hbase-win/pom.xml
@@ -18,13 +18,12 @@
limitations under the License.
-->
<parent>
- <groupId>org.apache.slider</groupId>
- <artifactId>slider</artifactId>
+ <groupId>org.apache.slider.packages</groupId>
+ <artifactId>slider-app-packages</artifactId>
<version>0.61.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.slider.packages</groupId>
<artifactId>slider-hbase-app-win-package</artifactId>
<packaging>pom</packaging>
<name>Slider HBase App Package for Windows</name>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/619a4650/app-packages/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase/pom.xml b/app-packages/hbase/pom.xml
index a524d9f..aad3fef 100644
--- a/app-packages/hbase/pom.xml
+++ b/app-packages/hbase/pom.xml
@@ -18,18 +18,16 @@
limitations under the License.
-->
<parent>
- <groupId>org.apache.slider</groupId>
- <artifactId>slider</artifactId>
+ <groupId>org.apache.slider.packages</groupId>
+ <artifactId>slider-app-packages</artifactId>
<version>0.61.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.slider.packages</groupId>
<artifactId>slider-hbase-app-package</artifactId>
<packaging>pom</packaging>
<name>Slider HBase App Package</name>
<description>Slider HBase App Package</description>
- <version>${pkg.version}</version>
<properties>
<work.dir>package-tmp</work.dir>
<app.package.name>${project.artifactId}-${project.version}</app.package.name>
@@ -62,6 +60,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
<configuration>
<tarLongFileMode>gnu</tarLongFileMode>
<descriptor>src/assembly/hbase.xml</descriptor>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/619a4650/app-packages/storm-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm-win/pom.xml b/app-packages/storm-win/pom.xml
index fb078cf..e78b4ac 100644
--- a/app-packages/storm-win/pom.xml
+++ b/app-packages/storm-win/pom.xml
@@ -18,18 +18,16 @@
limitations under the License.
-->
<parent>
- <groupId>org.apache.slider</groupId>
- <artifactId>slider</artifactId>
+ <groupId>org.apache.slider.packages</groupId>
+ <artifactId>slider-app-packages</artifactId>
<version>0.61.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.slider.packages</groupId>
<artifactId>slider-storm-app-win-package</artifactId>
<packaging>pom</packaging>
<name>Slider Storm App Package</name>
- <description>Slider Storm App Package</description>
- <version>${pkg.version}</version>
+ <description>Slider Storm Windows App Package</description>
<properties>
<work.dir>package-tmp</work.dir>
</properties>
@@ -43,7 +41,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
+ <version>${maven-antrun-plugin.version}</version>
<executions>
<execution>
<id>copy</id>
@@ -62,6 +60,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
<configuration>
<tarLongFileMode>gnu</tarLongFileMode>
<descriptor>src/assembly/storm.xml</descriptor>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/619a4650/app-packages/storm/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm/pom.xml b/app-packages/storm/pom.xml
index dbdb5b5..94870ab 100644
--- a/app-packages/storm/pom.xml
+++ b/app-packages/storm/pom.xml
@@ -18,13 +18,12 @@
limitations under the License.
-->
<parent>
- <groupId>org.apache.slider</groupId>
- <artifactId>slider</artifactId>
+ <groupId>org.apache.slider.packages</groupId>
+ <artifactId>slider-app-packages</artifactId>
<version>0.61.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.slider.packages</groupId>
<artifactId>slider-storm-app-package</artifactId>
<packaging>pom</packaging>
<name>Slider Storm App Package</name>
[3/5] incubator-slider git commit: SLIDER-655 split app packages out
of slider POM for independent releases
Posted by st...@apache.org.
SLIDER-655 split app packages out of slider POM for independent releases
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/d7ec46d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/d7ec46d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/d7ec46d8
Branch: refs/heads/develop
Commit: d7ec46d89d1f9711facf02e7abc8f7d92ad4de4b
Parents: bb59181
Author: Steve Loughran <st...@apache.org>
Authored: Wed Dec 3 15:35:01 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Dec 3 15:35:01 2014 +0000
----------------------------------------------------------------------
app-packages/accumulo/pom.xml | 1 +
app-packages/hbase-win/appConfig-default.json | 2 +-
app-packages/hbase-win/pom.xml | 2 +-
app-packages/hbase/appConfig-default.json | 2 +-
app-packages/hbase/pom.xml | 1 +
app-packages/storm-win/pom.xml | 1 +
app-packages/storm/appConfig-default.json | 8 ++++----
app-packages/storm/pom.xml | 2 +-
8 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d7ec46d8/app-packages/accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml
index 185cfa1..b95ebca 100644
--- a/app-packages/accumulo/pom.xml
+++ b/app-packages/accumulo/pom.xml
@@ -23,6 +23,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.slider.packages</groupId>
<artifactId>slider-accumulo-app-package</artifactId>
<packaging>jar</packaging>
<name>Slider Accumulo App Package</name>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d7ec46d8/app-packages/hbase-win/appConfig-default.json
----------------------------------------------------------------------
diff --git a/app-packages/hbase-win/appConfig-default.json b/app-packages/hbase-win/appConfig-default.json
index 04cb9a9..719a743 100644
--- a/app-packages/hbase-win/appConfig-default.json
+++ b/app-packages/hbase-win/appConfig-default.json
@@ -8,7 +8,7 @@
"java_home": "C:\\java",
"site.global.app_user": "hadoop",
- "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/hbase-${pkg.version}",
+ "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/hbase-${hbase.version}",
"site.global.hbase_instance_name": "instancename",
"site.global.user_group": "hadoop",
"site.global.hbase_additional_cp": "c:\\java\\lib\\tools.jar;",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d7ec46d8/app-packages/hbase-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase-win/pom.xml b/app-packages/hbase-win/pom.xml
index f494caf..20e9e42 100644
--- a/app-packages/hbase-win/pom.xml
+++ b/app-packages/hbase-win/pom.xml
@@ -24,11 +24,11 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.slider.packages</groupId>
<artifactId>slider-hbase-app-win-package</artifactId>
<packaging>pom</packaging>
<name>Slider HBase App Package for Windows</name>
<description>Slider HBase App Package for Windows</description>
- <version>${pkg.version}</version>
<properties>
<work.dir>package-tmp</work.dir>
<app.package.name>${project.artifactId}-${project.version}</app.package.name>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d7ec46d8/app-packages/hbase/appConfig-default.json
----------------------------------------------------------------------
diff --git a/app-packages/hbase/appConfig-default.json b/app-packages/hbase/appConfig-default.json
index 52587e5..f065185 100644
--- a/app-packages/hbase/appConfig-default.json
+++ b/app-packages/hbase/appConfig-default.json
@@ -9,7 +9,7 @@
"system_configs": "core-site",
"site.global.app_user": "yarn",
- "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/hbase-${pkg.version}",
+ "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/hbase-${hbase.version}",
"site.global.ganglia_server_host": "${NN_HOST}",
"site.global.ganglia_server_port": "8667",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d7ec46d8/app-packages/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase/pom.xml b/app-packages/hbase/pom.xml
index 513dc02..a524d9f 100644
--- a/app-packages/hbase/pom.xml
+++ b/app-packages/hbase/pom.xml
@@ -24,6 +24,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.slider.packages</groupId>
<artifactId>slider-hbase-app-package</artifactId>
<packaging>pom</packaging>
<name>Slider HBase App Package</name>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d7ec46d8/app-packages/storm-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm-win/pom.xml b/app-packages/storm-win/pom.xml
index c8e16ee..fb078cf 100644
--- a/app-packages/storm-win/pom.xml
+++ b/app-packages/storm-win/pom.xml
@@ -24,6 +24,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.slider.packages</groupId>
<artifactId>slider-storm-app-win-package</artifactId>
<packaging>pom</packaging>
<name>Slider Storm App Package</name>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d7ec46d8/app-packages/storm/appConfig-default.json
----------------------------------------------------------------------
diff --git a/app-packages/storm/appConfig-default.json b/app-packages/storm/appConfig-default.json
index d7908a3..9fd7130 100644
--- a/app-packages/storm/appConfig-default.json
+++ b/app-packages/storm/appConfig-default.json
@@ -8,7 +8,7 @@
"create.default.zookeeper.node": "true",
"site.global.app_user": "${USER_NAME}",
- "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}",
+ "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/apache-storm-${storm.version}",
"site.global.user_group": "hadoop",
"site.global.ganglia_server_host": "${NN_HOST}",
"site.global.ganglia_server_id": "Application2",
@@ -21,10 +21,10 @@
"site.storm-site.storm.local.dir": "${AGENT_WORK_ROOT}/app/tmp/storm",
"site.storm-site.transactional.zookeeper.root": "/transactional",
"site.storm-site.storm.zookeeper.port": "2181",
- "site.storm-site.nimbus.childopts": "-Xmx1024m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Nimbus_JVM",
- "site.storm-site.supervisor.childopts": "-Xmx256m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM",
+ "site.storm-site.nimbus.childopts": "-Xmx1024m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${storm.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${storm.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Nimbus_JVM",
+ "site.storm-site.supervisor.childopts": "-Xmx256m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${storm.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${storm.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM",
"site.storm-site.ui.childopts": "-Xmx768m",
- "site.storm-site.worker.childopts": "-Xmx768m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Worker_%ID%_JVM",
+ "site.storm-site.worker.childopts": "-Xmx768m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${storm.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${storm.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Worker_%ID%_JVM",
"site.storm-site.dev.zookeeper.path": "${AGENT_WORK_ROOT}/app/tmp/dev-storm-zookeeper",
"site.storm-site.drpc.invocations.port": "0",
"site.storm-site.storm.zookeeper.root": "${DEFAULT_ZK_PATH}",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d7ec46d8/app-packages/storm/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm/pom.xml b/app-packages/storm/pom.xml
index e79c381..dbdb5b5 100644
--- a/app-packages/storm/pom.xml
+++ b/app-packages/storm/pom.xml
@@ -24,11 +24,11 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.slider.packages</groupId>
<artifactId>slider-storm-app-package</artifactId>
<packaging>pom</packaging>
<name>Slider Storm App Package</name>
<description>Slider Storm App Package</description>
- <version>${pkg.version}</version>
<properties>
<work.dir>package-tmp</work.dir>
</properties>