From 77470635c506af97be4712c1133d94eb3a593b69 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Thu, 8 Aug 2024 20:40:09 +0200
Subject: [PATCH] [MGPG-134] Update maven-invoker (#110)

Needs a bit tweaking due newer maven-shared-utils needed as well.

---

https://issues.apache.org/jira/browse/MGPG-134
---
 pgp-keys-map.list                                         | 1 +
 pom.xml                                                   | 8 +++++++-
 .../org/apache/maven/plugins/gpg/it/InvokerTestUtils.java | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pgp-keys-map.list b/pgp-keys-map.list
index 049b240..49d8340 100644
--- a/pgp-keys-map.list
+++ b/pgp-keys-map.list
@@ -27,6 +27,7 @@ org.junit.platform:junit-platform-commons = 0xFF6E2C001948C5F2F38B0CC385911F425E
 org.opentest4j:opentest4j = 0xFF6E2C001948C5F2F38B0CC385911F425EC61B51
 org.apache.maven.resolver = 0x29BEA2A645F2D6CED7FB12E02B172E3E156466E8
 org.apache.maven.shared:maven-invoker = 0x84789D24DF77A32433CE1F079EB80E92EB2135B1
+org.apache.maven.shared:maven-shared-utils = 0x84789D24DF77A32433CE1F079EB80E92EB2135B1
 org.codehaus.plexus:plexus-cipher = 0x6A814B1F869C2BBEAB7CB7271A2A1C94BDE89688
 org.codehaus.plexus:plexus-classworlds = 0xB91AB7D2121DC6B0A61AA182D7742D58455ECC7C
 org.codehaus.plexus:plexus-component-annotations = 0xFA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A
diff --git a/pom.xml b/pom.xml
index 33efd04..5c31d16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,7 +186,13 @@ under the License.
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-invoker</artifactId>
-      <version>3.2.0</version>
+      <version>3.3.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-shared-utils</artifactId>
+      <version>3.4.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/src/test/java/org/apache/maven/plugins/gpg/it/InvokerTestUtils.java b/src/test/java/org/apache/maven/plugins/gpg/it/InvokerTestUtils.java
index 89bbeea..cdcfde8 100644
--- a/src/test/java/org/apache/maven/plugins/gpg/it/InvokerTestUtils.java
+++ b/src/test/java/org/apache/maven/plugins/gpg/it/InvokerTestUtils.java
@@ -23,7 +23,6 @@
 import java.io.PrintStream;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.util.Arrays;
 import java.util.Properties;
 
 import org.apache.commons.io.input.NullInputStream;
@@ -48,7 +47,8 @@ public static InvocationRequest createRequest(
         request.setDebug(true);
         request.setShowErrors(true);
         request.setTimeoutInSeconds(60); // safeguard against GPG freezes
-        request.setGoals(Arrays.asList("clean", "install"));
+        request.addArg("clean");
+        request.addArg("install");
         request.setPomFile(pomFile);
 
         if (providePassphraseEnv) {