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 vi...@apache.org on 2016/01/13 23:29:43 UTC
[15/17] hadoop git commit: HADOOP-12526. there are duplicate
dependency definitions in pom's (sjlee)
HADOOP-12526. there are duplicate dependency definitions in pom's (sjlee)
(cherry picked from commit 7802248c238afaa51b560ee79766464ef0daae65)
(cherry picked from commit 7e8467df9f203375acc3ea8f28b1420db8c7d742)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/17ad3b15
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/17ad3b15
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/17ad3b15
Branch: refs/heads/branch-2.7.2
Commit: 17ad3b150b89709155d4c8572823ca9d79636d86
Parents: c3ba72c
Author: Sangjin Lee <sj...@apache.org>
Authored: Sun Nov 8 17:46:37 2015 -0800
Committer: Vinod Kumar Vavilapalli (I am also known as @tshooter.) <vi...@apache.org>
Committed: Wed Jan 13 11:49:59 2016 -0800
----------------------------------------------------------------------
hadoop-common-project/hadoop-auth/pom.xml | 5 ---
hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++
hadoop-project/pom.xml | 38 +++++++++-----------
3 files changed, 19 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/17ad3b15/hadoop-common-project/hadoop-auth/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-auth/pom.xml b/hadoop-common-project/hadoop-auth/pom.xml
index 462af27..aa3c2c7 100644
--- a/hadoop-common-project/hadoop-auth/pom.xml
+++ b/hadoop-common-project/hadoop-auth/pom.xml
@@ -59,11 +59,6 @@
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/17ad3b15/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 3e1f1ab..d694868 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -818,6 +818,8 @@ Release 2.6.3 - UNRELEASED
HADOOP-12577. Bumped up commons-collections version to 3.2.2 to address a
security flaw. (Wei-Chiu Chuang via vinodkv)
+ HADOOP-12526. there are duplicate dependency definitions in pom's (sjlee)
+
Release 2.6.2 - 2015-10-28
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/17ad3b15/hadoop-project/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 3ff9f01..4dec4e2 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -1084,7 +1084,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <inherited>false</inherited>
<configuration>
<rules>
<requireMavenVersion>
@@ -1102,6 +1101,7 @@
<goal>enforce</goal>
</goals>
<phase>pre-clean</phase>
+ <inherited>false</inherited>
</execution>
<execution>
<id>default</id>
@@ -1109,6 +1109,7 @@
<goal>enforce</goal>
</goals>
<phase>validate</phase>
+ <inherited>false</inherited>
</execution>
<execution>
<id>site</id>
@@ -1116,6 +1117,21 @@
<goal>enforce</goal>
</goals>
<phase>pre-site</phase>
+ <inherited>false</inherited>
+ </execution>
+ <execution>
+ <id>depcheck</id>
+ <configuration>
+ <rules>
+ <DependencyConvergence>
+ <uniqueVersions>true</uniqueVersions>
+ </DependencyConvergence>
+ </rules>
+ </configuration>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <phase>verify</phase>
</execution>
</executions>
</plugin>
@@ -1167,26 +1183,6 @@
<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>