Merge pull request #50 from rundeck-plugins/dependency_updates

Update gradle version, plugin dependencies
rundeck-plugins · Jun 1, 2023 · f5878ba · f5878ba
2 parents efdf27d + 9ac2f94
commit f5878ba
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,13 +6,12 @@ buildscript {
 }
 
 plugins {
-    id 'pl.allegro.tech.build.axion-release' version '1.10.0'
+    id 'pl.allegro.tech.build.axion-release' version '1.13.4'
 }
 defaultTasks 'clean','build'
 apply plugin: 'java'
 apply plugin: 'idea'
 apply plugin: 'pl.allegro.tech.build.axion-release'
-apply plugin: 'maven'
 
 sourceCompatibility = 1.8
 ext.rundeckPluginVersion= '1.2'
@@ -66,18 +65,20 @@ dependencies {
     // add any third-party jar dependencies you wish to include in the plugin
     // using the `pluginLibs` configuration as shown here:
 
-    compile "com.amazonaws:aws-java-sdk-s3:1.11.743"
-    pluginLibs (group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.11.743') {
+    implementation "com.amazonaws:aws-java-sdk-s3:1.12.470"
+    pluginLibs (group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.470') {
             exclude group: "com.fasterxml.jackson.core"
+            exclude group: "com.fasterxml.jackson.dataformat"
     }
-    pluginLibs (group: 'com.amazonaws', name: 'aws-java-sdk-sts', version: '1.11.743') {
+    pluginLibs (group: 'com.amazonaws', name: 'aws-java-sdk-sts', version: '1.12.470') {
             exclude group: "com.fasterxml.jackson.core"
+            exclude group: "com.fasterxml.jackson.dataformat"
     }
 
 
     //the compile dependency won't add the rundeck-core jar to the plugin contents
-    compile group: 'org.rundeck', name: 'rundeck-core', version: rundeckVersion
-    testCompile group: 'junit', name:'junit', version: '4.11'
+    implementation group: 'org.rundeck', name: 'rundeck-core', version: rundeckVersion
+    testImplementation group: 'junit', name:'junit', version: '4.11'
 }
 
 // task to copy plugin libs to output/lib dir
@@ -107,8 +108,4 @@ jar {
     }
 }
 //set jar task to depend on copyToLib
-jar.dependsOn(copyToLib)
-
-//task wrapper(type: Wrapper) {
-//    gradleVersion = '2.12'
-//}
+jar.dependsOn(copyToLib)
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Thu Apr 14 14:20:18 PDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip
diff --git a/src/test/java/org/rundeck/plugins/S3LogFileStoragePluginTest.java b/src/test/java/org/rundeck/plugins/S3LogFileStoragePluginTest.java
@@ -660,7 +660,7 @@ public void isAvailableS3Exception() {
         } catch (ExecutionFileStorageException e) {
             Assert.assertEquals(
                     "blah (Service: null; Status Code: 0; Error Code: null; Request ID: requestId; S3 Extended " +
-                    "Request ID: extendedRequestId)",
+                    "Request ID: extendedRequestId; Proxy: null)",
                     e.getMessage()
             );
         }
@@ -702,7 +702,7 @@ public void storeS3Exception() throws IOException {
             Assert.fail("should throw");
         } catch (ExecutionFileStorageException e) {
             Assert.assertEquals(
-                    "putObject (Service: null; Status Code: 0; Error Code: null; Request ID: requestId; S3 Extended Request ID: extendedRequestId)",
+                    "putObject (Service: null; Status Code: 0; Error Code: null; Request ID: requestId; S3 Extended Request ID: extendedRequestId; Proxy: null)",
                     e.getMessage()
             );
         }
@@ -855,7 +855,7 @@ public void retrieveS3Exception() throws IOException {
             Assert.fail("should throw");
         } catch (ExecutionFileStorageException e) {
             Assert.assertEquals(
-                    "getObject (Service: null; Status Code: 0; Error Code: null; Request ID: requestId; S3 Extended Request ID: extendedRequestId)",
+                    "getObject (Service: null; Status Code: 0; Error Code: null; Request ID: requestId; S3 Extended Request ID: extendedRequestId; Proxy: null)",
                     e.getMessage()
             );
         }