Skip to content

Commit

Permalink
Merge pull request #51 from rundeck-plugins/gradle_update
Browse files Browse the repository at this point in the history
Update to gradle 7.6.1
  • Loading branch information
chrismcg14 authored Aug 8, 2023
2 parents e17d4bd + cbd18a3 commit ec33f52
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 18 deletions.
25 changes: 8 additions & 17 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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'

}
Expand All @@ -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
Expand All @@ -47,7 +38,7 @@ configurations{
pluginLibs

//declare compile to extend from pluginLibs so it inherits the dependencies
compile{
implementation{
extendsFrom pluginLibs
}
}
Expand All @@ -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'],
Expand All @@ -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"

}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit ec33f52

Please sign in to comment.