Skip to content
This repository was archived by the owner on Nov 11, 2022. It is now read-only.

Commit b5b8d95

Browse files
lukecwikdavorbonaci
authored andcommitted
Upgrade Jackson dependency from 2.4.5 to 2.7.0
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
1 parent 1c47353 commit b5b8d95

File tree

6 files changed

+27
-5
lines changed

6 files changed

+27
-5
lines changed

examples/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,11 @@
276276
<location>${basedir}/../javadoc/guava-docs</location>
277277
</offlineLink>
278278
<offlineLink>
279-
<url>http://fasterxml.github.io/jackson-annotations/javadoc/2.4/</url>
279+
<url>http://fasterxml.github.io/jackson-annotations/javadoc/2.7/</url>
280280
<location>${basedir}/../javadoc/jackson-annotations-docs</location>
281281
</offlineLink>
282282
<offlineLink>
283-
<url>http://fasterxml.github.io/jackson-databind/javadoc/2.4/</url>
283+
<url>http://fasterxml.github.io/jackson-databind/javadoc/2.7/</url>
284284
<location>${basedir}/../javadoc/jackson-databind-docs</location>
285285
</offlineLink>
286286
<offlineLink>
+18
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,20 @@
11
com.fasterxml.jackson.databind
22
com.fasterxml.jackson.databind.annotation
3+
com.fasterxml.jackson.databind.cfg
4+
com.fasterxml.jackson.databind.deser
5+
com.fasterxml.jackson.databind.deser.impl
6+
com.fasterxml.jackson.databind.deser.std
7+
com.fasterxml.jackson.databind.exc
8+
com.fasterxml.jackson.databind.ext
9+
com.fasterxml.jackson.databind.introspect
10+
com.fasterxml.jackson.databind.jsonFormatVisitors
11+
com.fasterxml.jackson.databind.jsonschema
12+
com.fasterxml.jackson.databind.jsontype
13+
com.fasterxml.jackson.databind.jsontype.impl
14+
com.fasterxml.jackson.databind.module
15+
com.fasterxml.jackson.databind.node
16+
com.fasterxml.jackson.databind.ser
17+
com.fasterxml.jackson.databind.ser.impl
18+
com.fasterxml.jackson.databind.ser.std
19+
com.fasterxml.jackson.databind.type
20+
com.fasterxml.jackson.databind.util

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<google-clients.version>1.21.0</google-clients.version>
7575
<guava.version>19.0</guava.version>
7676
<hamcrest.version>1.3</hamcrest.version>
77-
<jackson.version>2.4.2</jackson.version>
77+
<jackson.version>2.7.0</jackson.version>
7878
<joda.version>2.4</joda.version>
7979
<junit.version>4.11</junit.version>
8080
<protobuf.version>2.5.0</protobuf.version>

sdk/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -253,11 +253,11 @@
253253
<location>${basedir}/../javadoc/hamcrest-docs</location>
254254
</offlineLink>
255255
<offlineLink>
256-
<url>http://fasterxml.github.io/jackson-annotations/javadoc/2.4/</url>
256+
<url>http://fasterxml.github.io/jackson-annotations/javadoc/2.7/</url>
257257
<location>${basedir}/../javadoc/jackson-annotations-docs</location>
258258
</offlineLink>
259259
<offlineLink>
260-
<url>http://fasterxml.github.io/jackson-databind/javadoc/2.4/</url>
260+
<url>http://fasterxml.github.io/jackson-databind/javadoc/2.7/</url>
261261
<location>${basedir}/../javadoc/jackson-databind-docs</location>
262262
</offlineLink>
263263
<offlineLink>

sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/KvCoderBase.java

+2
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,15 @@
3131
*
3232
* @param <T> the type of values being transcoded
3333
*/
34+
@Deprecated
3435
public abstract class KvCoderBase<T> extends StandardCoder<T> {
3536
/**
3637
* A constructor used only for decoding from JSON.
3738
*
3839
* @param typeId present in the JSON encoding, but unused
3940
* @param isPairLike present in the JSON encoding, but unused
4041
*/
42+
@Deprecated
4143
@JsonCreator
4244
public static KvCoderBase<?> of(
4345
// N.B. typeId is a required parameter here, since a field named "@type"

sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/MapCoderBase.java

+2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@
3030
* parameters). This should be removed in favor of a better workaround.
3131
* @param <T> the type of values being transcoded
3232
*/
33+
@Deprecated
3334
public abstract class MapCoderBase<T> extends StandardCoder<T> {
35+
@Deprecated
3436
@JsonCreator
3537
public static MapCoderBase<?> of(
3638
// N.B. typeId is a required parameter here, since a field named "@type"

0 commit comments

Comments
 (0)