Update dependency org.spockframework:spock-core to v2.3-groovy-4.0

gradle/libs.versions.toml

@@ -5,8 +5,8 @@ okhttp = "4.11.0"
 lombok = "1.18.30"
 jaxb = "2.3.8"
 junit = "4.13.2"
-groovy = "3.0.15"
-spock = "2.1-groovy-3.0"
+groovy = "4.0.22"
+spock = "2.3-groovy-4.0"
 axion = "1.15.5"
 nexusPublish = "1.3.0"
 shadow = "7.1.2"
@@ -38,7 +38,7 @@ okhttpMockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.r
 jaxb = { module = "com.sun.xml.bind:jaxb-impl", version.ref = "jaxb" }
 
 junit = { module = "junit:junit", version.ref = "junit" }
-groovy = { module = "org.codehaus.groovy:groovy-all", version.ref = "groovy" }
+groovy = { module = "org.apache.groovy:groovy-all", version.ref = "groovy" }
 spock = { module = "org.spockframework:spock-core", version.ref = "spock" }
 
 jacksonDatabind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jacksonDatabind" }

gradle/verification-metadata.xml

@@ -12,6 +12,7 @@
          <ignored-key id="84e913a8e3a748c0" reason="Key couldn't be downloaded from any key server"/>
          <ignored-key id="b3de72e647d35161" reason="Key couldn't be downloaded from any key server"/>
          <ignored-key id="928fbf39003c0425" reason="Key couldn't be downloaded from any key server"/>
+         <ignored-key id="6c70a3b7599c5736" reason="Key couldn't be downloaded from any key server"/>
       </ignored-keys>
       <trusted-keys>
          <trusted-key id="015479e1055341431b4545ab72475fd306b9cab7">
@@ -67,7 +68,10 @@
             <trusting group="org.rundeck.cli-toolbelt"/>
          </trusted-key>
          <trusted-key id="31fae244a81d64507b47182e1b2718089ce964b8" group="com.thoughtworks.qdox" name="qdox" version="1.12.1"/>
-         <trusted-key id="34441e504a937f43eb0daef96a65176a0fb1cd0b" group="org.codehaus.groovy"/>
+         <trusted-key id="34441e504a937f43eb0daef96a65176a0fb1cd0b">
+            <trusting group="org.apache.groovy"/>
+            <trusting group="org.codehaus.groovy"/>
+         </trusted-key>
          <trusted-key id="34d6ff19930adf43ac127792a50569c7ca7fa1f0">
             <trusting group="com.jcraft"/>
             <trusting group="com.jcraft" name="jsch" version="0.1.51"/>
@@ -78,6 +82,7 @@
          <trusted-key id="43c79b4bbd131821e17d2ca77b2f0491728b8e02" group="net.i2p.crypto" name="eddsa" version="0.3.0"/>
          <trusted-key id="475f3b8e59e6e63aa78067482c7b12f2a511e325" group="org.slf4j"/>
          <trusted-key id="485e371cb07eabe6d5778d4b0c27e8fac93b3b19" group="com.sun.mail"/>
+         <trusted-key id="48b086a7d843cfa258e83286928fbf39003c0425" group="org.springframework" name="spring-framework-bom" version="5.3.27"/>
          <trusted-key id="4a720fe790b07a68744e371675bf031b7c94e183" group="net.java.dev.jna"/>
          <trusted-key id="4db1a49729b053caf015cee9a6adfc93ef34893e" group="org.hamcrest"/>
          <trusted-key id="4f5277bf72a045dad4ae36dd9440c8d6decafa12" group="org.testng" name="testng" version="6.13.1"/>
@@ -114,13 +119,17 @@
          <trusted-key id="7615ad56144df2376f49d98b1669c4bb543e0445" group="com.google.errorprone"/>
          <trusted-key id="7616eb882daf57a11477aaf559a252fb1199d873" group="com.google.code.findbugs" name="jsr305" version="3.0.2"/>
          <trusted-key id="767abe5902dc1603c4b2468a3b42b015e1c86d65" group="org.anarres.jdiagnostics" name="jdiagnostics" version="1.0.7"/>
