Merge pull request #11 from rundeck-plugins/upd/migrate-log4j-to-slf4j

Change logging to slf4j
rundeck-plugins · May 21, 2020 · 1bff204 · 1bff204
2 parents 76b1ee6 + be49f11
commit 1bff204
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -56,6 +56,7 @@ repositories {
 
 dependencies {
     compile group: 'org.rundeck', name: 'rundeck-core', version: '2.10.1'
+    compile 'org.slf4j:slf4j-api:1.7.30'
     pluginLibs (group: 'org.codehaus.groovy.modules.http-builder', name: 'http-builder', version: '0.7.1') {
         exclude (group: "commons-collections", module: "commons-collections")
         exclude (group: "commons-beanutils", module: "commons-beanutils")

diff --git a/src/main/groovy/com/rundeck/plugin/HttpNotificationPlugin.groovy b/src/main/groovy/com/rundeck/plugin/HttpNotificationPlugin.groovy
@@ -15,7 +15,8 @@ import com.rundeck.plugin.oauth.OAuthClient
 import groovyx.net.http.ContentType
 import groovyx.net.http.HTTPBuilder
 import groovyx.net.http.Method
-import org.apache.log4j.Logger
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 
 /**
  * Created by rundeck on 12/27/17.
@@ -24,7 +25,7 @@ import org.apache.log4j.Logger
 @PluginDescription(title=HttpNotificationPlugin.SERVICE_TITLE, description=HttpNotificationPlugin.SERVICE_PROVIDER_DESCRIPTION)
 class HttpNotificationPlugin implements NotificationPlugin, Describable {
 
-    private static final Logger log = Logger.getLogger(HttpNotificationPlugin.class);
+    private static final Logger log = LoggerFactory.getLogger(HttpNotificationPlugin.class);
 
     public static final String SERVICE_PROVIDER_NAME="HttpNotification"
     public static final String  SERVICE_TITLE="Http Notification"

diff --git a/src/main/groovy/com/rundeck/plugin/oauth/OAuthClient.groovy b/src/main/groovy/com/rundeck/plugin/oauth/OAuthClient.groovy
@@ -6,13 +6,14 @@ import groovyx.net.http.HTTPBuilder
 import groovyx.net.http.HttpResponseException
 import groovyx.net.http.Method
 import org.apache.http.util.EntityUtils
-import org.apache.log4j.Logger;
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 
 /**
  * Created by rundeck on 12/27/17.
  */
 class OAuthClient {
-    private static final Logger log = Logger.getLogger(OAuthClient.class);
+    private static final Logger log = LoggerFactory.getLogger(OAuthClient.class);
 
 
     public static final String JSON_CONTENT_TYPE = "application/json";