From 1bfd59c487b5dfe6b8878502151631a462fcfbd0 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Thu, 6 Feb 2025 10:47:12 +0100
Subject: [PATCH 1/2] [MNG-8564] Move to maven-compat Plexus legacy

This merely moves a newly introduced legacy support class to
maven-compat.

---

https://issues.apache.org/jira/browse/MNG-8564
---
 compat/maven-compat/pom.xml                   | 10 ++++-----
 .../LegacyPlexusInteractivity.java            |  3 ++-
 impl/maven-cli/pom.xml                        |  9 --------
 impl/maven-jline/pom.xml                      | 21 -------------------
 .../apache/maven/jline/DefaultPrompter.java   |  8 +++----
 impl/maven-logging/pom.xml                    | 10 ---------
 6 files changed, 11 insertions(+), 50 deletions(-)
 rename {impl/maven-jline/src/main/java/org/apache/maven/jline => compat/maven-compat/src/main/java/org/apache/maven/internal/compat/interactivity}/LegacyPlexusInteractivity.java (97%)

diff --git a/compat/maven-compat/pom.xml b/compat/maven-compat/pom.xml
index d23d5efd1fea..e0d6ec4fd73a 100644
--- a/compat/maven-compat/pom.xml
+++ b/compat/maven-compat/pom.xml
@@ -92,6 +92,11 @@ under the License.
       <artifactId>javax.inject</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.sisu</groupId>
+      <artifactId>org.eclipse.sisu.inject</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.sisu</groupId>
       <artifactId>org.eclipse.sisu.plexus</artifactId>
@@ -103,11 +108,6 @@ under the License.
       <artifactId>hamcrest</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.sisu</groupId>
-      <artifactId>org.eclipse.sisu.inject</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
diff --git a/impl/maven-jline/src/main/java/org/apache/maven/jline/LegacyPlexusInteractivity.java b/compat/maven-compat/src/main/java/org/apache/maven/internal/compat/interactivity/LegacyPlexusInteractivity.java
similarity index 97%
rename from impl/maven-jline/src/main/java/org/apache/maven/jline/LegacyPlexusInteractivity.java
rename to compat/maven-compat/src/main/java/org/apache/maven/internal/compat/interactivity/LegacyPlexusInteractivity.java
index 41f16090ef23..dd5a941659f8 100644
--- a/impl/maven-jline/src/main/java/org/apache/maven/jline/LegacyPlexusInteractivity.java
+++ b/compat/maven-compat/src/main/java/org/apache/maven/internal/compat/interactivity/LegacyPlexusInteractivity.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.maven.jline;
+package org.apache.maven.internal.compat.interactivity;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -27,6 +27,7 @@
 import java.util.List;
 
 import org.apache.maven.api.annotations.Experimental;
+import org.apache.maven.jline.DefaultPrompter;
 import org.codehaus.plexus.components.interactivity.InputHandler;
 import org.codehaus.plexus.components.interactivity.OutputHandler;
 import org.codehaus.plexus.components.interactivity.Prompter;
diff --git a/impl/maven-cli/pom.xml b/impl/maven-cli/pom.xml
index ecffd52480f5..1b65b7788de3 100644
--- a/impl/maven-cli/pom.xml
+++ b/impl/maven-cli/pom.xml
@@ -46,11 +46,6 @@ under the License.
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-classworlds</artifactId>
     </dependency>
-    <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.sisu</groupId>
       <artifactId>org.eclipse.sisu.inject</artifactId>
@@ -118,10 +113,6 @@ under the License.
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.eclipse.sisu</groupId>
-        <artifactId>sisu-maven-plugin</artifactId>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
diff --git a/impl/maven-jline/pom.xml b/impl/maven-jline/pom.xml
index 083b7997e840..1668a239c376 100644
--- a/impl/maven-jline/pom.xml
+++ b/impl/maven-jline/pom.xml
@@ -77,26 +77,5 @@ under the License.
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-interactivity-api</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.sisu</groupId>
-      <artifactId>org.eclipse.sisu.inject</artifactId>
-      <scope>provided</scope>
-    </dependency>
   </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.sisu</groupId>
-        <artifactId>sisu-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/impl/maven-jline/src/main/java/org/apache/maven/jline/DefaultPrompter.java b/impl/maven-jline/src/main/java/org/apache/maven/jline/DefaultPrompter.java
index 326bc34499dc..cf0ae093f656 100644
--- a/impl/maven-jline/src/main/java/org/apache/maven/jline/DefaultPrompter.java
+++ b/impl/maven-jline/src/main/java/org/apache/maven/jline/DefaultPrompter.java
@@ -61,9 +61,9 @@ public void showMessage(String message) throws PrompterException {
     }
 
     /**
-     * Used by {@link LegacyPlexusInteractivity}
+     * Used by {@code LegacyPlexusInteractivity}
      */
-    String doPrompt(String message, boolean password) throws IOException {
+    public String doPrompt(String message, boolean password) throws IOException {
         try {
             if (message != null) {
                 if (!message.endsWith("\n")) {
@@ -86,9 +86,9 @@ String doPrompt(String message, boolean password) throws IOException {
     }
 
     /**
-     * Used by {@link LegacyPlexusInteractivity}
+     * Used by {@code LegacyPlexusInteractivity}
      */
-    void doDisplay(String message) throws IOException {
+    public void doDisplay(String message) throws IOException {
         try {
             MessageUtils.terminal.writer().print(message);
             MessageUtils.terminal.flush();
diff --git a/impl/maven-logging/pom.xml b/impl/maven-logging/pom.xml
index f6fcc118c233..42ef4be1bc34 100644
--- a/impl/maven-logging/pom.xml
+++ b/impl/maven-logging/pom.xml
@@ -61,14 +61,4 @@ under the License.
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.sisu</groupId>
-        <artifactId>sisu-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>

From 78f9d3c7aee9201795c4da59dbe5952d8b0234bd Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Thu, 6 Feb 2025 10:48:51 +0100
Subject: [PATCH 2/2] Return this one

---
 impl/maven-cli/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/impl/maven-cli/pom.xml b/impl/maven-cli/pom.xml
index 1b65b7788de3..337aa7a5072f 100644
--- a/impl/maven-cli/pom.xml
+++ b/impl/maven-cli/pom.xml
@@ -46,6 +46,11 @@ under the License.
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-classworlds</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.sisu</groupId>
       <artifactId>org.eclipse.sisu.inject</artifactId>