[ 
https://issues.apache.org/jira/browse/BEAM-4411?focusedWorklogId=105986&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-105986
 ]

ASF GitHub Bot logged work on BEAM-4411:
----------------------------------------

                Author: ASF GitHub Bot
            Created on: 25/May/18 19:34
            Start Date: 25/May/18 19:34
    Worklog Time Spent: 10m 
      Work Description: lukecwik closed pull request #5485: [BEAM-4411] Update 
Jackson version to latest to pick up security fixes.
URL: https://github.com/apache/beam/pull/5485
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/build_rules.gradle b/build_rules.gradle
index 0d00d1f3dd5..c55f1c57243 100644
--- a/build_rules.gradle
+++ b/build_rules.gradle
@@ -179,7 +179,7 @@ def netty_version = "4.1.8.Final"
 def grpc_google_common_protos = "0.1.9"
 def hamcrest_version = "1.3"
 def hadoop_version = "2.7.3"
-def jackson_version = "2.8.9"
+def jackson_version = "2.9.5"
 def spark_version = "2.3.0"
 def pubsub_grpc_version = "0.1.18"
 def apex_core_version = "3.7.0"
@@ -187,7 +187,6 @@ def apex_malhar_version = "3.4.0"
 def postgres_version = "9.4.1212.jre7"
 def jaxb_api_version = "2.2.12"
 def kafka_version = "1.0.0"
-def jackson_datatype_joda_version = "2.4.0"
 def quickcheck_version = "0.8"
 
 // A map of maps containing common libraries used per language. To use:
