Skip to content

MNG-7758 workaround #1095

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

Draft
michael-o wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

MNG-7758 workaround #1095

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
d8c754e
[MNG-7771] Don't use ArtifactResolutionException#getMessage() w/o kno…
michael-o Apr 22, 2023
30dbf2b
[MNG-7770] Implement workaround for MNG-7758/MRESOLVER-335
michael-o Apr 22, 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
10 changes: 7 additions & 3 deletions maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,14 @@ private void resolve(

result = repoSystem.resolveArtifact(session, artifactRequest);
} catch (org.eclipse.aether.resolution.ArtifactResolutionException e) {
if (e.getCause() instanceof org.eclipse.aether.transfer.ArtifactNotFoundException) {
throw new ArtifactNotFoundException(e.getMessage(), artifact, remoteRepositories, e);
// This is a workaround for MNG-7758/MRESOLVER-335
if (e.getResult().getExceptions().stream()
.anyMatch(re -> re instanceof org.eclipse.aether.transfer.ArtifactNotFoundException)) {
throw new ArtifactNotFoundException(
"Could not find artifact '" + artifact + "'", artifact, remoteRepositories, e);
} else {
throw new ArtifactResolutionException(e.getMessage(), artifact, remoteRepositories, e);
throw new ArtifactResolutionException(
"Failed to resolve artifact '" + artifact + "'", artifact, remoteRepositories, e);
}
}

Expand Down
8 changes: 5 additions & 3 deletions maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,11 +307,13 @@ public ProjectBuildingResult build(Artifact artifact, boolean allowStubModel, Pr
pomArtifact = pomResult.getArtifact();
localProject = pomResult.getRepository() instanceof WorkspaceRepository;
} catch (org.eclipse.aether.resolution.ArtifactResolutionException e) {
if (e.getResults().get(0).isMissing() && allowStubModel) {
// This is a workaround for MNG-7758/MRESOLVER-335
if (e.getResult().getExceptions().stream()
.anyMatch(re -> re instanceof org.eclipse.aether.transfer.ArtifactNotFoundException)
&& allowStubModel) {
return build(null, createStubModelSource(artifact), config);
}
throw new ProjectBuildingException(
artifact.getId(), "Error resolving project artifact: " + e.getMessage(), e);
throw new ProjectBuildingException(artifact.getId(), "Error resolving project artifact", e);
}

File pomFile = pomArtifact.getFile();
Expand Down
7 changes: 6 additions & 1 deletion maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,12 @@ public ModelSource resolveModel(String groupId, String artifactId, String versio
request.setTrace(trace);
pomArtifact = resolver.resolveArtifact(session, request).getArtifact();
} catch (ArtifactResolutionException e) {
throw new UnresolvableModelException(e.getMessage(), groupId, artifactId, version, e);
throw new UnresolvableModelException(
String.format("Failed to resolve model artifact '%s'", pomArtifact),
groupId,
artifactId,
version,
e);
}

return new ArtifactModelSource(pomArtifact.getFile(), groupId, artifactId, version);
Expand Down
11 changes: 8 additions & 3 deletions maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.repository.RepositoryPolicy;
import org.eclipse.aether.repository.WorkspaceReader;
import org.eclipse.aether.transfer.ArtifactNotFoundException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -672,16 +671,22 @@ private boolean isMissingPom(Exception e) {
if (e.getCause() instanceof MultipleArtifactsNotFoundException) {
return true;
}
// This is a workaround for MNG-7758/MRESOLVER-335
return e.getCause() instanceof org.eclipse.aether.resolution.ArtifactResolutionException
&& e.getCause().getCause() instanceof ArtifactNotFoundException;
&& ((org.eclipse.aether.resolution.ArtifactResolutionException) e.getCause())
.getResult().getExceptions().stream()
.anyMatch(re -> re instanceof org.eclipse.aether.transfer.ArtifactNotFoundException);
}

private boolean isNonTransferablePom(Exception e) {
if (e.getCause() instanceof ArtifactResolutionException) {
return true;
}
// This is a workaround for MNG-7758/MRESOLVER-335
return e.getCause() instanceof org.eclipse.aether.resolution.ArtifactResolutionException
&& !(e.getCause().getCause() instanceof ArtifactNotFoundException);
&& ((org.eclipse.aether.resolution.ArtifactResolutionException) e.getCause())
.getResult().getExceptions().stream()
.noneMatch(re -> re instanceof org.eclipse.aether.transfer.ArtifactNotFoundException);
}

private Properties getSystemProperties() {
Expand Down
5 changes: 4 additions & 1 deletion ...-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,10 @@ private boolean isModuleOutsideRequestScopeDependingOnPluginModule(
Predicate<Exception> pluginArtifactNotFoundException = exc -> exc instanceof PluginManagerException
&& exc.getCause() instanceof PluginResolutionException
&& exc.getCause().getCause() instanceof ArtifactResolutionException
&& exc.getCause().getCause().getCause() instanceof ArtifactNotFoundException;
// This is a workaround for MNG-7758/MRESOLVER-335
&& ((ArtifactResolutionException) exc.getCause().getCause())
.getResult().getExceptions().stream()
.anyMatch(re -> re instanceof ArtifactNotFoundException);

Predicate<Plugin> isPluginPartOfRequestScope = plugin -> projectsInRequestScope.stream()
.anyMatch(project -> project.getGroupId().equals(plugin.getGroupId())
Expand Down
4 changes: 2 additions & 2 deletions maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ void testResolveParentThrowsUnresolvableModelExceptionWhenNotFound() throws Exce
() -> newModelResolver().resolveModel(parent.getDelegate(), new AtomicReference<>()),
"Expected 'UnresolvableModelException' not thrown.");
assertNotNull(e.getMessage());
assertThat(e.getMessage(), containsString("Could not find artifact org.apache:apache:pom:0 in central"));
assertThat(e.getMessage(), containsString("Failed to resolve model artifact 'org.apache:apache:pom:0'"));
}

@Test
Expand Down Expand Up @@ -135,7 +135,7 @@ void testResolveDependencyThrowsUnresolvableModelExceptionWhenNotFound() throws
() -> newModelResolver().resolveModel(dependency.getDelegate(), new AtomicReference<>()),
"Expected 'UnresolvableModelException' not thrown.");
assertNotNull(e.getMessage());
assertThat(e.getMessage(), containsString("Could not find artifact org.apache:apache:pom:0 in central"));
assertThat(e.getMessage(), containsString("Failed to resolve model artifact 'org.apache:apache:pom:0'"));
}

@Test
Expand Down
8 changes: 6 additions & 2 deletions ...r/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,12 @@ private Model loadPom(
pomArtifact = resolveResult.getArtifact();
result.setRepository(resolveResult.getRepository());
} catch (ArtifactResolutionException e) {
if (e.getCause() instanceof ArtifactNotFoundException) {
missingDescriptor(session, trace, a, (Exception) e.getCause());
// This is a workaround for MNG-7758/MRESOLVER-335
if (e.getResult().getExceptions().stream().anyMatch(re -> re instanceof ArtifactNotFoundException)) {
missingDescriptor(session, trace, a, (Exception) e.getResult().getExceptions().stream()
.filter(re -> re instanceof ArtifactNotFoundException)
.findFirst()
.get());
if ((getPolicy(session, a, request) & ArtifactDescriptorPolicy.IGNORE_MISSING) != 0) {
return null;
}
Expand Down
7 changes: 6 additions & 1 deletion ...ver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,12 @@ public ModelSource resolveModel(String groupId, String artifactId, String versio
request.setTrace(trace);
pomArtifact = resolver.resolveArtifact(session, request).getArtifact();
} catch (ArtifactResolutionException e) {
throw new UnresolvableModelException(e.getMessage(), groupId, artifactId, version, e);
throw new UnresolvableModelException(
String.format("Failed to resolve model artifact '%s'", pomArtifact),
groupId,
artifactId,
version,
e);
}

return new ArtifactModelSource(pomArtifact.getFile(), groupId, artifactId, version);
Expand Down
4 changes: 2 additions & 2 deletions ...provider/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void testResolveParentThrowsUnresolvableModelExceptionWhenNotFound() throws Exce
() -> newModelResolver().resolveModel(parent, new AtomicReference<>()),
"Expected 'UnresolvableModelException' not thrown.");
assertNotNull(e.getMessage());
assertTrue(e.getMessage().contains("Could not find artifact ut.simple:artifact:pom:0 in repo"));
assertTrue(e.getMessage().contains("Failed to resolve model artifact 'ut.simple:artifact:pom:0'"));
}

@Test
Expand Down Expand Up @@ -138,7 +138,7 @@ void testResolveDependencyThrowsUnresolvableModelExceptionWhenNotFound() throws
() -> newModelResolver().resolveModel(dependency, new AtomicReference<>()),
"Expected 'UnresolvableModelException' not thrown.");
assertNotNull(e.getMessage());
assertTrue(e.getMessage().contains("Could not find artifact ut.simple:artifact:pom:0 in repo"));
assertTrue(e.getMessage().contains("Failed to resolve model artifact 'ut.simple:artifact:pom:0'"));
}

@Test
Expand Down