Removing deprecated funtions

rundeck-plugins · Oct 30, 2018 · 5b8e8d1 · 5b8e8d1
1 parent 973743c
commit 5b8e8d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 apply plugin: 'java'
 apply plugin: 'pl.allegro.tech.build.axion-release'
 
-sourceCompatibility = 1.6
+sourceCompatibility = 1.8
 defaultTasks 'clean', 'build'
 
 configurations{
@@ -28,21 +28,14 @@ scmVersion {
 
         //apend .0 to satisfy semver if the tag version is only X.Y
         deserialize = { config, position, tagName ->
-            println("config:" + config)
-            println("position:" + position)
-            println("tagName:" + tagName)
             def orig = origDeserialize(config, position, tagName)
-            println("orig:" + orig)
             if (orig.split('\\.').length < 3) {
                 orig += ".0"
             }
-            println("orig2:" + orig)
             orig
         }
     }
 }
-
-println("scmVersion.version:" +  scmVersion.version)
 project.version = scmVersion.version
 
 repositories {

diff --git a/src/main/java/com/bitplaces/rundeck/plugins/slack/SlackNotificationPlugin.java b/src/main/java/com/bitplaces/rundeck/plugins/slack/SlackNotificationPlugin.java
@@ -122,7 +122,7 @@ public boolean postNotification(String trigger, Map executionData, Map config) {
 
         String message = generateMessage(trigger, executionData, config, this.slack_channel);
         String slackResponse = invokeSlackAPIMethod(webhook_url, message);
-        String ms = "payload=" + URLEncoder.encode(message);
+        String ms = "payload=" + this.urlEncode(message);
 
         if ("ok".equals(slackResponse)) {
             return true;
@@ -174,7 +174,7 @@ private String invokeSlackAPIMethod(String webhook_url, String message) {
 
         HttpURLConnection connection = null;
         InputStream responseStream = null;
-        String body = "payload=" + URLEncoder.encode(message);
+        String body = "payload=" + this.urlEncode(message);
         try {
             connection = openConnection(requestUrl);
             putRequestStream(connection, body);