HADOOP-12541. make re2j dependency consistent (Matthew Paduano via aw)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6e0d3532 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6e0d3532 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6e0d3532 Branch: refs/heads/HDFS-7240 Commit: 6e0d35323505cc68dbd963b8628b89ee04af2f2b Parents: d565480 Author: Allen Wittenauer <a...@apache.org> Authored: Mon Nov 2 20:39:46 2015 -0800 Committer: Allen Wittenauer <a...@apache.org> Committed: Mon Nov 2 20:39:46 2015 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ hadoop-common-project/hadoop-common/pom.xml | 1 - hadoop-project/pom.xml | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6e0d3532/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 1a9c93c..b055069 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -251,6 +251,8 @@ Trunk (Unreleased) HADOOP-12133. Add schemas to Maven Assembly XMLs (Gábor Lipták via aw) + HADOOP-12541. make re2j dependency consistent (Matthew Paduano via aw) + BUG FIXES HADOOP-11473. test-patch says "-1 overall" even when all checks are +1 http://git-wip-us.apache.org/repos/asf/hadoop/blob/6e0d3532/hadoop-common-project/hadoop-common/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 4e47a3f..4735c6b 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -194,7 +194,6 @@ <dependency> <groupId>com.google.re2j</groupId> <artifactId>re2j</artifactId> - <version>${re2j.version}</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/hadoop/blob/6e0d3532/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index c974a61..efc3a7d 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -800,6 +800,11 @@ <version>1.8.1</version> </dependency> <dependency> + <groupId>com.google.re2j</groupId> + <artifactId>re2j</artifactId> + <version>${re2j.version}</version> + </dependency> + <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> <version>${protobuf.version}</version>
