You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by cg...@apache.org on 2023/02/09 03:03:42 UTC

[drill] branch master updated: DRILL-8309: Upgrade slf4j to 2.0.x (#2750)

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 170b7f460b DRILL-8309: Upgrade slf4j to 2.0.x (#2750)
170b7f460b is described below

commit 170b7f460b125db07c8d51adcc496aea613bc20c
Author: James Turton <91...@users.noreply.github.com>
AuthorDate: Thu Feb 9 05:03:36 2023 +0200

    DRILL-8309: Upgrade slf4j to 2.0.x (#2750)
---
 contrib/storage-hive/hive-exec-shade/pom.xml |  2 +-
 exec/java-exec/pom.xml                       |  2 +-
 exec/jdbc/pom.xml                            |  2 +-
 pom.xml                                      | 21 ++++++---------------
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/contrib/storage-hive/hive-exec-shade/pom.xml b/contrib/storage-hive/hive-exec-shade/pom.xml
index f1998de857..31f15aafeb 100644
--- a/contrib/storage-hive/hive-exec-shade/pom.xml
+++ b/contrib/storage-hive/hive-exec-shade/pom.xml
@@ -66,7 +66,7 @@
         </exclusion>
         <exclusion>
           <groupId>org.apache.calcite.avatica</groupId>
-          <artifactId>avatica</artifactId>
+          <artifactId>avatica-core</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.apache.calcite</groupId>
diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
index 7b6c858163..65d8c80251 100644
--- a/exec/java-exec/pom.xml
+++ b/exec/java-exec/pom.xml
@@ -239,7 +239,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.calcite.avatica</groupId>
-      <artifactId>avatica</artifactId>
+      <artifactId>avatica-core</artifactId>
     </dependency>
     <dependency>
       <groupId>net.sf.jpam</groupId>
diff --git a/exec/jdbc/pom.xml b/exec/jdbc/pom.xml
index 9efb71d5db..b74d7db9ad 100644
--- a/exec/jdbc/pom.xml
+++ b/exec/jdbc/pom.xml
@@ -31,7 +31,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.calcite.avatica</groupId>
-      <artifactId>avatica</artifactId>
+      <artifactId>avatica-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.drill</groupId>
diff --git a/pom.xml b/pom.xml
index 332aaa20bc..baf2d3433b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
     <junit.version>5.7.2</junit.version>
     <junit4.version>4.13.2</junit4.version>
     <junit.platform.version>1.8.2</junit.platform.version>
-    <slf4j.version>1.7.26</slf4j.version>
+    <slf4j.version>2.0.6</slf4j.version>
     <shaded.guava.version>28.2-jre</shaded.guava.version>
     <guava.version>30.1.1-jre</guava.version>
     <forkCount>1</forkCount>
@@ -72,7 +72,7 @@
     <curator.version>5.2.0</curator.version>
     <wiremock.standalone.version>2.23.2</wiremock.standalone.version>
     <jmockit.version>1.47</jmockit.version>
-    <logback.version>1.2.11</logback.version>
+    <logback.version>1.4.5</logback.version>
     <mockito.version>3.11.2</mockito.version>
     <!--
       Currently, Hive storage plugin only supports Apache Hive 3.1.3 or vendor specific variants of the
@@ -87,7 +87,7 @@
     <javassist.version>3.28.0-GA</javassist.version>
     <msgpack.version>0.6.6</msgpack.version>
     <reflections.version>0.9.10</reflections.version>
-    <avro.version>1.11.0</avro.version>
+    <avro.version>1.11.1</avro.version>
     <metrics.version>4.2.10</metrics.version>
     <jetty.version>9.4.44.v20210927</jetty.version>
     <jersey.version>2.34</jersey.version>
@@ -129,7 +129,7 @@
     <commons.beanutils.version>1.9.4</commons.beanutils.version>
     <httpdlog-parser.version>5.8</httpdlog-parser.version>
     <yauaa.version>7.9.0</yauaa.version>
-    <log4j.version>2.18.0</log4j.version>
+    <log4j.version>2.19.0</log4j.version>
     <aircompressor.version>0.20</aircompressor.version>
     <iceberg.version>0.12.1</iceberg.version>
     <univocity-parsers.version>2.8.3</univocity-parsers.version>
@@ -1202,14 +1202,9 @@
     <dependency>
       <groupId>de.huxhorn.lilith</groupId>
       <artifactId>de.huxhorn.lilith.logback.appender.multiplex-classic</artifactId>
-      <version>0.9.44</version>
+      <version>8.3.0</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.xerial.snappy</groupId>
-      <artifactId>snappy-java</artifactId>
-      <version>1.1.2.6</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.kerby</groupId>
       <artifactId>kerb-client</artifactId>
@@ -1302,13 +1297,9 @@
       </dependency>
       <dependency>
         <groupId>org.apache.calcite.avatica</groupId>
-        <artifactId>avatica</artifactId>
+        <artifactId>avatica-core</artifactId>
         <version>${avatica.version}</version>
         <exclusions>
-          <exclusion>
-            <groupId>org.apache.calcite.avatica</groupId>
-            <artifactId>avatica-core</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>