You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2018/03/01 23:07:29 UTC

[2/6] calcite-avatica git commit: [CALCITE-2154] Upgrade jackson to 2.9.4

[CALCITE-2154] Upgrade jackson to 2.9.4


Project: http://git-wip-us.apache.org/repos/asf/calcite-avatica/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite-avatica/commit/100469ad
Tree: http://git-wip-us.apache.org/repos/asf/calcite-avatica/tree/100469ad
Diff: http://git-wip-us.apache.org/repos/asf/calcite-avatica/diff/100469ad

Branch: refs/heads/master
Commit: 100469ad9910a72c2848e468e933d4d64883215f
Parents: 02d00b7
Author: Julian Hyde <jh...@apache.org>
Authored: Tue Feb 27 19:53:02 2018 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Tue Feb 27 19:55:32 2018 -0800

----------------------------------------------------------------------
 core/src/main/java/org/apache/calcite/avatica/remote/Service.java | 3 +--
 pom.xml                                                           | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/100469ad/core/src/main/java/org/apache/calcite/avatica/remote/Service.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/avatica/remote/Service.java b/core/src/main/java/org/apache/calcite/avatica/remote/Service.java
index b935b22..3905c3e 100644
--- a/core/src/main/java/org/apache/calcite/avatica/remote/Service.java
+++ b/core/src/main/java/org/apache/calcite/avatica/remote/Service.java
@@ -154,8 +154,7 @@ public interface Service {
   /** Base class for all service response messages. */
   @JsonTypeInfo(
       use = JsonTypeInfo.Id.NAME,
-      property = "response",
-      defaultImpl = ResultSetResponse.class)
+      property = "response")
   @JsonSubTypes({
       @JsonSubTypes.Type(value = OpenConnectionResponse.class, name = "openConnection"),
       @JsonSubTypes.Type(value = ResultSetResponse.class, name = "resultSet"),

http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/100469ad/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4efc3bc..96db016 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@ limitations under the License.
     <httpclient.version>4.5.2</httpclient.version>
     <httpcore.version>4.4.4</httpcore.version>
     <hydromatic-toolbox.version>0.3</hydromatic-toolbox.version>
-    <jackson.version>2.6.3</jackson.version>
+    <jackson.version>2.9.4</jackson.version>
     <jcip-annotations.version>1.0-1</jcip-annotations.version>
     <jcommander.version>1.48</jcommander.version>
     <jetty.version>9.2.19.v20160908</jetty.version>