diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index a771af0..3b53963 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -14,10 +14,10 @@ jobs: - name: Get Fetch Tags run: git -c protocol.version=2 fetch --tags --progress --no-recurse-submodules origin if: "!contains(github.ref, 'refs/tags')" - - name: Set up JDK 1.8 + - name: set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle diff --git a/build.gradle b/build.gradle index 6e89ece..4f48eed 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.15.4' } group 'com.rundeck' @@ -14,15 +14,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 @@ -37,29 +28,34 @@ 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' + implementation 'org.codehaus.groovy:groovy-all:3.0.9' + testImplementation group: 'junit', name: 'junit', version: '4.12' - compile group: 'org.rundeck', name: 'rundeck-core', version: '2.11.4' - compile 'org.slf4j:slf4j-api:1.7.30' + implementation group: 'org.rundeck', name: 'rundeck-core', version: '4.15.0-20230725' + implementation 'org.slf4j:slf4j-api:1.7.30' - pluginLibs( 'org.eclipse.jgit:org.eclipse.jgit:4.4.0.201606070830-r') { + pluginLibs( 'org.eclipse.jgit:org.eclipse.jgit:5.13.2.202306221912-r') { exclude module: 'slf4j-api' exclude module: 'jsch' exclude module: 'commons-logging' } - 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' + pluginLibs ("org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:5.13.2.202306221912-r"){ + exclude module: 'slf4j-api' + exclude group: 'org.bouncycastle' + } + + testImplementation "org.codehaus.groovy:groovy-all:3.0.9" + testImplementation "org.spockframework:spock-core:2.0-groovy-3.0" + testImplementation "cglib:cglib-nodep:2.2.2" + testImplementation 'org.objenesis:objenesis:1.4' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d2c45a4..774fae8 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-4.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/test/groovy/com/rundeck/plugin/GitResourceModelSpec.groovy b/src/test/groovy/com/rundeck/plugin/GitResourceModelSpec.groovy index ca9acbb..b3f869f 100644 --- a/src/test/groovy/com/rundeck/plugin/GitResourceModelSpec.groovy +++ b/src/test/groovy/com/rundeck/plugin/GitResourceModelSpec.groovy @@ -5,7 +5,6 @@ import com.dtolabs.rundeck.core.common.INodeSet import com.dtolabs.rundeck.core.resources.format.ResourceFormatParser import com.dtolabs.rundeck.core.resources.format.ResourceFormatParserService import spock.lang.Specification -import org.apache.log4j.Logger /** * Created by luistoledo on 12/22/17.