This is an automated email from the ASF dual-hosted git repository.
zabetak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 46f27831645 HIVE-29107: Drop avatica version management and use of
shaded jars (#5984)
46f27831645 is described below
commit 46f2783164584bddfef6efdc4d84586bb3114ba1
Author: Stamatis Zampetakis <[email protected]>
AuthorDate: Tue Jul 29 20:20:23 2025 +0300
HIVE-29107: Drop avatica version management and use of shaded jars (#5984)
Avatica is tighly connected with Calcite so it doesn't make sense to manage
it separately
Moreover, there is no need to use the shaded avatica artifact since the
latter pulls in tons of things that Hive doesn't need.
---
itests/hive-blobstore/pom.xml | 4 ----
itests/qtest-druid/pom.xml | 21 -------------------
pom.xml | 21 -------------------
ql/pom.xml | 48 +------------------------------------------
4 files changed, 1 insertion(+), 93 deletions(-)
diff --git a/itests/hive-blobstore/pom.xml b/itests/hive-blobstore/pom.xml
index df463ee7c23..7daefebc13c 100644
--- a/itests/hive-blobstore/pom.xml
+++ b/itests/hive-blobstore/pom.xml
@@ -288,10 +288,6 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.calcite.avatica</groupId>
- <artifactId>avatica-core</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
diff --git a/itests/qtest-druid/pom.xml b/itests/qtest-druid/pom.xml
index 65135aad641..2e3b84cbf31 100644
--- a/itests/qtest-druid/pom.xml
+++ b/itests/qtest-druid/pom.xml
@@ -30,7 +30,6 @@
<!-- dependencies are always listed in sorted order by groupId, artifactId
-->
<properties>
<hive.path.to.root>../..</hive.path.to.root>
- <druid.avatica.version>1.15.0</druid.avatica.version>
<druid.curator.version>4.0.0</druid.curator.version>
<druid.jersey.version>1.19.3</druid.jersey.version>
<druid.jetty.version>9.4.57.v20241219</druid.jetty.version>
@@ -163,26 +162,6 @@
<artifactId>curator-recipes</artifactId>
<version>${druid.curator.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.calcite.avatica</groupId>
- <artifactId>avatica</artifactId>
- <version>${avatica.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.calcite.avatica</groupId>
- <artifactId>avatica-core</artifactId>
- <version>${avatica.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.calcite.avatica</groupId>
- <artifactId>avatica-metrics</artifactId>
- <version>${avatica.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.calcite.avatica</groupId>
- <artifactId>avatica-server</artifactId>
- <version>${avatica.version}</version>
- </dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-bundle</artifactId>
diff --git a/pom.xml b/pom.xml
index 28a65a35a91..a5e26976172 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,6 @@
<!-- Make sure to sync it with standalone-metastore/pom.xml -->
<antlr4.version>4.9.3</antlr4.version>
<apache-directory-server.version>2.0.0-M24</apache-directory-server.version>
- <avatica.version>1.23.0</avatica.version>
<avro.version>1.12.0</avro.version>
<bcprov-jdk18on.version>1.78</bcprov-jdk18on.version>
<calcite.version>1.33.0</calcite.version>
@@ -548,26 +547,6 @@
<artifactId>accumulo-trace</artifactId>
<version>${accumulo.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.calcite.avatica</groupId>
- <artifactId>avatica</artifactId>
- <version>${avatica.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.calcite.avatica</groupId>
- <artifactId>avatica-core</artifactId>
- <version>${avatica.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.calcite.avatica</groupId>
- <artifactId>avatica-metrics</artifactId>
- <version>${avatica.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.calcite.avatica</groupId>
- <artifactId>avatica-server</artifactId>
- <version>${avatica.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
diff --git a/ql/pom.xml b/ql/pom.xml
index 9aba7488fca..0851dbd940d 100644
--- a/ql/pom.xml
+++ b/ql/pom.xml
@@ -481,55 +481,18 @@
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.calcite.avatica</groupId>
- <artifactId>avatica-core</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-druid</artifactId>
<exclusions>
- <exclusion>
- <groupId>org.apache.calcite.avatica</groupId>
- <artifactId>avatica-core</artifactId>
- </exclusion>
<exclusion>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.calcite.avatica</groupId>
- <artifactId>avatica</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.calcite.avatica</groupId>
- <artifactId>avatica-core</artifactId>
- </exclusion>
- <!-- hsqldb interferes with the use of derby as the default db
- in hive's use of datanucleus.
- -->
- <exclusion>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -1127,7 +1090,7 @@
<include>com.zaxxer:HikariCP</include>
<include>org.apache.datasketches:*</include>
<include>org.apache.calcite:*</include>
- <include>org.apache.calcite.avatica:avatica</include>
+ <include>org.apache.calcite.avatica:*</include>
<include>com.esri.geometry:esri-geometry-api</include>
<include>org.roaringbitmap:RoaringBitmap</include>
<include>com.github.luben:zstd-jni</include>
@@ -1136,15 +1099,6 @@
</includes>
</artifactSet>
<filters>
- <filter>
- <artifact>org.apache.calcite.avatica:avatica</artifact>
- <excludes>
- <!-- Exclude Avatica bundled SLF4J, because Hive manages
its own SLF4J version. -->
- <exclude>org/slf4j/**</exclude>
- <exclude>META-INF/maven/org.slf4j/**</exclude>
- <exclude>META-INF/licenses/slf4j*/**</exclude>
- </excludes>
- </filter>
<filter>
<artifact>*:*</artifact>
<excludes>
