You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2023/04/22 21:31:09 UTC
[maven] branch MNG-7758_workaround created (now 30dbf2bb4)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-7758_workaround
in repository https://gitbox.apache.org/repos/asf/maven.git
at 30dbf2bb4 [MNG-7770] Implement workaround for MNG-7758/MRESOLVER-335
This branch includes the following new commits:
new d8c754e99 [MNG-7771] Don't use ArtifactResolutionException#getMessage() w/o knowing whether there are other exceptions or not
new 30dbf2bb4 [MNG-7770] Implement workaround for MNG-7758/MRESOLVER-335
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven] 02/02: [MNG-7770] Implement workaround for MNG-7758/MRESOLVER-335
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-7758_workaround
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 30dbf2bb47dbb4df05b8c108f78e27cc40b2b3ba
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Apr 22 23:30:56 2023 +0200
[MNG-7770] Implement workaround for MNG-7758/MRESOLVER-335
---
.../maven/artifact/resolver/DefaultArtifactResolver.java | 4 +++-
.../java/org/apache/maven/project/DefaultProjectBuilder.java | 5 ++++-
.../apache/maven/project/artifact/MavenMetadataSource.java | 11 ++++++++---
.../project/collector/MultiModuleCollectionStrategy.java | 5 ++++-
.../repository/internal/DefaultArtifactDescriptorReader.java | 8 ++++++--
5 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
index 6277c1787..48537f771 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -187,7 +187,9 @@ public class DefaultArtifactResolver implements ArtifactResolver, Disposable {
result = repoSystem.resolveArtifact(session, artifactRequest);
} catch (org.eclipse.aether.resolution.ArtifactResolutionException e) {
- if (e.getCause() instanceof org.eclipse.aether.transfer.ArtifactNotFoundException) {
+ // 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 {
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index 55d52cac5..8235ef302 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -307,7 +307,10 @@ public class DefaultProjectBuilder implements ProjectBuilder {
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);
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
index 41af27985..d4398ad09 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
@@ -83,7 +83,6 @@ import org.apache.maven.repository.legacy.metadata.MetadataResolutionRequest;
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;
@@ -672,16 +671,22 @@ public class MavenMetadataSource implements ArtifactMetadataSource {
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() {
diff --git a/maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java b/maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java
index fa38120f4..2379bb228 100644
--- a/maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java
+++ b/maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java
@@ -160,7 +160,10 @@ public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy
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())
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
index 8a3ed3ed6..2caea1216 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
@@ -170,8 +170,12 @@ public class DefaultArtifactDescriptorReader implements ArtifactDescriptorReader
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;
}
[maven] 01/02: [MNG-7771] Don't use ArtifactResolutionException#getMessage() w/o knowing whether there are other exceptions or not
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-7758_workaround
in repository https://gitbox.apache.org/repos/asf/maven.git
commit d8c754e9967e3ac48e7be485d7a8409bf97523ea
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Apr 22 23:28:40 2023 +0200
[MNG-7771] Don't use ArtifactResolutionException#getMessage() w/o knowing whether there are other exceptions or not
---
.../apache/maven/artifact/resolver/DefaultArtifactResolver.java | 6 ++++--
.../main/java/org/apache/maven/project/DefaultProjectBuilder.java | 3 +--
.../main/java/org/apache/maven/project/ProjectModelResolver.java | 7 ++++++-
.../java/org/apache/maven/project/ProjectModelResolverTest.java | 4 ++--
.../org/apache/maven/repository/internal/DefaultModelResolver.java | 7 ++++++-
.../apache/maven/repository/internal/DefaultModelResolverTest.java | 4 ++--
6 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
index 952382a23..6277c1787 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -188,9 +188,11 @@ public class DefaultArtifactResolver implements ArtifactResolver, Disposable {
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);
+ 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);
}
}
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index 027ca74ee..55d52cac5 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -310,8 +310,7 @@ public class DefaultProjectBuilder implements ProjectBuilder {
if (e.getResults().get(0).isMissing() && 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();
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
index 3ca215292..112426543 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
@@ -166,7 +166,12 @@ public class ProjectModelResolver implements ModelResolver {
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);
diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
index b7352b930..d43cb53b8 100644
--- a/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
@@ -69,7 +69,7 @@ class ProjectModelResolverTest extends AbstractMavenProjectTestCase {
() -> 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
@@ -135,7 +135,7 @@ class ProjectModelResolverTest extends AbstractMavenProjectTestCase {
() -> 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
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
index c48968f89..138c94ece 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
@@ -157,7 +157,12 @@ class DefaultModelResolver implements ModelResolver {
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);
diff --git a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java
index 5fe183d2d..8666d82ff 100644
--- a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java
+++ b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java
@@ -65,7 +65,7 @@ final class DefaultModelResolverTest extends AbstractRepositoryTestCase {
() -> 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
@@ -138,7 +138,7 @@ final class DefaultModelResolverTest extends AbstractRepositoryTestCase {
() -> 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