You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by nk...@apache.org on 2019/10/09 20:25:04 UTC
[avro] branch master updated: AVRO-2587: Upgrade jackson to 2.10.0
(#675)
This is an automated email from the ASF dual-hosted git repository.
nkollar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/avro.git
The following commit(s) were added to refs/heads/master by this push:
new 2b75804 AVRO-2587: Upgrade jackson to 2.10.0 (#675)
2b75804 is described below
commit 2b75804d73fa3a8d4d25be2f79aa772f5965bbcd
Author: Ana Felisatti <af...@mulesoft.com>
AuthorDate: Wed Oct 9 17:24:58 2019 -0300
AVRO-2587: Upgrade jackson to 2.10.0 (#675)
---
lang/java/avro/src/main/java/org/apache/avro/SchemaBuilder.java | 6 +++---
lang/java/pom.xml | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lang/java/avro/src/main/java/org/apache/avro/SchemaBuilder.java b/lang/java/avro/src/main/java/org/apache/avro/SchemaBuilder.java
index 1a9f177..049522b 100644
--- a/lang/java/avro/src/main/java/org/apache/avro/SchemaBuilder.java
+++ b/lang/java/avro/src/main/java/org/apache/avro/SchemaBuilder.java
@@ -28,7 +28,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import com.fasterxml.jackson.core.util.BufferRecyclers;
+import com.fasterxml.jackson.core.io.JsonStringEncoder;
import org.apache.avro.Schema.Field;
import org.apache.avro.generic.GenericData;
import org.apache.avro.generic.GenericRecord;
@@ -2711,11 +2711,11 @@ public class SchemaBuilder {
bytes.get(data);
bytes.reset(); // put the buffer back the way we got it
s = new String(data, StandardCharsets.ISO_8859_1);
- char[] quoted = BufferRecyclers.getJsonStringEncoder().quoteAsString(s);
+ char[] quoted = JsonStringEncoder.getInstance().quoteAsString(s);
s = "\"" + new String(quoted) + "\"";
} else if (o instanceof byte[]) {
s = new String((byte[]) o, StandardCharsets.ISO_8859_1);
- char[] quoted = BufferRecyclers.getJsonStringEncoder().quoteAsString(s);
+ char[] quoted = JsonStringEncoder.getInstance().quoteAsString(s);
s = '\"' + new String(quoted) + '\"';
} else {
s = GenericData.get().toString(o);
diff --git a/lang/java/pom.xml b/lang/java/pom.xml
index f64ecc7..ac0b114 100644
--- a/lang/java/pom.xml
+++ b/lang/java/pom.xml
@@ -40,8 +40,8 @@
<!-- version properties for dependencies -->
<hadoop.version>2.7.3</hadoop.version>
- <jackson.version>2.9.10</jackson.version>
- <jackson.databind.version>2.9.10</jackson.databind.version>
+ <jackson.version>2.10.0</jackson.version>
+ <jackson.databind.version>2.10.0</jackson.databind.version>
<servlet-api.version>4.0.1</servlet-api.version>
<jetty.version>9.4.21.v20190926</jetty.version>
<jopt-simple.version>5.0.4</jopt-simple.version>