From acad55f2158c8f3d3aa382b8d0ea3042739b350d Mon Sep 17 00:00:00 2001
From: Greg Schueler <greg.schueler@gmail.com>
Date: Tue, 22 Oct 2024 12:37:13 -0700
Subject: [PATCH] Change to use version catalog

---
 build.gradle              | 25 ++++++++++---------------
 gradle.properties         |  1 -
 gradle/libs.versions.toml | 31 +++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 16 deletions(-)
 create mode 100644 gradle/libs.versions.toml

diff --git a/build.gradle b/build.gradle
index 6852ed9b..f7565071 100644
--- a/build.gradle
+++ b/build.gradle
@@ -52,33 +52,28 @@ repositories {
     mavenLocal()
 }
 dependencies {
-    implementation "org.slf4j:slf4j-api:1.7.36"
-    implementation (group: 'org.rundeck', name: 'rundeck-core', version: '4.0.0-20220322') {
+    implementation libs.slf4jApi
+    implementation(libs.rundeckCore) {
         exclude group: "com.google.guava"
     }
-    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'
+    implementation libs.bundles.awsSdk
+    implementation libs.jacksonDatabind
+    implementation libs.commonsBeanutils
 
-    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: "${awsSdkVersion}") {
+    pluginLibs libs.stax
+    pluginLibs libs.staxApi
+    pluginLibs(libs.awsSdkEc2) {
         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: "${awsSdkVersion}") {
+    pluginLibs(libs.awsSdkSts) {
         exclude group: "org.apache.httpcomponents", module: "httpclient"
         exclude group: "com.fasterxml.jackson.core"
         exclude group: "com.fasterxml.jackson.dataformat"
     }
 
-    testImplementation "org.codehaus.groovy:groovy-all:2.3.7"
-    testImplementation "org.spockframework:spock-core:0.7-groovy-2.0"
-    testImplementation "cglib:cglib-nodep:2.2.2"
-    testImplementation 'org.objenesis:objenesis:3.1'
+    testImplementation libs.bundles.testLibs
 }
 
 // task to copy plugin libs to output/lib dir
diff --git a/gradle.properties b/gradle.properties
index 03716651..e69de29b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +0,0 @@
-awsSdkVersion=1.12.770
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 00000000..593c938c
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,31 @@
+[versions]
+slf4j = "1.7.36"
+rundeckCore = "4.0.0-20220322"
+awsSdk = "1.12.770"
+jacksonDatabind = "2.10.5.1"
+commonsBeanutils = "1.9.4"
+stax = "1.2.0"
+staxApi = "1.0"
+groovy = "2.3.7"
+spock = "0.7-groovy-2.0"
+cglib = "2.2.2"
+objenesis = "3.1"
+
+[libraries]
+slf4jApi = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" }
+rundeckCore = { group = "org.rundeck", name = "rundeck-core", version.ref = "rundeckCore" }
+awsSdkCore = { group = "com.amazonaws", name = "aws-java-sdk-core", version.ref = "awsSdk" }
+awsSdkSts = { group = "com.amazonaws", name = "aws-java-sdk-sts", version.ref = "awsSdk" }
+jacksonDatabind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jacksonDatabind" }
+commonsBeanutils = { group = "commons-beanutils", name = "commons-beanutils", version.ref = "commonsBeanutils" }
+stax = { group = "stax", name = "stax", version.ref = "stax" }
+staxApi = { group = "javax.xml.stream", name = "stax-api", version.ref = "staxApi" }
+awsSdkEc2 = { group = "com.amazonaws", name = "aws-java-sdk-ec2", version.ref = "awsSdk" }
+groovyAll = { group = "org.codehaus.groovy", name = "groovy-all", version.ref = "groovy" }
+spockCore = { group = "org.spockframework", name = "spock-core", version.ref = "spock" }
+cglibNodep = { group = "cglib", name = "cglib-nodep", version.ref = "cglib" }
+objenesis = { group = "org.objenesis", name = "objenesis", version.ref = "objenesis" }
+
+[bundles]
+awsSdk = ["awsSdkCore", "awsSdkSts"]
+testLibs = ["groovyAll", "spockCore", "cglibNodep", "objenesis"]
\ No newline at end of file