Parcourir la source

svn merge -c 1294784 FIXES: HADOOP-8104. Inconsistent Jackson versions (tucu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1332802 13f79535-47bb-0310-9956-ffa450edef68
Robert Joseph Evans il y a 13 ans
Parent
commit
515967b593
2 fichiers modifiés avec 17 ajouts et 0 suppressions
  1. 2 0
      hadoop-common-project/hadoop-common/CHANGES.txt
  2. 15 0
      hadoop-project/pom.xml

+ 2 - 0
hadoop-common-project/hadoop-common/CHANGES.txt

@@ -53,6 +53,8 @@ Release 0.23.3 - UNRELEASED
     HADOOP-8335. Improve Configuration's address handling (Daryn Sharp via
     bobby)
 
+    HADOOP-8104. Inconsistent Jackson versions (tucu)
+
 Release 0.23.2 - UNRELEASED 
 
   NEW FEATURES

+ 15 - 0
hadoop-project/pom.xml

@@ -532,6 +532,21 @@
         <artifactId>jackson-mapper-asl</artifactId>
         <version>1.8.8</version>
       </dependency>
+      <dependency>
+        <groupId>org.codehaus.jackson</groupId>
+        <artifactId>jackson-core-asl</artifactId>
+        <version>1.8.8</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.jackson</groupId>
+        <artifactId>jackson-jaxrs</artifactId>
+        <version>1.8.8</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.jackson</groupId>
+        <artifactId>jackson-xc</artifactId>
+        <version>1.8.8</version>
+      </dependency>
       <dependency>
         <groupId>org.aspectj</groupId>
         <artifactId>aspectjtools</artifactId>