Author: arp
Date: Thu Nov 14 23:56:56 2013
New Revision: 1542125
URL: http://svn.apache.org/r1542125
Log:
Merging r1541618 through r1542122 from trunk to branch HDFS-2832
Modified:
hadoop/common/branches/HDFS-2832/ (props changed)
hadoop/common/branches/HDFS-2832/hadoop-project/pom.xml
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-archives/pom.xml
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-datajoin/pom.xml
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-distcp/pom.xml
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-extras/pom.xml
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-gridmix/pom.xml
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-openstack/ (props
changed)
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-rumen/pom.xml
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/ (props changed)
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-streaming/pom.xml
Propchange: hadoop/common/branches/HDFS-2832/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2:r1541667,1541680,1541687,1541699,1541861
Merged /hadoop/common/trunk:r1541618-1542122
Modified: hadoop/common/branches/HDFS-2832/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-project/pom.xml?rev=1542125&r1=1542124&r2=1542125&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-2832/hadoop-project/pom.xml Thu Nov 14 23:56:56
2013
@@ -324,8 +324,8 @@
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-math</artifactId>
- <version>2.1</version>
+ <artifactId>commons-math3</artifactId>
+ <version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -745,6 +745,11 @@
<artifactId>hadoop-sls</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>1.3.9</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-archives/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-archives/pom.xml?rev=1542125&r1=1542124&r2=1542125&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-archives/pom.xml
(original)
+++ hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-archives/pom.xml Thu
Nov 14 23:56:56 2013
@@ -36,6 +36,11 @@
<dependencies>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
<scope>provided</scope>
Modified: hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-datajoin/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-datajoin/pom.xml?rev=1542125&r1=1542124&r2=1542125&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-datajoin/pom.xml
(original)
+++ hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-datajoin/pom.xml Thu
Nov 14 23:56:56 2013
@@ -33,6 +33,11 @@
<dependencies>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
<scope>provided</scope>
Modified: hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-distcp/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-distcp/pom.xml?rev=1542125&r1=1542124&r2=1542125&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-distcp/pom.xml
(original)
+++ hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-distcp/pom.xml Thu Nov
14 23:56:56 2013
@@ -38,6 +38,11 @@
<dependencies>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<scope>provided</scope>
Modified: hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-extras/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-extras/pom.xml?rev=1542125&r1=1542124&r2=1542125&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-extras/pom.xml
(original)
+++ hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-extras/pom.xml Thu Nov
14 23:56:56 2013
@@ -36,6 +36,11 @@
<dependencies>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
<scope>provided</scope>
Modified: hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-gridmix/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-gridmix/pom.xml?rev=1542125&r1=1542124&r2=1542125&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-gridmix/pom.xml
(original)
+++ hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-gridmix/pom.xml Thu
Nov 14 23:56:56 2013
@@ -33,6 +33,11 @@
<dependencies>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
<scope>provided</scope>
Propchange: hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-openstack/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Nov 14 23:56:56 2013
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
Modified: hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-rumen/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-rumen/pom.xml?rev=1542125&r1=1542124&r2=1542125&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-rumen/pom.xml
(original)
+++ hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-rumen/pom.xml Thu Nov
14 23:56:56 2013
@@ -36,6 +36,11 @@
<dependencies>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
<scope>provided</scope>
Propchange: hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Nov 14 23:56:56 2013
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
Modified: hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-streaming/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-streaming/pom.xml?rev=1542125&r1=1542124&r2=1542125&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-streaming/pom.xml
(original)
+++ hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-streaming/pom.xml Thu
Nov 14 23:56:56 2013
@@ -37,6 +37,11 @@
<dependencies>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
<scope>provided</scope>
