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 @@ ${basedir}/../javadoc/guava-docs - http://fasterxml.github.io/jackson-annotations/javadoc/2.4/ + http://fasterxml.github.io/jackson-annotations/javadoc/2.7/ ${basedir}/../javadoc/jackson-annotations-docs - http://fasterxml.github.io/jackson-databind/javadoc/2.4/ + http://fasterxml.github.io/jackson-databind/javadoc/2.7/ ${basedir}/../javadoc/jackson-databind-docs 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 @@ 1.21.0 19.0 1.3 - 2.4.2 + 2.7.0 2.4 4.11 2.5.0 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 @@ ${basedir}/../javadoc/hamcrest-docs - http://fasterxml.github.io/jackson-annotations/javadoc/2.4/ + http://fasterxml.github.io/jackson-annotations/javadoc/2.7/ ${basedir}/../javadoc/jackson-annotations-docs - http://fasterxml.github.io/jackson-databind/javadoc/2.4/ + http://fasterxml.github.io/jackson-databind/javadoc/2.7/ ${basedir}/../javadoc/jackson-databind-docs 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 the type of values being transcoded */ +@Deprecated public abstract class KvCoderBase extends StandardCoder { /** * A constructor used only for decoding from JSON. @@ -38,6 +39,7 @@ public abstract class KvCoderBase extends StandardCoder { * @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 the type of values being transcoded */ +@Deprecated public abstract class MapCoderBase extends StandardCoder { + @Deprecated @JsonCreator public static MapCoderBase of( // N.B. typeId is a required parameter here, since a field named "@type"