Skip to content

Commit

Permalink
Change to use version catalog
Browse files Browse the repository at this point in the history
  • Loading branch information
gschueler committed Oct 22, 2024
1 parent affbd02 commit acad55f
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 16 deletions.
25 changes: 10 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
awsSdkVersion=1.12.770
31 changes: 31 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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"]

0 comments on commit acad55f

Please sign in to comment.