@@ -268,7 +267,7 @@ ext.library = [
     jackson_databind: 
"com.fasterxml.jackson.core:jackson-databind:$jackson_version",
     jackson_dataformat_cbor: 
"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:$jackson_version",
     jackson_dataformat_yaml: 
"com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$jackson_version",
-    jackson_datatype_joda: 
"com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_datatype_joda_version",
+    jackson_datatype_joda: 
"com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version",
     jackson_module_scala: 
"com.fasterxml.jackson.module:jackson-module-scala_2.11:$jackson_version",
     jaxb_api: "javax.xml.bind:jaxb-api:$jaxb_api_version",
     joda_time: "joda-time:joda-time:2.4",
diff --git a/pom.xml b/pom.xml
index 920f6ff7ce5..8331d5627bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,7 +136,7 @@
     -->
     <hadoop.version>2.7.3</hadoop.version>
     <hamcrest.version>1.3</hamcrest.version>
-    <jackson.version>2.8.9</jackson.version>
+    <jackson.version>2.9.5</jackson.version>
     <findbugs.version>3.0.1</findbugs.version>
     <findbugs.annotations.version>1.3.9-1</findbugs.annotations.version>
     <joda.version>2.4</joda.version>
@@ -185,7 +185,6 @@
     <compiler.default.exclude>nothing</compiler.default.exclude>
     <gax-grpc.version>0.20.0</gax-grpc.version>
     <jaxb-api.version>2.2.12</jaxb-api.version>
-    <jackson-datatype-joda-version>2.4.0</jackson-datatype-joda-version>
 
     <!-- standard binary for kubectl -->
     <kubectl>kubectl</kubectl>
@@ -1489,7 +1488,7 @@
       <dependency>
         <groupId>com.fasterxml.jackson.datatype</groupId>
         <artifactId>jackson-datatype-joda</artifactId>
-        <version>${jackson-datatype-joda-version}</version>
+        <version>${jackson.version}</version>
       </dependency>
 
       <dependency>
diff --git a/runners/spark/build.gradle b/runners/spark/build.gradle
index b236173479e..56042cc0304 100644
--- a/runners/spark/build.gradle
+++ b/runners/spark/build.gradle
@@ -63,7 +63,7 @@ dependencies {
   shadow library.java.slf4j_api
   shadow library.java.joda_time
   shadow "io.dropwizard.metrics:metrics-core:3.1.2"
-  shadow "com.fasterxml.jackson.module:jackson-module-scala_2.11:2.8.9"
+  shadow library.java.jackson_module_scala
   provided library.java.spark_core
   provided library.java.spark_streaming
   provided library.java.spark_network_common
diff --git a/sdks/java/io/elasticsearch/build.gradle 
b/sdks/java/io/elasticsearch/build.gradle
index 27b68dfb792..7b5ff9f2c91 100644
--- a/sdks/java/io/elasticsearch/build.gradle
+++ b/sdks/java/io/elasticsearch/build.gradle
@@ -28,7 +28,7 @@ dependencies {
   shadow project(path: ":beam-sdks-java-core", configuration: "shadow")
   shadow library.java.jackson_databind
   shadow library.java.findbugs_jsr305
-  shadow "com.fasterxml.jackson.core:jackson-annotations:2.8.9"
+  shadow library.java.jackson_annotations
   shadow "org.elasticsearch.client:elasticsearch-rest-client:5.6.3"
   shadow "org.apache.httpcomponents:httpasyncclient:4.1.2"
   shadow "org.apache.httpcomponents:httpcore-nio:4.4.5"
diff --git a/sdks/java/io/hadoop-input-format/pom.xml 
b/sdks/java/io/hadoop-input-format/pom.xml
index 1fba06d303f..846228dc009 100644
--- a/sdks/java/io/hadoop-input-format/pom.xml
+++ b/sdks/java/io/hadoop-input-format/pom.xml
@@ -96,7 +96,6 @@
         <dependency>
           <groupId>com.fasterxml.jackson.module</groupId>
           <artifactId>jackson-module-scala_2.11</artifactId>
-          <version>2.8.9</version>
           <scope>runtime</scope>
         </dependency>
       </dependencies>
diff --git a/sdks/java/javadoc/build.gradle b/sdks/java/javadoc/build.gradle
index 70fc711792c..e6f7c4dc006 100644
--- a/sdks/java/javadoc/build.gradle
+++ b/sdks/java/javadoc/build.gradle
@@ -101,8 +101,8 @@ task aggregateJavadoc(type: Javadoc) {
     linksOffline 
'https://developers.google.com/resources/api-libraries/documentation/bigquery/v2/java/latest/',
 'bq-docs'
     linksOffline 
'http://googlecloudplatform.github.io/google-cloud-java/0.8.0/apidocs/index.html',
 'datastore-docs'
     linksOffline 'http://google.github.io/guava/releases/20.0/api/docs/', 
'guava-docs'
-    linksOffline 
'http://fasterxml.github.io/jackson-annotations/javadoc/2.7/', 
'jackson-annotations-docs'
-    linksOffline 'http://fasterxml.github.io/jackson-databind/javadoc/2.7/', 
'jackson-databind-docs'
+    linksOffline 
'http://fasterxml.github.io/jackson-annotations/javadoc/2.9/', 
'jackson-annotations-docs'
+    linksOffline 'http://fasterxml.github.io/jackson-databind/javadoc/2.9/', 
'jackson-databind-docs'
     linksOffline 'http://hamcrest.org/JavaHamcrest/javadoc/1.3/', 
'hamcrest-docs'
     linksOffline 'http://www.joda.org/joda-time/apidocs', 'joda-docs'
     linksOffline 'http://junit.sourceforge.net/javadoc/', 'junit-docs'


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
[email protected]


Issue Time Tracking
-------------------

    Worklog Id:     (was: 105986)
    Time Spent: 1.5h  (was: 1h 20m)

> Upgrade Jackson
> ---------------
>
>                 Key: BEAM-4411
>                 URL: https://issues.apache.org/jira/browse/BEAM-4411
>             Project: Beam
>          Issue Type: Improvement
>          Components: sdk-java-core
>            Reporter: Luke Cwik
>            Assignee: Luke Cwik
>            Priority: Minor
>          Time Spent: 1.5h
>  Remaining Estimate: 0h
>
> Update Jackson library to latest version.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

Reply via email to