HADOOP-12526. there are duplicate dependency definitions in pom's (sjlee)

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>

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -30,6 +30,8 @@ Release 2.6.3 - UNRELEASED
     HADOOP-10134 [JDK8] Fix Javadoc errors caused by incorrect or illegal tags in doc
     comments. (apurtell via stevel)
 
+    HADOOP-12526. there are duplicate dependency definitions in pom's (sjlee)
+
 Release 2.6.2 - 2015-10-28
 
   INCOMPATIBLE CHANGES

hadoop-project/pom.xml

@@ -560,11 +560,6 @@
         <artifactId>jasper-runtime</artifactId>
         <version>5.5.23</version>
       </dependency>
-      <dependency>
-        <groupId>javax.servlet.jsp</groupId>
-        <artifactId>jsp-api</artifactId>
-        <version>2.1</version>
-      </dependency>
       <dependency>
         <groupId>commons-el</groupId>
         <artifactId>commons-el</artifactId>
@@ -1057,7 +1052,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <inherited>false</inherited>
         <configuration>
           <rules>
             <requireMavenVersion>
@@ -1075,6 +1069,7 @@
               <goal>enforce</goal>
             </goals>
             <phase>pre-clean</phase>
+            <inherited>false</inherited>
           </execution>
           <execution>
             <id>default</id>
@@ -1082,6 +1077,7 @@
               <goal>enforce</goal>
             </goals>
             <phase>validate</phase>
+            <inherited>false</inherited>
           </execution>
           <execution>
             <id>site</id>
@@ -1089,6 +1085,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>
@@ -1140,26 +1151,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>