Skip to content

Improve error message for unresolved expressions #11615

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

Open
GaoSSR wants to merge 1 commit into
base: master
Choose a base branch
from
+57 −1
Open

Improve error message for unresolved expressions #11615

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
58 changes: 57 additions & 1 deletion impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultDependencyResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,8 @@ public DependencyResolverResult collect(@Nonnull DependencyResolverRequest reque
session.getNode(result.getRoot(), request.getVerbose()),
0);
} catch (DependencyCollectionException e) {
throw new DependencyResolverException("Unable to collect dependencies", e);
String enhancedMessage = enhanceCollectionError(e, collectRequest);
throw new DependencyResolverException(enhancedMessage, e);
}
} finally {
RequestTraceHelper.exit(trace);
Expand Down Expand Up @@ -274,4 +275,59 @@ public DependencyResolverResult resolve(DependencyResolverRequest request)
private static DependencyResolverException cannotReadModuleInfo(final Path path, final IOException cause) {
return new DependencyResolverException("Cannot read module information of " + path, cause);
}

private static boolean containsUnresolvedExpression(String value) {
return value != null && value.contains("${") && value.contains("}");
}

private static String enhanceCollectionError(DependencyCollectionException e, CollectRequest request) {
if (e.getMessage() != null && e.getMessage().contains("Invalid Collect Request")) {
StringBuilder enhanced = new StringBuilder();
enhanced.append("Failed to collect dependencies");

org.eclipse.aether.graph.Dependency root = request.getRoot();
if (root != null && root.getArtifact() != null) {
org.eclipse.aether.artifact.Artifact artifact = root.getArtifact();
String groupId = artifact.getGroupId();
String artifactId = artifact.getArtifactId();
String version = artifact.getVersion();

if (containsUnresolvedExpression(groupId) || containsUnresolvedExpression(artifactId)
|| containsUnresolvedExpression(version)) {
enhanced.append(" due to unresolved expression(s) in dependency: ")
.append(groupId)
.append(":")
.append(artifactId)
.append(":")
.append(version)
.append(".\n")
.append("Please check that all properties are defined in your POM or settings.xml.");
return enhanced.toString();
}
}

for (org.eclipse.aether.graph.Dependency dep : request.getDependencies()) {
if (dep != null && dep.getArtifact() != null) {
org.eclipse.aether.artifact.Artifact artifact = dep.getArtifact();
String groupId = artifact.getGroupId();
String artifactId = artifact.getArtifactId();
String version = artifact.getVersion();

if (containsUnresolvedExpression(groupId) || containsUnresolvedExpression(artifactId)
|| containsUnresolvedExpression(version)) {
enhanced.append(" due to unresolved expression(s) in dependency: ")
.append(groupId)
.append(":")
.append(artifactId)
.append(":")
.append(version)
.append(".\n")
.append("Please check that all properties are defined in your POM or settings.xml.");
return enhanced.toString();
}
}
}
}
return e.getMessage();
}
}