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 2015/01/11 17:45:50 UTC
[06/19] incubator-slider git commit: SLIDER-671 pom fixup: all
plugins have version references, no modules have explicit JAR versions,
hbase->0.99.0
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/1f183bf4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/1f183bf4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/1f183bf4
Branch: refs/heads/branches/branch-0.6
Commit: 1f183bf402cc900b6becaead80f89fd679e7ae81
Parents: f722d34
Author: Steve Loughran <st...@apache.org>
Authored: Fri Nov 28 18:22:23 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 10 16:26:01 2015 +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/1f183bf4/app-packages/accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml
index 469ca85..cee1041 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/1f183bf4/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 2c1fd46..75462f4 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/1f183bf4/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 f7514dc..180396f 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/1f183bf4/app-packages/hbase-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase-win/pom.xml b/app-packages/hbase-win/pom.xml
index 55c4c53..14bbcce 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/1f183bf4/app-packages/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase/pom.xml b/app-packages/hbase/pom.xml
index 6caef05..ca54e57 100644
--- a/app-packages/hbase/pom.xml
+++ b/app-packages/hbase/pom.xml
@@ -98,6 +98,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>
@@ -138,6 +139,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>
@@ -164,6 +166,7 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
@@ -181,6 +184,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/1f183bf4/app-packages/storm/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm/pom.xml b/app-packages/storm/pom.xml
index 00ec044..b586a73 100644
--- a/app-packages/storm/pom.xml
+++ b/app-packages/storm/pom.xml
@@ -41,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>
@@ -60,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/1f183bf4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 576e4fe..7849bd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,9 +139,8 @@
-->
<hadoop.version>2.6.0-SNAPSHOT</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
-->
@@ -170,6 +169,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>
@@ -180,6 +180,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>
@@ -1132,7 +1133,7 @@
<version>${slf4j.version}</version>
</dependency>
- <!-- Used for unit testing -->
+ <!-- Used for testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -1145,6 +1146,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/1f183bf4/slider-funtest/pom.xml
----------------------------------------------------------------------
diff --git a/slider-funtest/pom.xml b/slider-funtest/pom.xml
index b5ef62e..deba7ed 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>