Skip to content

Commit

Permalink
upgrade gradle version
Browse files Browse the repository at this point in the history
upgrade groovy version
upgrade jgit version
  • Loading branch information
ltamaster committed Jul 31, 2023
1 parent 6d73b05 commit 27a4472
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 22 deletions.
36 changes: 16 additions & 20 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.15.4'
}

group 'com.rundeck'
Expand All @@ -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
Expand All @@ -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'
}


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

0 comments on commit 27a4472

Please sign in to comment.