Skip to content

Commit

Permalink
Upgrade Jackson dependency from 2.4.5 to 2.7.0
Browse files Browse the repository at this point in the history
FasterXML/jackson-databind#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
  • Loading branch information
lukecwik authored and davorbonaci committed Feb 2, 2016
1 parent c34fcfb commit 600359e
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 5 deletions.
4 changes: 2 additions & 2 deletions examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
18 changes: 18 additions & 0 deletions javadoc/jackson-databind-docs/package-list
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions sdk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,15 @@
*
* @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.
*
* @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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 600359e

Please sign in to comment.