From 7e8467df9f203375acc3ea8f28b1420db8c7d742 Mon Sep 17 00:00:00 2001
From: Sangjin Lee <sjlee@apache.org>
Date: Sun, 8 Nov 2015 17:46:37 -0800
Subject: [PATCH] HADOOP-12526. there are duplicate dependency definitions in
 pom's (sjlee)

(cherry picked from commit 7802248c238afaa51b560ee79766464ef0daae65)
---
 hadoop-common-project/hadoop-auth/pom.xml     |  5 ---
 .../hadoop-common/CHANGES.txt                 |  2 +
 hadoop-project/pom.xml                        | 38 +++++++++----------
 3 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/hadoop-common-project/hadoop-auth/pom.xml b/hadoop-common-project/hadoop-auth/pom.xml
index ceb65745426..cf93f96503b 100644
--- a/hadoop-common-project/hadoop-auth/pom.xml
+++ b/hadoop-common-project/hadoop-auth/pom.xml
@@ -57,11 +57,6 @@
       <artifactId>jetty-util</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty</artifactId>
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index a54bb39d8ea..a90cc3a468e 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -18,6 +18,8 @@ Release 2.7.3 - UNRELEASED
     HADOOP-12296. when setnetgrent returns 0 in linux, exception should be
     thrown (Chang Li via jlowe)
 
+    HADOOP-12526. there are duplicate dependency definitions in pom's (sjlee)
+
 Release 2.7.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 037668e7ac2..750ada32ea2 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>