From b9478c18fe6f4116f813fa4d7e6f995147ffdb40 Mon Sep 17 00:00:00 2001
From: Stephen Joyner <sjoyner@pagerduty.com>
Date: Fri, 22 Nov 2024 10:20:23 -0600
Subject: [PATCH 1/4] Update axion to 1.17.2

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

diff --git a/build.gradle b/build.gradle
index f8c3d90..4f2ff08 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 }
 
 plugins {
-    id 'pl.allegro.tech.build.axion-release' version '1.13.4'
+    id 'pl.allegro.tech.build.axion-release' version '1.17.2'
 }
 defaultTasks 'clean','build'
 apply plugin: 'java'
@@ -25,18 +25,10 @@ ext.rundeckVersion='4.17.6-20240402'
 ext.pluginClassNames='org.rundeck.plugins.S3LogFileStoragePlugin'
 
 scmVersion {
+    ignoreUncommittedChanges = true
     tag {
         prefix = 'v'
         versionSeparator = ''
-        def origDeserialize=deserialize
-        //apend .0 to satisfy semver if the tag version is only X.Y
-        deserialize = { config, position, tagName ->
-            def orig = origDeserialize(config, position, tagName)
-            if (orig.split('\\.').length < 3) {
-                orig += ".0"
-            }
-            orig
-        }
     }
 }
 project.version = scmVersion.version

From 0a1e6e38f9f243113e37bb3e4299173c69aa9556 Mon Sep 17 00:00:00 2001
From: Stephen Joyner <sjoyner@pagerduty.com>
Date: Fri, 22 Nov 2024 10:35:38 -0600
Subject: [PATCH 2/4] Update source compatibility and rundeck dependency

---
 build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4f2ff08..1362939 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,9 +14,9 @@ apply plugin: 'idea'
 apply plugin: 'maven-publish'
 apply plugin: 'pl.allegro.tech.build.axion-release'
 
-sourceCompatibility = 1.8
+sourceCompatibility = 11
 ext.rundeckPluginVersion= '1.2'
-ext.rundeckVersion='4.17.6-20240402'
+ext.rundeckVersion='5.2.0-20240410'
 
 /**
  * Set this to a comma-separated list of full classnames of your implemented Rundeck
@@ -86,7 +86,7 @@ jar {
         def libList = configurations.pluginLibs.collect{'lib/'+it.name}.join(' ')
         attributes 'Rundeck-Plugin-Name': 'S3 Log Plugin'
         attributes 'Rundeck-Plugin-Description': 'Store execution log files in S3, for backup or for cloud-friendly behavior.'
-        attributes 'Rundeck-Plugin-Rundeck-Compatibility-Version': '2.6.5+'
+        attributes 'Rundeck-Plugin-Rundeck-Compatibility-Version': '5.2.0+'
         attributes 'Rundeck-Plugin-Tags': 'java,s3,execution file storage'
         attributes 'Rundeck-Plugin-License': 'Apache 2.0'
         attributes 'Rundeck-Plugin-Author': 'Rundeck, Inc.'

From 79d2e201c29e90623e24f3a4d1334c02d4bdff50 Mon Sep 17 00:00:00 2001
From: Stephen Joyner <sjoyner@pagerduty.com>
Date: Fri, 22 Nov 2024 10:39:50 -0600
Subject: [PATCH 3/4] Fix compatibility versioning

---
 build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 1362939..2dedaa4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,8 @@ apply plugin: 'idea'
 apply plugin: 'maven-publish'
 apply plugin: 'pl.allegro.tech.build.axion-release'
 
-sourceCompatibility = 11
+sourceCompatibility = JavaVersion.VERSION_11
+targetCompatibility = JavaVersion.VERSION_11
 ext.rundeckPluginVersion= '1.2'
 ext.rundeckVersion='5.2.0-20240410'
 

From 202391ecd0f3b4a3dd9a96c86b577ba1b3905199 Mon Sep 17 00:00:00 2001
From: Stephen Joyner <sjoyner@pagerduty.com>
Date: Fri, 22 Nov 2024 10:48:24 -0600
Subject: [PATCH 4/4] Update build scripts to use Java 11

---
 .github/workflows/gradle.yml  | 4 ++--
 .github/workflows/release.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index a7ba272..43e0509 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -14,10 +14,10 @@ jobs:
       - name: Get Fetch Tags
         run: git -c protocol.version=2 fetch --tags --progress --no-recurse-submodules origin
         if: "!contains(github.ref, 'refs/tags')"
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 276cb01..1c975d3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,10 +15,10 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: set up JDK 1.8
+      - name: set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Build with Gradle
         run: ./gradlew build
       - name: Get Release Version