This is an automated email from the ASF dual-hosted git repository.
cgivre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
The following commit(s) were added to refs/heads/master by this push:
new 111e345 DRILL-7950: Drill classpath includes both
avatica-core:jar:1.15.0 and avatica:jar:1.17.0 (#2253)
111e345 is described below
commit 111e345c20a8e31ab3e4c2b0aefb62405efa0b3f
Author: Volodymyr Vysotskyi <[email protected]>
AuthorDate: Fri Jun 11 17:02:58 2021 +0300
DRILL-7950: Drill classpath includes both avatica-core:jar:1.15.0 and
avatica:jar:1.17.0 (#2253)
---
contrib/storage-cassandra/pom.xml | 4 ++++
contrib/storage-elasticsearch/pom.xml | 7 ++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/contrib/storage-cassandra/pom.xml
b/contrib/storage-cassandra/pom.xml
index 9733b0f..f27c4e0 100644
--- a/contrib/storage-cassandra/pom.xml
+++ b/contrib/storage-cassandra/pom.xml
@@ -50,6 +50,10 @@
<groupId>com.datastax.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.calcite.avatica</groupId>
+ <artifactId>avatica-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/contrib/storage-elasticsearch/pom.xml
b/contrib/storage-elasticsearch/pom.xml
index 7caaac5..bded6e9 100644
--- a/contrib/storage-elasticsearch/pom.xml
+++ b/contrib/storage-elasticsearch/pom.xml
@@ -47,7 +47,12 @@
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- </exclusion></exclusions>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.calcite.avatica</groupId>
+ <artifactId>avatica-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.drill.exec</groupId>