-         <trusted-key id="76e94e8ff0ab5af3b6f8366972fefd1572eb75e1" group="org.spockframework" name="spock-core" version="2.1-groovy-3.0"/>
+         <trusted-key id="76e94e8ff0ab5af3b6f8366972fefd1572eb75e1">
+            <trusting group="org.spockframework" name="spock-core" version="2.1-groovy-3.0"/>
+            <trusting group="org.spockframework" name="spock-core" version="2.3-groovy-4.0"/>
+         </trusted-key>
          <trusted-key id="78eaa88a4812b840741c127262e2e2578a60bda8" group="com.lexicalscope.jewelcli"/>
          <trusted-key id="79156e0351af8604de9b186b09a79e1e15a04694" group="org.vafer" name="jdependency" version="2.7.0"/>
          <trusted-key id="79eb1eae95f376ab9629429de2d0f3764b54797f">
             <trusting group="pl.allegro.tech.build" name="axion-release-plugin" version="1.13.6"/>
             <trusting group="pl.allegro.tech.build" name="axion-release-plugin" version="1.15.5"/>
          </trusted-key>
+         <trusted-key id="7b121b76a7ed6ce6e60ad51784e913a8e3a748c0" group="org.bouncycastle"/>
          <trusted-key id="7c669810892cbd3148fa92995b05ccde140c2876" group="org.eclipse.jgit"/>
          <trusted-key id="7cd52b5a8295137c88fb5748dddafa7674e54418" group="org.testng" name="testng" version="7.5"/>
          <trusted-key id="81d3eb0408b4e1eb10af443ba4f4c886b29bc2f4" group="org.apache.lucene"/>
@@ -2269,6 +2278,11 @@
             <sha256 value="3178dc2b1574824ce1eab9888cf711902d246c5b0195e7825e12a89775edcfd0" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.sshd" name="sshd" version="2.10.0">
+         <artifact name="sshd-2.10.0.pom">
+            <sha256 value="d91da98b1d94ac656b95e7c6bc01258d6e64b6f7979bfe5f295787d7358615ec" origin="Generated by Gradle because a key couldn't be downloaded"/>
+         </artifact>
+      </component>
       <component group="org.apache.sshd" name="sshd" version="2.6.0">
          <artifact name="sshd-2.6.0.pom">
             <sha256 value="e919d361aca140f40f2bb496faddf08972d851998ecd3fe8a1139e48b919ff92" origin="Generated by Gradle"/>
@@ -2311,6 +2325,14 @@
             <sha256 value="d5b8bfc8e10fbf3e8105b45c4dc9c7a6b17c8a70403be604caba5fd02b53e1b9" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.sshd" name="sshd-osgi" version="2.10.0">
+         <artifact name="sshd-osgi-2.10.0.jar">
+            <sha256 value="90c50ae43863e577b5a908abee1ba02b1baa86305eeb602abbad821518cb1725" origin="Generated by Gradle because a key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="sshd-osgi-2.10.0.pom">
+            <sha256 value="85af6bede918006bc4c8b99875213b175c473f414c893709de8339180bdae451" origin="Generated by Gradle because a key couldn't be downloaded"/>
+         </artifact>
+      </component>
       <component group="org.apache.sshd" name="sshd-osgi" version="2.6.0">
          <artifact name="sshd-osgi-2.6.0.jar">
             <sha256 value="056452b1c0405fafefbfbbb5108d9308c64214c96774e2767ab2a3ee748f6b66" origin="Generated by Gradle"/>
@@ -2327,6 +2349,14 @@
             <sha256 value="87aa685d5b11561dcf8d9a58f1c3826e464c96557cd8d2db3404afb66c15804f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.sshd" name="sshd-sftp" version="2.10.0">
