This is an automated email from the ASF dual-hosted git repository. gvvinblade pushed a commit to branch ignite-12248 in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/ignite-12248 by this push: new 82e6a06 fix release artifacts 82e6a06 is described below commit 82e6a0676868c3253bf777e4fe548ff312fd5acd Author: Igor Seliverstov <gvvinbl...@gmail.com> AuthorDate: Tue May 19 23:53:11 2020 +0300 fix release artifacts --- modules/calcite/pom.xml | 44 ++++++++++++++++++++++ .../query/calcite/externalize/RelJsonReader.java | 4 +- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/modules/calcite/pom.xml b/modules/calcite/pom.xml index 88aac81..07b87e6 100644 --- a/modules/calcite/pom.xml +++ b/modules/calcite/pom.xml @@ -28,6 +28,8 @@ <calcite.version>1.22.0</calcite.version> <guava.version>19.0</guava.version> <janino.version>3.0.11</janino.version> + <avatica.version>1.16.0</avatica.version> + <jsonpath.version>2.4.0</jsonpath.version> </properties> <parent> @@ -65,6 +67,18 @@ </dependency> <dependency> + <groupId>org.apache.calcite</groupId> + <artifactId>calcite-linq4j</artifactId> + <version>${calcite.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.calcite</groupId> + <artifactId>calcite-linq4j</artifactId> + <version>${calcite.version}</version> + </dependency> + + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <version>${guava.version}</version> @@ -83,6 +97,36 @@ </dependency> <dependency> + <groupId>org.apache.calcite.avatica</groupId> + <artifactId>avatica-core</artifactId> + <version>${avatica.version}</version> + </dependency> + + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>${jackson.version}</version> + </dependency> + + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${jackson.version}</version> + </dependency> + + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>${jackson.version}</version> + </dependency> + + <dependency> + <groupId>com.jayway.jsonpath</groupId> + <artifactId>json-path</artifactId> + <version>${jsonpath.version}</version> + </dependency> + + <dependency> <groupId>org.apache.ignite</groupId> <artifactId>ignite-core</artifactId> <version>${project.version}</version> diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/externalize/RelJsonReader.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/externalize/RelJsonReader.java index 5c000e0..eaf9e53 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/externalize/RelJsonReader.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/externalize/RelJsonReader.java @@ -16,10 +16,10 @@ */ package org.apache.ignite.internal.processors.query.calcite.externalize; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; +import java.io.IOException; import java.util.AbstractList; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -83,7 +83,7 @@ public class RelJsonReader { readRels(rels); return lastRel; } - catch (JsonProcessingException e) { + catch (IOException e) { throw new IgniteException(e); } }