[pulsar] branch master updated: [Presto] Fix issue of mixed SLF4J library versions in presto libs (#13603)

[lhotari]

This is an automated email from the ASF dual-hosted git repository.

lhotari pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 29840b4  [Presto] Fix issue of mixed SLF4J library versions in presto 
libs (#13603)
29840b4 is described below

commit 29840b4ecabd0d997c25d52f6c02086b215f2cae
Author: Lari Hotari <lhot...@users.noreply.github.com>
AuthorDate: Tue Jan 4 20:26:54 2022 +0200

    [Presto] Fix issue of mixed SLF4J library versions in presto libs (#13603)
---
 pulsar-sql/pom.xml                     | 12 ++++++++++++
 pulsar-sql/presto-distribution/LICENSE |  6 ++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/pulsar-sql/pom.xml b/pulsar-sql/pom.xml
index 3a21a9d..23b83fb 100644
--- a/pulsar-sql/pom.xml
+++ b/pulsar-sql/pom.xml
@@ -133,6 +133,18 @@
                 <artifactId>okio</artifactId>
                 <version>${okio.version}</version>
             </dependency>
+
+            <!-- force specific version of slf4j -->
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>log4j-over-slf4j</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-jdk14</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/pulsar-sql/presto-distribution/LICENSE 
b/pulsar-sql/presto-distribution/LICENSE
index 0899762..391acc2 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -329,8 +329,7 @@ The Apache Software License, Version 2.0
     - leveldb-0.10.jar
     - leveldb-api-0.10.jar
   * Log4j implemented over SLF4J
-    - log4j-over-slf4j-1.7.29.jar
-    - log4j-over-slf4j-1.7.30.jar
+    - log4j-over-slf4j-1.7.32.jar
   * Lucene Common Analyzers
     - lucene-analyzers-common-8.4.1.jar
     - lucene-core-8.4.1.jar
@@ -484,9 +483,8 @@ MIT License
  * PCollections
    - pcollections-2.1.2.jar
  * SLF4J
-   - slf4j-jdk14-1.7.29.jar
    - slf4j-api-1.7.32.jar
-   - slf4j-jdk14-1.7.30.jar
+   - slf4j-jdk14-1.7.32.jar
  * JCL 1.2 Implemented Over SLF4J
    - jcl-over-slf4j-1.7.32.jar
  * JUL to SLF4J Bridge