Upgrade org.apache.logging.log4j:log4j-core and log4j-api libraries i…

…n presto Upgraded org.apache.logging.log4j:log4j-core from 2.17.1 to 2.24.3 Upgraded org.apache.logging.log4j:log4j-api from 2.17.1 to 2.24.3 Fixes almost 25 CVEs.
prestodb · Feb 11, 2025 · 0016219 · 0016219
1 parent 903520c
commit 0016219
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -103,6 +103,7 @@
         <air.test.thread-count>2</air.test.thread-count>
         <air.test.jvmsize>4g</air.test.jvmsize>
         <grpc.version>1.68.0</grpc.version>
+        <dep.log4j.version>2.24.3</dep.log4j.version>
 
         <air.javadoc.lint>-missing</air.javadoc.lint>
     </properties>
@@ -233,6 +234,20 @@
                 <scope>import</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-api</artifactId>
+                <version>${dep.log4j.version}</version>
+                <scope>runtime</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-core</artifactId>
+                <version>${dep.log4j.version}</version>
+                <scope>runtime</scope>
+            </dependency>
+
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-transport</artifactId>

diff --git a/presto-cli/src/main/java/com/facebook/presto/cli/KeyReader.java b/presto-cli/src/main/java/com/facebook/presto/cli/KeyReader.java
@@ -13,14 +13,13 @@
  */
 package com.facebook.presto.cli;
 
+import org.fusesource.jansi.AnsiConsole;
+
 import java.io.FileDescriptor;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import static org.fusesource.jansi.internal.CLibrary.STDIN_FILENO;
-import static org.fusesource.jansi.internal.CLibrary.isatty;
-
 public final class KeyReader
 {
     private KeyReader() {}
@@ -47,7 +46,11 @@ public static int readKey()
     private static boolean hasTerminal()
     {
         try {
-            return isatty(STDIN_FILENO) == 1;
+            //return isatty(STDIN_FILENO) == 1;
+            AnsiConsole.systemInstall();
+            boolean isAnsiSupported = AnsiConsole.isInstalled();
+            AnsiConsole.systemUninstall(); // Uninstall after check
+            return isAnsiSupported;
         }
         catch (Throwable e) {
             return false;

diff --git a/presto-druid/pom.xml b/presto-druid/pom.xml
@@ -13,7 +13,6 @@
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
-        <dep.log4j.version>2.17.1</dep.log4j.version>
     </properties>
 
     <repositories>

diff --git a/presto-elasticsearch/pom.xml b/presto-elasticsearch/pom.xml
@@ -12,7 +12,6 @@
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
-        <dep.log4j.version>2.17.1</dep.log4j.version>
         <dep.elasticsearch.version>6.0.0</dep.elasticsearch.version>
     </properties>
 

diff --git a/presto-main/etc/catalog/iceberg.properties b/presto-main/etc/catalog/iceberg.properties
@@ -1,2 +1,9 @@
 connector.name=iceberg
-hive.metastore.uri=thrift://localhost:9083
+hive.s3.path-style-access=true
+hive.metastore=file
+hive.metastore.catalog.dir=file:///Users/godaridillibabu/Downloads/minioIkc
+hive.s3.endpoint=http://9.30.1.187:9000
+hive.s3.aws-access-key=minioadmin
+hive.s3.aws-secret-key=minioadmin
+hive.temporary-staging-directory-path=file:///Users/godaridillibabu/Downloads/minioIkc
+hive.s3.socket-timeout=1m