You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2013/09/16 22:59:03 UTC
svn commit: r1523804 - in /hadoop/common/branches/HDFS-2832: ./
hadoop-project/pom.xml pom.xml
Author: arp
Date: Mon Sep 16 20:59:02 2013
New Revision: 1523804
URL: http://svn.apache.org/r1523804
Log:
Merging r1523402 through r1523803 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/pom.xml
Propchange: hadoop/common/branches/HDFS-2832/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1523402-1523803
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=1523804&r1=1523803&r2=1523804&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-2832/hadoop-project/pom.xml Mon Sep 16 20:59:02 2013
@@ -319,6 +319,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>
@@ -361,6 +366,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>
@@ -420,7 +442,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.5.11.Final</version>
+ <version>3.6.2.Final</version>
</dependency>
<dependency>
@@ -544,6 +566,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.10</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
@@ -604,6 +627,7 @@
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.8.5</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
@@ -664,6 +688,10 @@
<groupId>com.sun.jmx</groupId>
<artifactId>jmxri</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -672,6 +700,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>
@@ -706,7 +740,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>
@@ -874,6 +908,26 @@
<includeReports>false</includeReports>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>depcheck</id>
+ <configuration>
+ <rules>
+ <DependencyConvergence>
+ <uniqueVersions>true</uniqueVersions>
+ </DependencyConvergence>
+ </rules>
+ </configuration>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: hadoop/common/branches/HDFS-2832/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/pom.xml?rev=1523804&r1=1523803&r2=1523804&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/pom.xml (original)
+++ hadoop/common/branches/HDFS-2832/pom.xml Mon Sep 16 20:59:02 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>
@@ -224,7 +229,7 @@ xsi:schemaLocation="http://maven.apache.
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <versionRange>[2.1,)</versionRange>
+ <versionRange>[2.4,)</versionRange>
<goals>
<goal>copy-dependencies</goal>
<goal>build-classpath</goal>