(maven) branch master updated: [MNG-8438] maven-jline: Migrate to Maven DI (off javax.inject) (#1987)

[cstamas]

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

cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/master by this push:
     new cc368b31e3 [MNG-8438] maven-jline: Migrate to Maven DI (off 
javax.inject) (#1987)
cc368b31e3 is described below

commit cc368b31e330369137862b97184f708f1b0250c8
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Tue Dec 17 10:51:50 2024 +0100

    [MNG-8438] maven-jline: Migrate to Maven DI (off javax.inject) (#1987)
    
    Move to Maven DI
    
    ---
    
    https://issues.apache.org/jira/browse/MNG-8438
---
 apache-maven/pom.xml                                           | 10 ++++++++++
 impl/maven-jline/pom.xml                                       |  8 --------
 .../org/apache/maven/jline/JLineMessageBuilderFactory.java     |  7 +++----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 3d7e8c5370..1f7428cd9e 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -110,6 +110,16 @@ under the License.
       <artifactId>jline-terminal-ffm</artifactId>
     </dependency>
 
+    <!-- (legacy) DI annotations -->
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+    </dependency>
+
     <!-- DI Runtime -->
     <dependency>
       <groupId>org.eclipse.sisu</groupId>
diff --git a/impl/maven-jline/pom.xml b/impl/maven-jline/pom.xml
index da3a9ec6c8..2c7e2a1cbb 100644
--- a/impl/maven-jline/pom.xml
+++ b/impl/maven-jline/pom.xml
@@ -73,14 +73,6 @@ under the License.
       <groupId>org.jline</groupId>
       <artifactId>jansi-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-interactivity-api</artifactId>
diff --git 
a/impl/maven-jline/src/main/java/org/apache/maven/jline/JLineMessageBuilderFactory.java
 
b/impl/maven-jline/src/main/java/org/apache/maven/jline/JLineMessageBuilderFactory.java
index 92a287a0a0..092f63a771 100644
--- 
a/impl/maven-jline/src/main/java/org/apache/maven/jline/JLineMessageBuilderFactory.java
+++ 
b/impl/maven-jline/src/main/java/org/apache/maven/jline/JLineMessageBuilderFactory.java
@@ -18,10 +18,6 @@
  */
 package org.apache.maven.jline;
 
-import javax.annotation.Priority;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -31,6 +27,9 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.maven.api.Constants;
 import org.apache.maven.api.annotations.Experimental;
+import org.apache.maven.api.di.Named;
+import org.apache.maven.api.di.Priority;
+import org.apache.maven.api.di.Singleton;
 import org.apache.maven.api.services.MessageBuilder;
 import org.apache.maven.api.services.MessageBuilderFactory;
 import org.codehaus.plexus.components.interactivity.InputHandler;