Repository: hadoop Updated Branches: refs/heads/branch-2.7 63ed399e1 -> 7e8467df9
HADOOP-12526. there are duplicate dependency definitions in pom's (sjlee) (cherry picked from commit 7802248c238afaa51b560ee79766464ef0daae65) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7e8467df Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7e8467df Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7e8467df Branch: refs/heads/branch-2.7 Commit: 7e8467df9f203375acc3ea8f28b1420db8c7d742 Parents: 63ed399 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:52:15 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/7e8467df/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 ceb6574..cf93f96 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/7e8467df/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 a54bb39..a90cc3a 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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/7e8467df/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 037668e..750ada3 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>
