[beam] branch master updated: Fix Jackson being imported from both org.codehaus.jackson (old) and com.fasterxml.jackson (new)

[pabloem]

This is an automated email from the ASF dual-hosted git repository.

pabloem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 73aee9e  Fix Jackson being imported from both org.codehaus.jackson 
(old) and com.fasterxml.jackson (new)
     new e5b63a1  Merge pull request #13152 from sjvanrossum/fix-jackson-import 
- Fix imports from old and new Jackson packages
73aee9e is described below

commit 73aee9ef86f3db8c86c0cf72f3ff34bc804ec79f
Author: Steven van Rossum <sjvanros...@google.com>
AuthorDate: Tue Oct 20 20:32:03 2020 +0200

    Fix Jackson being imported from both org.codehaus.jackson (old) and 
com.fasterxml.jackson (new)
---
 .../src/main/java/org/apache/beam/sdk/io/gcp/healthcare/FhirIO.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/healthcare/FhirIO.java
 
b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/healthcare/FhirIO.java
index 86dcc18..7f10437 100644
--- 
a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/healthcare/FhirIO.java
+++ 
b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/healthcare/FhirIO.java
@@ -19,6 +19,7 @@ package org.apache.beam.sdk.io.gcp.healthcare;
 
 import static 
org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions.checkState;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.api.services.healthcare.v1beta1.model.DeidentifyConfig;
 import com.google.api.services.healthcare.v1beta1.model.HttpBody;
@@ -84,7 +85,6 @@ import 
org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Throwables;
 import 
org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList;
 import 
org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap;
 import org.checkerframework.checker.nullness.qual.Nullable;
-import org.codehaus.jackson.JsonProcessingException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;