Repository: hadoop Updated Branches: refs/heads/branch-2 385dcc406 -> 7802248c2
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/7802248c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7802248c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7802248c Branch: refs/heads/branch-2 Commit: 7802248c238afaa51b560ee79766464ef0daae65 Parents: 385dcc4 Author: Sangjin Lee <sj...@apache.org> Authored: Sun Nov 8 17:46:37 2015 -0800 Committer: Sangjin Lee <sj...@apache.org> Committed: Sun Nov 8 17:46:37 2015 -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/7802248c/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 ccbfca0..f59cf84 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/7802248c/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 e75693e..fff26db 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -708,6 +708,8 @@ Release 2.8.0 - UNRELEASED fails intermittently due to assumption that a lease error will be thrown. (Gaurav Kanade via cnauroth) + HADOOP-12526. there are duplicate dependency definitions in pom's (sjlee) + OPTIMIZATIONS HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString() http://git-wip-us.apache.org/repos/asf/hadoop/blob/7802248c/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index cf58a1d..940efda 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -1117,7 +1117,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <inherited>false</inherited> <configuration> <rules> <requireMavenVersion> @@ -1135,6 +1134,7 @@ <goal>enforce</goal> </goals> <phase>pre-clean</phase> + <inherited>false</inherited> </execution> <execution> <id>default</id> @@ -1142,6 +1142,7 @@ <goal>enforce</goal> </goals> <phase>validate</phase> + <inherited>false</inherited> </execution> <execution> <id>site</id> @@ -1149,6 +1150,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> @@ -1200,26 +1216,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>
