maven: Update to use groovy.xml.XmlSlurper for Groovy 3

The maven-invoker-plugin 3.3.0 update moves to Groovy 3 so we need to import the proper XmlSlurper class. We also need to avoid a missing method. Signed-off-by: BJ Hargrave <bj@hargrave.dev>
bndtools · Jun 2, 2022 · 0dc0b47 · 0dc0b47
1 parent c1cac7f
commit 0dc0b47
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 3 deletions.
diff --git a/maven/bnd-indexer-maven-plugin/src/it/bad-remote-metadata/prebuild.groovy b/maven/bnd-indexer-maven-plugin/src/it/bad-remote-metadata/prebuild.groovy
@@ -1,10 +1,11 @@
 import java.nio.file.*;
+import aQute.lib.io.IO
+
 
 Path source = Paths.get("${projectsDirectory}/local-repo/org/objenesis");
 Path target = Paths.get("${localRepositoryPath}/org/objenesis");
 
-target.deleteDir();
-
+IO.delete(target)
 
 source.toFile().eachFileRecurse({ f ->
     Path s = Paths.get(f.toURI());
@@ -29,4 +30,4 @@ Path remote = target.resolve("objenesis/2.2/_remote.repositories");
 
 assert remote.toFile().text.normalize() == expected.normalize()
 
-return;
+return;
diff --git a/maven/bnd-maven-plugin/src/it/jar-test-api-bundle/postbuild.groovy b/maven/bnd-maven-plugin/src/it/jar-test-api-bundle/postbuild.groovy
@@ -1,4 +1,6 @@
 import java.util.jar.*;
+import groovy.xml.XmlSlurper
+
 
 def bsn = 'jar-test-api-bundle'
 def version = '0.0.1'

diff --git a/maven/bnd-maven-plugin/src/it/jar-test-bnd-process-tests-goal-fragment/postbuild.groovy b/maven/bnd-maven-plugin/src/it/jar-test-bnd-process-tests-goal-fragment/postbuild.groovy
@@ -1,4 +1,6 @@
 import java.util.jar.*;
+import groovy.xml.XmlSlurper
+
 
 def bsn = 'jar-test-bnd-process-tests-goal-fragment'
 def version = '0.0.1-SNAPSHOT'

diff --git a/maven/bnd-maven-plugin/src/it/jar-test-bnd-process-tests-goal/postbuild.groovy b/maven/bnd-maven-plugin/src/it/jar-test-bnd-process-tests-goal/postbuild.groovy
@@ -1,4 +1,6 @@
 import java.util.jar.*;
+import groovy.xml.XmlSlurper
+
 
 def bsn = 'jar-test-bnd-process-tests-goal'
 def version = '0.0.1-SNAPSHOT'

diff --git a/maven/bnd-maven-plugin/src/it/jar-test-bnd-process-tests-skipIfEmpty/postbuild.groovy b/maven/bnd-maven-plugin/src/it/jar-test-bnd-process-tests-skipIfEmpty/postbuild.groovy
@@ -1,4 +1,6 @@
 import java.util.jar.*;
+import groovy.xml.XmlSlurper
+
 
 def bsn = 'jar-test-bnd-process-tests-skipIfEmpty'
 def version = '0.0.1'

diff --git a/maven/bnd-maven-plugin/src/it/jar-test-impl-bundle/postbuild.groovy b/maven/bnd-maven-plugin/src/it/jar-test-impl-bundle/postbuild.groovy
@@ -1,6 +1,8 @@
 import java.time.*;
 import java.time.format.*;
 import java.util.jar.*;
+import groovy.xml.XmlSlurper
+
 
 def bsn = 'jar-test-impl-bundle'
 def version = '0.0.1-SNAPSHOT'

diff --git a/...n/bnd-maven-plugin/src/it/jar-test-in-build-pluginManagement-inheritance/postbuild.groovy b/...n/bnd-maven-plugin/src/it/jar-test-in-build-pluginManagement-inheritance/postbuild.groovy
@@ -1,4 +1,6 @@
 import java.util.jar.*;
+import groovy.xml.XmlSlurper
+
 
 def bsn = 'jar-test-inheriting-api-bundle'
 def version = '0.0.1'

diff --git a/maven/bnd-maven-plugin/src/it/jar-test-war-bundle/postbuild.groovy b/maven/bnd-maven-plugin/src/it/jar-test-war-bundle/postbuild.groovy
@@ -1,4 +1,6 @@
 import java.util.jar.*;
+import groovy.xml.XmlSlurper
+
 
 def bsn = 'jar-test-war-bundle'
 def version = '0.0.1-SNAPSHOT'

diff --git a/maven/bnd-maven-plugin/src/it/jar-test-wrapper-bundle/postbuild.groovy b/maven/bnd-maven-plugin/src/it/jar-test-wrapper-bundle/postbuild.groovy
@@ -1,6 +1,8 @@
 import java.time.*;
 import java.time.format.*;
 import java.util.jar.*;
+import groovy.xml.XmlSlurper
+
 
 def bsn = 'test.wrapper.bundle'
 def moduleDir = 'jar-test-wrapper-bundle'

diff --git a/maven/bnd-testing-maven-plugin/src/it/test-no-resolve/postbuild.groovy b/maven/bnd-testing-maven-plugin/src/it/test-no-resolve/postbuild.groovy
@@ -1,3 +1,5 @@
+import groovy.xml.XmlSlurper
+
 File testsuite_xml = new File(basedir, "/target/test-reports/test/TEST-test-no-resolve-0.0.1.xml")
 assert testsuite_xml.isFile();
 def testsuite = new XmlSlurper().parse(testsuite_xml)

diff --git a/maven/bnd-testing-maven-plugin/src/it/test-single-test/postbuild.groovy b/maven/bnd-testing-maven-plugin/src/it/test-single-test/postbuild.groovy
@@ -1,3 +1,5 @@
+import groovy.xml.XmlSlurper
+
 File testsuite_xml = new File(basedir, "target/test-reports/test/TEST-test.xml")
 assert testsuite_xml.isFile();
 testsuite = new XmlSlurper().parse(testsuite_xml)

diff --git a/maven/bnd-testing-maven-plugin/src/it/test-with-resolve-from-dependencies/postbuild.groovy b/maven/bnd-testing-maven-plugin/src/it/test-with-resolve-from-dependencies/postbuild.groovy
@@ -3,6 +3,7 @@ import aQute.bnd.build.model.*;
 import aQute.bnd.osgi.*;
 import aQute.bnd.properties.*;
 import aQute.lib.io.*;
+import groovy.xml.XmlSlurper
 
 // Check the bndrun file exist!
 File bndrunFile = new File(basedir, "test.bndrun")

diff --git a/maven/bnd-testing-maven-plugin/src/it/test-with-resolve/postbuild.groovy b/maven/bnd-testing-maven-plugin/src/it/test-with-resolve/postbuild.groovy
@@ -3,6 +3,7 @@ import aQute.bnd.build.model.*;
 import aQute.bnd.osgi.*;
 import aQute.bnd.properties.*;
 import aQute.lib.io.*;
+import groovy.xml.XmlSlurper
 
 // Check the bndrun file exist!
 File bndrunFile = new File(basedir,"test.bndrun")