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:25 UTC
[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.
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>