From 65c5bae39ba685aef13da1b07ca27bee81b276bc Mon Sep 17 00:00:00 2001 From: Luis Toledo Date: Thu, 21 Jul 2022 20:03:35 -0400 Subject: [PATCH 1/2] upgrade grails 7 --- build.gradle | 16 ++++++++-------- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index b268bee..972b1b1 100644 --- a/build.gradle +++ b/build.gradle @@ -42,15 +42,15 @@ repositories { configurations { pluginLibs - compile { + implementation { extendsFrom pluginLibs } } dependencies { - compile 'org.codehaus.groovy:groovy-all:2.3.11' - testCompile group: 'junit', name: 'junit', version: '4.12' - compile group: 'org.rundeck', name: 'rundeck-core', version: '3.3.+' + implementation 'org.codehaus.groovy:groovy-all:2.3.11' + testImplementation group: 'junit', name: 'junit', version: '4.12' + implementation group: 'org.rundeck', name: 'rundeck-core', version: '3.3.+' pluginLibs (group: 'com.microsoft.azure', name: 'azure', version: '1.3.0'){ exclude group: "com.fasterxml.jackson.core" } @@ -64,10 +64,10 @@ dependencies { pluginLibs group: 'com.microsoft.azure', name: 'azure-keyvault-core', version: '1.0.0' - testCompile "org.codehaus.groovy:groovy-all:2.3.7" - testCompile "org.spockframework:spock-core:0.7-groovy-2.0" - testCompile "cglib:cglib-nodep:2.2.2" - testCompile 'org.objenesis:objenesis:1.4' + 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:1.4' constraints { pluginLibs("com.squareup.retrofit2:adapter-rxjava:2.6.1") { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f4d7b2b..aa991fc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 53597f4fdc298f7e0a38b09cde88957319ae48c8 Mon Sep 17 00:00:00 2001 From: Luis Toledo Date: Fri, 22 Jul 2022 12:19:37 -0400 Subject: [PATCH 2/2] upgrade axion version --- build.gradle | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 972b1b1..9fdecf1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'pl.allegro.tech.build.axion-release' version '1.10.2' + id 'pl.allegro.tech.build.axion-release' version '1.13.14' } group 'com.rundeck' @@ -19,15 +19,6 @@ scmVersion { tag { prefix = '' 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