ソースを参照

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

Allen Wittenauer 9 年 前
コミット
6e0d353235

+ 2 - 0
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

+ 0 - 1
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>

+ 5 - 0
hadoop-project/pom.xml

@@ -799,6 +799,11 @@
         <artifactId>ant</artifactId>
         <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>