Author: tucu
Date: Mon Sep 16 11:31:17 2013
New Revision: 1523597
URL: http://svn.apache.org/r1523597
Log:
HADOOP-9961. versions of a few transitive dependencies diverged between hadoop
subprojects. (rvs via tucu)
Modified:
hadoop/common/branches/branch-2/hadoop-project/pom.xml
hadoop/common/branches/branch-2/pom.xml
Modified: hadoop/common/branches/branch-2/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/pom.xml?rev=1523597&r1=1523596&r2=1523597&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-project/pom.xml Mon Sep 16 11:31:17
2013
@@ -318,6 +318,11 @@
<version>2.1</version>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
<groupId>xmlenc</groupId>
<artifactId>xmlenc</artifactId>
<version>0.52</version>
@@ -360,6 +365,23 @@
</dependency>
<dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.servlet</artifactId>
+ <version>3.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ <version>1.5.5</version>
+ </dependency>
+
+ <dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
<version>3.2</version>
@@ -419,7 +441,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.5.11.Final</version>
+ <version>3.6.2.Final</version>
</dependency>
<dependency>
@@ -665,6 +687,10 @@
<groupId>com.sun.jmx</groupId>
<artifactId>jmxri</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -673,6 +699,12 @@
<version>3.4.2</version>
<type>test-jar</type>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.bookkeeper</groupId>
@@ -707,7 +739,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: hadoop/common/branches/branch-2/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/pom.xml?rev=1523597&r1=1523596&r2=1523597&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/pom.xml (original)
+++ hadoop/common/branches/branch-2/pom.xml Mon Sep 16 11:31:17 2013
@@ -107,8 +107,13 @@ xsi:schemaLocation="http://maven.apache.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0</version>
+ <version>1.3.1</version>
<configuration>
<rules>
<requireMavenVersion>
