From 600359ec26ae7e952149528d39a4983d349c8918 Mon Sep 17 00:00:00 2001
From: lcwik <lcwik@google.com>
Date: Fri, 22 Jan 2016 11:08:37 -0800
Subject: [PATCH] Upgrade Jackson dependency from 2.4.5 to 2.7.0

https://github.com/FasterXML/jackson-databind/issues/543
was fixed and we have deprecated KvCoderBase and MapCoderBase
which were used as work arounds for the issue.

----Release Notes----

[]
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=112801278
---
 examples/pom.xml                               |  4 ++--
 javadoc/jackson-databind-docs/package-list     | 18 ++++++++++++++++++
 pom.xml                                        |  2 +-
 sdk/pom.xml                                    |  4 ++--
 .../cloud/dataflow/sdk/coders/KvCoderBase.java |  2 ++
 .../dataflow/sdk/coders/MapCoderBase.java      |  2 ++
 6 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/examples/pom.xml b/examples/pom.xml
index 2b8c3d83b8..0e7db3d59b 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -276,11 +276,11 @@
               <location>${basedir}/../javadoc/guava-docs</location>
             </offlineLink>
             <offlineLink>
-              <url>http://fasterxml.github.io/jackson-annotations/javadoc/2.4/</url>
+              <url>http://fasterxml.github.io/jackson-annotations/javadoc/2.7/</url>
               <location>${basedir}/../javadoc/jackson-annotations-docs</location>
             </offlineLink>
             <offlineLink>
-              <url>http://fasterxml.github.io/jackson-databind/javadoc/2.4/</url>
+              <url>http://fasterxml.github.io/jackson-databind/javadoc/2.7/</url>
               <location>${basedir}/../javadoc/jackson-databind-docs</location>
             </offlineLink>
             <offlineLink>
diff --git a/javadoc/jackson-databind-docs/package-list b/javadoc/jackson-databind-docs/package-list
index 8a7d4399ff..8a2cd8be56 100644
--- a/javadoc/jackson-databind-docs/package-list
+++ b/javadoc/jackson-databind-docs/package-list
@@ -1,2 +1,20 @@
 com.fasterxml.jackson.databind
 com.fasterxml.jackson.databind.annotation
+com.fasterxml.jackson.databind.cfg
+com.fasterxml.jackson.databind.deser
+com.fasterxml.jackson.databind.deser.impl
+com.fasterxml.jackson.databind.deser.std
+com.fasterxml.jackson.databind.exc
+com.fasterxml.jackson.databind.ext
+com.fasterxml.jackson.databind.introspect
+com.fasterxml.jackson.databind.jsonFormatVisitors
+com.fasterxml.jackson.databind.jsonschema
+com.fasterxml.jackson.databind.jsontype
+com.fasterxml.jackson.databind.jsontype.impl
+com.fasterxml.jackson.databind.module
+com.fasterxml.jackson.databind.node
+com.fasterxml.jackson.databind.ser
+com.fasterxml.jackson.databind.ser.impl
+com.fasterxml.jackson.databind.ser.std
+com.fasterxml.jackson.databind.type
+com.fasterxml.jackson.databind.util
diff --git a/pom.xml b/pom.xml
index 3c49657d91..7bdee33965 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
     <google-clients.version>1.21.0</google-clients.version>
     <guava.version>19.0</guava.version>
     <hamcrest.version>1.3</hamcrest.version>
-    <jackson.version>2.4.2</jackson.version>
+    <jackson.version>2.7.0</jackson.version>
     <joda.version>2.4</joda.version>
     <junit.version>4.11</junit.version>
     <protobuf.version>2.5.0</protobuf.version>
diff --git a/sdk/pom.xml b/sdk/pom.xml
index 5378ffa1f3..891bb220d9 100644
--- a/sdk/pom.xml
+++ b/sdk/pom.xml
@@ -253,11 +253,11 @@
               <location>${basedir}/../javadoc/hamcrest-docs</location>
             </offlineLink>
             <offlineLink>
-              <url>http://fasterxml.github.io/jackson-annotations/javadoc/2.4/</url>
+              <url>http://fasterxml.github.io/jackson-annotations/javadoc/2.7/</url>
               <location>${basedir}/../javadoc/jackson-annotations-docs</location>
             </offlineLink>
             <offlineLink>
-              <url>http://fasterxml.github.io/jackson-databind/javadoc/2.4/</url>
+              <url>http://fasterxml.github.io/jackson-databind/javadoc/2.7/</url>
               <location>${basedir}/../javadoc/jackson-databind-docs</location>
             </offlineLink>
             <offlineLink>
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/KvCoderBase.java b/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/KvCoderBase.java
index d33da00d5c..4a12ee0d96 100644
--- a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/KvCoderBase.java
+++ b/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/KvCoderBase.java
@@ -31,6 +31,7 @@
  *
  * @param <T> the type of values being transcoded
  */
+@Deprecated
 public abstract class KvCoderBase<T> extends StandardCoder<T> {
   /**
    * A constructor used only for decoding from JSON.
@@ -38,6 +39,7 @@ public abstract class KvCoderBase<T> extends StandardCoder<T> {
    * @param typeId present in the JSON encoding, but unused
    * @param isPairLike present in the JSON encoding, but unused
    */
+  @Deprecated
   @JsonCreator
   public static KvCoderBase<?> of(
       // N.B. typeId is a required parameter here, since a field named "@type"
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/MapCoderBase.java b/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/MapCoderBase.java
index 7a6a99790e..d32406c50d 100644
--- a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/MapCoderBase.java
+++ b/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/MapCoderBase.java
@@ -30,7 +30,9 @@
  * parameters).  This should be removed in favor of a better workaround.
  * @param <T> the type of values being transcoded
  */
+@Deprecated
 public abstract class MapCoderBase<T> extends StandardCoder<T> {
+  @Deprecated
   @JsonCreator
   public static MapCoderBase<?> of(
       // N.B. typeId is a required parameter here, since a field named "@type"