From cb53707d01f03b1c21f1f420b83deac605e1918b Mon Sep 17 00:00:00 2001 From: Chris McCarroll-Gilbert Date: Thu, 1 Jun 2023 08:09:18 -0600 Subject: [PATCH 1/2] update sdk version, fix tests, exclud jackson group --- build.gradle | 19 ++++++++----------- gradle/wrapper/gradle-wrapper.properties | 3 +-- .../plugins/S3LogFileStoragePluginTest.java | 6 +++--- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index 782c512..f094fb6 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,6 @@ 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) \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 14b10ae..774fae8 100644 --- 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 index accfc49..069ac9d 100644 --- 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() ); } From 9ac2f9434855753475168ba7edd90ea7f4b04eae Mon Sep 17 00:00:00 2001 From: Chris McCarroll-Gilbert Date: Thu, 1 Jun 2023 08:31:40 -0600 Subject: [PATCH 2/2] update acioin release version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f094fb6..90e148e 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ 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'