Merge pull request #9 from rundeck-plugins/enh/slf4j

Use slf4j instead of log4j
rundeck-plugins · Aug 13, 2020 · 46e3c43 · 46e3c43
2 parents c863b34 + 44f5b27
commit 46e3c43
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -44,6 +44,7 @@ configurations {
 
 dependencies {
     compile group: 'org.rundeck', name: 'rundeck-core', version: '2.10.0'
+    compile "org.slf4j:slf4j-api:1.7.30"
     pluginLibs ('com.amazonaws:aws-java-sdk-s3:1.11.743') {
         exclude group: "com.fasterxml.jackson.core"
     }

diff --git a/src/main/java/com/rundeck/plugins/aws/S3Base.java b/src/main/java/com/rundeck/plugins/aws/S3Base.java
@@ -23,7 +23,6 @@
 import java.io.OutputStream;
 import java.nio.file.Files;
 
-import org.apache.log4j.Logger;
 
 import com.amazonaws.AmazonClientException;
 import com.amazonaws.ClientConfiguration;
@@ -46,10 +45,12 @@
 import com.dtolabs.rundeck.core.resources.format.ResourceFormatParserException;
 import com.dtolabs.rundeck.core.resources.format.UnsupportedFormatException;
 import com.dtolabs.utils.Streams;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class S3Base implements AWSCredentials,ResourceModelSource, WriteableModelSource {
 
-    private static final Logger logger = Logger.getLogger(S3Base.class);
+    private static final Logger logger = LoggerFactory.getLogger(S3Base.class);
 
     private String AWSAccessKeyId;
     private String AWSSecretKey;