Apache/hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sangjin Lee 2015-11-08 18:00:03 -08:00
parent 6165fd8663
commit f55e1a4f3e
3 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-common-project/hadoop-auth/pom.xml
View File

@ -57,11 +57,6 @@
<artifactId>jetty-util</artifactId> <artifactId>jetty-util</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.mortbay.jetty</groupId> <groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId> <artifactId>jetty</artifactId>

2
hadoop-common-project/hadoop-common/CHANGES.txt
View File

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

43
hadoop-project/pom.xml
View File

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