You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by as...@apache.org on 2019/02/28 09:52:03 UTC

[oozie] branch master updated: OOZIE-3441 Upgrade jackson version to 2.6.5 (nobigo via asalamon74)

This is an automated email from the ASF dual-hosted git repository.

asalamon74 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/oozie.git


The following commit(s) were added to refs/heads/master by this push:
     new f9053c8  OOZIE-3441 Upgrade jackson version to 2.6.5 (nobigo via asalamon74)
f9053c8 is described below

commit f9053c8b4a8af7f5be364b53c0756deb308a8277
Author: Andras Salamon <as...@apache.org>
AuthorDate: Thu Feb 28 10:51:17 2019 +0100

    OOZIE-3441 Upgrade jackson version to 2.6.5 (nobigo via asalamon74)
---
 pom.xml         | 18 ++++++++++++------
 release-log.txt |  1 +
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4227d31..5449a5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
          <openjpa.version>2.4.2</openjpa.version>
          <xerces.version>2.11.0</xerces.version>
          <curator.version>2.5.0</curator.version>
-         <jackson.version>2.4.2</jackson.version>
+         <jackson.version>2.6.5</jackson.version>
          <log4j.version>1.2.17</log4j.version>
          <activemq.version>5.15.3</activemq.version>
          <httpcore.version>4.3.3</httpcore.version>
@@ -327,11 +327,17 @@
                 <version>1.0</version>
             </dependency>
 
-          <dependency>
-              <groupId>org.slf4j</groupId>
-              <artifactId>slf4j-simple</artifactId>
-              <version>1.6.6</version>
-          </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-simple</artifactId>
+                <version>1.6.6</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.fasterxml.jackson.module</groupId>
+                <artifactId>jackson-module-scala_${spark.scala.binary.version}</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/release-log.txt b/release-log.txt
index ca89f56..a729806 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.2.0 release (trunk - unreleased)
 
+OOZIE-3441 Upgrade jackson version to 2.6.5 (nobigo via asalamon74)
 OOZIE-3326 [action] Sqoop Action should support tez delegation tokens for hive-import (bgoerlitz, dionusos via asalamon74)
 OOZIE-3395 [build] Migration from FindBugs to SpotBugs (kmarton via asalamon74)
 OOZIE-3438 Copy only apache-jsp server dependencies to distro (asalamon74 via kmarton)