+         <artifact name="sshd-sftp-2.10.0.jar">
+            <sha256 value="af28d7d059eeeac3080a58d98bc75d23186cead52b9aa7c92763c2ee7b966a4c" origin="Generated by Gradle because a key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="sshd-sftp-2.10.0.pom">
+            <sha256 value="a1c0fb3d150157e5dae7e5855805e9d55b3565dddf7aa963d465c8e79284484a" origin="Generated by Gradle because a key couldn't be downloaded"/>
+         </artifact>
+      </component>
       <component group="org.apache.sshd" name="sshd-sftp" version="2.6.0">
          <artifact name="sshd-sftp-2.6.0.jar">
             <sha256 value="7495d4d21b38e3b5fd90396b1cb80351f036796e0893737ae09b99b09f459a02" origin="Generated by Gradle"/>
@@ -4732,6 +4762,7 @@
       </component>
       <component group="org.testcontainers" name="testcontainers-bom" version="1.16.2">
          <artifact name="testcontainers-bom-1.16.2.pom">
+            <pgp value="d022218dcc08aad6ef3af876b3de72e647d35161"/>
             <sha256 value="4cdc10db524d5c7efdc7dac9fbfac58befb3741b9a765d99289f28843fb1c56e" origin="Generated by Gradle because a key couldn't be downloaded"/>
          </artifact>
       </component>

rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Executions.java

@@ -735,7 +735,7 @@ public void metrics(@CommandLine.Mixin MetricsCmd options) throws IOException, I
         MetricsResponse result;
 
         // Case project wire.
