Merge pull request #1845 from tqtu/MSF-23046

FEATURE: MSF-23046 fix log4j issue CVE-2021-44228 Reviewed-by: <[email protected]> https://github.com/phong-nguyen-duy
gooddata · Mar 14, 2022 · 27a8385 · 27a8385
2 parents cd737a4 + 92e3a3f
commit 27a8385
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 21 deletions.
diff --git a/ci/redshift/pom.xml b/ci/redshift/pom.xml
@@ -30,10 +30,9 @@
             <version>1.11.633</version>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
-            <scope>compile</scope>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.2</version>
         </dependency>
     </dependencies>
 

diff --git a/lib/gooddata/cloud_resources/redshift/drivers/.gitkeepme b/lib/gooddata/cloud_resources/redshift/drivers/.gitkeepme
diff --git a/lib/gooddata/cloud_resources/redshift/drivers/log4j.properties b/lib/gooddata/cloud_resources/redshift/drivers/log4j.properties
diff --git a/lib/gooddata/cloud_resources/redshift/redshift_client.rb b/lib/gooddata/cloud_resources/redshift/redshift_client.rb
@@ -39,8 +39,6 @@ def initialize(options = {})
         @debug = options['debug'] == true || options['debug'] == 'true'
 
         Java.com.amazon.redshift.jdbc42.Driver
-        base = Pathname(__FILE__).dirname
-        org.apache.log4j.PropertyConfigurator.configure("#{base}/drivers/log4j.properties")
       end
 
       def realize_query(query, _params)