Skip to content

Commit

Permalink
Merge pull request #491 from stchar/feature/gradle7.4
Browse files Browse the repository at this point in the history
feat(gradle): bump version 7.4
  • Loading branch information
nre-ableton authored Feb 23, 2022
2 parents de15efb + 0b4a2a3 commit e33365a
Show file tree
Hide file tree
Showing 6 changed files with 243 additions and 269 deletions.
27 changes: 0 additions & 27 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,6 @@ archivesBaseName = "jenkins-pipeline-unit"
sourceCompatibility = 1.8
targetCompatibility = 1.8

// Grape configuration is used to test @Grape annotation in unit tests
// using grapeConfig.xml
configurations {
grape {
// Note our simple use case does not use or support
// transitive dependencies
transitive = false
}
}

dependencies {
implementation('org.codehaus.groovy:groovy-all:2.4.14')
implementation('com.cloudbees:groovy-cps:1.31')
Expand All @@ -40,8 +30,6 @@ dependencies {
api('org.springframework:spring-core:5.3.16')

testImplementation('junit:junit:4.13.2')

grape('org.apache.commons:commons-math3:3.6.1')
}

defaultTasks 'test'
Expand All @@ -56,22 +44,7 @@ task sourcesJar(type: Jar) {
from sourceSets.main.allSource
}

// Copy the resolved grapes configuration to a maven2 like directory
// structure (no transitive dependencies)
task copyGrapesDependencies(type: CopyDependenciesToMavenTreeTask) {
configuration = configurations.grape
outputDir = "$buildDir/grapes"
}

test.dependsOn copyGrapesDependencies

test {
inputs.files ("$projectDir/src/test/jenkins", "$projectDir/grapeConfig.xml")
systemProperty "grape.config", "$projectDir/grapeConfig.xml"
systemProperty "grape.home", file("$buildDir/grapes").toURI()
// Settings for debugging @Grape() resolution in test cases
//systemProperty "groovy.grape.report.downloads", "true"
//systemProperty "ivy.message.logger.level", "4"

// Enable writing stacks with -Ppipeline.stack.write
if (project.hasProperty("pipeline.stack.write")) {
Expand Down

This file was deleted.

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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-6.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit e33365a

Please sign in to comment.