diff --git a/build.gradle b/build.gradle index da0e8cf..b5e479a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'pl.allegro.tech.build.axion-release' version '1.11.0' + id 'pl.allegro.tech.build.axion-release' version '1.14.2' id 'groovy' } @@ -21,19 +21,10 @@ ext.pluginClassNames='io.github.valfadeev.rundeck.plugin.vault.VaultStoragePlugi scmVersion { - ignoreUncommittedChanges = false + ignoreUncommittedChanges = true 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 @@ -47,7 +38,7 @@ configurations{ pluginLibs //declare compile to extend from pluginLibs so it inherits the dependencies - compile{ + implementation{ extendsFrom pluginLibs } } @@ -60,8 +51,8 @@ dependencies { //the compile dependency won't add the rundeck-core jar to the plugin contents - compile group: 'org.rundeck', name: 'rundeck-core', version: rundeckVersion - testCompile( + implementation group: 'org.rundeck', name: 'rundeck-core', version: rundeckVersion + testImplementation( [group: 'junit', name: 'junit', version: '4.12', ext: 'jar'], [group: 'org.hamcrest', name: 'hamcrest-core', version: '1.3', ext: 'jar'], [group: 'org.hamcrest', name: 'hamcrest-library', version: '1.3', ext: 'jar'], @@ -71,9 +62,9 @@ dependencies { [group: 'org.objenesis', name: 'objenesis', version: '3.2'] ) - testCompile "org.codehaus.groovy:groovy-all:2.4.15" - testCompile "org.spockframework:spock-core:1.0-groovy-2.4" - testCompile "cglib:cglib-nodep:2.2.2" + testImplementation "org.codehaus.groovy:groovy-all:2.4.15" + testImplementation "org.spockframework:spock-core:1.0-groovy-2.4" + testImplementation "cglib:cglib-nodep:2.2.2" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 91efaa6..18a6af3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip