Repository: hadoop Updated Branches: refs/heads/branch-2.6 6165fd866 -> f55e1a4f3
HADOOP-12526. there are duplicate dependency definitions in pom's (sjlee) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f55e1a4f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f55e1a4f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f55e1a4f Branch: refs/heads/branch-2.6 Commit: f55e1a4f3ed6409027345c112dec7139361ff921 Parents: 6165fd8 Author: Sangjin Lee <sj...@apache.org> Authored: Sun Nov 8 18:00:03 2015 -0800 Committer: Sangjin Lee <sj...@apache.org> Committed: Sun Nov 8 18:00:03 2015 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-auth/pom.xml | 5 --- hadoop-common-project/hadoop-common/CHANGES.txt | 2 + hadoop-project/pom.xml | 43 ++++++++------------ 3 files changed, 19 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f55e1a4f/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 ea2bc0d..5e56473 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/f55e1a4f/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 3e1e046..26f4d05 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/f55e1a4f/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index fd4956e..4adb42b 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -561,11 +561,6 @@ <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> <version>1.0</version> @@ -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>
