Skip to content

Commit

Permalink
[MNG-8438] maven-jline: Migrate to Maven DI (off javax.inject) (#1987)
Browse files Browse the repository at this point in the history
  • Loading branch information
cstamas authored Dec 17, 2024
1 parent 49825e6 commit cc368b3
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 12 deletions.
10 changes: 10 additions & 0 deletions apache-maven/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 0 additions & 8 deletions impl/maven-jline/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -31,6 +27,9 @@

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;
Expand Down

0 comments on commit cc368b3

Please sign in to comment.