Skip to content
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

Jump to bottom

[MNG-7795] IllegalArgumentException: 'other' has different root during plugin validation #1133

Merged
merged 2 commits into from
Jun 1, 2023
Merged

[MNG-7795] IllegalArgumentException: 'other' has different root during plugin validation #1133

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
41bb24b
[MNG-7795] IllegalArgumentException: 'other' has different root durin…
adangel May 26, 2023
a1e1f59
Fix test
gnodet May 31, 2023
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
24 changes: 13 additions & 11 deletions ...n-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import javax.inject.Singleton;

import java.io.File;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;

Expand Down Expand Up @@ -251,16 +253,12 @@ private String pluginDeclaration(MavenSession mavenSession, MojoDescriptor mojoD
if (location.contains("://")) {
stringBuilder.append(" (").append(location).append(")");
} else {
File rootBasedir = mavenSession.getTopLevelProject().getBasedir();
File locationFile = new File(location);
if (location.startsWith(rootBasedir.getPath())) {
stringBuilder
.append(" (")
.append(rootBasedir.toPath().relativize(locationFile.toPath()))
.append(")");
} else {
stringBuilder.append(" (").append(location).append(")");
Path topDirectory = mavenSession.getTopDirectory();
Path locationPath = Paths.get(location).toAbsolutePath().normalize();
if (locationPath.startsWith(topDirectory)) {
locationPath = topDirectory.relativize(locationPath);
}
stringBuilder.append(" (").append(locationPath).append(")");
}
}
stringBuilder.append(" @ line ").append(inputLocation.getLineNumber());
Expand All @@ -275,8 +273,12 @@ private String pluginOccurrence(MavenSession mavenSession) {
String result = prj.getGroupId() + ":" + prj.getArtifactId() + ":" + prj.getVersion();
File currentPom = prj.getFile();
if (currentPom != null) {
File rootBasedir = mavenSession.getTopLevelProject().getBasedir();
result += " (" + rootBasedir.toPath().relativize(currentPom.toPath()) + ")";
Path topDirectory = mavenSession.getTopDirectory();
Path current = currentPom.toPath().toAbsolutePath().normalize();
if (current.startsWith(topDirectory)) {
current = topDirectory.relativize(current);
}
result += " (" + current + ")";
}
return result;
}
Expand Down
9 changes: 7 additions & 2 deletions maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package org.apache.maven.cli.event;

import java.io.File;
import java.nio.file.Path;
import java.util.List;
import java.util.Objects;

Expand Down Expand Up @@ -336,8 +337,12 @@ public void projectStarted(ExecutionEvent event) {
File currentPom = project.getFile();
if (currentPom != null) {
MavenSession session = event.getSession();
File rootBasedir = session.getTopLevelProject().getBasedir();
logger.info(" from " + rootBasedir.toPath().relativize(currentPom.toPath()));
Path topDirectory = session.getTopDirectory();
Path current = currentPom.toPath().toAbsolutePath().normalize();
if (current.startsWith(topDirectory)) {
current = topDirectory.relativize(current);
}
logger.info(" from " + current);
}

// ----------[ packaging ]----------
Expand Down
2 changes: 2 additions & 0 deletions maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ void testProjectStarted() {
when(rootProject.getBasedir()).thenReturn(basedir);
MavenSession session = mock(MavenSession.class);
when(session.getTopLevelProject()).thenReturn(rootProject);
when(session.getTopDirectory()).thenReturn(basedir.toPath());
when(event.getSession()).thenReturn(session);

// execute
Expand Down Expand Up @@ -112,6 +113,7 @@ void testProjectStartedOverflow() {
MavenSession session = mock(MavenSession.class);
when(session.getTopLevelProject()).thenReturn(project);
when(event.getSession()).thenReturn(session);
when(session.getTopDirectory()).thenReturn(basedir.toPath());

// execute
executionEventLogger.projectStarted(event);
Expand Down