This is an automated email from the ASF dual-hosted git repository. sjaranowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
The following commit(s) were added to refs/heads/master by this push: new dfb22c37 [MRESOLVER-337] Rename RepositoryFilteredException to ArtifactFilteredOutException dfb22c37 is described below commit dfb22c378aefd2eccfc11117bb7cf094978c4eeb Author: Slawomir Jaranowski <s.jaranow...@gmail.com> AuthorDate: Thu Mar 2 11:19:54 2023 +0100 [MRESOLVER-337] Rename RepositoryFilteredException to ArtifactFilteredOutException --- .../org/eclipse/aether/resolution/ArtifactResolutionException.java | 4 ++-- ...sitoryFilteredException.java => ArtifactFilteredOutException.java} | 4 ++-- .../org/eclipse/aether/internal/impl/DefaultArtifactResolver.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactResolutionException.java b/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactResolutionException.java index 4a6cb431..15f3c53d 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactResolutionException.java +++ b/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactResolutionException.java @@ -23,8 +23,8 @@ import java.util.List; import org.eclipse.aether.RepositoryException; import org.eclipse.aether.repository.LocalArtifactResult; +import org.eclipse.aether.transfer.ArtifactFilteredOutException; import org.eclipse.aether.transfer.ArtifactNotFoundException; -import org.eclipse.aether.transfer.RepositoryFilteredException; import org.eclipse.aether.transfer.RepositoryOfflineException; /** @@ -128,7 +128,7 @@ public class ArtifactResolutionException extends RepositoryException { Throwable notFound = null, offline = null; for (Throwable t : result.getExceptions()) { if (t instanceof ArtifactNotFoundException) { - if (notFound == null || notFound instanceof RepositoryFilteredException) { + if (notFound == null || notFound instanceof ArtifactFilteredOutException) { notFound = t; } if (offline == null && t.getCause() instanceof RepositoryOfflineException) { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/RepositoryFilteredException.java b/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/ArtifactFilteredOutException.java similarity index 88% rename from maven-resolver-api/src/main/java/org/eclipse/aether/transfer/RepositoryFilteredException.java rename to maven-resolver-api/src/main/java/org/eclipse/aether/transfer/ArtifactFilteredOutException.java index a0e5e930..b0a67de3 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/RepositoryFilteredException.java +++ b/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/ArtifactFilteredOutException.java @@ -26,7 +26,7 @@ import org.eclipse.aether.repository.RemoteRepository; * * @since 1.9.6 */ -public class RepositoryFilteredException extends ArtifactNotFoundException { +public class ArtifactFilteredOutException extends ArtifactNotFoundException { /** * Creates a new exception with the specified artifact, repository and detail message. @@ -35,7 +35,7 @@ public class RepositoryFilteredException extends ArtifactNotFoundException { * @param repository The involved remote repository, may be {@code null}. * @param message The detail message, may be {@code null}. */ - public RepositoryFilteredException(Artifact artifact, RemoteRepository repository, String message) { + public ArtifactFilteredOutException(Artifact artifact, RemoteRepository repository, String message) { super(artifact, repository, message); } } diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java index 18792a7e..bcdc4074 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java @@ -72,10 +72,10 @@ import org.eclipse.aether.spi.locator.Service; import org.eclipse.aether.spi.locator.ServiceLocator; import org.eclipse.aether.spi.resolution.ArtifactResolverPostProcessor; import org.eclipse.aether.spi.synccontext.SyncContextFactory; +import org.eclipse.aether.transfer.ArtifactFilteredOutException; import org.eclipse.aether.transfer.ArtifactNotFoundException; import org.eclipse.aether.transfer.ArtifactTransferException; import org.eclipse.aether.transfer.NoRepositoryConnectorException; -import org.eclipse.aether.transfer.RepositoryFilteredException; import org.eclipse.aether.transfer.RepositoryOfflineException; import org.eclipse.aether.util.ConfigUtils; import org.slf4j.Logger; @@ -309,7 +309,7 @@ public class DefaultArtifactResolver implements ArtifactResolver, Service { RemoteRepositoryFilter.Result filterResult = filter.acceptArtifact(repository, artifact); if (!filterResult.isAccepted()) { result.addException( - new RepositoryFilteredException(artifact, repository, filterResult.reasoning())); + new ArtifactFilteredOutException(artifact, repository, filterResult.reasoning())); filteredRemoteRepositories.remove(repository); } }