-        if (options.isProject()) {
+        if (options.hasProject()) {
             // Get response.
             result = apiCall(api -> api.executionMetrics(
                     options.getProject(),

rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ProjectNameOptions.java

@@ -34,7 +34,7 @@ public class ProjectNameOptions implements ProjectInput {
     )
     private String project;
 
-    public boolean isProject() {
+    public boolean hasProject() {
         return project != null;
     }
 

rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/ExecutionsSpec.groovy

@@ -417,7 +417,7 @@ class ExecutionsSpec extends Specification {
         (doesapi?1:0) * api.deleteAllJobExecutions('jobid') >> Calls.response(
                 new BulkExecutionDeleteResponse(
                         allsuccessful:allsuccess,
-                        failures: allsuccess?[]:[new BulkExecutionDeleteResponse.DeleteFailure(id:'jobid',message:'amessage')]
+                        failures: allsuccess ? [] : [new BulkExecutionDeleteResponse.DeleteFailure(id: 'jobid', message: 'amessage')]
                 )
         )
 

rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/JobsSpec.groovy

@@ -246,7 +246,7 @@ class JobsSpec extends Specification {
         then:
         1 * api.listJobs('ProjectName', job, null,null,null) >>
                 Calls.response([new JobItem(id: 'fakeid')])
-        1 * api.deleteJobsBulk({ it.ids == ['fakeid'] }) >> Calls.response(new DeleteJobsResult(allsuccessful: allsuccess, failed: allsuccess?[]:[new DeleteJob(id:'fakeid')]))
+        1 * api.deleteJobsBulk({ it.ids == ['fakeid'] }) >> Calls.response(new DeleteJobsResult(allsuccessful: allsuccess, failed: allsuccess ? [] : [new DeleteJob(id: 'fakeid')]))
         0 * api._(*_)
         result == exit
 
@@ -597,7 +597,7 @@ class JobsSpec extends Specification {
         then:
         1 * api.bulkEnableJobs(_) >> Calls.response(new BulkToggleJobExecutionResponse(
                 allsuccessful: issuccess,
-                failed: issuccess?[]:[new BulkToggleJobExecutionResponse.Result()]
+                failed: issuccess ? [] : [new BulkToggleJobExecutionResponse.Result()]
         ))
         0 * api._(*_)
         result == exit
@@ -625,7 +625,7 @@ class JobsSpec extends Specification {
         then:
         1 * api.bulkDisableJobs(_) >> Calls.response(new BulkToggleJobExecutionResponse(
                 allsuccessful: issuccess,
-                failed: issuccess?[]:[new BulkToggleJobExecutionResponse.Result()]
+                failed: issuccess ? [] : [new BulkToggleJobExecutionResponse.Result()]
         ))
         0 * api._(*_)
         result == exit
@@ -653,7 +653,7 @@ class JobsSpec extends Specification {
         then:
         1 * api.bulkEnableJobSchedule(_) >> Calls.response(new BulkToggleJobScheduleResponse(
                 allsuccessful: issuccess,
-                failed: issuccess?[]:[new BulkToggleJobScheduleResponse.Result()]
+                failed: issuccess ? [] : [new BulkToggleJobScheduleResponse.Result()]
         ))
         0 * api._(*_)
         result == exit
@@ -681,7 +681,7 @@ class JobsSpec extends Specification {
         then:
         1 * api.bulkDisableJobSchedule(_) >> Calls.response(new BulkToggleJobScheduleResponse(
                 allsuccessful: issuccess,
-                failed: issuccess?[]:[new BulkToggleJobScheduleResponse.Result()]
+                failed: issuccess ? [] : [new BulkToggleJobScheduleResponse.Result()]
         ))
         0 * api._(*_)
         result == exit

rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/KeysSpec.groovy

@@ -35,12 +35,10 @@ class KeysSpec extends Specification {
         File testfile = File.createTempFile('KeysSpec', '.test')
         testfile.text = input
 
-        def opts = Mock(Keys.Upload) {
-            getPath() >> new Keys.Path('keys/test1')
-            getType() >> KeyStorageItem.KeyFileType.password
-            getFile() >> testfile
-            isFile() >> true
-        }
+        def opts = new Keys.Upload()
+        opts.path = new Keys.Path('keys/test1')
+        opts.type = KeyStorageItem.KeyFileType.password
+        opts.file = testfile
         when:
         def body = Keys.prepareKeyUpload(opts)
 
@@ -64,14 +62,12 @@ class KeysSpec extends Specification {
         File testfile = File.createTempFile('KeysSpec', '.test')
         testfile.setText(input, charset)
 
-        def opts = Mock(Keys.Upload) {
-            getPath() >> new Keys.Path('keys/test1')
-            getType() >> KeyStorageItem.KeyFileType.password
-            getFile() >> testfile
-            isFile() >> true
-            getCharset() >> charset
-            isCharset() >> true
-        }
+        def opts = new Keys.Upload()
+        opts.path = new Keys.Path('keys/test1')
+        opts.type = KeyStorageItem.KeyFileType.password
+        opts.file = testfile
+        opts.charset = charset
+
         when:
         def body = Keys.prepareKeyUpload(opts)
 
@@ -93,12 +89,10 @@ class KeysSpec extends Specification {
         File testfile = File.createTempFile('KeysSpec', '.test')
         testfile.text = input
 
-        def opts = Mock(Keys.Upload) {
-            getPath() >> new Keys.Path('keys/test1')
-            getType() >> KeyStorageItem.KeyFileType.password
-            getFile() >> testfile
-            isFile() >> true
-        }
+        def opts = new Keys.Upload()
+        opts.path = new Keys.Path('keys/test1')
+        opts.type = KeyStorageItem.KeyFileType.password
+        opts.file = testfile
         when:
         def body = Keys.prepareKeyUpload(opts)
 
@@ -117,12 +111,10 @@ class KeysSpec extends Specification {
     def "create password require file or prompt"() {
         given:
 
-        def opts = Mock(Keys.Upload) {
-            getPath() >> new Keys.Path('keys/test1')
-            getType() >> type
-            isFile() >> false
-            isPrompt() >> false
-        }
+        def opts = new Keys.Upload()
+        opts.path = new Keys.Path('keys/test1')
+        opts.type = type
+        opts.prompt = prompt
         when:
         def body = Keys.prepareKeyUpload(opts)
 
@@ -139,12 +131,10 @@ class KeysSpec extends Specification {
     def "create #type require file"() {
         given:
 
-        def opts = Mock(Keys.Upload) {
-            getPath() >> new Keys.Path('keys/test1')
-            getType() >> type
-            isFile() >> false
-            isPrompt() >> prompt
-        }
+        def opts = new Keys.Upload()
+        opts.path = new Keys.Path('keys/test1')
+        opts.type = type
+        opts.prompt = prompt
         when:
         def body = Keys.prepareKeyUpload(opts)