You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ke...@apache.org on 2017/04/21 17:53:20 UTC

[36/50] [abbrv] beam git commit: [BEAM-2013] Upgrade to Jackson 2.8.8

[BEAM-2013] Upgrade to Jackson 2.8.8


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/0650d666
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/0650d666
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/0650d666

Branch: refs/heads/gearpump-runner
Commit: 0650d6668a25b1f1fa9c0120dd6d1d2ebd357188
Parents: 7515c26
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Wed Apr 19 16:27:56 2017 +0200
Committer: Luke Cwik <lc...@google.com>
Committed: Wed Apr 19 14:12:17 2017 -0700

----------------------------------------------------------------------
 pom.xml                                                        | 2 +-
 .../src/main/java/org/apache/beam/sdk/util/CoderUtils.java     | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/0650d666/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 802f305..638c97f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
     <grpc.version>1.2.0</grpc.version>
     <grpc-google-common-protos.version>0.1.0</grpc-google-common-protos.version>
     <hamcrest.version>1.3</hamcrest.version>
-    <jackson.version>2.7.2</jackson.version>
+    <jackson.version>2.8.8</jackson.version>
     <findbugs.version>3.0.1</findbugs.version>
     <joda.version>2.4</joda.version>
     <junit.version>4.12</junit.version>

http://git-wip-us.apache.org/repos/asf/beam/blob/0650d666/sdks/java/core/src/main/java/org/apache/beam/sdk/util/CoderUtils.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/CoderUtils.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/CoderUtils.java
index 6d97868..857f903 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/CoderUtils.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/CoderUtils.java
@@ -247,12 +247,6 @@ public final class CoderUtils {
             TypeFactory.defaultInstance());
       }
 
-      @Deprecated
-      @Override
-      public JavaType typeFromId(String id) {
-        return typeFromId(null, id);
-      }
-
       @Override
       public JavaType typeFromId(DatabindContext context, String id) {
         Class<?> clazz = getClassForId(id);