(maven-invoker-plugin) branch spell created (now 416b771)

[el...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

elharo pushed a change to branch spell
in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git


      at 416b771  wip

This branch includes the following new commits:

     new 416b771  wip

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

(maven-invoker-plugin) 01/01: wip

[el...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

elharo pushed a commit to branch spell
in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git

commit 416b771ed82e57c05b9101e96531d8da606a9dec
Merge: 05395ab 6fe729b
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Mon Jun 23 18:36:30 2025 -0400

    wip

 .../apache/maven/plugins/invoker/InterpolationTest.java  | 16 ++++++++--------
 .../apache/maven/plugins/invoker/InvokerMojoTest.java    |  4 +++-
 .../invoker/{AbstractTestUtil.java => TestUtil.java}     | 12 +++++++++++-
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --cc src/test/java/org/apache/maven/plugins/invoker/TestUtil.java
index 99a3e85,452b8ba..3dcede3
--- a/src/test/java/org/apache/maven/plugins/invoker/TestUtil.java
+++ b/src/test/java/org/apache/maven/plugins/invoker/TestUtil.java
@@@ -22,15 -22,16 +22,25 @@@ import java.io.File
  
  import org.codehaus.plexus.util.ReflectionUtils;
  
++<<<<<<< HEAD:src/test/java/org/apache/maven/plugins/invoker/AbstractTestUtil.java
 +// TODO this should be a static utility class that does not require inheritance
 +abstract class AbstractTestUtil {
++=======
+ class TestUtil {
++>>>>>>> master:src/test/java/org/apache/maven/plugins/invoker/TestUtil.java
  
-     protected String getBasedir() {
+     private TestUtil() {}
+ 
+     static String getBasedir() {
          String path = System.getProperty("basedir");
          return path != null ? path : new File("").getAbsolutePath();
      }
  
++<<<<<<< HEAD:src/test/java/org/apache/maven/plugins/invoker/AbstractTestUtil.java
 +    protected void setVariableValueToObject(Object object, String field, Object value) throws IllegalAccessException {
++=======
+     static void setVariableValueToObject(Object object, String field, Object value) throws IllegalAccessException {
++>>>>>>> master:src/test/java/org/apache/maven/plugins/invoker/TestUtil.java
          ReflectionUtils.setVariableValueInObject(object, field, value);
      }
  }