From d774bf03c29b6b50aa402780aee259da96e2d753 Mon Sep 17 00:00:00 2001
From: lruiz <larry.b.ruiz@gmail.com>
Date: Sat, 9 Nov 2024 13:45:59 -0600
Subject: [PATCH] fix polyglot-groovy tests

---
 polyglot-groovy/pom.xml                       | 31 +++++++++++++++++--
 .../groovy/GroovyModelTestSupport.groovy      | 28 ++++++++++-------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/polyglot-groovy/pom.xml b/polyglot-groovy/pom.xml
index 3e088517..d640efb4 100644
--- a/polyglot-groovy/pom.xml
+++ b/polyglot-groovy/pom.xml
@@ -26,6 +26,12 @@
     <dependency>
       <groupId>io.takari.polyglot</groupId>
       <artifactId>polyglot-common</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-utils</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
@@ -50,10 +56,29 @@
         </exclusion>
       </exclusions>
     </dependency>
+
+    <!-- Test -->
+    <dependency>
+      <groupId>io.takari.polyglot</groupId>
+      <artifactId>polyglot-maven-plugin</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <!-- polyglot-groovy only one uses PlexusTestCase and that one needs this -->
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-component-annotations</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>3.25.3</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 
diff --git a/polyglot-groovy/src/test/groovy/org/sonatype/maven/polyglot/groovy/GroovyModelTestSupport.groovy b/polyglot-groovy/src/test/groovy/org/sonatype/maven/polyglot/groovy/GroovyModelTestSupport.groovy
index 075d11f5..a61112f5 100644
--- a/polyglot-groovy/src/test/groovy/org/sonatype/maven/polyglot/groovy/GroovyModelTestSupport.groovy
+++ b/polyglot-groovy/src/test/groovy/org/sonatype/maven/polyglot/groovy/GroovyModelTestSupport.groovy
@@ -7,25 +7,29 @@
  */
 package org.sonatype.maven.polyglot.groovy
 
-import javax.xml.parsers.DocumentBuilder
-import javax.xml.parsers.DocumentBuilderFactory
 import org.apache.maven.model.Model
 import org.apache.maven.model.io.DefaultModelWriter
-import org.sonatype.maven.polyglot.groovy.Dom2Groovy
+import org.codehaus.plexus.ContainerConfiguration
+import org.codehaus.plexus.PlexusConstants
+import org.codehaus.plexus.PlexusTestCase
 import org.w3c.dom.Document
 import org.xml.sax.InputSource
-import static org.junit.Assert.*
-import org.sonatype.maven.polyglot.groovy.Dom2Groovy
-import org.codehaus.plexus.PlexusTestCase
+
+import javax.xml.parsers.DocumentBuilder
+import javax.xml.parsers.DocumentBuilderFactory
 
 /**
  * Support for model tests.
  *
  * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
  */
-public class GroovyModelTestSupport
-    extends PlexusTestCase
-{
+public class GroovyModelTestSupport extends PlexusTestCase {
+    @Override
+    protected void customizeContainerConfiguration(ContainerConfiguration configuration) {
+        configuration.autoWiring = true;
+        configuration.classPathScanning = PlexusConstants.SCANNING_CACHE
+    }
+
     protected String load(final String name) {
         assertNotNull(name)
         def url = getClass().getResource(name)
@@ -46,15 +50,15 @@ public class GroovyModelTestSupport
         Dom2Groovy converter = new Dom2Groovy(new IndentPrinter(new PrintWriter(buff), "    "))
         DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder()
         Document doc = builder.parse(new InputSource(new StringReader(chew(model))))
-        
+
         def root = doc.documentElement
         def attrs = root.attributes
-        for (int i=0; i<attrs.length; i++) {
+        for (int i = 0; i < attrs.length; i++) {
             root.removeAttribute(attrs.item(i).name)
         }
         // Not sure where this comes from but the above will not nuke it
         root.removeAttribute("xmlns:xsi")
-        
+
         converter.print(doc)
         println(buff)
     }