From 7415e367dca12e7ef04358b90855465615b8b48a Mon Sep 17 00:00:00 2001
From: Alberto Hormazabal <ahormazabal@exatech.cl>
Date: Mon, 7 Oct 2024 15:35:43 -0300
Subject: [PATCH 1/3] Update aws sdk version and exclude httpcilent from build

---
 build.gradle      | 18 ++++++++++--------
 gradle.properties |  1 +
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2dd98587..eda9f210 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,10 +36,11 @@ project.version = scmVersion.version
 
 configurations{
     //declare custom pluginLibs configuration to include only libs for this plugin
-    pluginLibs
+    pluginLibs {
+    }
 
     //declare compile to extend from pluginLibs so it inherits the dependencies
-    implementation{
+    implementation {
         extendsFrom pluginLibs
     }
 }
@@ -49,23 +50,24 @@ repositories {
 }
 dependencies {
     implementation "org.slf4j:slf4j-api:1.7.36"
-    implementation (group: 'org.rundeck', name: 'rundeck-core', version: '3.4.0-20210614') {
+    implementation (group: 'org.rundeck', name: 'rundeck-core', version: '4.0.0-20220322') {
         exclude group: "com.google.guava"
     }
-    implementation "com.amazonaws:aws-java-sdk-core:1.11.743"
-    implementation "com.amazonaws:aws-java-sdk-sts:1.11.743"
+    implementation "com.amazonaws:aws-java-sdk-core:${awsSdkVersion}"
+    implementation "com.amazonaws:aws-java-sdk-sts:${awsSdkVersion}"
     implementation "com.fasterxml.jackson.core:jackson-databind:2.10.5.1"
     implementation group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4'
 
     pluginLibs group: 'stax', name: 'stax', version: '1.2.0'
     pluginLibs group: 'javax.xml.stream', name: 'stax-api', version: '1.0'
 
-    pluginLibs (group: 'com.amazonaws', name: 'aws-java-sdk-ec2', version: '1.11.743') {
+    pluginLibs (group: 'com.amazonaws', name: 'aws-java-sdk-ec2', version: "${awsSdkVersion}") {
+        exclude group: "org.apache.httpcomponents", module: "httpclient"
         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: "${awsSdkVersion}") {
+        exclude group: "org.apache.httpcomponents", module: "httpclient"
         exclude group: "com.fasterxml.jackson.core"
         exclude group: "com.fasterxml.jackson.dataformat"
     }
diff --git a/gradle.properties b/gradle.properties
index e69de29b..03716651 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -0,0 +1 @@
+awsSdkVersion=1.12.770
\ No newline at end of file

From 969dcef7a10a4edfd36cd17b2e9cab9ddcda6607 Mon Sep 17 00:00:00 2001
From: Alberto Hormazabal <ahormazabal@exatech.cl>
Date: Mon, 7 Oct 2024 16:29:34 -0300
Subject: [PATCH 2/3] upload github upload action

---
 .github/workflows/gradle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 57a345c3..c4b2d3ea 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -26,7 +26,7 @@ jobs:
         id: get_version
         run: VERSION=$(./gradlew currentVersion -q -Prelease.quiet) && echo ::set-output name=VERSION::$VERSION
       - name: Upload sshj-plugin jar
-        uses: actions/upload-artifact@v1.0.0
+        uses: actions/upload-artifact@v4
         with:
           # Artifact name
           name: Grails-Plugin-${{ steps.get_version.outputs.VERSION }}

From 04d2c4ec7fbabfd3a4f0dd52e743c252a980f56b Mon Sep 17 00:00:00 2001
From: Alberto Hormazabal <ahormazabal@exatech.cl>
Date: Tue, 8 Oct 2024 12:28:36 -0300
Subject: [PATCH 3/3] Add maven publish plugin for local publishing

---
 build.gradle | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/build.gradle b/build.gradle
index eda9f210..6852ed9b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,8 +7,11 @@ buildscript {
 
 plugins {
     id 'pl.allegro.tech.build.axion-release' version '1.13.4'
+    id 'maven-publish'
 }
 
+group = 'com.github.rundeck-plugins'
+
 apply plugin: 'java'
 apply plugin: 'groovy'
 apply plugin: 'idea'
@@ -106,3 +109,12 @@ jar {
 
 //set jar task to depend on copyToLib
 jar.dependsOn(copyToLib)
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifactId = 'rundeck-ec2-nodes-plugin'
+            from components.java
+        }
+    }
+}
\ No newline at end of file