Skip to content

[MNG-8564] Move to maven-compat Plexus legacy #2088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 6, 2025
Merged

[MNG-8564] Move to maven-compat Plexus legacy #2088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1bfd59c
[MNG-8564] Move to maven-compat Plexus legacy
cstamas Feb 6, 2025
78f9d3c
Return this one
cstamas Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions compat/maven-compat/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion ...aven/jline/LegacyPlexusInteractivity.java → ...eractivity/LegacyPlexusInteractivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
4 changes: 0 additions & 4 deletions impl/maven-cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,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>
Expand Down
21 changes: 0 additions & 21 deletions impl/maven-jline/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
8 changes: 4 additions & 4 deletions impl/maven-jline/src/main/java/org/apache/maven/jline/DefaultPrompter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")) {
Expand All @@ -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();
Expand Down
10 changes: 0 additions & 10 deletions impl/maven-logging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>