diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 90787cbb2..1f3636409 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -2,6 +2,6 @@ io.jenkins.tools.incrementals git-changelist-maven-extension - 1.6 + 1.7 diff --git a/Jenkinsfile b/Jenkinsfile index fcf864e8f..9ceab4214 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ buildPlugin(useContainerAgent: true, configurations: [ - [platform: 'linux', jdk: 11], + [platform: 'linux', jdk: 17], [platform: 'windows', jdk: 11], ]) diff --git a/job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/MemoryJobManagementSpec.groovy b/job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/MemoryJobManagementSpec.groovy index b92eed59a..f87a7b37c 100644 --- a/job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/MemoryJobManagementSpec.groovy +++ b/job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/MemoryJobManagementSpec.groovy @@ -164,7 +164,7 @@ class MemoryJobManagementSpec extends Specification { def 'outputStream'() { setup: - PrintStream out = Mock(PrintStream) + PrintStream out = new PrintStream(OutputStream.nullOutputStream()) when: JobManagement jobManagement = new MemoryJobManagement(out) diff --git a/job-dsl-plugin/src/test/groovy/javaposse/jobdsl/plugin/ScriptRequestGeneratorSpec.groovy b/job-dsl-plugin/src/test/groovy/javaposse/jobdsl/plugin/ScriptRequestGeneratorSpec.groovy index cc889f460..53eb4d55b 100644 --- a/job-dsl-plugin/src/test/groovy/javaposse/jobdsl/plugin/ScriptRequestGeneratorSpec.groovy +++ b/job-dsl-plugin/src/test/groovy/javaposse/jobdsl/plugin/ScriptRequestGeneratorSpec.groovy @@ -319,9 +319,8 @@ class ScriptRequestGeneratorSpec extends Specification { requests[0].body == SCRIPT_A requests[0].urlRoots.length == 3 requests[0].urlRoots[0].toString() == 'workspace:/' - URL tempDirUrl = new File(System.getProperty('java.io.tmpdir')).toURI().toURL() - requests[0].urlRoots[1] =~ "${tempDirUrl}jobdsl.*\\.jar" - requests[0].urlRoots[2] =~ "${tempDirUrl}jobdsl.*\\.jar" + requests[0].urlRoots[1] =~ 'jobdsl.*\\.jar' + requests[0].urlRoots[2] =~ 'jobdsl.*\\.jar' !requests[0].ignoreExisting requests[0].scriptPath == getAbsolutePath(remoteBuild.workspace.child('a.groovy')) requests[0].relativeScriptPath == 'a.groovy' diff --git a/pom.xml b/pom.xml index 5cd98d96f..0206a2c08 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 4.66 + 4.72 job-dsl-parent