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

HADOOP-12541. make re2j dependency consistent (Matthew Paduano via aw)

This commit is contained in:
Allen Wittenauer 2015-11-02 20:39:46 -08:00
parent d565480da2
commit 6e0d353235
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -251,6 +251,8 @@ Trunk (Unreleased)
HADOOP-12133. Add schemas to Maven Assembly XMLs (Gábor Lipták via aw) 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 BUG FIXES
HADOOP-11473. test-patch says "-1 overall" even when all checks are +1 HADOOP-11473. test-patch says "-1 overall" even when all checks are +1

1
hadoop-common-project/hadoop-common/pom.xml
View File

@ -194,7 +194,6 @@
<dependency> <dependency>
<groupId>com.google.re2j</groupId> <groupId>com.google.re2j</groupId>
<artifactId>re2j</artifactId> <artifactId>re2j</artifactId>
<version>${re2j.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

5
hadoop-project/pom.xml
View File

@ -799,6 +799,11 @@
<artifactId>ant</artifactId> <artifactId>ant</artifactId>
<version>1.8.1</version> <version>1.8.1</version>
</dependency> </dependency>
<dependency>
<groupId>com.google.re2j</groupId>
<artifactId>re2j</artifactId>
<version>${re2j.version}</version>
</dependency>
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId> <artifactId>protobuf-java</artifactId>