From 76c14ac7f36e49b5beb0d6648a4963d3877ac1ed Mon Sep 17 00:00:00 2001 From: Greg Schueler Date: Tue, 6 Jun 2023 13:49:55 -0700 Subject: [PATCH 1/2] remove old references to toolbelt --- gradle.properties | 1 - gradle/libs.versions.toml | 7 ------- rd-cli-base/build.gradle | 2 -- 3 files changed, 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index b3f2d375..8f56a857 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -toolbeltVersion=0.2.29 lombokVersion=1.18.24 retrofitVersion=2.9.0 okhttpVersion=4.9.3 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fa3a57b3..d7779b4b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,6 @@ retrofit = "2.9.0" okhttp = "4.9.3" -toolbelt = "0.2.29" lombok = "1.18.26" jaxb = "2.3.8" junit = "4.13.2" @@ -42,11 +41,6 @@ junit = { module = "junit:junit", version.ref = "junit" } groovy = { module = "org.codehaus.groovy:groovy-all", version.ref = "groovy" } spock = { module = "org.spockframework:spock-core", version.ref = "spock" } -toolbelt = { module = "org.rundeck.cli-toolbelt:toolbelt", version.ref = "toolbelt" } -toolbeltYaml = { module = "org.rundeck.cli-toolbelt:toolbelt-snakeyaml", version.ref = "toolbelt" } -toolbeltJackson = { module = "org.rundeck.cli-toolbelt:toolbelt-json-jackson", version.ref = "toolbelt" } -toolbeltCli = { module = "org.rundeck.cli-toolbelt:toolbelt-jewelcli", version.ref = "toolbelt" } - jacksonDatabind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jacksonDatabind" } snakeYaml = { module = "org.yaml:snakeyaml", version.ref = "snakeYaml" } @@ -62,7 +56,6 @@ testcontainersSpock = { module = "org.testcontainers:spock", version.ref = "test retrofit = ["retrofitCore", "retrofitJackson", "retrofitJaxb", "okhttpLogging", "okhttpUrlconnection", "jaxb"] test = ["junit", "groovy", "spock"] testcontainers = ["testcontainers", "testcontainersSpock"] -toolbelt = ["toolbelt", "toolbeltYaml", "toolbeltJackson", "toolbeltCli"] rundeckAuthz = ["rundeckAuthzCore", "rundeckAuthzApi", "rundeckAuthzYaml"] [plugins] diff --git a/rd-cli-base/build.gradle b/rd-cli-base/build.gradle index 3dc4d486..4986232d 100644 --- a/rd-cli-base/build.gradle +++ b/rd-cli-base/build.gradle @@ -11,8 +11,6 @@ dependencies { implementation project(":rd-cli-lib"), project(":rd-api-client") -// implementation libs.bundles.toolbelt - implementation libs.picocli annotationProcessor libs.picocliCodegen From e231d97137587d7cb91912e810ecde439ad466f2 Mon Sep 17 00:00:00 2001 From: Greg Schueler Date: Tue, 6 Jun 2023 13:50:29 -0700 Subject: [PATCH 2/2] cleanup: remove unused version info --- gradle.properties | 3 --- 1 file changed, 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8f56a857..76837905 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,6 +13,3 @@ # See the License for the specific language governing permissions and # limitations under the License. # -lombokVersion=1.18.24 -retrofitVersion=2.9.0 -okhttpVersion=4.9.3