diff --git a/maven-resolver-api/pom.xml b/maven-resolver-api/pom.xml index 8b821c4ea..c85433542 100644 --- a/maven-resolver-api/pom.xml +++ b/maven-resolver-api/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.resolver maven-resolver - 1.8.2-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-api diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/AbstractForwardingRepositorySystemSession.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/AbstractForwardingRepositorySystemSession.java similarity index 82% rename from maven-resolver-api/src/main/java/org/eclipse/aether/AbstractForwardingRepositorySystemSession.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/AbstractForwardingRepositorySystemSession.java index 008a2df55..8285eef33 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/AbstractForwardingRepositorySystemSession.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/AbstractForwardingRepositorySystemSession.java @@ -1,4 +1,4 @@ -package org.eclipse.aether; +package org.apache.maven.resolver; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,22 +21,22 @@ import java.util.Map; -import org.eclipse.aether.artifact.ArtifactTypeRegistry; -import org.eclipse.aether.collection.DependencyGraphTransformer; -import org.eclipse.aether.collection.DependencyManager; -import org.eclipse.aether.collection.DependencySelector; -import org.eclipse.aether.collection.DependencyTraverser; -import org.eclipse.aether.collection.VersionFilter; -import org.eclipse.aether.repository.AuthenticationSelector; -import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.repository.LocalRepositoryManager; -import org.eclipse.aether.repository.MirrorSelector; -import org.eclipse.aether.repository.ProxySelector; -import org.eclipse.aether.repository.WorkspaceReader; -import org.eclipse.aether.resolution.ArtifactDescriptorPolicy; -import org.eclipse.aether.resolution.ResolutionErrorPolicy; -import org.eclipse.aether.transfer.TransferListener; -import org.eclipse.aether.transform.FileTransformerManager; +import org.apache.maven.resolver.artifact.ArtifactTypeRegistry; +import org.apache.maven.resolver.collection.DependencyGraphTransformer; +import org.apache.maven.resolver.collection.DependencyManager; +import org.apache.maven.resolver.collection.DependencySelector; +import org.apache.maven.resolver.collection.DependencyTraverser; +import org.apache.maven.resolver.collection.VersionFilter; +import org.apache.maven.resolver.repository.AuthenticationSelector; +import org.apache.maven.resolver.repository.LocalRepository; +import org.apache.maven.resolver.repository.LocalRepositoryManager; +import org.apache.maven.resolver.repository.MirrorSelector; +import org.apache.maven.resolver.repository.ProxySelector; +import org.apache.maven.resolver.repository.WorkspaceReader; +import org.apache.maven.resolver.resolution.ArtifactDescriptorPolicy; +import org.apache.maven.resolver.resolution.ResolutionErrorPolicy; +import org.apache.maven.resolver.transfer.TransferListener; +import org.apache.maven.resolver.transform.FileTransformerManager; /** * A special repository system session to enable decorating or proxying another session. To do so, clients have to diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/AbstractRepositoryListener.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/AbstractRepositoryListener.java similarity index 98% rename from maven-resolver-api/src/main/java/org/eclipse/aether/AbstractRepositoryListener.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/AbstractRepositoryListener.java index f42d15e3d..3c11c3f42 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/AbstractRepositoryListener.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/AbstractRepositoryListener.java @@ -1,4 +1,4 @@ -package org.eclipse.aether; +package org.apache.maven.resolver; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/ConfigurationProperties.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/ConfigurationProperties.java similarity index 99% rename from maven-resolver-api/src/main/java/org/eclipse/aether/ConfigurationProperties.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/ConfigurationProperties.java index bc1738f31..d6bdc43a8 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/ConfigurationProperties.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/ConfigurationProperties.java @@ -1,4 +1,4 @@ -package org.eclipse.aether; +package org.apache.maven.resolver; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/DefaultRepositoryCache.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/DefaultRepositoryCache.java similarity index 97% rename from maven-resolver-api/src/main/java/org/eclipse/aether/DefaultRepositoryCache.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/DefaultRepositoryCache.java index 18e28f0a3..21ab7d00c 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/DefaultRepositoryCache.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/DefaultRepositoryCache.java @@ -1,4 +1,4 @@ -package org.eclipse.aether; +package org.apache.maven.resolver; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/DefaultRepositorySystemSession.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/DefaultRepositorySystemSession.java similarity index 95% rename from maven-resolver-api/src/main/java/org/eclipse/aether/DefaultRepositorySystemSession.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/DefaultRepositorySystemSession.java index 90b32f48f..704f8a8fb 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/DefaultRepositorySystemSession.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/DefaultRepositorySystemSession.java @@ -1,4 +1,4 @@ -package org.eclipse.aether; +package org.apache.maven.resolver; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,29 +26,29 @@ import java.util.Collection; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.ArtifactType; -import org.eclipse.aether.artifact.ArtifactTypeRegistry; -import org.eclipse.aether.collection.DependencyGraphTransformer; -import org.eclipse.aether.collection.DependencyManager; -import org.eclipse.aether.collection.DependencySelector; -import org.eclipse.aether.collection.DependencyTraverser; -import org.eclipse.aether.collection.VersionFilter; -import org.eclipse.aether.repository.Authentication; -import org.eclipse.aether.repository.AuthenticationSelector; -import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.repository.LocalRepositoryManager; -import org.eclipse.aether.repository.MirrorSelector; -import org.eclipse.aether.repository.Proxy; -import org.eclipse.aether.repository.ProxySelector; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.repository.RepositoryPolicy; -import org.eclipse.aether.repository.WorkspaceReader; -import org.eclipse.aether.resolution.ArtifactDescriptorPolicy; -import org.eclipse.aether.resolution.ResolutionErrorPolicy; -import org.eclipse.aether.transfer.TransferListener; -import org.eclipse.aether.transform.FileTransformer; -import org.eclipse.aether.transform.FileTransformerManager; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.ArtifactType; +import org.apache.maven.resolver.artifact.ArtifactTypeRegistry; +import org.apache.maven.resolver.collection.DependencyGraphTransformer; +import org.apache.maven.resolver.collection.DependencyManager; +import org.apache.maven.resolver.collection.DependencySelector; +import org.apache.maven.resolver.collection.DependencyTraverser; +import org.apache.maven.resolver.collection.VersionFilter; +import org.apache.maven.resolver.repository.Authentication; +import org.apache.maven.resolver.repository.AuthenticationSelector; +import org.apache.maven.resolver.repository.LocalRepository; +import org.apache.maven.resolver.repository.LocalRepositoryManager; +import org.apache.maven.resolver.repository.MirrorSelector; +import org.apache.maven.resolver.repository.Proxy; +import org.apache.maven.resolver.repository.ProxySelector; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.repository.RepositoryPolicy; +import org.apache.maven.resolver.repository.WorkspaceReader; +import org.apache.maven.resolver.resolution.ArtifactDescriptorPolicy; +import org.apache.maven.resolver.resolution.ResolutionErrorPolicy; +import org.apache.maven.resolver.transfer.TransferListener; +import org.apache.maven.resolver.transform.FileTransformer; +import org.apache.maven.resolver.transform.FileTransformerManager; /** * A simple repository system session. @@ -596,7 +596,7 @@ public ProxySelector getProxySelector() * * @param proxySelector The proxy selector to use, may be {@code null}. * @return This session for chaining, never {@code null}. - * @see org.eclipse.aether.repository.RemoteRepository#getProxy() + * @see RemoteRepository#getProxy() */ public DefaultRepositorySystemSession setProxySelector( ProxySelector proxySelector ) { @@ -621,7 +621,7 @@ public AuthenticationSelector getAuthenticationSelector() * * @param authenticationSelector The authentication selector to use, may be {@code null}. * @return This session for chaining, never {@code null}. - * @see org.eclipse.aether.repository.RemoteRepository#getAuthentication() + * @see RemoteRepository#getAuthentication() */ public DefaultRepositorySystemSession setAuthenticationSelector( AuthenticationSelector authenticationSelector ) { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/DefaultSessionData.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/DefaultSessionData.java similarity index 98% rename from maven-resolver-api/src/main/java/org/eclipse/aether/DefaultSessionData.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/DefaultSessionData.java index ea430a53c..9382cf857 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/DefaultSessionData.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/DefaultSessionData.java @@ -1,4 +1,4 @@ -package org.eclipse.aether; +package org.apache.maven.resolver; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/RepositoryCache.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/RepositoryCache.java similarity index 98% rename from maven-resolver-api/src/main/java/org/eclipse/aether/RepositoryCache.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/RepositoryCache.java index 6f9f1144f..2a4e4940e 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/RepositoryCache.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/RepositoryCache.java @@ -1,4 +1,4 @@ -package org.eclipse.aether; +package org.apache.maven.resolver; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/RepositoryEvent.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/RepositoryEvent.java similarity index 98% rename from maven-resolver-api/src/main/java/org/eclipse/aether/RepositoryEvent.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/RepositoryEvent.java index 8d1e6016f..0f1bd27f8 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/RepositoryEvent.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/RepositoryEvent.java @@ -1,4 +1,4 @@ -package org.eclipse.aether; +package org.apache.maven.resolver; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,9 +24,9 @@ import java.util.List; import static java.util.Objects.requireNonNull; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.repository.ArtifactRepository; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.repository.ArtifactRepository; /** * An event describing an action performed by the repository system. Note that events which indicate the end of an diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/RepositoryException.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/RepositoryException.java similarity index 98% rename from maven-resolver-api/src/main/java/org/eclipse/aether/RepositoryException.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/RepositoryException.java index abf962eb8..1778984e4 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/RepositoryException.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/RepositoryException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether; +package org.apache.maven.resolver; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/RepositoryListener.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/RepositoryListener.java similarity index 96% rename from maven-resolver-api/src/main/java/org/eclipse/aether/RepositoryListener.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/RepositoryListener.java index d65463059..1c9eb846c 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/RepositoryListener.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/RepositoryListener.java @@ -1,4 +1,4 @@ -package org.eclipse.aether; +package org.apache.maven.resolver; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.resolver.resolution.ArtifactDescriptorPolicy; +import org.apache.maven.resolver.transfer.TransferListener; + /** * A listener being notified of events from the repository system. In general, the system sends events upon termination * of an operation like {@link #artifactResolved(RepositoryEvent)} regardless whether it succeeded or failed so @@ -26,8 +29,8 @@ * Note: Implementors are strongly advised to inherit from {@link AbstractRepositoryListener} instead of * directly implementing this interface. * - * @see org.eclipse.aether.RepositorySystemSession#getRepositoryListener() - * @see org.eclipse.aether.transfer.TransferListener + * @see RepositorySystemSession#getRepositoryListener() + * @see TransferListener * @noimplement This interface is not intended to be implemented by clients. * @noextend This interface is not intended to be extended by clients. */ @@ -38,7 +41,7 @@ public interface RepositoryListener * Notifies the listener of a syntactically or semantically invalid artifact descriptor. * {@link RepositoryEvent#getArtifact()} indicates the artifact whose descriptor is invalid and * {@link RepositoryEvent#getExceptions()} carries the encountered errors. Depending on the session's - * {@link org.eclipse.aether.resolution.ArtifactDescriptorPolicy}, the underlying repository operation might abort + * {@link ArtifactDescriptorPolicy}, the underlying repository operation might abort * with an exception or ignore the invalid descriptor. * * @param event The event details, must not be {@code null}. @@ -48,7 +51,7 @@ public interface RepositoryListener /** * Notifies the listener of a missing artifact descriptor. {@link RepositoryEvent#getArtifact()} indicates the * artifact whose descriptor is missing. Depending on the session's - * {@link org.eclipse.aether.resolution.ArtifactDescriptorPolicy}, the underlying repository operation might abort + * {@link ArtifactDescriptorPolicy}, the underlying repository operation might abort * with an exception or ignore the missing descriptor. * * @param event The event details, must not be {@code null}. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/RepositorySystem.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/RepositorySystem.java similarity index 87% rename from maven-resolver-api/src/main/java/org/eclipse/aether/RepositorySystem.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/RepositorySystem.java index e6c30f30b..317d88959 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/RepositorySystem.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/RepositorySystem.java @@ -1,4 +1,4 @@ -package org.eclipse.aether; +package org.apache.maven.resolver; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,37 +22,37 @@ import java.util.Collection; import java.util.List; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.collection.CollectRequest; -import org.eclipse.aether.collection.CollectResult; -import org.eclipse.aether.collection.DependencyCollectionException; -import org.eclipse.aether.deployment.DeployRequest; -import org.eclipse.aether.deployment.DeployResult; -import org.eclipse.aether.deployment.DeploymentException; -import org.eclipse.aether.installation.InstallRequest; -import org.eclipse.aether.installation.InstallResult; -import org.eclipse.aether.installation.InstallationException; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.repository.LocalRepositoryManager; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.resolution.ArtifactDescriptorException; -import org.eclipse.aether.resolution.ArtifactDescriptorRequest; -import org.eclipse.aether.resolution.ArtifactDescriptorResult; -import org.eclipse.aether.resolution.ArtifactRequest; -import org.eclipse.aether.resolution.ArtifactResolutionException; -import org.eclipse.aether.resolution.ArtifactResult; -import org.eclipse.aether.resolution.DependencyRequest; -import org.eclipse.aether.resolution.DependencyResolutionException; -import org.eclipse.aether.resolution.DependencyResult; -import org.eclipse.aether.resolution.MetadataRequest; -import org.eclipse.aether.resolution.MetadataResult; -import org.eclipse.aether.resolution.VersionRangeRequest; -import org.eclipse.aether.resolution.VersionRangeResolutionException; -import org.eclipse.aether.resolution.VersionRangeResult; -import org.eclipse.aether.resolution.VersionRequest; -import org.eclipse.aether.resolution.VersionResolutionException; -import org.eclipse.aether.resolution.VersionResult; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.collection.CollectRequest; +import org.apache.maven.resolver.collection.CollectResult; +import org.apache.maven.resolver.collection.DependencyCollectionException; +import org.apache.maven.resolver.deployment.DeployRequest; +import org.apache.maven.resolver.deployment.DeployResult; +import org.apache.maven.resolver.deployment.DeploymentException; +import org.apache.maven.resolver.installation.InstallRequest; +import org.apache.maven.resolver.installation.InstallResult; +import org.apache.maven.resolver.installation.InstallationException; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.repository.LocalRepository; +import org.apache.maven.resolver.repository.LocalRepositoryManager; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.resolution.ArtifactDescriptorException; +import org.apache.maven.resolver.resolution.ArtifactDescriptorRequest; +import org.apache.maven.resolver.resolution.ArtifactDescriptorResult; +import org.apache.maven.resolver.resolution.ArtifactRequest; +import org.apache.maven.resolver.resolution.ArtifactResolutionException; +import org.apache.maven.resolver.resolution.ArtifactResult; +import org.apache.maven.resolver.resolution.DependencyRequest; +import org.apache.maven.resolver.resolution.DependencyResolutionException; +import org.apache.maven.resolver.resolution.DependencyResult; +import org.apache.maven.resolver.resolution.MetadataRequest; +import org.apache.maven.resolver.resolution.MetadataResult; +import org.apache.maven.resolver.resolution.VersionRangeRequest; +import org.apache.maven.resolver.resolution.VersionRangeResolutionException; +import org.apache.maven.resolver.resolution.VersionRangeResult; +import org.apache.maven.resolver.resolution.VersionRequest; +import org.apache.maven.resolver.resolution.VersionResolutionException; +import org.apache.maven.resolver.resolution.VersionResult; /** * The main entry point to the repository system and its functionality. Note that obtaining a concrete implementation of diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/RepositorySystemSession.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/RepositorySystemSession.java similarity index 88% rename from maven-resolver-api/src/main/java/org/eclipse/aether/RepositorySystemSession.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/RepositorySystemSession.java index 7aef49af2..13dfaee2c 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/RepositorySystemSession.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/RepositorySystemSession.java @@ -1,4 +1,4 @@ -package org.eclipse.aether; +package org.apache.maven.resolver; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,23 +21,24 @@ import java.util.Map; -import org.eclipse.aether.artifact.ArtifactTypeRegistry; -import org.eclipse.aether.collection.DependencyGraphTransformer; -import org.eclipse.aether.collection.DependencyManager; -import org.eclipse.aether.collection.DependencySelector; -import org.eclipse.aether.collection.DependencyTraverser; -import org.eclipse.aether.collection.VersionFilter; -import org.eclipse.aether.repository.AuthenticationSelector; -import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.repository.LocalRepositoryManager; -import org.eclipse.aether.repository.MirrorSelector; -import org.eclipse.aether.repository.ProxySelector; -import org.eclipse.aether.repository.RepositoryPolicy; -import org.eclipse.aether.repository.WorkspaceReader; -import org.eclipse.aether.resolution.ArtifactDescriptorPolicy; -import org.eclipse.aether.resolution.ResolutionErrorPolicy; -import org.eclipse.aether.transfer.TransferListener; -import org.eclipse.aether.transform.FileTransformerManager; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.artifact.ArtifactTypeRegistry; +import org.apache.maven.resolver.collection.DependencyGraphTransformer; +import org.apache.maven.resolver.collection.DependencyManager; +import org.apache.maven.resolver.collection.DependencySelector; +import org.apache.maven.resolver.collection.DependencyTraverser; +import org.apache.maven.resolver.collection.VersionFilter; +import org.apache.maven.resolver.repository.AuthenticationSelector; +import org.apache.maven.resolver.repository.LocalRepository; +import org.apache.maven.resolver.repository.LocalRepositoryManager; +import org.apache.maven.resolver.repository.MirrorSelector; +import org.apache.maven.resolver.repository.ProxySelector; +import org.apache.maven.resolver.repository.RepositoryPolicy; +import org.apache.maven.resolver.repository.WorkspaceReader; +import org.apache.maven.resolver.resolution.ArtifactDescriptorPolicy; +import org.apache.maven.resolver.resolution.ResolutionErrorPolicy; +import org.apache.maven.resolver.transfer.TransferListener; +import org.apache.maven.resolver.transform.FileTransformerManager; /** * Defines settings and components that control the repository system. Once initialized, the session object itself is @@ -185,7 +186,7 @@ public interface RepositorySystemSession * repositories are supposed to have their proxy (if any) already set. * * @return The proxy selector to use, never {@code null}. - * @see org.eclipse.aether.repository.RemoteRepository#getProxy() + * @see RemoteRepository#getProxy() * @see RepositorySystem#newResolutionRepositories(RepositorySystemSession, java.util.List) */ ProxySelector getProxySelector(); @@ -196,7 +197,7 @@ public interface RepositorySystemSession * those repositories are supposed to have their authentication (if any) already set. * * @return The authentication selector to use, never {@code null}. - * @see org.eclipse.aether.repository.RemoteRepository#getAuthentication() + * @see RemoteRepository#getAuthentication() * @see RepositorySystem#newResolutionRepositories(RepositorySystemSession, java.util.List) */ AuthenticationSelector getAuthenticationSelector(); diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/RequestTrace.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/RequestTrace.java similarity index 99% rename from maven-resolver-api/src/main/java/org/eclipse/aether/RequestTrace.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/RequestTrace.java index 86aaa78b1..6f148e14e 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/RequestTrace.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/RequestTrace.java @@ -1,4 +1,4 @@ -package org.eclipse.aether; +package org.apache.maven.resolver; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/SessionData.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/SessionData.java similarity index 98% rename from maven-resolver-api/src/main/java/org/eclipse/aether/SessionData.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/SessionData.java index 330449e28..59556853d 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/SessionData.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/SessionData.java @@ -1,4 +1,4 @@ -package org.eclipse.aether; +package org.apache.maven.resolver; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/SyncContext.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/SyncContext.java similarity index 95% rename from maven-resolver-api/src/main/java/org/eclipse/aether/SyncContext.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/SyncContext.java index 2d751c047..07b07140f 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/SyncContext.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/SyncContext.java @@ -1,4 +1,4 @@ -package org.eclipse.aether; +package org.apache.maven.resolver; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,8 +22,8 @@ import java.io.Closeable; import java.util.Collection; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.metadata.Metadata; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.metadata.Metadata; /** * A synchronization context used to coordinate concurrent access to artifacts or metadatas. The typical usage of a diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/AbstractArtifact.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/artifact/AbstractArtifact.java similarity index 99% rename from maven-resolver-api/src/main/java/org/eclipse/aether/artifact/AbstractArtifact.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/artifact/AbstractArtifact.java index f18b398c6..615e0a5a0 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/AbstractArtifact.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/artifact/AbstractArtifact.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.artifact; +package org.apache.maven.resolver.artifact; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/Artifact.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/artifact/Artifact.java similarity index 99% rename from maven-resolver-api/src/main/java/org/eclipse/aether/artifact/Artifact.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/artifact/Artifact.java index 632324327..c6e7d38fc 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/Artifact.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/artifact/Artifact.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.artifact; +package org.apache.maven.resolver.artifact; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/ArtifactProperties.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/artifact/ArtifactProperties.java similarity index 98% rename from maven-resolver-api/src/main/java/org/eclipse/aether/artifact/ArtifactProperties.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/artifact/ArtifactProperties.java index 11080868b..d701a4405 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/ArtifactProperties.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/artifact/ArtifactProperties.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.artifact; +package org.apache.maven.resolver.artifact; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/ArtifactType.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/artifact/ArtifactType.java similarity index 98% rename from maven-resolver-api/src/main/java/org/eclipse/aether/artifact/ArtifactType.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/artifact/ArtifactType.java index 5f8721743..64936ee44 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/ArtifactType.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/artifact/ArtifactType.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.artifact; +package org.apache.maven.resolver.artifact; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/ArtifactTypeRegistry.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/artifact/ArtifactTypeRegistry.java similarity index 88% rename from maven-resolver-api/src/main/java/org/eclipse/aether/artifact/ArtifactTypeRegistry.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/artifact/ArtifactTypeRegistry.java index f3791733e..848457b88 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/ArtifactTypeRegistry.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/artifact/ArtifactTypeRegistry.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.artifact; +package org.apache.maven.resolver.artifact; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,10 +19,12 @@ * under the License. */ +import org.apache.maven.resolver.RepositorySystemSession; + /** * A registry of known artifact types. * - * @see org.eclipse.aether.RepositorySystemSession#getArtifactTypeRegistry() + * @see RepositorySystemSession#getArtifactTypeRegistry() */ public interface ArtifactTypeRegistry { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/DefaultArtifact.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/artifact/DefaultArtifact.java similarity index 99% rename from maven-resolver-api/src/main/java/org/eclipse/aether/artifact/DefaultArtifact.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/artifact/DefaultArtifact.java index f385e2c8c..ded98ba7f 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/DefaultArtifact.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/artifact/DefaultArtifact.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.artifact; +package org.apache.maven.resolver.artifact; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/DefaultArtifactType.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/artifact/DefaultArtifactType.java similarity index 99% rename from maven-resolver-api/src/main/java/org/eclipse/aether/artifact/DefaultArtifactType.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/artifact/DefaultArtifactType.java index 5d23aa230..2c9285e74 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/DefaultArtifactType.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/artifact/DefaultArtifactType.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.artifact; +package org.apache.maven.resolver.artifact; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/package-info.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/artifact/package-info.java similarity index 95% rename from maven-resolver-api/src/main/java/org/eclipse/aether/artifact/package-info.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/artifact/package-info.java index 9a4cc7950..3055a9608 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/package-info.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/artifact/package-info.java @@ -20,5 +20,5 @@ /** * The definition of an artifact, that is the primary entity managed by the repository system. */ -package org.eclipse.aether.artifact; +package org.apache.maven.resolver.artifact; diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/CollectRequest.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/CollectRequest.java similarity index 96% rename from maven-resolver-api/src/main/java/org/eclipse/aether/collection/CollectRequest.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/CollectRequest.java index 59bc620e4..1e72b61f9 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/CollectRequest.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/CollectRequest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.collection; +package org.apache.maven.resolver.collection; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,11 +23,11 @@ import java.util.Collections; import java.util.List; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RequestTrace; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RequestTrace; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.artifact.Artifact; /** * A request to collect the transitive dependencies and to build a dependency graph from them. There are three ways to @@ -36,7 +36,7 @@ * retrieved from the artifact descriptor of the root dependency. And last, only direct dependencies can be specified in * which case the root node of the resulting graph has no associated dependency. * - * @see RepositorySystem#collectDependencies(org.eclipse.aether.RepositorySystemSession, CollectRequest) + * @see RepositorySystem#collectDependencies(org.apache.maven.resolver.RepositorySystemSession, CollectRequest) */ public final class CollectRequest { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/CollectResult.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/CollectResult.java similarity index 92% rename from maven-resolver-api/src/main/java/org/eclipse/aether/collection/CollectResult.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/CollectResult.java index 7944ad5c1..8090c9c77 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/CollectResult.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/CollectResult.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.collection; +package org.apache.maven.resolver.collection; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,14 +24,14 @@ import java.util.List; import static java.util.Objects.requireNonNull; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.graph.DependencyCycle; -import org.eclipse.aether.graph.DependencyNode; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.graph.DependencyCycle; +import org.apache.maven.resolver.graph.DependencyNode; /** * The result of a dependency collection request. * - * @see RepositorySystem#collectDependencies(org.eclipse.aether.RepositorySystemSession, CollectRequest) + * @see RepositorySystem#collectDependencies(org.apache.maven.resolver.RepositorySystemSession, CollectRequest) */ public final class CollectResult { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/CollectStepData.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/CollectStepData.java similarity index 86% rename from maven-resolver-api/src/main/java/org/eclipse/aether/collection/CollectStepData.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/CollectStepData.java index 28036e9d7..579ea2dc3 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/CollectStepData.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/CollectStepData.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.collection; +package org.apache.maven.resolver.collection; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,13 +21,14 @@ import java.util.List; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyNode; +import org.apache.maven.resolver.RequestTrace; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyNode; /** * A trace data object revealing collect step (while executing {@link CollectRequest}. * - * @see org.eclipse.aether.RequestTrace + * @see RequestTrace * @since 1.8.1 */ public interface CollectStepData diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/DependencyCollectionContext.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/DependencyCollectionContext.java similarity index 93% rename from maven-resolver-api/src/main/java/org/eclipse/aether/collection/DependencyCollectionContext.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/DependencyCollectionContext.java index 671bd2ac1..b7432c72d 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/DependencyCollectionContext.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/DependencyCollectionContext.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.collection; +package org.apache.maven.resolver.collection; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,9 +21,9 @@ import java.util.List; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.graph.Dependency; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.artifact.Artifact; /** * A context used during dependency collection to update the dependency manager, selector and traverser. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/DependencyCollectionException.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/DependencyCollectionException.java similarity index 97% rename from maven-resolver-api/src/main/java/org/eclipse/aether/collection/DependencyCollectionException.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/DependencyCollectionException.java index 8a04d7952..6af914b58 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/DependencyCollectionException.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/DependencyCollectionException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.collection; +package org.apache.maven.resolver.collection; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.RepositoryException; +import org.apache.maven.resolver.RepositoryException; /** * Thrown in case of bad artifact descriptors, version ranges or other issues encountered during calculation of the diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/DependencyGraphTransformationContext.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/DependencyGraphTransformationContext.java similarity index 95% rename from maven-resolver-api/src/main/java/org/eclipse/aether/collection/DependencyGraphTransformationContext.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/DependencyGraphTransformationContext.java index ba6647472..828278dce 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/DependencyGraphTransformationContext.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/DependencyGraphTransformationContext.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.collection; +package org.apache.maven.resolver.collection; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; +import org.apache.maven.resolver.RepositorySystemSession; /** * A context used during dependency collection to exchange information within a chain of dependency graph transformers. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/DependencyGraphTransformer.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/DependencyGraphTransformer.java similarity index 88% rename from maven-resolver-api/src/main/java/org/eclipse/aether/collection/DependencyGraphTransformer.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/DependencyGraphTransformer.java index c47250087..e131c931b 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/DependencyGraphTransformer.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/DependencyGraphTransformer.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.collection; +package org.apache.maven.resolver.collection; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,8 +19,8 @@ * under the License. */ -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.graph.DependencyNode; +import org.apache.maven.resolver.RepositoryException; +import org.apache.maven.resolver.graph.DependencyNode; /** * Transforms a given dependency graph. @@ -31,7 +31,7 @@ * sure that cycles have already been eliminated must gracefully handle cyclic graphs, e.g. guard against infinite * recursion. * - * @see org.eclipse.aether.RepositorySystemSession#getDependencyGraphTransformer() + * @see org.apache.maven.resolver.RepositorySystemSession#getDependencyGraphTransformer() */ public interface DependencyGraphTransformer { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/DependencyManagement.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/DependencyManagement.java similarity index 96% rename from maven-resolver-api/src/main/java/org/eclipse/aether/collection/DependencyManagement.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/DependencyManagement.java index 618f237c4..3045d5867 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/DependencyManagement.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/DependencyManagement.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.collection; +package org.apache.maven.resolver.collection; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,12 +22,12 @@ import java.util.Collection; import java.util.Map; -import org.eclipse.aether.graph.Exclusion; +import org.apache.maven.resolver.graph.Exclusion; /** * The management updates to apply to a dependency. * - * @see DependencyManager#manageDependency(org.eclipse.aether.graph.Dependency) + * @see DependencyManager#manageDependency(org.apache.maven.resolver.graph.Dependency) */ public final class DependencyManagement { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/DependencyManager.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/DependencyManager.java similarity index 88% rename from maven-resolver-api/src/main/java/org/eclipse/aether/collection/DependencyManager.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/DependencyManager.java index 993e388b1..ed08e5b14 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/DependencyManager.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/DependencyManager.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.collection; +package org.apache.maven.resolver.collection; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,8 @@ * under the License. */ -import org.eclipse.aether.graph.Dependency; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.graph.Dependency; /** * Applies dependency management to the dependencies of a dependency node. @@ -29,8 +30,8 @@ * Warning: This hook is called from a hot spot and therefore implementations should pay attention to * performance. Among others, implementations should provide a semantic {@link Object#equals(Object) equals()} method. * - * @see org.eclipse.aether.RepositorySystemSession#getDependencyManager() - * @see org.eclipse.aether.RepositorySystem#collectDependencies(org.eclipse.aether.RepositorySystemSession, + * @see org.apache.maven.resolver.RepositorySystemSession#getDependencyManager() + * @see RepositorySystem#collectDependencies(RepositorySystemSession, * CollectRequest) */ public interface DependencyManager diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/DependencySelector.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/DependencySelector.java similarity index 86% rename from maven-resolver-api/src/main/java/org/eclipse/aether/collection/DependencySelector.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/DependencySelector.java index b257ffa43..906fca6db 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/DependencySelector.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/DependencySelector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.collection; +package org.apache.maven.resolver.collection; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,8 @@ * under the License. */ -import org.eclipse.aether.graph.Dependency; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.graph.Dependency; /** * Decides what dependencies to include in the dependency graph. @@ -29,9 +30,8 @@ * Warning: This hook is called from a hot spot and therefore implementations should pay attention to * performance. Among others, implementations should provide a semantic {@link Object#equals(Object) equals()} method. * - * @see org.eclipse.aether.RepositorySystemSession#getDependencySelector() - * @see org.eclipse.aether.RepositorySystem#collectDependencies(org.eclipse.aether.RepositorySystemSession, - * CollectRequest) + * @see org.apache.maven.resolver.RepositorySystemSession#getDependencySelector() + * @see RepositorySystem#collectDependencies(org.apache.maven.resolver.RepositorySystemSession,CollectRequest) */ public interface DependencySelector { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/DependencyTraverser.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/DependencyTraverser.java similarity index 87% rename from maven-resolver-api/src/main/java/org/eclipse/aether/collection/DependencyTraverser.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/DependencyTraverser.java index be1887bfd..b6d657711 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/DependencyTraverser.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/DependencyTraverser.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.collection; +package org.apache.maven.resolver.collection; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,8 @@ * under the License. */ -import org.eclipse.aether.graph.Dependency; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.graph.Dependency; /** * Decides whether the dependencies of a dependency node should be traversed as well. @@ -29,9 +30,8 @@ * Warning: This hook is called from a hot spot and therefore implementations should pay attention to * performance. Among others, implementations should provide a semantic {@link Object#equals(Object) equals()} method. * - * @see org.eclipse.aether.RepositorySystemSession#getDependencyTraverser() - * @see org.eclipse.aether.RepositorySystem#collectDependencies(org.eclipse.aether.RepositorySystemSession, - * CollectRequest) + * @see org.apache.maven.resolver.RepositorySystemSession#getDependencyTraverser() + * @see RepositorySystem#collectDependencies(org.apache.maven.resolver.RepositorySystemSession,CollectRequest) */ public interface DependencyTraverser { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/UnsolvableVersionConflictException.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/UnsolvableVersionConflictException.java similarity index 94% rename from maven-resolver-api/src/main/java/org/eclipse/aether/collection/UnsolvableVersionConflictException.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/UnsolvableVersionConflictException.java index 81353ac2c..5f2c2ee7d 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/UnsolvableVersionConflictException.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/UnsolvableVersionConflictException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.collection; +package org.apache.maven.resolver.collection; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,10 +25,10 @@ import java.util.LinkedHashSet; import java.util.List; -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.version.VersionConstraint; +import org.apache.maven.resolver.RepositoryException; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.version.VersionConstraint; /** * Thrown in case of an unsolvable conflict between different version constraints for a dependency. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/VersionFilter.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/VersionFilter.java similarity index 88% rename from maven-resolver-api/src/main/java/org/eclipse/aether/collection/VersionFilter.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/VersionFilter.java index fb36747f3..1b16e9fb9 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/VersionFilter.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/VersionFilter.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.collection; +package org.apache.maven.resolver.collection; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,13 +22,14 @@ import java.util.Iterator; import java.util.List; -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.repository.ArtifactRepository; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.version.Version; -import org.eclipse.aether.version.VersionConstraint; +import org.apache.maven.resolver.RepositoryException; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.repository.ArtifactRepository; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.version.Version; +import org.apache.maven.resolver.version.VersionConstraint; /** * Decides which versions matching a version range should actually be considered for the dependency graph. The version @@ -39,9 +40,8 @@ * Warning: This hook is called from a hot spot and therefore implementations should pay attention to * performance. Among others, implementations should provide a semantic {@link Object#equals(Object) equals()} method. * - * @see org.eclipse.aether.RepositorySystemSession#getVersionFilter() - * @see org.eclipse.aether.RepositorySystem#collectDependencies(org.eclipse.aether.RepositorySystemSession, - * CollectRequest) + * @see RepositorySystemSession#getVersionFilter() + * @see RepositorySystem#collectDependencies(org.apache.maven.resolver.RepositorySystemSession,CollectRequest) */ public interface VersionFilter { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/package-info.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/package-info.java similarity index 95% rename from maven-resolver-api/src/main/java/org/eclipse/aether/collection/package-info.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/package-info.java index 414629f62..d609a0818 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/package-info.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/collection/package-info.java @@ -21,5 +21,5 @@ * The types and extension points for collecting the transitive dependencies of an artifact and building a dependency * graph. */ -package org.eclipse.aether.collection; +package org.apache.maven.resolver.collection; diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/deployment/DeployRequest.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/deployment/DeployRequest.java similarity index 93% rename from maven-resolver-api/src/main/java/org/eclipse/aether/deployment/DeployRequest.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/deployment/DeployRequest.java index 44bc721af..95fa4ec7e 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/deployment/DeployRequest.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/deployment/DeployRequest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.deployment; +package org.apache.maven.resolver.deployment; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,15 +23,16 @@ import java.util.Collection; import java.util.Collections; -import org.eclipse.aether.RequestTrace; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RequestTrace; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.metadata.Metadata; /** * A request to deploy artifacts and their accompanying metadata into the a remote repository. * - * @see org.eclipse.aether.RepositorySystem#deploy(org.eclipse.aether.RepositorySystemSession, DeployRequest) + * @see RepositorySystem#deploy(RepositorySystemSession, DeployRequest) */ public final class DeployRequest { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/deployment/DeployResult.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/deployment/DeployResult.java similarity index 94% rename from maven-resolver-api/src/main/java/org/eclipse/aether/deployment/DeployResult.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/deployment/DeployResult.java index df37cb627..787cae16a 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/deployment/DeployResult.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/deployment/DeployResult.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.deployment; +package org.apache.maven.resolver.deployment; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,14 +24,14 @@ import java.util.Collections; import static java.util.Objects.requireNonNull; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.metadata.Metadata; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.metadata.Metadata; /** * The result of deploying artifacts and their accompanying metadata into the a remote repository. * - * @see RepositorySystem#deploy(org.eclipse.aether.RepositorySystemSession, DeployRequest) + * @see RepositorySystem#deploy(RepositorySystemSession, DeployRequest) */ public final class DeployResult { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/deployment/DeploymentException.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/deployment/DeploymentException.java similarity index 93% rename from maven-resolver-api/src/main/java/org/eclipse/aether/deployment/DeploymentException.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/deployment/DeploymentException.java index 53252bafb..b6c274218 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/deployment/DeploymentException.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/deployment/DeploymentException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.deployment; +package org.apache.maven.resolver.deployment; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.RepositoryException; +import org.apache.maven.resolver.RepositoryException; /** * Thrown in case of a deployment error like authentication failure. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/deployment/package-info.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/deployment/package-info.java similarity index 95% rename from maven-resolver-api/src/main/java/org/eclipse/aether/deployment/package-info.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/deployment/package-info.java index dc50c2158..b271a9084 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/deployment/package-info.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/deployment/package-info.java @@ -20,5 +20,5 @@ /** * The types supporting the publishing of artifacts to a remote repository. */ -package org.eclipse.aether.deployment; +package org.apache.maven.resolver.deployment; diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/graph/DefaultDependencyNode.java similarity index 97% rename from maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/graph/DefaultDependencyNode.java index a2c1c8b0b..db0d61080 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/graph/DefaultDependencyNode.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.graph; +package org.apache.maven.resolver.graph; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -27,10 +27,10 @@ import java.util.Map; import static java.util.Objects.requireNonNull; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.version.Version; -import org.eclipse.aether.version.VersionConstraint; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.version.Version; +import org.apache.maven.resolver.version.VersionConstraint; /** * A node within a dependency graph. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/Dependency.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/graph/Dependency.java similarity index 99% rename from maven-resolver-api/src/main/java/org/eclipse/aether/graph/Dependency.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/graph/Dependency.java index db0efcb39..c7f8aee62 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/Dependency.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/graph/Dependency.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.graph; +package org.apache.maven.resolver.graph; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -30,7 +30,7 @@ import java.util.Objects; import java.util.Set; -import org.eclipse.aether.artifact.Artifact; +import org.apache.maven.resolver.artifact.Artifact; /** * A dependency to some artifact. Note: Instances of this class are immutable and the exposed mutators return diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DependencyCycle.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/graph/DependencyCycle.java similarity index 98% rename from maven-resolver-api/src/main/java/org/eclipse/aether/graph/DependencyCycle.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/graph/DependencyCycle.java index 1076ab81b..3665d0109 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DependencyCycle.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/graph/DependencyCycle.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.graph; +package org.apache.maven.resolver.graph; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DependencyFilter.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/graph/DependencyFilter.java similarity index 97% rename from maven-resolver-api/src/main/java/org/eclipse/aether/graph/DependencyFilter.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/graph/DependencyFilter.java index 41776ff98..27f3418bd 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DependencyFilter.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/graph/DependencyFilter.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.graph; +package org.apache.maven.resolver.graph; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DependencyNode.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/graph/DependencyNode.java similarity index 97% rename from maven-resolver-api/src/main/java/org/eclipse/aether/graph/DependencyNode.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/graph/DependencyNode.java index 25510430d..2c0139fa1 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DependencyNode.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/graph/DependencyNode.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.graph; +package org.apache.maven.resolver.graph; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,10 +23,10 @@ import java.util.List; import java.util.Map; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.version.Version; -import org.eclipse.aether.version.VersionConstraint; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.version.Version; +import org.apache.maven.resolver.version.VersionConstraint; /** * A node within a dependency graph. To conserve memory, dependency graphs may reuse a given node instance multiple diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DependencyVisitor.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/graph/DependencyVisitor.java similarity index 97% rename from maven-resolver-api/src/main/java/org/eclipse/aether/graph/DependencyVisitor.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/graph/DependencyVisitor.java index 2a85f2d0f..ca19fbdce 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DependencyVisitor.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/graph/DependencyVisitor.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.graph; +package org.apache.maven.resolver.graph; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/Exclusion.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/graph/Exclusion.java similarity index 98% rename from maven-resolver-api/src/main/java/org/eclipse/aether/graph/Exclusion.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/graph/Exclusion.java index 6d35b7109..7c75d116a 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/Exclusion.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/graph/Exclusion.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.graph; +package org.apache.maven.resolver.graph; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/package-info.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/graph/package-info.java similarity index 95% rename from maven-resolver-api/src/main/java/org/eclipse/aether/graph/package-info.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/graph/package-info.java index c3ba9db1d..babc2eb5e 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/package-info.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/graph/package-info.java @@ -20,5 +20,5 @@ /** * The representation of a dependency graph by means of connected dependency nodes. */ -package org.eclipse.aether.graph; +package org.apache.maven.resolver.graph; diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/installation/InstallRequest.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/installation/InstallRequest.java similarity index 94% rename from maven-resolver-api/src/main/java/org/eclipse/aether/installation/InstallRequest.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/installation/InstallRequest.java index a7f00cf08..267ffd3ce 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/installation/InstallRequest.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/installation/InstallRequest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.installation; +package org.apache.maven.resolver.installation; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,10 +23,10 @@ import java.util.Collection; import java.util.Collections; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RequestTrace; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.metadata.Metadata; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RequestTrace; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.metadata.Metadata; /** * A request to install artifacts and their accompanying metadata into the local repository. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/installation/InstallResult.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/installation/InstallResult.java similarity index 93% rename from maven-resolver-api/src/main/java/org/eclipse/aether/installation/InstallResult.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/installation/InstallResult.java index cfb9b6fcd..03a04cbac 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/installation/InstallResult.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/installation/InstallResult.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.installation; +package org.apache.maven.resolver.installation; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,13 +24,14 @@ import java.util.Collections; import static java.util.Objects.requireNonNull; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.metadata.Metadata; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.metadata.Metadata; /** * The result of installing artifacts and their accompanying metadata into the a remote repository. * - * @see org.eclipse.aether.RepositorySystem#install(org.eclipse.aether.RepositorySystemSession, InstallRequest) + * @see RepositorySystem#install(org.apache.maven.resolver.RepositorySystemSession, InstallRequest) */ public final class InstallResult { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/installation/InstallationException.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/installation/InstallationException.java similarity index 93% rename from maven-resolver-api/src/main/java/org/eclipse/aether/installation/InstallationException.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/installation/InstallationException.java index 9a556bb62..ae052de40 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/installation/InstallationException.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/installation/InstallationException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.installation; +package org.apache.maven.resolver.installation; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.RepositoryException; +import org.apache.maven.resolver.RepositoryException; /** * Thrown in case of an installation error like an IO error. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/installation/package-info.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/installation/package-info.java similarity index 95% rename from maven-resolver-api/src/main/java/org/eclipse/aether/installation/package-info.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/installation/package-info.java index d4ac07756..b7008d662 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/installation/package-info.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/installation/package-info.java @@ -20,5 +20,5 @@ /** * The types supporting the publishing of artifacts to a local repository. */ -package org.eclipse.aether.installation; +package org.apache.maven.resolver.installation; diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/metadata/AbstractMetadata.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/metadata/AbstractMetadata.java similarity index 99% rename from maven-resolver-api/src/main/java/org/eclipse/aether/metadata/AbstractMetadata.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/metadata/AbstractMetadata.java index 3c0706a38..f1885a283 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/metadata/AbstractMetadata.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/metadata/AbstractMetadata.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.metadata; +package org.apache.maven.resolver.metadata; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/metadata/DefaultMetadata.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/metadata/DefaultMetadata.java similarity index 99% rename from maven-resolver-api/src/main/java/org/eclipse/aether/metadata/DefaultMetadata.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/metadata/DefaultMetadata.java index 16bcd6191..dbcff6da2 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/metadata/DefaultMetadata.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/metadata/DefaultMetadata.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.metadata; +package org.apache.maven.resolver.metadata; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/metadata/MergeableMetadata.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/metadata/MergeableMetadata.java similarity index 94% rename from maven-resolver-api/src/main/java/org/eclipse/aether/metadata/MergeableMetadata.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/metadata/MergeableMetadata.java index deaff701b..b840a7184 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/metadata/MergeableMetadata.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/metadata/MergeableMetadata.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.metadata; +package org.apache.maven.resolver.metadata; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,7 +21,7 @@ import java.io.File; -import org.eclipse.aether.RepositoryException; +import org.apache.maven.resolver.RepositoryException; /** * A piece of metadata that needs to be merged with any current metadata before installation/deployment. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/metadata/Metadata.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/metadata/Metadata.java similarity index 99% rename from maven-resolver-api/src/main/java/org/eclipse/aether/metadata/Metadata.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/metadata/Metadata.java index 84e921231..36380db76 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/metadata/Metadata.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/metadata/Metadata.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.metadata; +package org.apache.maven.resolver.metadata; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/metadata/package-info.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/metadata/package-info.java similarity index 95% rename from maven-resolver-api/src/main/java/org/eclipse/aether/metadata/package-info.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/metadata/package-info.java index e41f98e99..4f1a22b54 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/metadata/package-info.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/metadata/package-info.java @@ -20,5 +20,5 @@ /** * The definition of metadata, that is an auxiliary entity managed by the repository system to locate artifacts. */ -package org.eclipse.aether.metadata; +package org.apache.maven.resolver.metadata; diff --git a/maven-resolver-api/src/main/java/org/apache/maven/resolver/package-info.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/package-info.java new file mode 100644 index 000000000..60ffc3bbc --- /dev/null +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/package-info.java @@ -0,0 +1,24 @@ +// CHECKSTYLE_OFF: RegexpHeader +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +/** + * The primary API of the {@link org.apache.maven.resolver.RepositorySystem} and its functionality. + */ +package org.apache.maven.resolver; + diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/ArtifactRepository.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/ArtifactRepository.java similarity index 96% rename from maven-resolver-api/src/main/java/org/eclipse/aether/repository/ArtifactRepository.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/ArtifactRepository.java index c62bf8793..190519268 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/ArtifactRepository.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/ArtifactRepository.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/Authentication.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/Authentication.java similarity index 98% rename from maven-resolver-api/src/main/java/org/eclipse/aether/repository/Authentication.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/Authentication.java index d85c2a26e..d7c1efaaf 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/Authentication.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/Authentication.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/AuthenticationContext.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/AuthenticationContext.java similarity index 99% rename from maven-resolver-api/src/main/java/org/eclipse/aether/repository/AuthenticationContext.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/AuthenticationContext.java index 88e13bd9a..480ba12b2 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/AuthenticationContext.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/AuthenticationContext.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,7 +26,7 @@ import java.util.Map; import static java.util.Objects.requireNonNull; -import org.eclipse.aether.RepositorySystemSession; +import org.apache.maven.resolver.RepositorySystemSession; /** * A glorified map of key value pairs holding (cleartext) authentication data. Authentication contexts are used diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/AuthenticationDigest.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/AuthenticationDigest.java similarity index 98% rename from maven-resolver-api/src/main/java/org/eclipse/aether/repository/AuthenticationDigest.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/AuthenticationDigest.java index 27b88c021..d7c8620fb 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/AuthenticationDigest.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/AuthenticationDigest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,7 +23,7 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import org.eclipse.aether.RepositorySystemSession; +import org.apache.maven.resolver.RepositorySystemSession; /** * A helper to calculate a fingerprint/digest for the authentication data of a repository/proxy. Such a fingerprint can diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/AuthenticationSelector.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/AuthenticationSelector.java similarity index 88% rename from maven-resolver-api/src/main/java/org/eclipse/aether/repository/AuthenticationSelector.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/AuthenticationSelector.java index 0637d1c28..3db6c89e6 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/AuthenticationSelector.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/AuthenticationSelector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,10 +19,12 @@ * under the License. */ +import org.apache.maven.resolver.RepositorySystemSession; + /** * Selects authentication for a given remote repository. * - * @see org.eclipse.aether.RepositorySystemSession#getAuthenticationSelector() + * @see RepositorySystemSession#getAuthenticationSelector() */ public interface AuthenticationSelector { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalArtifactRegistration.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/LocalArtifactRegistration.java similarity index 95% rename from maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalArtifactRegistration.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/LocalArtifactRegistration.java index 770cb1133..704a2e9b7 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalArtifactRegistration.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/LocalArtifactRegistration.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,13 +22,13 @@ import java.util.Collection; import java.util.Collections; -import org.eclipse.aether.artifact.Artifact; +import org.apache.maven.resolver.artifact.Artifact; /** * A request to register an artifact within the local repository. Certain local repository implementations can refuse to * serve physically present artifacts if those haven't been previously registered to them. * - * @see LocalRepositoryManager#add(org.eclipse.aether.RepositorySystemSession, LocalArtifactRegistration) + * @see LocalRepositoryManager#add(org.apache.maven.resolver.RepositorySystemSession, LocalArtifactRegistration) */ public final class LocalArtifactRegistration { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalArtifactRequest.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/LocalArtifactRequest.java similarity index 95% rename from maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalArtifactRequest.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/LocalArtifactRequest.java index 790dbfdac..ed98de0d6 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalArtifactRequest.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/LocalArtifactRequest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,12 +22,12 @@ import java.util.Collections; import java.util.List; -import org.eclipse.aether.artifact.Artifact; +import org.apache.maven.resolver.artifact.Artifact; /** * A query to the local repository for the existence of an artifact. * - * @see LocalRepositoryManager#find(org.eclipse.aether.RepositorySystemSession, LocalArtifactRequest) + * @see LocalRepositoryManager#find(org.apache.maven.resolver.RepositorySystemSession, LocalArtifactRequest) */ public final class LocalArtifactRequest { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalArtifactResult.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/LocalArtifactResult.java similarity index 96% rename from maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalArtifactResult.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/LocalArtifactResult.java index a18c1b2e6..97e383da8 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalArtifactResult.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/LocalArtifactResult.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,7 +25,7 @@ /** * A result from the local repository about the existence of an artifact. * - * @see LocalRepositoryManager#find(org.eclipse.aether.RepositorySystemSession, LocalArtifactRequest) + * @see LocalRepositoryManager#find(org.apache.maven.resolver.RepositorySystemSession, LocalArtifactRequest) */ public final class LocalArtifactResult { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalMetadataRegistration.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/LocalMetadataRegistration.java similarity index 95% rename from maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalMetadataRegistration.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/LocalMetadataRegistration.java index c2fe647ba..8953d56b8 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalMetadataRegistration.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/LocalMetadataRegistration.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,12 +22,12 @@ import java.util.Collection; import java.util.Collections; -import org.eclipse.aether.metadata.Metadata; +import org.apache.maven.resolver.metadata.Metadata; /** * A request to register metadata within the local repository. * - * @see LocalRepositoryManager#add(org.eclipse.aether.RepositorySystemSession, LocalMetadataRegistration) + * @see LocalRepositoryManager#add(org.apache.maven.resolver.RepositorySystemSession, LocalMetadataRegistration) */ public final class LocalMetadataRegistration { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalMetadataRequest.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/LocalMetadataRequest.java similarity index 94% rename from maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalMetadataRequest.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/LocalMetadataRequest.java index deb34c690..74087fd28 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalMetadataRequest.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/LocalMetadataRequest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,12 +19,12 @@ * under the License. */ -import org.eclipse.aether.metadata.Metadata; +import org.apache.maven.resolver.metadata.Metadata; /** * A query to the local repository for the existence of metadata. * - * @see LocalRepositoryManager#find(org.eclipse.aether.RepositorySystemSession, LocalMetadataRequest) + * @see LocalRepositoryManager#find(org.apache.maven.resolver.RepositorySystemSession, LocalMetadataRequest) */ public final class LocalMetadataRequest { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalMetadataResult.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/LocalMetadataResult.java similarity index 94% rename from maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalMetadataResult.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/LocalMetadataResult.java index 5fcfdf45b..0d68e3974 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalMetadataResult.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/LocalMetadataResult.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,7 +25,7 @@ /** * A result from the local repository about the existence of metadata. * - * @see LocalRepositoryManager#find(org.eclipse.aether.RepositorySystemSession, LocalMetadataRequest) + * @see LocalRepositoryManager#find(org.apache.maven.resolver.RepositorySystemSession, LocalMetadataRequest) */ public final class LocalMetadataResult { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalRepository.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/LocalRepository.java similarity index 98% rename from maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalRepository.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/LocalRepository.java index 0ef9ccd49..8cf8c6022 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalRepository.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/LocalRepository.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalRepositoryManager.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/LocalRepositoryManager.java similarity index 94% rename from maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalRepositoryManager.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/LocalRepositoryManager.java index 649707ce9..5b51c0f41 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/LocalRepositoryManager.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/LocalRepositoryManager.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,15 +19,16 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.metadata.Metadata; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.metadata.Metadata; /** * Manages access to a local repository. * * @see RepositorySystemSession#getLocalRepositoryManager() - * @see org.eclipse.aether.RepositorySystem#newLocalRepositoryManager(RepositorySystemSession, LocalRepository) + * @see RepositorySystem#newLocalRepositoryManager(RepositorySystemSession, LocalRepository) */ public interface LocalRepositoryManager { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/MirrorSelector.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/MirrorSelector.java similarity index 88% rename from maven-resolver-api/src/main/java/org/eclipse/aether/repository/MirrorSelector.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/MirrorSelector.java index d50262c08..29735ad6d 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/MirrorSelector.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/MirrorSelector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,10 +19,12 @@ * under the License. */ +import org.apache.maven.resolver.RepositorySystemSession; + /** * Selects a mirror for a given remote repository. * - * @see org.eclipse.aether.RepositorySystemSession#getMirrorSelector() + * @see RepositorySystemSession#getMirrorSelector() */ public interface MirrorSelector { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/NoLocalRepositoryManagerException.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/NoLocalRepositoryManagerException.java similarity index 97% rename from maven-resolver-api/src/main/java/org/eclipse/aether/repository/NoLocalRepositoryManagerException.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/NoLocalRepositoryManagerException.java index c8048216a..8482430b7 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/NoLocalRepositoryManagerException.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/NoLocalRepositoryManagerException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.RepositoryException; +import org.apache.maven.resolver.RepositoryException; /** * Thrown in case of an unsupported local repository type. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/Proxy.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/Proxy.java similarity index 98% rename from maven-resolver-api/src/main/java/org/eclipse/aether/repository/Proxy.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/Proxy.java index 25807a856..1c0eed1df 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/Proxy.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/Proxy.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/ProxySelector.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/ProxySelector.java similarity index 88% rename from maven-resolver-api/src/main/java/org/eclipse/aether/repository/ProxySelector.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/ProxySelector.java index 29b9e4eea..ba4c301ff 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/ProxySelector.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/ProxySelector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,10 +19,12 @@ * under the License. */ +import org.apache.maven.resolver.RepositorySystemSession; + /** * Selects a proxy for a given remote repository. * - * @see org.eclipse.aether.RepositorySystemSession#getProxySelector() + * @see RepositorySystemSession#getProxySelector() */ public interface ProxySelector { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/RemoteRepository.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/RemoteRepository.java similarity index 99% rename from maven-resolver-api/src/main/java/org/eclipse/aether/repository/RemoteRepository.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/RemoteRepository.java index 3092fc123..ac9bc1340 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/RemoteRepository.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/RemoteRepository.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/RepositoryPolicy.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/RepositoryPolicy.java similarity index 99% rename from maven-resolver-api/src/main/java/org/eclipse/aether/repository/RepositoryPolicy.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/RepositoryPolicy.java index 18fb850ce..12a21f839 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/RepositoryPolicy.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/RepositoryPolicy.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/WorkspaceReader.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/WorkspaceReader.java similarity index 89% rename from maven-resolver-api/src/main/java/org/eclipse/aether/repository/WorkspaceReader.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/WorkspaceReader.java index d1140f3ff..f9208f747 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/WorkspaceReader.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/WorkspaceReader.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,12 +22,13 @@ import java.io.File; import java.util.List; -import org.eclipse.aether.artifact.Artifact; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; /** * Manages a repository backed by the IDE workspace, a build session or a similar ad-hoc collection of artifacts. * - * @see org.eclipse.aether.RepositorySystemSession#getWorkspaceReader() + * @see RepositorySystemSession#getWorkspaceReader() */ public interface WorkspaceReader { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/WorkspaceRepository.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/WorkspaceRepository.java similarity index 98% rename from maven-resolver-api/src/main/java/org/eclipse/aether/repository/WorkspaceRepository.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/WorkspaceRepository.java index 38dc5c52a..6a52cda6b 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/WorkspaceRepository.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/WorkspaceRepository.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/package-info.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/package-info.java similarity index 95% rename from maven-resolver-api/src/main/java/org/eclipse/aether/repository/package-info.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/package-info.java index 538e7f17b..afd855423 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/package-info.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/repository/package-info.java @@ -20,5 +20,5 @@ /** * The definition of various kinds of repositories that host artifacts. */ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorException.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ArtifactDescriptorException.java similarity index 96% rename from maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorException.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ArtifactDescriptorException.java index d645a82c9..ead3f9631 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorException.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ArtifactDescriptorException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.resolution; +package org.apache.maven.resolver.resolution; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.RepositoryException; +import org.apache.maven.resolver.RepositoryException; /** * Thrown in case of an unreadable or unresolvable artifact descriptor. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorPolicy.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ArtifactDescriptorPolicy.java similarity index 91% rename from maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorPolicy.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ArtifactDescriptorPolicy.java index c4de9b224..d70e90e0f 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorPolicy.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ArtifactDescriptorPolicy.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.resolution; +package org.apache.maven.resolver.resolution; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,12 +19,12 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; +import org.apache.maven.resolver.RepositorySystemSession; /** * Controls the handling of errors related to reading an artifact descriptor. * - * @see RepositorySystemSession#getArtifactDescriptorPolicy() + * @see org.apache.maven.resolver.RepositorySystemSession#getArtifactDescriptorPolicy() */ public interface ArtifactDescriptorPolicy { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorPolicyRequest.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ArtifactDescriptorPolicyRequest.java similarity index 96% rename from maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorPolicyRequest.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ArtifactDescriptorPolicyRequest.java index ffaac16c5..cebfe10f8 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorPolicyRequest.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ArtifactDescriptorPolicyRequest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.resolution; +package org.apache.maven.resolver.resolution; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.artifact.Artifact; +import org.apache.maven.resolver.artifact.Artifact; /** * A query for the error policy for a given artifact's descriptor. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorRequest.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ArtifactDescriptorRequest.java similarity index 93% rename from maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorRequest.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ArtifactDescriptorRequest.java index 193e27449..5138ec346 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorRequest.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ArtifactDescriptorRequest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.resolution; +package org.apache.maven.resolver.resolution; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,15 +23,16 @@ import java.util.Collections; import java.util.List; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RequestTrace; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RequestTrace; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.repository.RemoteRepository; /** * A request to read an artifact descriptor. * - * @see RepositorySystem#readArtifactDescriptor(org.eclipse.aether.RepositorySystemSession, ArtifactDescriptorRequest) + * @see RepositorySystem#readArtifactDescriptor(org.apache.maven.resolver.RepositorySystemSession, + * ArtifactDescriptorRequest) */ public final class ArtifactDescriptorRequest { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorResult.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ArtifactDescriptorResult.java similarity index 96% rename from maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorResult.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ArtifactDescriptorResult.java index 4e97aab62..898e52ce6 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorResult.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ArtifactDescriptorResult.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.resolution; +package org.apache.maven.resolver.resolution; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,16 +26,16 @@ import java.util.Map; import static java.util.Objects.requireNonNull; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.repository.ArtifactRepository; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.repository.ArtifactRepository; +import org.apache.maven.resolver.repository.RemoteRepository; /** * The result from reading an artifact descriptor. * - * @see RepositorySystem#readArtifactDescriptor(org.eclipse.aether.RepositorySystemSession, ArtifactDescriptorRequest) + * @see RepositorySystem#readArtifactDescriptor(RepositorySystemSession, ArtifactDescriptorRequest) */ public final class ArtifactDescriptorResult { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactRequest.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ArtifactRequest.java similarity index 93% rename from maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactRequest.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ArtifactRequest.java index fec1affb7..f14b12eb1 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactRequest.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ArtifactRequest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.resolution; +package org.apache.maven.resolver.resolution; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,16 +23,16 @@ import java.util.Collections; import java.util.List; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RequestTrace; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RequestTrace; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.repository.RemoteRepository; /** * A request to resolve an artifact. * - * @see RepositorySystem#resolveArtifacts(org.eclipse.aether.RepositorySystemSession, java.util.Collection) + * @see RepositorySystem#resolveArtifacts(RepositorySystemSession, java.util.Collection) * @see Artifact#getFile() */ public final class ArtifactRequest diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactResolutionException.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ArtifactResolutionException.java similarity index 95% rename from maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactResolutionException.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ArtifactResolutionException.java index bfae4a0bb..1a85a56cf 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactResolutionException.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ArtifactResolutionException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.resolution; +package org.apache.maven.resolver.resolution; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,9 +22,9 @@ import java.util.Collections; import java.util.List; -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.transfer.ArtifactNotFoundException; -import org.eclipse.aether.transfer.RepositoryOfflineException; +import org.apache.maven.resolver.RepositoryException; +import org.apache.maven.resolver.transfer.ArtifactNotFoundException; +import org.apache.maven.resolver.transfer.RepositoryOfflineException; /** * Thrown in case of a unresolvable artifacts. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactResult.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ArtifactResult.java similarity index 93% rename from maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactResult.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ArtifactResult.java index 0c98dac1d..59ccd74a4 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ArtifactResult.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ArtifactResult.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.resolution; +package org.apache.maven.resolver.resolution; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,15 +24,15 @@ import java.util.List; import static java.util.Objects.requireNonNull; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.repository.ArtifactRepository; -import org.eclipse.aether.transfer.ArtifactNotFoundException; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.repository.ArtifactRepository; +import org.apache.maven.resolver.transfer.ArtifactNotFoundException; /** * The result of an artifact resolution request. * - * @see RepositorySystem#resolveArtifacts(org.eclipse.aether.RepositorySystemSession, java.util.Collection) + * @see RepositorySystem#resolveArtifacts(RepositorySystemSession, java.util.Collection) * @see Artifact#getFile() */ public final class ArtifactResult diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/DependencyRequest.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/DependencyRequest.java similarity index 92% rename from maven-resolver-api/src/main/java/org/eclipse/aether/resolution/DependencyRequest.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/DependencyRequest.java index 426540eda..d459bcf8f 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/DependencyRequest.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/DependencyRequest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.resolution; +package org.apache.maven.resolver.resolution; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,18 +19,18 @@ * under the License. */ -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RequestTrace; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.collection.CollectRequest; -import org.eclipse.aether.graph.DependencyFilter; -import org.eclipse.aether.graph.DependencyNode; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RequestTrace; +import org.apache.maven.resolver.graph.DependencyFilter; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.collection.CollectRequest; /** * A request to resolve transitive dependencies. This request can either be supplied with a {@link CollectRequest} to * calculate the transitive dependencies or with an already resolved dependency graph. * - * @see RepositorySystem#resolveDependencies(org.eclipse.aether.RepositorySystemSession, DependencyRequest) + * @see RepositorySystem#resolveDependencies(org.apache.maven.resolver.RepositorySystemSession, DependencyRequest) * @see Artifact#getFile() */ public final class DependencyRequest diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/DependencyResolutionException.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/DependencyResolutionException.java similarity index 96% rename from maven-resolver-api/src/main/java/org/eclipse/aether/resolution/DependencyResolutionException.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/DependencyResolutionException.java index 658a11405..e8bab6b37 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/DependencyResolutionException.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/DependencyResolutionException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.resolution; +package org.apache.maven.resolver.resolution; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.RepositoryException; +import org.apache.maven.resolver.RepositoryException; /** * Thrown in case of a unresolvable dependencies. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/DependencyResult.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/DependencyResult.java similarity index 92% rename from maven-resolver-api/src/main/java/org/eclipse/aether/resolution/DependencyResult.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/DependencyResult.java index 6aea55253..2553972b2 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/DependencyResult.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/DependencyResult.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.resolution; +package org.apache.maven.resolver.resolution; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,14 +23,15 @@ import java.util.List; import static java.util.Objects.requireNonNull; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.graph.DependencyCycle; -import org.eclipse.aether.graph.DependencyNode; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.collection.CollectRequest; +import org.apache.maven.resolver.graph.DependencyCycle; +import org.apache.maven.resolver.graph.DependencyNode; /** * The result of a dependency resolution request. * - * @see RepositorySystem#resolveDependencies(org.eclipse.aether.RepositorySystemSession, DependencyRequest) + * @see RepositorySystem#resolveDependencies(RepositorySystemSession, DependencyRequest) */ public final class DependencyResult { @@ -95,7 +96,7 @@ public DependencyResult setRoot( DependencyNode root ) /** * Gets the dependency cycles that were encountered while building the dependency graph. Note that dependency cycles * will only be reported here if the underlying request was created from a - * {@link org.eclipse.aether.collection.CollectRequest CollectRequest}. If the underlying {@link DependencyRequest} + * {@link CollectRequest CollectRequest}. If the underlying {@link DependencyRequest} * was created from an existing dependency graph, information about cycles will not be available in this result. * * @return The dependency cycles in the (raw) graph, never {@code null}. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/MetadataRequest.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/MetadataRequest.java similarity index 95% rename from maven-resolver-api/src/main/java/org/eclipse/aether/resolution/MetadataRequest.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/MetadataRequest.java index 6b55d92b6..3f5c9a119 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/MetadataRequest.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/MetadataRequest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.resolution; +package org.apache.maven.resolver.resolution; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,15 +19,15 @@ * under the License. */ -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RequestTrace; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RequestTrace; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.repository.RemoteRepository; /** * A request to resolve metadata from either a remote repository or the local repository. * - * @see RepositorySystem#resolveMetadata(org.eclipse.aether.RepositorySystemSession, java.util.Collection) + * @see RepositorySystem#resolveMetadata(org.apache.maven.resolver.RepositorySystemSession, java.util.Collection) * @see Metadata#getFile() */ public final class MetadataRequest diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/MetadataResult.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/MetadataResult.java similarity index 93% rename from maven-resolver-api/src/main/java/org/eclipse/aether/resolution/MetadataResult.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/MetadataResult.java index 2bfd24df8..bf73f7272 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/MetadataResult.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/MetadataResult.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.resolution; +package org.apache.maven.resolver.resolution; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,14 +21,14 @@ import static java.util.Objects.requireNonNull; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.transfer.MetadataNotFoundException; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.transfer.MetadataNotFoundException; /** * The result of a metadata resolution request. * - * @see RepositorySystem#resolveMetadata(org.eclipse.aether.RepositorySystemSession, java.util.Collection) + * @see RepositorySystem#resolveMetadata(org.apache.maven.resolver.RepositorySystemSession, java.util.Collection) */ public final class MetadataResult { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ResolutionErrorPolicy.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ResolutionErrorPolicy.java similarity index 94% rename from maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ResolutionErrorPolicy.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ResolutionErrorPolicy.java index 5158fa030..0b946ac7b 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ResolutionErrorPolicy.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ResolutionErrorPolicy.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.resolution; +package org.apache.maven.resolver.resolution; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.metadata.Metadata; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.metadata.Metadata; /** * Controls the caching of resolution errors for artifacts/metadata from remote repositories. If caching is enabled for diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ResolutionErrorPolicyRequest.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ResolutionErrorPolicyRequest.java similarity index 96% rename from maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ResolutionErrorPolicyRequest.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ResolutionErrorPolicyRequest.java index 912691471..4eee10698 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/ResolutionErrorPolicyRequest.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/ResolutionErrorPolicyRequest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.resolution; +package org.apache.maven.resolver.resolution; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.repository.RemoteRepository; /** * A query for the resolution error policy for a given artifact/metadata. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/VersionRangeRequest.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/VersionRangeRequest.java similarity index 93% rename from maven-resolver-api/src/main/java/org/eclipse/aether/resolution/VersionRangeRequest.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/VersionRangeRequest.java index 64803dca4..e1c93158b 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/VersionRangeRequest.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/VersionRangeRequest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.resolution; +package org.apache.maven.resolver.resolution; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,14 +23,15 @@ import java.util.Collections; import java.util.List; -import org.eclipse.aether.RequestTrace; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RequestTrace; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.repository.RemoteRepository; /** * A request to resolve a version range. * - * @see org.eclipse.aether.RepositorySystem#resolveVersionRange(org.eclipse.aether.RepositorySystemSession, + * @see RepositorySystem#resolveVersionRange(org.apache.maven.resolver.RepositorySystemSession, * VersionRangeRequest) */ public final class VersionRangeRequest diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/VersionRangeResolutionException.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/VersionRangeResolutionException.java similarity index 97% rename from maven-resolver-api/src/main/java/org/eclipse/aether/resolution/VersionRangeResolutionException.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/VersionRangeResolutionException.java index deb0e5293..b874cc314 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/VersionRangeResolutionException.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/VersionRangeResolutionException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.resolution; +package org.apache.maven.resolver.resolution; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.RepositoryException; +import org.apache.maven.resolver.RepositoryException; /** * Thrown in case of an unparseable or unresolvable version range. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/VersionRangeResult.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/VersionRangeResult.java similarity index 95% rename from maven-resolver-api/src/main/java/org/eclipse/aether/resolution/VersionRangeResult.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/VersionRangeResult.java index 78a279acb..eb3f31def 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/VersionRangeResult.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/VersionRangeResult.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.resolution; +package org.apache.maven.resolver.resolution; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,14 +26,15 @@ import java.util.Map; import static java.util.Objects.requireNonNull; -import org.eclipse.aether.repository.ArtifactRepository; -import org.eclipse.aether.version.Version; -import org.eclipse.aether.version.VersionConstraint; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.repository.ArtifactRepository; +import org.apache.maven.resolver.version.Version; +import org.apache.maven.resolver.version.VersionConstraint; /** * The result of a version range resolution request. * - * @see org.eclipse.aether.RepositorySystem#resolveVersionRange(org.eclipse.aether.RepositorySystemSession, + * @see RepositorySystem#resolveVersionRange(RepositorySystemSession, * VersionRangeRequest) */ public final class VersionRangeResult diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/VersionRequest.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/VersionRequest.java similarity index 93% rename from maven-resolver-api/src/main/java/org/eclipse/aether/resolution/VersionRequest.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/VersionRequest.java index c36b9910c..7bec3eccd 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/VersionRequest.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/VersionRequest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.resolution; +package org.apache.maven.resolver.resolution; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,15 +23,15 @@ import java.util.Collections; import java.util.List; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RequestTrace; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RequestTrace; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.repository.RemoteRepository; /** * A request to resolve a metaversion. * - * @see RepositorySystem#resolveVersion(org.eclipse.aether.RepositorySystemSession, VersionRequest) + * @see RepositorySystem#resolveVersion(RepositorySystemSession, VersionRequest) */ public final class VersionRequest { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/VersionResolutionException.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/VersionResolutionException.java similarity index 97% rename from maven-resolver-api/src/main/java/org/eclipse/aether/resolution/VersionResolutionException.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/VersionResolutionException.java index 1aca861e0..a5c61c207 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/VersionResolutionException.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/VersionResolutionException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.resolution; +package org.apache.maven.resolver.resolution; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.RepositoryException; +import org.apache.maven.resolver.RepositoryException; /** * Thrown in case of an unresolvable metaversion. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/VersionResult.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/VersionResult.java similarity index 93% rename from maven-resolver-api/src/main/java/org/eclipse/aether/resolution/VersionResult.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/VersionResult.java index 40797a2b6..1ae5f7cdc 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/VersionResult.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/VersionResult.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.resolution; +package org.apache.maven.resolver.resolution; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,13 +24,13 @@ import java.util.List; import static java.util.Objects.requireNonNull; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.repository.ArtifactRepository; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.repository.ArtifactRepository; /** * The result of a version resolution request. * - * @see RepositorySystem#resolveVersion(org.eclipse.aether.RepositorySystemSession, VersionRequest) + * @see RepositorySystem#resolveVersion(org.apache.maven.resolver.RepositorySystemSession, VersionRequest) */ public final class VersionResult { diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/package-info.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/package-info.java similarity index 95% rename from maven-resolver-api/src/main/java/org/eclipse/aether/resolution/package-info.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/package-info.java index 33f9ef892..5002f9e4c 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/resolution/package-info.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/resolution/package-info.java @@ -20,5 +20,5 @@ /** * The types supporting the resolution of artifacts and metadata from repositories. */ -package org.eclipse.aether.resolution; +package org.apache.maven.resolver.resolution; diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/AbstractTransferListener.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/AbstractTransferListener.java similarity index 97% rename from maven-resolver-api/src/main/java/org/eclipse/aether/transfer/AbstractTransferListener.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/AbstractTransferListener.java index 5691e31db..aef8cf4eb 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/AbstractTransferListener.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/AbstractTransferListener.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transfer; +package org.apache.maven.resolver.transfer; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/ArtifactNotFoundException.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/ArtifactNotFoundException.java similarity index 94% rename from maven-resolver-api/src/main/java/org/eclipse/aether/transfer/ArtifactNotFoundException.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/ArtifactNotFoundException.java index 88f62aa7f..d7529ecf6 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/ArtifactNotFoundException.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/ArtifactNotFoundException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transfer; +package org.apache.maven.resolver.transfer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.ArtifactProperties; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.ArtifactProperties; /** * Thrown when an artifact was not found in a particular repository. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/ArtifactTransferException.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/ArtifactTransferException.java similarity index 95% rename from maven-resolver-api/src/main/java/org/eclipse/aether/transfer/ArtifactTransferException.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/ArtifactTransferException.java index c79f12539..cebd6e32d 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/ArtifactTransferException.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/ArtifactTransferException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transfer; +package org.apache.maven.resolver.transfer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.RepositoryException; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.artifact.Artifact; /** * Thrown when an artifact could not be uploaded/downloaded to/from a particular remote repository. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/ChecksumFailureException.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/ChecksumFailureException.java similarity index 98% rename from maven-resolver-api/src/main/java/org/eclipse/aether/transfer/ChecksumFailureException.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/ChecksumFailureException.java index 88df9703a..af3ca2a55 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/ChecksumFailureException.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/ChecksumFailureException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transfer; +package org.apache.maven.resolver.transfer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.RepositoryException; +import org.apache.maven.resolver.RepositoryException; /** * Thrown in case of a checksum failure during an artifact/metadata download. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/MetadataNotFoundException.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/MetadataNotFoundException.java similarity index 94% rename from maven-resolver-api/src/main/java/org/eclipse/aether/transfer/MetadataNotFoundException.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/MetadataNotFoundException.java index 28d78bdf9..f99d2037b 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/MetadataNotFoundException.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/MetadataNotFoundException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transfer; +package org.apache.maven.resolver.transfer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.repository.LocalRepository; +import org.apache.maven.resolver.repository.RemoteRepository; /** * Thrown when metadata was not found in a particular repository. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/MetadataTransferException.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/MetadataTransferException.java similarity index 95% rename from maven-resolver-api/src/main/java/org/eclipse/aether/transfer/MetadataTransferException.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/MetadataTransferException.java index ff363a332..45d9795a0 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/MetadataTransferException.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/MetadataTransferException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transfer; +package org.apache.maven.resolver.transfer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.RepositoryException; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.metadata.Metadata; /** * Thrown when metadata could not be uploaded/downloaded to/from a particular remote repository. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/NoRepositoryConnectorException.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/NoRepositoryConnectorException.java similarity index 95% rename from maven-resolver-api/src/main/java/org/eclipse/aether/transfer/NoRepositoryConnectorException.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/NoRepositoryConnectorException.java index 314056998..2f95b2b24 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/NoRepositoryConnectorException.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/NoRepositoryConnectorException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transfer; +package org.apache.maven.resolver.transfer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,8 +19,8 @@ * under the License. */ -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.RepositoryException; +import org.apache.maven.resolver.repository.RemoteRepository; /** * Thrown in case of an unsupported remote repository type. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/NoRepositoryLayoutException.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/NoRepositoryLayoutException.java similarity index 95% rename from maven-resolver-api/src/main/java/org/eclipse/aether/transfer/NoRepositoryLayoutException.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/NoRepositoryLayoutException.java index 3fc05bb70..b33efc468 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/NoRepositoryLayoutException.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/NoRepositoryLayoutException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transfer; +package org.apache.maven.resolver.transfer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,8 +19,8 @@ * under the License. */ -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.RepositoryException; +import org.apache.maven.resolver.repository.RemoteRepository; /** * Thrown in case of an unsupported repository layout. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/NoTransporterException.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/NoTransporterException.java similarity index 95% rename from maven-resolver-api/src/main/java/org/eclipse/aether/transfer/NoTransporterException.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/NoTransporterException.java index 5d985588d..fb37978ba 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/NoTransporterException.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/NoTransporterException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transfer; +package org.apache.maven.resolver.transfer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,8 +19,8 @@ * under the License. */ -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.RepositoryException; +import org.apache.maven.resolver.repository.RemoteRepository; /** * Thrown in case of an unsupported transport protocol. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/RepositoryOfflineException.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/RepositoryOfflineException.java similarity index 93% rename from maven-resolver-api/src/main/java/org/eclipse/aether/transfer/RepositoryOfflineException.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/RepositoryOfflineException.java index 02d468080..f194cbc94 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/RepositoryOfflineException.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/RepositoryOfflineException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transfer; +package org.apache.maven.resolver.transfer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,8 +19,8 @@ * under the License. */ -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.RepositoryException; +import org.apache.maven.resolver.repository.RemoteRepository; /** * Thrown when a transfer could not be performed because a remote repository is not accessible in offline mode. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferCancelledException.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/TransferCancelledException.java similarity index 94% rename from maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferCancelledException.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/TransferCancelledException.java index 88caa13dc..fb8125357 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferCancelledException.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/TransferCancelledException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transfer; +package org.apache.maven.resolver.transfer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.RepositoryException; +import org.apache.maven.resolver.RepositoryException; /** * Thrown in case an upload/download was cancelled (e.g. due to user request). diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferEvent.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/TransferEvent.java similarity index 99% rename from maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferEvent.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/TransferEvent.java index b73543985..1ad3ebaec 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferEvent.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/TransferEvent.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transfer; +package org.apache.maven.resolver.transfer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,7 +22,7 @@ import java.nio.ByteBuffer; import static java.util.Objects.requireNonNull; -import org.eclipse.aether.RepositorySystemSession; +import org.apache.maven.resolver.RepositorySystemSession; /** * An event fired to a transfer listener during an artifact/metadata transfer. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferListener.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/TransferListener.java similarity index 94% rename from maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferListener.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/TransferListener.java index 18019a9f5..44d33aa8e 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferListener.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/TransferListener.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transfer; +package org.apache.maven.resolver.transfer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.resolver.RepositoryListener; +import org.apache.maven.resolver.RepositorySystemSession; + /** * A listener being notified of artifact/metadata transfers from/to remote repositories. The listener may be called from * an arbitrary thread. Reusing common regular expression syntax, the sequence of events is roughly as follows: @@ -30,8 +33,8 @@ * Note: Implementors are strongly advised to inherit from {@link AbstractTransferListener} instead of directly * implementing this interface. * - * @see org.eclipse.aether.RepositorySystemSession#getTransferListener() - * @see org.eclipse.aether.RepositoryListener + * @see RepositorySystemSession#getTransferListener() + * @see RepositoryListener * @noimplement This interface is not intended to be implemented by clients. * @noextend This interface is not intended to be extended by clients. */ diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferResource.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/TransferResource.java similarity index 98% rename from maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferResource.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/TransferResource.java index 7c578645b..75c48437b 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferResource.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/TransferResource.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transfer; +package org.apache.maven.resolver.transfer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,7 +21,7 @@ import java.io.File; -import org.eclipse.aether.RequestTrace; +import org.apache.maven.resolver.RequestTrace; /** * Describes a resource being uploaded or downloaded by the repository system. @@ -56,7 +56,7 @@ public final class TransferResource * @param trace The trace information, may be {@code null}. * * @deprecated As of 1.1.0, replaced by {@link #TransferResource(java.lang.String, java.lang.String, - * java.lang.String, java.io.File, org.eclipse.aether.RequestTrace)} + * java.lang.String, java.io.File, RequestTrace)} */ @Deprecated public TransferResource( String repositoryUrl, String resourceName, File file, RequestTrace trace ) diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/package-info.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/package-info.java similarity index 95% rename from maven-resolver-api/src/main/java/org/eclipse/aether/transfer/package-info.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/package-info.java index 541b24417..6aa833f48 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/package-info.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transfer/package-info.java @@ -21,5 +21,5 @@ * A listener and various exception types dealing with the transfer of a resource between the local system and a remote * repository. */ -package org.eclipse.aether.transfer; +package org.apache.maven.resolver.transfer; diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/transform/FileTransformer.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transform/FileTransformer.java similarity index 94% rename from maven-resolver-api/src/main/java/org/eclipse/aether/transform/FileTransformer.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/transform/FileTransformer.java index 45c0b5b14..c7aca33e8 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/transform/FileTransformer.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transform/FileTransformer.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transform; +package org.apache.maven.resolver.transform; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,7 +23,7 @@ import java.io.IOException; import java.io.InputStream; -import org.eclipse.aether.artifact.Artifact; +import org.apache.maven.resolver.artifact.Artifact; /** * Can transform a file while installing/deploying diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/transform/FileTransformerManager.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transform/FileTransformerManager.java similarity index 94% rename from maven-resolver-api/src/main/java/org/eclipse/aether/transform/FileTransformerManager.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/transform/FileTransformerManager.java index 1a472e597..c48b12cf5 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/transform/FileTransformerManager.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transform/FileTransformerManager.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transform; +package org.apache.maven.resolver.transform; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,7 +21,7 @@ import java.util.Collection; -import org.eclipse.aether.artifact.Artifact; +import org.apache.maven.resolver.artifact.Artifact; /** * Manager the FileTransformers diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/transform/TransformException.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transform/TransformException.java similarity index 97% rename from maven-resolver-api/src/main/java/org/eclipse/aether/transform/TransformException.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/transform/TransformException.java index 748b39d2c..4f36ab08f 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/transform/TransformException.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/transform/TransformException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transform; +package org.apache.maven.resolver.transform; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/version/InvalidVersionSpecificationException.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/version/InvalidVersionSpecificationException.java similarity index 96% rename from maven-resolver-api/src/main/java/org/eclipse/aether/version/InvalidVersionSpecificationException.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/version/InvalidVersionSpecificationException.java index a57684420..a4824c933 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/version/InvalidVersionSpecificationException.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/version/InvalidVersionSpecificationException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.version; +package org.apache.maven.resolver.version; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.RepositoryException; +import org.apache.maven.resolver.RepositoryException; /** * Thrown when a version or version range could not be parsed. diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/version/Version.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/version/Version.java similarity index 96% rename from maven-resolver-api/src/main/java/org/eclipse/aether/version/Version.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/version/Version.java index 41c02c008..5f96d5201 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/version/Version.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/version/Version.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.version; +package org.apache.maven.resolver.version; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/version/VersionConstraint.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/version/VersionConstraint.java similarity index 97% rename from maven-resolver-api/src/main/java/org/eclipse/aether/version/VersionConstraint.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/version/VersionConstraint.java index 1c685870e..5a26c2f69 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/version/VersionConstraint.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/version/VersionConstraint.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.version; +package org.apache.maven.resolver.version; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/version/VersionRange.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/version/VersionRange.java similarity index 98% rename from maven-resolver-api/src/main/java/org/eclipse/aether/version/VersionRange.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/version/VersionRange.java index bca24d201..9eec85a82 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/version/VersionRange.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/version/VersionRange.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.version; +package org.apache.maven.resolver.version; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/version/VersionScheme.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/version/VersionScheme.java similarity index 98% rename from maven-resolver-api/src/main/java/org/eclipse/aether/version/VersionScheme.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/version/VersionScheme.java index c765a0377..79df273bd 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/version/VersionScheme.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/version/VersionScheme.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.version; +package org.apache.maven.resolver.version; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/version/package-info.java b/maven-resolver-api/src/main/java/org/apache/maven/resolver/version/package-info.java similarity index 95% rename from maven-resolver-api/src/main/java/org/eclipse/aether/version/package-info.java rename to maven-resolver-api/src/main/java/org/apache/maven/resolver/version/package-info.java index a16dd64dc..85d50b214 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/version/package-info.java +++ b/maven-resolver-api/src/main/java/org/apache/maven/resolver/version/package-info.java @@ -20,5 +20,5 @@ /** * The definition of a version scheme for parsing and comparing versions. */ -package org.eclipse.aether.version; +package org.apache.maven.resolver.version; diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/package-info.java b/maven-resolver-api/src/main/java/org/eclipse/aether/package-info.java deleted file mode 100644 index 8d11fa8ad..000000000 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/package-info.java +++ /dev/null @@ -1,24 +0,0 @@ -// CHECKSTYLE_OFF: RegexpHeader -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/** - * The primary API of the {@link org.eclipse.aether.RepositorySystem} and its functionality. - */ -package org.eclipse.aether; - diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/AbstractForwardingRepositorySystemSessionTest.java b/maven-resolver-api/src/test/java/org/apache/maven/resolver/AbstractForwardingRepositorySystemSessionTest.java similarity index 97% rename from maven-resolver-api/src/test/java/org/eclipse/aether/AbstractForwardingRepositorySystemSessionTest.java rename to maven-resolver-api/src/test/java/org/apache/maven/resolver/AbstractForwardingRepositorySystemSessionTest.java index 5ad24758d..e5c1a62e5 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/AbstractForwardingRepositorySystemSessionTest.java +++ b/maven-resolver-api/src/test/java/org/apache/maven/resolver/AbstractForwardingRepositorySystemSessionTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether; +package org.apache.maven.resolver; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/AbstractRepositoryListenerTest.java b/maven-resolver-api/src/test/java/org/apache/maven/resolver/AbstractRepositoryListenerTest.java similarity index 91% rename from maven-resolver-api/src/test/java/org/eclipse/aether/AbstractRepositoryListenerTest.java rename to maven-resolver-api/src/test/java/org/apache/maven/resolver/AbstractRepositoryListenerTest.java index 74c617f45..b366fb402 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/AbstractRepositoryListenerTest.java +++ b/maven-resolver-api/src/test/java/org/apache/maven/resolver/AbstractRepositoryListenerTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether; +package org.apache.maven.resolver; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,8 +23,6 @@ import java.lang.reflect.Method; -import org.eclipse.aether.AbstractRepositoryListener; -import org.eclipse.aether.RepositoryListener; import org.junit.Test; /** diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositoryCacheTest.java b/maven-resolver-api/src/test/java/org/apache/maven/resolver/DefaultRepositoryCacheTest.java similarity index 98% rename from maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositoryCacheTest.java rename to maven-resolver-api/src/test/java/org/apache/maven/resolver/DefaultRepositoryCacheTest.java index 0586d8bee..d12bdf034 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositoryCacheTest.java +++ b/maven-resolver-api/src/test/java/org/apache/maven/resolver/DefaultRepositoryCacheTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether; +package org.apache.maven.resolver; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositorySystemSessionTest.java b/maven-resolver-api/src/test/java/org/apache/maven/resolver/DefaultRepositorySystemSessionTest.java similarity index 93% rename from maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositorySystemSessionTest.java rename to maven-resolver-api/src/test/java/org/apache/maven/resolver/DefaultRepositorySystemSessionTest.java index ccca26ad6..957a1265f 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositorySystemSessionTest.java +++ b/maven-resolver-api/src/test/java/org/apache/maven/resolver/DefaultRepositorySystemSessionTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether; +package org.apache.maven.resolver; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,11 +26,11 @@ import java.lang.reflect.Method; import java.util.Map; -import org.eclipse.aether.repository.Authentication; -import org.eclipse.aether.repository.AuthenticationContext; -import org.eclipse.aether.repository.AuthenticationDigest; -import org.eclipse.aether.repository.Proxy; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.repository.Authentication; +import org.apache.maven.resolver.repository.AuthenticationContext; +import org.apache.maven.resolver.repository.AuthenticationDigest; +import org.apache.maven.resolver.repository.Proxy; +import org.apache.maven.resolver.repository.RemoteRepository; import org.junit.Test; import org.mockito.Mockito; diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultSessionDataTest.java b/maven-resolver-api/src/test/java/org/apache/maven/resolver/DefaultSessionDataTest.java similarity index 98% rename from maven-resolver-api/src/test/java/org/eclipse/aether/DefaultSessionDataTest.java rename to maven-resolver-api/src/test/java/org/apache/maven/resolver/DefaultSessionDataTest.java index 50b0683e1..52df7b92e 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultSessionDataTest.java +++ b/maven-resolver-api/src/test/java/org/apache/maven/resolver/DefaultSessionDataTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether; +package org.apache.maven.resolver; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,7 +23,6 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Function; import java.util.function.Supplier; import org.junit.Test; diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/RepositoryExceptionTest.java b/maven-resolver-api/src/test/java/org/apache/maven/resolver/RepositoryExceptionTest.java similarity index 72% rename from maven-resolver-api/src/test/java/org/eclipse/aether/RepositoryExceptionTest.java rename to maven-resolver-api/src/test/java/org/apache/maven/resolver/RepositoryExceptionTest.java index c3246be07..781f79362 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/RepositoryExceptionTest.java +++ b/maven-resolver-api/src/test/java/org/apache/maven/resolver/RepositoryExceptionTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether; +package org.apache.maven.resolver; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,44 +25,44 @@ import java.util.Arrays; import java.util.Collections; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.collection.CollectRequest; -import org.eclipse.aether.collection.CollectResult; -import org.eclipse.aether.collection.DependencyCollectionException; -import org.eclipse.aether.collection.UnsolvableVersionConflictException; -import org.eclipse.aether.graph.DefaultDependencyNode; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.metadata.DefaultMetadata; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.repository.NoLocalRepositoryManagerException; -import org.eclipse.aether.repository.Proxy; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.resolution.ArtifactDescriptorException; -import org.eclipse.aether.resolution.ArtifactDescriptorRequest; -import org.eclipse.aether.resolution.ArtifactDescriptorResult; -import org.eclipse.aether.resolution.ArtifactRequest; -import org.eclipse.aether.resolution.ArtifactResolutionException; -import org.eclipse.aether.resolution.ArtifactResult; -import org.eclipse.aether.resolution.DependencyRequest; -import org.eclipse.aether.resolution.DependencyResolutionException; -import org.eclipse.aether.resolution.DependencyResult; -import org.eclipse.aether.resolution.VersionRangeRequest; -import org.eclipse.aether.resolution.VersionRangeResolutionException; -import org.eclipse.aether.resolution.VersionRangeResult; -import org.eclipse.aether.resolution.VersionRequest; -import org.eclipse.aether.resolution.VersionResolutionException; -import org.eclipse.aether.resolution.VersionResult; -import org.eclipse.aether.transfer.ArtifactNotFoundException; -import org.eclipse.aether.transfer.ArtifactTransferException; -import org.eclipse.aether.transfer.MetadataNotFoundException; -import org.eclipse.aether.transfer.MetadataTransferException; -import org.eclipse.aether.transfer.NoRepositoryConnectorException; -import org.eclipse.aether.transfer.NoRepositoryLayoutException; -import org.eclipse.aether.transfer.NoTransporterException; -import org.eclipse.aether.transfer.RepositoryOfflineException; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.collection.CollectRequest; +import org.apache.maven.resolver.collection.CollectResult; +import org.apache.maven.resolver.collection.DependencyCollectionException; +import org.apache.maven.resolver.collection.UnsolvableVersionConflictException; +import org.apache.maven.resolver.graph.DefaultDependencyNode; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.metadata.DefaultMetadata; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.repository.LocalRepository; +import org.apache.maven.resolver.repository.NoLocalRepositoryManagerException; +import org.apache.maven.resolver.repository.Proxy; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.resolution.ArtifactDescriptorException; +import org.apache.maven.resolver.resolution.ArtifactDescriptorRequest; +import org.apache.maven.resolver.resolution.ArtifactDescriptorResult; +import org.apache.maven.resolver.resolution.ArtifactRequest; +import org.apache.maven.resolver.resolution.ArtifactResolutionException; +import org.apache.maven.resolver.resolution.ArtifactResult; +import org.apache.maven.resolver.resolution.DependencyRequest; +import org.apache.maven.resolver.resolution.DependencyResolutionException; +import org.apache.maven.resolver.resolution.DependencyResult; +import org.apache.maven.resolver.resolution.VersionRangeRequest; +import org.apache.maven.resolver.resolution.VersionRangeResolutionException; +import org.apache.maven.resolver.resolution.VersionRangeResult; +import org.apache.maven.resolver.resolution.VersionRequest; +import org.apache.maven.resolver.resolution.VersionResolutionException; +import org.apache.maven.resolver.resolution.VersionResult; +import org.apache.maven.resolver.transfer.ArtifactNotFoundException; +import org.apache.maven.resolver.transfer.ArtifactTransferException; +import org.apache.maven.resolver.transfer.MetadataNotFoundException; +import org.apache.maven.resolver.transfer.MetadataTransferException; +import org.apache.maven.resolver.transfer.NoRepositoryConnectorException; +import org.apache.maven.resolver.transfer.NoRepositoryLayoutException; +import org.apache.maven.resolver.transfer.NoTransporterException; +import org.apache.maven.resolver.transfer.RepositoryOfflineException; import org.junit.Test; public class RepositoryExceptionTest diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/RequestTraceTest.java b/maven-resolver-api/src/test/java/org/apache/maven/resolver/RequestTraceTest.java similarity index 98% rename from maven-resolver-api/src/test/java/org/eclipse/aether/RequestTraceTest.java rename to maven-resolver-api/src/test/java/org/apache/maven/resolver/RequestTraceTest.java index 63e5877ff..63a9f80a4 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/RequestTraceTest.java +++ b/maven-resolver-api/src/test/java/org/apache/maven/resolver/RequestTraceTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether; +package org.apache.maven.resolver; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/artifact/DefaultArtifactTest.java b/maven-resolver-api/src/test/java/org/apache/maven/resolver/artifact/DefaultArtifactTest.java similarity index 97% rename from maven-resolver-api/src/test/java/org/eclipse/aether/artifact/DefaultArtifactTest.java rename to maven-resolver-api/src/test/java/org/apache/maven/resolver/artifact/DefaultArtifactTest.java index 7aec3e4d5..b577d1a1b 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/artifact/DefaultArtifactTest.java +++ b/maven-resolver-api/src/test/java/org/apache/maven/resolver/artifact/DefaultArtifactTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.artifact; +package org.apache.maven.resolver.artifact; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,9 +26,6 @@ import java.util.HashMap; import java.util.Map; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.ArtifactProperties; -import org.eclipse.aether.artifact.DefaultArtifact; import org.junit.Test; /** diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/graph/DependencyTest.java b/maven-resolver-api/src/test/java/org/apache/maven/resolver/graph/DependencyTest.java similarity index 93% rename from maven-resolver-api/src/test/java/org/eclipse/aether/graph/DependencyTest.java rename to maven-resolver-api/src/test/java/org/apache/maven/resolver/graph/DependencyTest.java index c96746d9a..d778bed8d 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/graph/DependencyTest.java +++ b/maven-resolver-api/src/test/java/org/apache/maven/resolver/graph/DependencyTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.graph; +package org.apache.maven.resolver.graph; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,9 +24,7 @@ import java.util.Arrays; import java.util.Collections; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.Exclusion; +import org.apache.maven.resolver.artifact.DefaultArtifact; import org.junit.Test; /** diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/repository/AuthenticationContextTest.java b/maven-resolver-api/src/test/java/org/apache/maven/resolver/repository/AuthenticationContextTest.java similarity index 97% rename from maven-resolver-api/src/test/java/org/eclipse/aether/repository/AuthenticationContextTest.java rename to maven-resolver-api/src/test/java/org/apache/maven/resolver/repository/AuthenticationContextTest.java index 6d579a103..a729221b7 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/repository/AuthenticationContextTest.java +++ b/maven-resolver-api/src/test/java/org/apache/maven/resolver/repository/AuthenticationContextTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,8 +24,8 @@ import java.io.File; import java.util.Map; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositorySystemSession; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.RepositorySystemSession; import org.junit.Test; public class AuthenticationContextTest diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/repository/AuthenticationDigestTest.java b/maven-resolver-api/src/test/java/org/apache/maven/resolver/repository/AuthenticationDigestTest.java similarity index 96% rename from maven-resolver-api/src/test/java/org/eclipse/aether/repository/AuthenticationDigestTest.java rename to maven-resolver-api/src/test/java/org/apache/maven/resolver/repository/AuthenticationDigestTest.java index 387a3da1c..69bf4da78 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/repository/AuthenticationDigestTest.java +++ b/maven-resolver-api/src/test/java/org/apache/maven/resolver/repository/AuthenticationDigestTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,8 +23,8 @@ import java.util.Map; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositorySystemSession; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.RepositorySystemSession; import org.junit.Test; public class AuthenticationDigestTest diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/repository/RemoteRepositoryBuilderTest.java b/maven-resolver-api/src/test/java/org/apache/maven/resolver/repository/RemoteRepositoryBuilderTest.java similarity index 98% rename from maven-resolver-api/src/test/java/org/eclipse/aether/repository/RemoteRepositoryBuilderTest.java rename to maven-resolver-api/src/test/java/org/apache/maven/resolver/repository/RemoteRepositoryBuilderTest.java index 0d6b19041..64ad9c3ae 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/repository/RemoteRepositoryBuilderTest.java +++ b/maven-resolver-api/src/test/java/org/apache/maven/resolver/repository/RemoteRepositoryBuilderTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; -import org.eclipse.aether.repository.RemoteRepository.Builder; +import org.apache.maven.resolver.repository.RemoteRepository.Builder; import org.junit.Before; import org.junit.Test; diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/repository/RemoteRepositoryTest.java b/maven-resolver-api/src/test/java/org/apache/maven/resolver/repository/RemoteRepositoryTest.java similarity index 97% rename from maven-resolver-api/src/test/java/org/eclipse/aether/repository/RemoteRepositoryTest.java rename to maven-resolver-api/src/test/java/org/apache/maven/resolver/repository/RemoteRepositoryTest.java index 97f0b3ef7..df0c611d5 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/repository/RemoteRepositoryTest.java +++ b/maven-resolver-api/src/test/java/org/apache/maven/resolver/repository/RemoteRepositoryTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.repository; +package org.apache.maven.resolver.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,7 +21,6 @@ import static org.junit.Assert.*; -import org.eclipse.aether.repository.RemoteRepository; import org.junit.Test; /** diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/transfer/AbstractTransferListenerTest.java b/maven-resolver-api/src/test/java/org/apache/maven/resolver/transfer/AbstractTransferListenerTest.java similarity index 89% rename from maven-resolver-api/src/test/java/org/eclipse/aether/transfer/AbstractTransferListenerTest.java rename to maven-resolver-api/src/test/java/org/apache/maven/resolver/transfer/AbstractTransferListenerTest.java index 87c1472b7..f81996520 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/transfer/AbstractTransferListenerTest.java +++ b/maven-resolver-api/src/test/java/org/apache/maven/resolver/transfer/AbstractTransferListenerTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transfer; +package org.apache.maven.resolver.transfer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,8 +23,6 @@ import java.lang.reflect.Method; -import org.eclipse.aether.transfer.AbstractTransferListener; -import org.eclipse.aether.transfer.TransferListener; import org.junit.Test; /** diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/transfer/TransferEventTest.java b/maven-resolver-api/src/test/java/org/apache/maven/resolver/transfer/TransferEventTest.java similarity index 91% rename from maven-resolver-api/src/test/java/org/eclipse/aether/transfer/TransferEventTest.java rename to maven-resolver-api/src/test/java/org/apache/maven/resolver/transfer/TransferEventTest.java index 7d4c07065..2202b0abd 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/transfer/TransferEventTest.java +++ b/maven-resolver-api/src/test/java/org/apache/maven/resolver/transfer/TransferEventTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transfer; +package org.apache.maven.resolver.transfer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,10 +23,8 @@ import java.nio.ByteBuffer; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.transfer.TransferEvent; -import org.eclipse.aether.transfer.TransferResource; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.RepositorySystemSession; import org.junit.Test; /** diff --git a/maven-resolver-connector-basic/pom.xml b/maven-resolver-connector-basic/pom.xml index ce75b1f9e..426dd8119 100644 --- a/maven-resolver-connector-basic/pom.xml +++ b/maven-resolver-connector-basic/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.resolver maven-resolver - 1.8.2-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-connector-basic diff --git a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ArtifactTransportListener.java b/maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/ArtifactTransportListener.java similarity index 79% rename from maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ArtifactTransportListener.java rename to maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/ArtifactTransportListener.java index 22e8437b9..cd24d041d 100644 --- a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ArtifactTransportListener.java +++ b/maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/ArtifactTransportListener.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.connector.basic; +package org.apache.maven.resolver.connector.basic; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,12 +19,12 @@ * under the License. */ -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.spi.connector.ArtifactTransfer; -import org.eclipse.aether.spi.connector.transport.Transporter; -import org.eclipse.aether.transfer.ArtifactNotFoundException; -import org.eclipse.aether.transfer.ArtifactTransferException; -import org.eclipse.aether.transfer.TransferEvent; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.spi.connector.ArtifactTransfer; +import org.apache.maven.resolver.spi.connector.transport.Transporter; +import org.apache.maven.resolver.transfer.ArtifactNotFoundException; +import org.apache.maven.resolver.transfer.ArtifactTransferException; +import org.apache.maven.resolver.transfer.TransferEvent; final class ArtifactTransportListener extends TransferTransportListener diff --git a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java b/maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/BasicRepositoryConnector.java similarity index 91% rename from maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java rename to maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/BasicRepositoryConnector.java index e292de336..a0b05a77e 100644 --- a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java +++ b/maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/BasicRepositoryConnector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.connector.basic; +package org.apache.maven.resolver.connector.basic; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -37,38 +37,38 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import org.eclipse.aether.ConfigurationProperties; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.RequestTrace; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.spi.connector.ArtifactDownload; -import org.eclipse.aether.spi.connector.ArtifactUpload; -import org.eclipse.aether.spi.connector.MetadataDownload; -import org.eclipse.aether.spi.connector.MetadataUpload; -import org.eclipse.aether.spi.connector.RepositoryConnector; -import org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithmFactory; -import org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithmHelper; -import org.eclipse.aether.spi.connector.checksum.ChecksumPolicy; -import org.eclipse.aether.spi.connector.checksum.ChecksumPolicyProvider; -import org.eclipse.aether.spi.connector.checksum.ProvidedChecksumsSource; -import org.eclipse.aether.spi.connector.layout.RepositoryLayout; -import org.eclipse.aether.spi.connector.layout.RepositoryLayoutProvider; -import org.eclipse.aether.spi.connector.transport.GetTask; -import org.eclipse.aether.spi.connector.transport.PeekTask; -import org.eclipse.aether.spi.connector.transport.PutTask; -import org.eclipse.aether.spi.connector.transport.Transporter; -import org.eclipse.aether.spi.connector.transport.TransporterProvider; -import org.eclipse.aether.spi.io.FileProcessor; -import org.eclipse.aether.transfer.ChecksumFailureException; -import org.eclipse.aether.transfer.NoRepositoryConnectorException; -import org.eclipse.aether.transfer.NoRepositoryLayoutException; -import org.eclipse.aether.transfer.NoTransporterException; -import org.eclipse.aether.transfer.TransferEvent; -import org.eclipse.aether.transfer.TransferResource; -import org.eclipse.aether.transform.FileTransformer; -import org.eclipse.aether.util.ConfigUtils; -import org.eclipse.aether.util.concurrency.RunnableErrorForwarder; -import org.eclipse.aether.util.concurrency.WorkerThreadFactory; +import org.apache.maven.resolver.ConfigurationProperties; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.RequestTrace; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.spi.connector.ArtifactDownload; +import org.apache.maven.resolver.spi.connector.ArtifactUpload; +import org.apache.maven.resolver.spi.connector.MetadataDownload; +import org.apache.maven.resolver.spi.connector.MetadataUpload; +import org.apache.maven.resolver.spi.connector.RepositoryConnector; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumAlgorithmFactory; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumAlgorithmHelper; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumPolicy; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumPolicyProvider; +import org.apache.maven.resolver.spi.connector.checksum.ProvidedChecksumsSource; +import org.apache.maven.resolver.spi.connector.layout.RepositoryLayout; +import org.apache.maven.resolver.spi.connector.layout.RepositoryLayoutProvider; +import org.apache.maven.resolver.spi.connector.transport.GetTask; +import org.apache.maven.resolver.spi.connector.transport.PeekTask; +import org.apache.maven.resolver.spi.connector.transport.PutTask; +import org.apache.maven.resolver.spi.connector.transport.Transporter; +import org.apache.maven.resolver.spi.connector.transport.TransporterProvider; +import org.apache.maven.resolver.spi.io.FileProcessor; +import org.apache.maven.resolver.transfer.ChecksumFailureException; +import org.apache.maven.resolver.transfer.NoRepositoryConnectorException; +import org.apache.maven.resolver.transfer.NoRepositoryLayoutException; +import org.apache.maven.resolver.transfer.NoTransporterException; +import org.apache.maven.resolver.transfer.TransferEvent; +import org.apache.maven.resolver.transfer.TransferResource; +import org.apache.maven.resolver.transform.FileTransformer; +import org.apache.maven.resolver.util.ConfigUtils; +import org.apache.maven.resolver.util.concurrency.RunnableErrorForwarder; +import org.apache.maven.resolver.util.concurrency.WorkerThreadFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java b/maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/BasicRepositoryConnectorFactory.java similarity index 79% rename from maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java rename to maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/BasicRepositoryConnectorFactory.java index 576d12160..a7f338e7e 100644 --- a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java +++ b/maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/BasicRepositoryConnectorFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.connector.basic; +package org.apache.maven.resolver.connector.basic; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,6 @@ * under the License. */ -import java.util.Collections; import java.util.Map; import javax.inject.Inject; @@ -27,27 +26,27 @@ import static java.util.Objects.requireNonNull; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.spi.connector.RepositoryConnector; -import org.eclipse.aether.spi.connector.RepositoryConnectorFactory; -import org.eclipse.aether.spi.connector.checksum.ChecksumPolicyProvider; -import org.eclipse.aether.spi.connector.checksum.ProvidedChecksumsSource; -import org.eclipse.aether.spi.connector.layout.RepositoryLayoutProvider; -import org.eclipse.aether.spi.connector.transport.TransporterProvider; -import org.eclipse.aether.spi.io.FileProcessor; -import org.eclipse.aether.spi.locator.Service; -import org.eclipse.aether.spi.locator.ServiceLocator; -import org.eclipse.aether.transfer.NoRepositoryConnectorException; +import org.apache.maven.resolver.spi.connector.layout.RepositoryLayoutFactory; +import org.apache.maven.resolver.spi.connector.transport.TransporterFactory; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.spi.connector.RepositoryConnector; +import org.apache.maven.resolver.spi.connector.RepositoryConnectorFactory; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumPolicyProvider; +import org.apache.maven.resolver.spi.connector.checksum.ProvidedChecksumsSource; +import org.apache.maven.resolver.spi.connector.layout.RepositoryLayoutProvider; +import org.apache.maven.resolver.spi.connector.transport.TransporterProvider; +import org.apache.maven.resolver.spi.io.FileProcessor; +import org.apache.maven.resolver.transfer.NoRepositoryConnectorException; /** * A repository connector factory that employs pluggable - * {@link org.eclipse.aether.spi.connector.transport.TransporterFactory transporters} and - * {@link org.eclipse.aether.spi.connector.layout.RepositoryLayoutFactory repository layouts} for the transfers. + * {@link TransporterFactory transporters} and + * {@link RepositoryLayoutFactory repository layouts} for the transfers. */ @Named( "basic" ) public final class BasicRepositoryConnectorFactory - implements RepositoryConnectorFactory, Service + implements RepositoryConnectorFactory { private TransporterProvider transporterProvider; @@ -85,15 +84,6 @@ public BasicRepositoryConnectorFactory() setProvidedChecksumSources( providedChecksumsSources ); } - public void initService( ServiceLocator locator ) - { - setTransporterProvider( locator.getService( TransporterProvider.class ) ); - setRepositoryLayoutProvider( locator.getService( RepositoryLayoutProvider.class ) ); - setChecksumPolicyProvider( locator.getService( ChecksumPolicyProvider.class ) ); - setFileProcessor( locator.getService( FileProcessor.class ) ); - setProvidedChecksumSources( Collections.emptyMap() ); - } - /** * Sets the transporter provider to use for this component. * diff --git a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java b/maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/ChecksumCalculator.java similarity index 96% rename from maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java rename to maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/ChecksumCalculator.java index ccf04310a..d34574e44 100644 --- a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java +++ b/maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/ChecksumCalculator.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.connector.basic; +package org.apache.maven.resolver.connector.basic; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -34,8 +34,8 @@ import java.util.Map; import java.util.Set; -import org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithm; -import org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithmFactory; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumAlgorithm; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumAlgorithmFactory; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumValidator.java b/maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/ChecksumValidator.java similarity index 95% rename from maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumValidator.java rename to maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/ChecksumValidator.java index 14ae450a0..3153b6f1a 100644 --- a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumValidator.java +++ b/maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/ChecksumValidator.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.connector.basic; +package org.apache.maven.resolver.connector.basic; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -28,12 +28,12 @@ import java.util.Map; import java.util.UUID; -import org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithmFactory; -import org.eclipse.aether.spi.connector.checksum.ChecksumPolicy; -import org.eclipse.aether.spi.connector.checksum.ChecksumPolicy.ChecksumKind; -import org.eclipse.aether.spi.connector.layout.RepositoryLayout.ChecksumLocation; -import org.eclipse.aether.spi.io.FileProcessor; -import org.eclipse.aether.transfer.ChecksumFailureException; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumAlgorithmFactory; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumPolicy; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumPolicy.ChecksumKind; +import org.apache.maven.resolver.spi.connector.layout.RepositoryLayout.ChecksumLocation; +import org.apache.maven.resolver.spi.io.FileProcessor; +import org.apache.maven.resolver.transfer.ChecksumFailureException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/MetadataTransportListener.java b/maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/MetadataTransportListener.java similarity index 79% rename from maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/MetadataTransportListener.java rename to maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/MetadataTransportListener.java index b0740e22f..98fb50527 100644 --- a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/MetadataTransportListener.java +++ b/maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/MetadataTransportListener.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.connector.basic; +package org.apache.maven.resolver.connector.basic; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,12 +19,12 @@ * under the License. */ -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.spi.connector.MetadataTransfer; -import org.eclipse.aether.spi.connector.transport.Transporter; -import org.eclipse.aether.transfer.MetadataNotFoundException; -import org.eclipse.aether.transfer.MetadataTransferException; -import org.eclipse.aether.transfer.TransferEvent; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.spi.connector.MetadataTransfer; +import org.apache.maven.resolver.spi.connector.transport.Transporter; +import org.apache.maven.resolver.transfer.MetadataNotFoundException; +import org.apache.maven.resolver.transfer.MetadataTransferException; +import org.apache.maven.resolver.transfer.TransferEvent; final class MetadataTransportListener extends TransferTransportListener diff --git a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/PartialFile.java b/maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/PartialFile.java similarity index 99% rename from maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/PartialFile.java rename to maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/PartialFile.java index c7a74f7ca..0d52ea4ab 100644 --- a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/PartialFile.java +++ b/maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/PartialFile.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.connector.basic; +package org.apache.maven.resolver.connector.basic; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/TransferTransportListener.java b/maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/TransferTransportListener.java similarity index 90% rename from maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/TransferTransportListener.java rename to maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/TransferTransportListener.java index 3440d893b..51efa4417 100644 --- a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/TransferTransportListener.java +++ b/maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/TransferTransportListener.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.connector.basic; +package org.apache.maven.resolver.connector.basic; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,12 +23,12 @@ import java.util.Collections; import java.util.Map; -import org.eclipse.aether.spi.connector.Transfer; -import org.eclipse.aether.spi.connector.transport.TransportListener; -import org.eclipse.aether.transfer.TransferCancelledException; -import org.eclipse.aether.transfer.TransferEvent; -import org.eclipse.aether.transfer.TransferEvent.EventType; -import org.eclipse.aether.transfer.TransferListener; +import org.apache.maven.resolver.spi.connector.Transfer; +import org.apache.maven.resolver.spi.connector.transport.TransportListener; +import org.apache.maven.resolver.transfer.TransferCancelledException; +import org.apache.maven.resolver.transfer.TransferEvent; +import org.apache.maven.resolver.transfer.TransferEvent.EventType; +import org.apache.maven.resolver.transfer.TransferListener; class TransferTransportListener extends TransportListener diff --git a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/package-info.java b/maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/package-info.java similarity index 94% rename from maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/package-info.java rename to maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/package-info.java index df8689701..c63a9445e 100644 --- a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/package-info.java +++ b/maven-resolver-connector-basic/src/main/java/org/apache/maven/resolver/connector/basic/package-info.java @@ -20,5 +20,5 @@ /** * Support for downloads/uploads using remote repositories that have a URI-based content structure/layout. */ -package org.eclipse.aether.connector.basic; +package org.apache.maven.resolver.connector.basic; diff --git a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumCalculatorTest.java b/maven-resolver-connector-basic/src/test/java/org/apache/maven/resolver/connector/basic/ChecksumCalculatorTest.java similarity index 63% rename from maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumCalculatorTest.java rename to maven-resolver-connector-basic/src/test/java/org/apache/maven/resolver/connector/basic/ChecksumCalculatorTest.java index 6560537f0..dfe0cf024 100644 --- a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumCalculatorTest.java +++ b/maven-resolver-connector-basic/src/test/java/org/apache/maven/resolver/connector/basic/ChecksumCalculatorTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.connector.basic; +package org.apache.maven.resolver.connector.basic; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,10 +19,6 @@ * under the License. */ -import static org.eclipse.aether.connector.basic.TestChecksumAlgorithmSelector.MD5; -import static org.eclipse.aether.connector.basic.TestChecksumAlgorithmSelector.SHA1; -import static org.eclipse.aether.connector.basic.TestChecksumAlgorithmSelector.SHA256; -import static org.eclipse.aether.connector.basic.TestChecksumAlgorithmSelector.SHA512; import static org.junit.Assert.*; import java.io.File; @@ -33,8 +29,8 @@ import java.util.List; import java.util.Map; -import org.eclipse.aether.internal.test.util.TestFileUtils; -import org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithmFactory; +import org.apache.maven.resolver.internal.test.util.TestFileUtils; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumAlgorithmFactory; import org.junit.Before; import org.junit.Test; @@ -70,45 +66,45 @@ public void init() @Test public void testNoOffset() { - ChecksumCalculator calculator = newCalculator( SHA512, SHA256, SHA1, MD5 ); + ChecksumCalculator calculator = newCalculator( TestChecksumAlgorithmSelector.SHA512, TestChecksumAlgorithmSelector.SHA256, TestChecksumAlgorithmSelector.SHA1, TestChecksumAlgorithmSelector.MD5 ); calculator.init( 0 ); calculator.update( toBuffer( "Hello World!" ) ); Map digests = calculator.get(); assertNotNull( digests ); - assertEquals( "861844d6704e8573fec34d967e20bcfef3d424cf48be04e6dc08f2bd58c729743371015ead891cc3cf1c9d34b49264b510751b1ff9e537937bc46b5d6ff4ecc8", digests.get( SHA512 ) ); - assertEquals( "7f83b1657ff1fc53b92dc18148a1d65dfc2d4b1fa3d677284addd200126d9069", digests.get( SHA256 ) ); - assertEquals( "2ef7bde608ce5404e97d5f042f95f89f1c232871", digests.get( SHA1 ) ); - assertEquals( "ed076287532e86365e841e92bfc50d8c", digests.get( MD5 ) ); + assertEquals( "861844d6704e8573fec34d967e20bcfef3d424cf48be04e6dc08f2bd58c729743371015ead891cc3cf1c9d34b49264b510751b1ff9e537937bc46b5d6ff4ecc8", digests.get( TestChecksumAlgorithmSelector.SHA512 ) ); + assertEquals( "7f83b1657ff1fc53b92dc18148a1d65dfc2d4b1fa3d677284addd200126d9069", digests.get( TestChecksumAlgorithmSelector.SHA256 ) ); + assertEquals( "2ef7bde608ce5404e97d5f042f95f89f1c232871", digests.get( TestChecksumAlgorithmSelector.SHA1 ) ); + assertEquals( "ed076287532e86365e841e92bfc50d8c", digests.get( TestChecksumAlgorithmSelector.MD5 ) ); assertEquals( 4, digests.size() ); } @Test public void testWithOffset() { - ChecksumCalculator calculator = newCalculator( SHA512, SHA256, SHA1, MD5 ); + ChecksumCalculator calculator = newCalculator( TestChecksumAlgorithmSelector.SHA512, TestChecksumAlgorithmSelector.SHA256, TestChecksumAlgorithmSelector.SHA1, TestChecksumAlgorithmSelector.MD5 ); calculator.init( 6 ); calculator.update( toBuffer( "World!" ) ); Map digests = calculator.get(); assertNotNull( digests ); - assertEquals( "861844d6704e8573fec34d967e20bcfef3d424cf48be04e6dc08f2bd58c729743371015ead891cc3cf1c9d34b49264b510751b1ff9e537937bc46b5d6ff4ecc8", digests.get( SHA512 ) ); - assertEquals( "7f83b1657ff1fc53b92dc18148a1d65dfc2d4b1fa3d677284addd200126d9069", digests.get( SHA256 ) ); - assertEquals( "2ef7bde608ce5404e97d5f042f95f89f1c232871", digests.get( SHA1 ) ); - assertEquals( "ed076287532e86365e841e92bfc50d8c", digests.get( MD5 ) ); + assertEquals( "861844d6704e8573fec34d967e20bcfef3d424cf48be04e6dc08f2bd58c729743371015ead891cc3cf1c9d34b49264b510751b1ff9e537937bc46b5d6ff4ecc8", digests.get( TestChecksumAlgorithmSelector.SHA512 ) ); + assertEquals( "7f83b1657ff1fc53b92dc18148a1d65dfc2d4b1fa3d677284addd200126d9069", digests.get( TestChecksumAlgorithmSelector.SHA256 ) ); + assertEquals( "2ef7bde608ce5404e97d5f042f95f89f1c232871", digests.get( TestChecksumAlgorithmSelector.SHA1 ) ); + assertEquals( "ed076287532e86365e841e92bfc50d8c", digests.get( TestChecksumAlgorithmSelector.MD5 ) ); assertEquals( 4, digests.size() ); } @Test public void testWithExcessiveOffset() { - ChecksumCalculator calculator = newCalculator( SHA512, SHA256, SHA1, MD5 ); + ChecksumCalculator calculator = newCalculator( TestChecksumAlgorithmSelector.SHA512, TestChecksumAlgorithmSelector.SHA256, TestChecksumAlgorithmSelector.SHA1, TestChecksumAlgorithmSelector.MD5 ); calculator.init( 100 ); calculator.update( toBuffer( "World!" ) ); Map digests = calculator.get(); assertNotNull( digests ); - assertTrue( digests.get( SHA512 ) instanceof IOException ); - assertTrue( digests.get( SHA256 ) instanceof IOException ); - assertTrue( digests.get( SHA1 ) instanceof IOException ); - assertTrue( digests.get( MD5 ) instanceof IOException ); + assertTrue( digests.get( TestChecksumAlgorithmSelector.SHA512 ) instanceof IOException ); + assertTrue( digests.get( TestChecksumAlgorithmSelector.SHA256 ) instanceof IOException ); + assertTrue( digests.get( TestChecksumAlgorithmSelector.SHA1 ) instanceof IOException ); + assertTrue( digests.get( TestChecksumAlgorithmSelector.MD5 ) instanceof IOException ); assertEquals( 4, digests.size() ); } @@ -116,53 +112,53 @@ public void testWithExcessiveOffset() public void testUnknownAlgorithm() { // resolver now does not tolerate unknown checksums: as they may be set by user only, it is user misconfiguration - newCalculator( "unknown", SHA1 ); + newCalculator( "unknown", TestChecksumAlgorithmSelector.SHA1 ); } @Test public void testNoInitCall() { - ChecksumCalculator calculator = newCalculator( SHA512, SHA256, SHA1, MD5 ); + ChecksumCalculator calculator = newCalculator( TestChecksumAlgorithmSelector.SHA512, TestChecksumAlgorithmSelector.SHA256, TestChecksumAlgorithmSelector.SHA1, TestChecksumAlgorithmSelector.MD5 ); calculator.update( toBuffer( "Hello World!" ) ); Map digests = calculator.get(); assertNotNull( digests ); - assertEquals( "861844d6704e8573fec34d967e20bcfef3d424cf48be04e6dc08f2bd58c729743371015ead891cc3cf1c9d34b49264b510751b1ff9e537937bc46b5d6ff4ecc8", digests.get( SHA512 ) ); - assertEquals( "7f83b1657ff1fc53b92dc18148a1d65dfc2d4b1fa3d677284addd200126d9069", digests.get( SHA256 ) ); - assertEquals( "2ef7bde608ce5404e97d5f042f95f89f1c232871", digests.get( SHA1 ) ); - assertEquals( "ed076287532e86365e841e92bfc50d8c", digests.get( MD5 ) ); + assertEquals( "861844d6704e8573fec34d967e20bcfef3d424cf48be04e6dc08f2bd58c729743371015ead891cc3cf1c9d34b49264b510751b1ff9e537937bc46b5d6ff4ecc8", digests.get( TestChecksumAlgorithmSelector.SHA512 ) ); + assertEquals( "7f83b1657ff1fc53b92dc18148a1d65dfc2d4b1fa3d677284addd200126d9069", digests.get( TestChecksumAlgorithmSelector.SHA256 ) ); + assertEquals( "2ef7bde608ce5404e97d5f042f95f89f1c232871", digests.get( TestChecksumAlgorithmSelector.SHA1 ) ); + assertEquals( "ed076287532e86365e841e92bfc50d8c", digests.get( TestChecksumAlgorithmSelector.MD5 ) ); assertEquals( 4, digests.size() ); } @Test public void testRestart() { - ChecksumCalculator calculator = newCalculator( SHA512, SHA256, SHA1, MD5 ); + ChecksumCalculator calculator = newCalculator( TestChecksumAlgorithmSelector.SHA512, TestChecksumAlgorithmSelector.SHA256, TestChecksumAlgorithmSelector.SHA1, TestChecksumAlgorithmSelector.MD5 ); calculator.init( 0 ); calculator.update( toBuffer( "Ignored" ) ); calculator.init( 0 ); calculator.update( toBuffer( "Hello World!" ) ); Map digests = calculator.get(); assertNotNull( digests ); - assertEquals( "861844d6704e8573fec34d967e20bcfef3d424cf48be04e6dc08f2bd58c729743371015ead891cc3cf1c9d34b49264b510751b1ff9e537937bc46b5d6ff4ecc8", digests.get( SHA512 ) ); - assertEquals( "7f83b1657ff1fc53b92dc18148a1d65dfc2d4b1fa3d677284addd200126d9069", digests.get( SHA256 ) ); - assertEquals( "2ef7bde608ce5404e97d5f042f95f89f1c232871", digests.get( SHA1 ) ); - assertEquals( "ed076287532e86365e841e92bfc50d8c", digests.get( MD5 ) ); + assertEquals( "861844d6704e8573fec34d967e20bcfef3d424cf48be04e6dc08f2bd58c729743371015ead891cc3cf1c9d34b49264b510751b1ff9e537937bc46b5d6ff4ecc8", digests.get( TestChecksumAlgorithmSelector.SHA512 ) ); + assertEquals( "7f83b1657ff1fc53b92dc18148a1d65dfc2d4b1fa3d677284addd200126d9069", digests.get( TestChecksumAlgorithmSelector.SHA256 ) ); + assertEquals( "2ef7bde608ce5404e97d5f042f95f89f1c232871", digests.get( TestChecksumAlgorithmSelector.SHA1 ) ); + assertEquals( "ed076287532e86365e841e92bfc50d8c", digests.get( TestChecksumAlgorithmSelector.MD5 ) ); assertEquals( 4, digests.size() ); } @Test public void testRestartAfterError() { - ChecksumCalculator calculator = newCalculator( SHA512, SHA256, SHA1, MD5 ); + ChecksumCalculator calculator = newCalculator( TestChecksumAlgorithmSelector.SHA512, TestChecksumAlgorithmSelector.SHA256, TestChecksumAlgorithmSelector.SHA1, TestChecksumAlgorithmSelector.MD5 ); calculator.init( 100 ); calculator.init( 0 ); calculator.update( toBuffer( "Hello World!" ) ); Map digests = calculator.get(); assertNotNull( digests ); - assertEquals( "861844d6704e8573fec34d967e20bcfef3d424cf48be04e6dc08f2bd58c729743371015ead891cc3cf1c9d34b49264b510751b1ff9e537937bc46b5d6ff4ecc8", digests.get( SHA512 ) ); - assertEquals( "7f83b1657ff1fc53b92dc18148a1d65dfc2d4b1fa3d677284addd200126d9069", digests.get( SHA256 ) ); - assertEquals( "2ef7bde608ce5404e97d5f042f95f89f1c232871", digests.get( SHA1 ) ); - assertEquals( "ed076287532e86365e841e92bfc50d8c", digests.get( MD5 ) ); + assertEquals( "861844d6704e8573fec34d967e20bcfef3d424cf48be04e6dc08f2bd58c729743371015ead891cc3cf1c9d34b49264b510751b1ff9e537937bc46b5d6ff4ecc8", digests.get( TestChecksumAlgorithmSelector.SHA512 ) ); + assertEquals( "7f83b1657ff1fc53b92dc18148a1d65dfc2d4b1fa3d677284addd200126d9069", digests.get( TestChecksumAlgorithmSelector.SHA256 ) ); + assertEquals( "2ef7bde608ce5404e97d5f042f95f89f1c232871", digests.get( TestChecksumAlgorithmSelector.SHA1 ) ); + assertEquals( "ed076287532e86365e841e92bfc50d8c", digests.get( TestChecksumAlgorithmSelector.MD5 ) ); assertEquals( 4, digests.size() ); } diff --git a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java b/maven-resolver-connector-basic/src/test/java/org/apache/maven/resolver/connector/basic/ChecksumValidatorTest.java similarity index 68% rename from maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java rename to maven-resolver-connector-basic/src/test/java/org/apache/maven/resolver/connector/basic/ChecksumValidatorTest.java index 530e5e776..8f1acd05a 100644 --- a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java +++ b/maven-resolver-connector-basic/src/test/java/org/apache/maven/resolver/connector/basic/ChecksumValidatorTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.connector.basic; +package org.apache.maven.resolver.connector.basic; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,8 +19,6 @@ * under the License. */ -import static org.eclipse.aether.connector.basic.TestChecksumAlgorithmSelector.MD5; -import static org.eclipse.aether.connector.basic.TestChecksumAlgorithmSelector.SHA1; import static org.junit.Assert.*; import java.io.File; @@ -33,13 +31,13 @@ import java.util.List; import java.util.Map; -import org.eclipse.aether.internal.test.util.TestFileProcessor; -import org.eclipse.aether.internal.test.util.TestFileUtils; -import org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithmFactory; -import org.eclipse.aether.spi.connector.checksum.ChecksumPolicy; -import org.eclipse.aether.spi.connector.checksum.ChecksumPolicy.ChecksumKind; -import org.eclipse.aether.spi.connector.layout.RepositoryLayout; -import org.eclipse.aether.transfer.ChecksumFailureException; +import org.apache.maven.resolver.internal.test.util.TestFileProcessor; +import org.apache.maven.resolver.internal.test.util.TestFileUtils; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumAlgorithmFactory; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumPolicy; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumPolicy.ChecksumKind; +import org.apache.maven.resolver.spi.connector.layout.RepositoryLayout; +import org.apache.maven.resolver.transfer.ChecksumFailureException; import org.junit.Before; import org.junit.Test; @@ -256,8 +254,8 @@ public void testValidate_NullPolicy() throws Exception { policy = null; - ChecksumValidator validator = newValidator( SHA1 ); - validator.validate( checksums( SHA1, "ignored" ), null ); + ChecksumValidator validator = newValidator( TestChecksumAlgorithmSelector.SHA1 ); + validator.validate( checksums( TestChecksumAlgorithmSelector.SHA1, "ignored" ), null ); fetcher.assertFetchedFiles(); } @@ -265,21 +263,21 @@ public void testValidate_NullPolicy() public void testValidate_AcceptOnFirstMatch() throws Exception { - ChecksumValidator validator = newValidator( SHA1 ); - fetcher.mock( SHA1, "foo" ); - validator.validate( checksums( SHA1, "foo" ), null ); - fetcher.assertFetchedFiles( SHA1 ); + ChecksumValidator validator = newValidator( TestChecksumAlgorithmSelector.SHA1 ); + fetcher.mock( TestChecksumAlgorithmSelector.SHA1, "foo" ); + validator.validate( checksums( TestChecksumAlgorithmSelector.SHA1, "foo" ), null ); + fetcher.assertFetchedFiles( TestChecksumAlgorithmSelector.SHA1 ); policy.assertCallbacks( "match(SHA-1, REMOTE_EXTERNAL)" ); } @Test public void testValidate_FailOnFirstMismatch() { - ChecksumValidator validator = newValidator( SHA1 ); - fetcher.mock( SHA1, "foo" ); + ChecksumValidator validator = newValidator( TestChecksumAlgorithmSelector.SHA1 ); + fetcher.mock( TestChecksumAlgorithmSelector.SHA1, "foo" ); try { - validator.validate( checksums( SHA1, "not-foo" ), null ); + validator.validate( checksums( TestChecksumAlgorithmSelector.SHA1, "not-foo" ), null ); fail( "expected exception" ); } catch ( ChecksumFailureException e ) @@ -289,7 +287,7 @@ public void testValidate_FailOnFirstMismatch() assertEquals( "not-foo", e.getActual() ); assertTrue( e.isRetryWorthy() ); } - fetcher.assertFetchedFiles( SHA1 ); + fetcher.assertFetchedFiles( TestChecksumAlgorithmSelector.SHA1 ); policy.assertCallbacks( "mismatch(SHA-1, REMOTE_EXTERNAL)" ); } @@ -298,11 +296,11 @@ public void testValidate_AcceptOnEnd() throws Exception { policy.inspectAll = true; - ChecksumValidator validator = newValidator( SHA1, MD5 ); - fetcher.mock( SHA1, "foo" ); - fetcher.mock( MD5, "bar" ); - validator.validate( checksums( SHA1, "foo", MD5, "bar" ), null ); - fetcher.assertFetchedFiles( SHA1, MD5 ); + ChecksumValidator validator = newValidator( TestChecksumAlgorithmSelector.SHA1, TestChecksumAlgorithmSelector.MD5 ); + fetcher.mock( TestChecksumAlgorithmSelector.SHA1, "foo" ); + fetcher.mock( TestChecksumAlgorithmSelector.MD5, "bar" ); + validator.validate( checksums( TestChecksumAlgorithmSelector.SHA1, "foo", TestChecksumAlgorithmSelector.MD5, "bar" ), null ); + fetcher.assertFetchedFiles( TestChecksumAlgorithmSelector.SHA1, TestChecksumAlgorithmSelector.MD5 ); policy.assertCallbacks( "match(SHA-1, REMOTE_EXTERNAL)", "match(MD5, REMOTE_EXTERNAL)", "noMore()" ); } @@ -310,12 +308,12 @@ public void testValidate_AcceptOnEnd() public void testValidate_FailOnEnd() { policy.inspectAll = true; - ChecksumValidator validator = newValidator( SHA1, MD5 ); - fetcher.mock( SHA1, "foo" ); - fetcher.mock( MD5, "bar" ); + ChecksumValidator validator = newValidator( TestChecksumAlgorithmSelector.SHA1, TestChecksumAlgorithmSelector.MD5 ); + fetcher.mock( TestChecksumAlgorithmSelector.SHA1, "foo" ); + fetcher.mock( TestChecksumAlgorithmSelector.MD5, "bar" ); try { - validator.validate( checksums( SHA1, "not-foo", MD5, "bar" ), null ); + validator.validate( checksums( TestChecksumAlgorithmSelector.SHA1, "not-foo", TestChecksumAlgorithmSelector.MD5, "bar" ), null ); fail( "expected exception" ); } catch ( ChecksumFailureException e ) @@ -325,7 +323,7 @@ public void testValidate_FailOnEnd() assertEquals( "not-foo", e.getActual() ); assertTrue( e.isRetryWorthy() ); } - fetcher.assertFetchedFiles( SHA1, MD5 ); + fetcher.assertFetchedFiles( TestChecksumAlgorithmSelector.SHA1, TestChecksumAlgorithmSelector.MD5 ); policy.assertCallbacks( "mismatch(SHA-1, REMOTE_EXTERNAL)", "match(MD5, REMOTE_EXTERNAL)", "noMore()" ); } @@ -335,12 +333,12 @@ public void testValidate_IncludedBeforeExternal() { policy.inspectAll = true; HashMap provided = new HashMap<>(); - provided.put( SHA1, "foo" ); - ChecksumValidator validator = newValidator( provided, SHA1, MD5 ); - fetcher.mock( SHA1, "foo" ); - fetcher.mock( MD5, "bar" ); - validator.validate( checksums( SHA1, "foo", MD5, "bar" ), checksums( SHA1, "foo", MD5, "bar" ) ); - fetcher.assertFetchedFiles( SHA1, MD5 ); + provided.put( TestChecksumAlgorithmSelector.SHA1, "foo" ); + ChecksumValidator validator = newValidator( provided, TestChecksumAlgorithmSelector.SHA1, TestChecksumAlgorithmSelector.MD5 ); + fetcher.mock( TestChecksumAlgorithmSelector.SHA1, "foo" ); + fetcher.mock( TestChecksumAlgorithmSelector.MD5, "bar" ); + validator.validate( checksums( TestChecksumAlgorithmSelector.SHA1, "foo", TestChecksumAlgorithmSelector.MD5, "bar" ), checksums( TestChecksumAlgorithmSelector.SHA1, "foo", TestChecksumAlgorithmSelector.MD5, "bar" ) ); + fetcher.assertFetchedFiles( TestChecksumAlgorithmSelector.SHA1, TestChecksumAlgorithmSelector.MD5 ); policy.assertCallbacks( "match(SHA-1, PROVIDED)", "match(SHA-1, REMOTE_INCLUDED)", "match(MD5, REMOTE_INCLUDED)", "match(SHA-1, REMOTE_EXTERNAL)", "match(MD5, REMOTE_EXTERNAL)", "noMore()" ); } @@ -350,9 +348,9 @@ public void testValidate_CaseInsensitive() throws Exception { policy.inspectAll = true; - ChecksumValidator validator = newValidator( SHA1 ); - fetcher.mock( SHA1, "FOO" ); - validator.validate( checksums( SHA1, "foo" ), checksums( SHA1, "foo" ) ); + ChecksumValidator validator = newValidator( TestChecksumAlgorithmSelector.SHA1 ); + fetcher.mock( TestChecksumAlgorithmSelector.SHA1, "FOO" ); + validator.validate( checksums( TestChecksumAlgorithmSelector.SHA1, "foo" ), checksums( TestChecksumAlgorithmSelector.SHA1, "foo" ) ); policy.assertCallbacks( "match(SHA-1, REMOTE_INCLUDED)", "match(SHA-1, REMOTE_EXTERNAL)", "noMore()" ); } @@ -360,10 +358,10 @@ public void testValidate_CaseInsensitive() public void testValidate_MissingRemoteChecksum() throws Exception { - ChecksumValidator validator = newValidator( SHA1, MD5 ); - fetcher.mock( MD5, "bar" ); - validator.validate( checksums( MD5, "bar" ), null ); - fetcher.assertFetchedFiles( SHA1, MD5 ); + ChecksumValidator validator = newValidator( TestChecksumAlgorithmSelector.SHA1, TestChecksumAlgorithmSelector.MD5 ); + fetcher.mock( TestChecksumAlgorithmSelector.MD5, "bar" ); + validator.validate( checksums( TestChecksumAlgorithmSelector.MD5, "bar" ), null ); + fetcher.assertFetchedFiles( TestChecksumAlgorithmSelector.SHA1, TestChecksumAlgorithmSelector.MD5 ); policy.assertCallbacks( "match(MD5, REMOTE_EXTERNAL)" ); } @@ -371,11 +369,11 @@ public void testValidate_MissingRemoteChecksum() public void testValidate_InaccessibleRemoteChecksum() throws Exception { - ChecksumValidator validator = newValidator( SHA1, MD5 ); - fetcher.mock( SHA1, new IOException( "inaccessible" ) ); - fetcher.mock( MD5, "bar" ); - validator.validate( checksums( MD5, "bar" ), null ); - fetcher.assertFetchedFiles( SHA1, MD5 ); + ChecksumValidator validator = newValidator( TestChecksumAlgorithmSelector.SHA1, TestChecksumAlgorithmSelector.MD5 ); + fetcher.mock( TestChecksumAlgorithmSelector.SHA1, new IOException( "inaccessible" ) ); + fetcher.mock( TestChecksumAlgorithmSelector.MD5, "bar" ); + validator.validate( checksums( TestChecksumAlgorithmSelector.MD5, "bar" ), null ); + fetcher.assertFetchedFiles( TestChecksumAlgorithmSelector.SHA1, TestChecksumAlgorithmSelector.MD5 ); policy.assertCallbacks( "error(SHA-1, REMOTE_EXTERNAL, inaccessible)", "match(MD5, REMOTE_EXTERNAL)" ); } @@ -383,11 +381,11 @@ public void testValidate_InaccessibleRemoteChecksum() public void testValidate_InaccessibleLocalChecksum() throws Exception { - ChecksumValidator validator = newValidator( SHA1, MD5 ); - fetcher.mock( SHA1, "foo" ); - fetcher.mock( MD5, "bar" ); - validator.validate( checksums( SHA1, null, MD5, "bar" ), null ); - fetcher.assertFetchedFiles( MD5 ); + ChecksumValidator validator = newValidator( TestChecksumAlgorithmSelector.SHA1, TestChecksumAlgorithmSelector.MD5 ); + fetcher.mock( TestChecksumAlgorithmSelector.SHA1, "foo" ); + fetcher.mock( TestChecksumAlgorithmSelector.MD5, "bar" ); + validator.validate( checksums( TestChecksumAlgorithmSelector.SHA1, null, TestChecksumAlgorithmSelector.MD5, "bar" ), null ); + fetcher.assertFetchedFiles( TestChecksumAlgorithmSelector.MD5 ); policy.assertCallbacks( "error(SHA-1, REMOTE_EXTERNAL, error)", "match(MD5, REMOTE_EXTERNAL)" ); } @@ -395,7 +393,7 @@ public void testValidate_InaccessibleLocalChecksum() public void testHandle_Accept() { policy.tolerateFailure = true; - ChecksumValidator validator = newValidator( SHA1 ); + ChecksumValidator validator = newValidator( TestChecksumAlgorithmSelector.SHA1 ); assertTrue( validator.handle( new ChecksumFailureException( "accept" ) ) ); policy.assertCallbacks( "fail(accept)" ); } @@ -404,7 +402,7 @@ public void testHandle_Accept() public void testHandle_Reject() { policy.tolerateFailure = false; - ChecksumValidator validator = newValidator( SHA1 ); + ChecksumValidator validator = newValidator( TestChecksumAlgorithmSelector.SHA1 ); assertFalse( validator.handle( new ChecksumFailureException( "reject" ) ) ); policy.assertCallbacks( "fail(reject)" ); } @@ -412,7 +410,7 @@ public void testHandle_Reject() @Test public void testRetry_ResetPolicy() { - ChecksumValidator validator = newValidator( SHA1 ); + ChecksumValidator validator = newValidator( TestChecksumAlgorithmSelector.SHA1 ); validator.retry(); policy.assertCallbacks( "retry()" ); } @@ -421,10 +419,10 @@ public void testRetry_ResetPolicy() public void testRetry_RemoveTempFiles() throws Exception { - ChecksumValidator validator = newValidator( SHA1 ); - fetcher.mock( SHA1, "foo" ); - validator.validate( checksums( SHA1, "foo" ), null ); - fetcher.assertFetchedFiles( SHA1 ); + ChecksumValidator validator = newValidator( TestChecksumAlgorithmSelector.SHA1 ); + fetcher.mock( TestChecksumAlgorithmSelector.SHA1, "foo" ); + validator.validate( checksums( TestChecksumAlgorithmSelector.SHA1, "foo" ), null ); + fetcher.assertFetchedFiles( TestChecksumAlgorithmSelector.SHA1 ); assertEquals( 1, fetcher.checksumFiles.size() ); for ( File file : fetcher.checksumFiles ) { @@ -442,9 +440,9 @@ public void testCommit_SaveChecksumFiles() throws Exception { policy.inspectAll = true; - ChecksumValidator validator = newValidator( SHA1, MD5 ); - fetcher.mock( MD5, "bar" ); - validator.validate( checksums( SHA1, "foo", MD5, "bar" ), checksums( SHA1, "foo" ) ); + ChecksumValidator validator = newValidator( TestChecksumAlgorithmSelector.SHA1, TestChecksumAlgorithmSelector.MD5 ); + fetcher.mock( TestChecksumAlgorithmSelector.MD5, "bar" ); + validator.validate( checksums( TestChecksumAlgorithmSelector.SHA1, "foo", TestChecksumAlgorithmSelector.MD5, "bar" ), checksums( TestChecksumAlgorithmSelector.SHA1, "foo" ) ); assertEquals( 1, fetcher.checksumFiles.size() ); for ( File file : fetcher.checksumFiles ) { @@ -467,10 +465,10 @@ public void testCommit_SaveChecksumFiles() public void testClose_RemoveTempFiles() throws Exception { - ChecksumValidator validator = newValidator( SHA1 ); - fetcher.mock( SHA1, "foo" ); - validator.validate( checksums( SHA1, "foo" ), null ); - fetcher.assertFetchedFiles( SHA1 ); + ChecksumValidator validator = newValidator( TestChecksumAlgorithmSelector.SHA1 ); + fetcher.mock( TestChecksumAlgorithmSelector.SHA1, "foo" ); + validator.validate( checksums( TestChecksumAlgorithmSelector.SHA1, "foo" ), null ); + fetcher.assertFetchedFiles( TestChecksumAlgorithmSelector.SHA1 ); assertEquals( 1, fetcher.checksumFiles.size() ); for ( File file : fetcher.checksumFiles ) { diff --git a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/PartialFileTest.java b/maven-resolver-connector-basic/src/test/java/org/apache/maven/resolver/connector/basic/PartialFileTest.java similarity index 98% rename from maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/PartialFileTest.java rename to maven-resolver-connector-basic/src/test/java/org/apache/maven/resolver/connector/basic/PartialFileTest.java index bb6530e6d..9ed8648ef 100644 --- a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/PartialFileTest.java +++ b/maven-resolver-connector-basic/src/test/java/org/apache/maven/resolver/connector/basic/PartialFileTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.connector.basic; +package org.apache.maven.resolver.connector.basic; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -34,7 +34,7 @@ import java.util.Locale; import java.util.concurrent.CountDownLatch; -import org.eclipse.aether.internal.test.util.TestFileUtils; +import org.apache.maven.resolver.internal.test.util.TestFileUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/TestChecksumAlgorithmSelector.java b/maven-resolver-connector-basic/src/test/java/org/apache/maven/resolver/connector/basic/TestChecksumAlgorithmSelector.java similarity index 89% rename from maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/TestChecksumAlgorithmSelector.java rename to maven-resolver-connector-basic/src/test/java/org/apache/maven/resolver/connector/basic/TestChecksumAlgorithmSelector.java index 6a88470f7..f655c2850 100644 --- a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/TestChecksumAlgorithmSelector.java +++ b/maven-resolver-connector-basic/src/test/java/org/apache/maven/resolver/connector/basic/TestChecksumAlgorithmSelector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.connector.basic; +package org.apache.maven.resolver.connector.basic; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,11 +26,11 @@ import java.util.Locale; import java.util.Set; -import org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithm; -import org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithmFactory; -import org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithmFactorySelector; -import org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithmFactorySupport; -import org.eclipse.aether.util.ChecksumUtils; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumAlgorithm; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumAlgorithmFactory; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumAlgorithmFactorySelector; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumAlgorithmFactorySupport; +import org.apache.maven.resolver.util.ChecksumUtils; /** * Test implementation of {@link ChecksumAlgorithmFactorySelector}. diff --git a/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml b/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml index c759f81c2..b1dd6cd45 100644 --- a/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml +++ b/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.resolver maven-resolver-demos - 1.8.2-SNAPSHOT + 2.0.0-SNAPSHOT resolver-demo-maven-plugin diff --git a/maven-resolver-demos/maven-resolver-demo-maven-plugin/src/main/java/org/apache/maven/resolver/examples/maven/ResolveArtifactMojo.java b/maven-resolver-demos/maven-resolver-demo-maven-plugin/src/main/java/org/apache/maven/resolver/examples/maven/ResolveArtifactMojo.java index bd3b430eb..77eeb6ff7 100644 --- a/maven-resolver-demos/maven-resolver-demo-maven-plugin/src/main/java/org/apache/maven/resolver/examples/maven/ResolveArtifactMojo.java +++ b/maven-resolver-demos/maven-resolver-demo-maven-plugin/src/main/java/org/apache/maven/resolver/examples/maven/ResolveArtifactMojo.java @@ -27,14 +27,14 @@ import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.resolution.ArtifactRequest; -import org.eclipse.aether.resolution.ArtifactResolutionException; -import org.eclipse.aether.resolution.ArtifactResult; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.resolution.ArtifactRequest; +import org.apache.maven.resolver.resolution.ArtifactResolutionException; +import org.apache.maven.resolver.resolution.ArtifactResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml b/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml index badae9f08..456733eea 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml +++ b/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.resolver maven-resolver-demos - 1.8.2-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-demo-snippets diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/DeployArtifacts.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/DeployArtifacts.java index 4596cee61..810771df0 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/DeployArtifacts.java +++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/DeployArtifacts.java @@ -22,13 +22,13 @@ import java.io.File; import org.apache.maven.resolver.examples.util.Booter; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.deployment.DeployRequest; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.util.artifact.SubArtifact; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.deployment.DeployRequest; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.util.artifact.SubArtifact; /** * Deploys a JAR and its POM to a remote repository. diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/FindAvailableVersions.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/FindAvailableVersions.java index 61a233871..085a2c625 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/FindAvailableVersions.java +++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/FindAvailableVersions.java @@ -22,13 +22,13 @@ import java.util.List; import org.apache.maven.resolver.examples.util.Booter; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.resolution.VersionRangeRequest; -import org.eclipse.aether.resolution.VersionRangeResult; -import org.eclipse.aether.version.Version; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.resolution.VersionRangeRequest; +import org.apache.maven.resolver.resolution.VersionRangeResult; +import org.apache.maven.resolver.version.Version; /** * Determines all available versions of an artifact. diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/FindNewestVersion.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/FindNewestVersion.java index 099e65a02..3e275dbc0 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/FindNewestVersion.java +++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/FindNewestVersion.java @@ -20,13 +20,13 @@ */ import org.apache.maven.resolver.examples.util.Booter; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.resolution.VersionRangeRequest; -import org.eclipse.aether.resolution.VersionRangeResult; -import org.eclipse.aether.version.Version; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.resolution.VersionRangeRequest; +import org.apache.maven.resolver.resolution.VersionRangeResult; +import org.apache.maven.resolver.version.Version; /** * Determines the newest version of an artifact. diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/GetDependencyHierarchy.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/GetDependencyHierarchy.java index 526ddb1a3..d33711cca 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/GetDependencyHierarchy.java +++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/GetDependencyHierarchy.java @@ -21,16 +21,16 @@ import org.apache.maven.resolver.examples.util.Booter; import org.apache.maven.resolver.examples.util.ConsoleDependencyGraphDumper; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.collection.CollectRequest; -import org.eclipse.aether.collection.CollectResult; -import org.eclipse.aether.resolution.ArtifactDescriptorRequest; -import org.eclipse.aether.resolution.ArtifactDescriptorResult; -import org.eclipse.aether.util.graph.manager.DependencyManagerUtils; -import org.eclipse.aether.util.graph.transformer.ConflictResolver; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.collection.CollectRequest; +import org.apache.maven.resolver.collection.CollectResult; +import org.apache.maven.resolver.resolution.ArtifactDescriptorRequest; +import org.apache.maven.resolver.resolution.ArtifactDescriptorResult; +import org.apache.maven.resolver.util.graph.manager.DependencyManagerUtils; +import org.apache.maven.resolver.util.graph.transformer.ConflictResolver; /** * Visualizes the transitive dependencies of an artifact similar to m2e's dependency hierarchy view. diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/GetDependencyTree.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/GetDependencyTree.java index 78af7839a..d742a2b46 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/GetDependencyTree.java +++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/GetDependencyTree.java @@ -21,13 +21,13 @@ import org.apache.maven.resolver.examples.util.Booter; import org.apache.maven.resolver.examples.util.ConsoleDependencyGraphDumper; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.collection.CollectRequest; -import org.eclipse.aether.collection.CollectResult; -import org.eclipse.aether.graph.Dependency; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.collection.CollectRequest; +import org.apache.maven.resolver.collection.CollectResult; +import org.apache.maven.resolver.graph.Dependency; /** * Collects the transitive dependencies of an artifact. diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/GetDirectDependencies.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/GetDirectDependencies.java index e6042b340..a4238d22a 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/GetDirectDependencies.java +++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/GetDirectDependencies.java @@ -20,13 +20,13 @@ */ import org.apache.maven.resolver.examples.util.Booter; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.resolution.ArtifactDescriptorRequest; -import org.eclipse.aether.resolution.ArtifactDescriptorResult; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.resolution.ArtifactDescriptorRequest; +import org.apache.maven.resolver.resolution.ArtifactDescriptorResult; /** * Determines the direct dependencies of an artifact as declared in its artifact descriptor (POM). diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/InstallArtifacts.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/InstallArtifacts.java index 98fbb925c..93c0b17bc 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/InstallArtifacts.java +++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/InstallArtifacts.java @@ -22,12 +22,12 @@ import java.io.File; import org.apache.maven.resolver.examples.util.Booter; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.installation.InstallRequest; -import org.eclipse.aether.util.artifact.SubArtifact; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.installation.InstallRequest; +import org.apache.maven.resolver.util.artifact.SubArtifact; /** * Installs a JAR and its POM to the local repository. diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/ResolveArtifact.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/ResolveArtifact.java index bd6a662c1..db20e6c1d 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/ResolveArtifact.java +++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/ResolveArtifact.java @@ -20,13 +20,13 @@ */ import org.apache.maven.resolver.examples.util.Booter; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.repository.RepositoryPolicy; -import org.eclipse.aether.resolution.ArtifactRequest; -import org.eclipse.aether.resolution.ArtifactResult; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.repository.RepositoryPolicy; +import org.apache.maven.resolver.resolution.ArtifactRequest; +import org.apache.maven.resolver.resolution.ArtifactResult; /** * Resolves a single artifact. diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/ResolveTransitiveDependencies.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/ResolveTransitiveDependencies.java index 88ee3ec3d..d1f2b62d0 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/ResolveTransitiveDependencies.java +++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/ResolveTransitiveDependencies.java @@ -22,17 +22,17 @@ import java.util.List; import org.apache.maven.resolver.examples.util.Booter; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.collection.CollectRequest; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyFilter; -import org.eclipse.aether.resolution.ArtifactResult; -import org.eclipse.aether.resolution.DependencyRequest; -import org.eclipse.aether.util.artifact.JavaScopes; -import org.eclipse.aether.util.filter.DependencyFilterUtils; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.collection.CollectRequest; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyFilter; +import org.apache.maven.resolver.resolution.ArtifactResult; +import org.apache.maven.resolver.resolution.DependencyRequest; +import org.apache.maven.resolver.util.artifact.JavaScopes; +import org.apache.maven.resolver.util.filter.DependencyFilterUtils; /** * Resolves the transitive (compile) dependencies of an artifact. diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/ReverseDependencyTree.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/ReverseDependencyTree.java index 97b0b4af1..62056962b 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/ReverseDependencyTree.java +++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/ReverseDependencyTree.java @@ -21,16 +21,16 @@ import org.apache.maven.resolver.examples.util.Booter; import org.apache.maven.resolver.examples.util.ReverseTreeRepositoryListener; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.collection.CollectRequest; -import org.eclipse.aether.resolution.ArtifactDescriptorRequest; -import org.eclipse.aether.resolution.ArtifactDescriptorResult; -import org.eclipse.aether.util.graph.manager.DependencyManagerUtils; -import org.eclipse.aether.util.graph.transformer.ConflictResolver; -import org.eclipse.aether.util.listener.ChainedRepositoryListener; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.collection.CollectRequest; +import org.apache.maven.resolver.resolution.ArtifactDescriptorRequest; +import org.apache.maven.resolver.resolution.ArtifactDescriptorResult; +import org.apache.maven.resolver.util.graph.manager.DependencyManagerUtils; +import org.apache.maven.resolver.util.graph.transformer.ConflictResolver; +import org.apache.maven.resolver.util.listener.ChainedRepositoryListener; /** * Example of building reverse dependency tree using custom {@link ReverseTreeRepositoryListener}. diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/guice/DemoResolverModule.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/guice/DemoResolverModule.java index 21f25bd5b..6a7725f05 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/guice/DemoResolverModule.java +++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/guice/DemoResolverModule.java @@ -29,22 +29,14 @@ import org.apache.maven.model.building.DefaultModelBuilderFactory; import org.apache.maven.model.building.ModelBuilder; -import org.apache.maven.repository.internal.DefaultArtifactDescriptorReader; -import org.apache.maven.repository.internal.DefaultVersionRangeResolver; -import org.apache.maven.repository.internal.DefaultVersionResolver; -import org.apache.maven.repository.internal.SnapshotMetadataGeneratorFactory; -import org.apache.maven.repository.internal.VersionsMetadataGeneratorFactory; -import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory; -import org.eclipse.aether.impl.ArtifactDescriptorReader; -import org.eclipse.aether.impl.MetadataGeneratorFactory; -import org.eclipse.aether.impl.VersionRangeResolver; -import org.eclipse.aether.impl.VersionResolver; -import org.eclipse.aether.impl.guice.AetherModule; -import org.eclipse.aether.spi.connector.RepositoryConnectorFactory; -import org.eclipse.aether.spi.connector.transport.TransporterFactory; -import org.eclipse.aether.transport.file.FileTransporterFactory; -import org.eclipse.aether.transport.http.ChecksumExtractor; -import org.eclipse.aether.transport.http.HttpTransporterFactory; +import org.apache.maven.resolver.connector.basic.BasicRepositoryConnectorFactory; +import org.apache.maven.resolver.impl.MetadataGeneratorFactory; +import org.apache.maven.resolver.impl.guice.AetherModule; +import org.apache.maven.resolver.spi.connector.RepositoryConnectorFactory; +import org.apache.maven.resolver.spi.connector.transport.TransporterFactory; +import org.apache.maven.resolver.transport.file.FileTransporterFactory; +import org.apache.maven.resolver.transport.http.ChecksumExtractor; +import org.apache.maven.resolver.transport.http.HttpTransporterFactory; import com.google.inject.AbstractModule; import com.google.inject.Provides; @@ -69,14 +61,15 @@ protected void configure() install( new AetherModule() ); // make module "complete" by binding things not bound by AetherModule - bind( ArtifactDescriptorReader.class ).to( DefaultArtifactDescriptorReader.class ).in( Singleton.class ); - bind( VersionResolver.class ).to( DefaultVersionResolver.class ).in( Singleton.class ); - bind( VersionRangeResolver.class ).to( DefaultVersionRangeResolver.class ).in( Singleton.class ); - bind( MetadataGeneratorFactory.class ).annotatedWith( Names.named( "snapshot" ) ) - .to( SnapshotMetadataGeneratorFactory.class ).in( Singleton.class ); - - bind( MetadataGeneratorFactory.class ).annotatedWith( Names.named( "versions" ) ) - .to( VersionsMetadataGeneratorFactory.class ).in( Singleton.class ); + // FIXME +// bind( ArtifactDescriptorReader.class ).to( DefaultArtifactDescriptorReader.class ).in( Singleton.class ); +// bind( VersionResolver.class ).to( DefaultVersionResolver.class ).in( Singleton.class ); +// bind( VersionRangeResolver.class ).to( DefaultVersionRangeResolver.class ).in( Singleton.class ); +// bind( MetadataGeneratorFactory.class ).annotatedWith( Names.named( "snapshot" ) ) +// .to( SnapshotMetadataGeneratorFactory.class ).in( Singleton.class ); +// +// bind( MetadataGeneratorFactory.class ).annotatedWith( Names.named( "versions" ) ) +// .to( VersionsMetadataGeneratorFactory.class ).in( Singleton.class ); bind( RepositoryConnectorFactory.class ).annotatedWith( Names.named( "basic" ) ) .to( BasicRepositoryConnectorFactory.class ); diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/guice/GuiceRepositorySystemFactory.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/guice/GuiceRepositorySystemFactory.java index 3ff0db056..3fd7709fb 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/guice/GuiceRepositorySystemFactory.java +++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/guice/GuiceRepositorySystemFactory.java @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.RepositorySystem; +import org.apache.maven.resolver.RepositorySystem; import com.google.inject.Guice; diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/manual/ManualRepositorySystemFactory.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/manual/ManualRepositorySystemFactory.java index 77c37fb35..05036fa03 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/manual/ManualRepositorySystemFactory.java +++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/manual/ManualRepositorySystemFactory.java @@ -19,14 +19,7 @@ * under the License. */ -import org.apache.maven.repository.internal.MavenRepositorySystemUtils; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory; -import org.eclipse.aether.impl.DefaultServiceLocator; -import org.eclipse.aether.spi.connector.RepositoryConnectorFactory; -import org.eclipse.aether.spi.connector.transport.TransporterFactory; -import org.eclipse.aether.transport.file.FileTransporterFactory; -import org.eclipse.aether.transport.http.HttpTransporterFactory; +import org.apache.maven.resolver.RepositorySystem; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,27 +33,8 @@ public class ManualRepositorySystemFactory public static RepositorySystem newRepositorySystem() { - /* - * Aether's components implement org.eclipse.aether.spi.locator.Service to ease manual wiring and using the - * prepopulated DefaultServiceLocator, we only need to register the repository connector and transporter - * factories. - */ - DefaultServiceLocator locator = MavenRepositorySystemUtils.newServiceLocator(); - locator.addService( RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class ); - locator.addService( TransporterFactory.class, FileTransporterFactory.class ); - locator.addService( TransporterFactory.class, HttpTransporterFactory.class ); - - locator.setErrorHandler( new DefaultServiceLocator.ErrorHandler() - { - @Override - public void serviceCreationFailed( Class type, Class impl, Throwable exception ) - { - LOGGER.error( "Service creation failed for {} with implementation {}", - type, impl, exception ); - } - } ); - - return locator.getService( RepositorySystem.class ); + //FIXME + return null; } } diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/Resolver.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/Resolver.java index 606b129ba..8e3a5691f 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/Resolver.java +++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/Resolver.java @@ -24,25 +24,25 @@ import org.apache.maven.resolver.examples.util.Booter; import org.apache.maven.resolver.examples.util.ConsoleDependencyGraphDumper; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.collection.CollectRequest; -import org.eclipse.aether.deployment.DeployRequest; -import org.eclipse.aether.deployment.DeploymentException; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.installation.InstallRequest; -import org.eclipse.aether.installation.InstallationException; -import org.eclipse.aether.repository.Authentication; -import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.resolution.DependencyRequest; -import org.eclipse.aether.resolution.DependencyResolutionException; -import org.eclipse.aether.util.graph.visitor.PreorderNodeListGenerator; -import org.eclipse.aether.util.repository.AuthenticationBuilder; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.collection.CollectRequest; +import org.apache.maven.resolver.deployment.DeployRequest; +import org.apache.maven.resolver.deployment.DeploymentException; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.installation.InstallRequest; +import org.apache.maven.resolver.installation.InstallationException; +import org.apache.maven.resolver.repository.Authentication; +import org.apache.maven.resolver.repository.LocalRepository; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.resolution.DependencyRequest; +import org.apache.maven.resolver.resolution.DependencyResolutionException; +import org.apache.maven.resolver.util.graph.visitor.PreorderNodeListGenerator; +import org.apache.maven.resolver.util.repository.AuthenticationBuilder; /** */ diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/ResolverDemo.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/ResolverDemo.java index e3a4ebc2d..ab1ff6c22 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/ResolverDemo.java +++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/ResolverDemo.java @@ -22,13 +22,13 @@ import java.io.File; import java.util.List; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.deployment.DeploymentException; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.installation.InstallationException; -import org.eclipse.aether.resolution.DependencyResolutionException; -import org.eclipse.aether.util.artifact.SubArtifact; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.deployment.DeploymentException; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.installation.InstallationException; +import org.apache.maven.resolver.resolution.DependencyResolutionException; +import org.apache.maven.resolver.util.artifact.SubArtifact; /** */ diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/ResolverResult.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/ResolverResult.java index 813e22be2..2e3ddba97 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/ResolverResult.java +++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/ResolverResult.java @@ -22,7 +22,7 @@ import java.io.File; import java.util.List; -import org.eclipse.aether.graph.DependencyNode; +import org.apache.maven.resolver.graph.DependencyNode; /** */ diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/sisu/SisuRepositorySystemFactory.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/sisu/SisuRepositorySystemFactory.java index 1403e1292..0be48e793 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/sisu/SisuRepositorySystemFactory.java +++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/sisu/SisuRepositorySystemFactory.java @@ -27,7 +27,7 @@ import com.google.inject.Module; import org.apache.maven.model.building.DefaultModelBuilderFactory; import org.apache.maven.model.building.ModelBuilder; -import org.eclipse.aether.RepositorySystem; +import org.apache.maven.resolver.RepositorySystem; import org.eclipse.sisu.launch.Main; import org.eclipse.sisu.space.BeanScanning; diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/Booter.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/Booter.java index 399f2f997..4a607ddf4 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/Booter.java +++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/Booter.java @@ -23,12 +23,10 @@ import java.util.Collections; import java.util.List; -import org.apache.maven.repository.internal.MavenRepositorySystemUtils; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.RemoteRepository; /** * A helper to boot the repository system and a repository system session. @@ -70,18 +68,19 @@ public static RepositorySystem newRepositorySystem( final String factory ) public static DefaultRepositorySystemSession newRepositorySystemSession( RepositorySystem system ) { - DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession(); - - LocalRepository localRepo = new LocalRepository( "target/local-repo" ); - session.setLocalRepositoryManager( system.newLocalRepositoryManager( session, localRepo ) ); - - session.setTransferListener( new ConsoleTransferListener() ); - session.setRepositoryListener( new ConsoleRepositoryListener() ); + // FIXME +// DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession(); +// +// LocalRepository localRepo = new LocalRepository( "target/local-repo" ); +// session.setLocalRepositoryManager( system.newLocalRepositoryManager( session, localRepo ) ); +// +// session.setTransferListener( new ConsoleTransferListener() ); +// session.setRepositoryListener( new ConsoleRepositoryListener() ); // uncomment to generate dirty trees // session.setDependencyGraphTransformer( null ); - return session; + return null; } public static List newRepositories( RepositorySystem system, RepositorySystemSession session ) diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleDependencyGraphDumper.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleDependencyGraphDumper.java index b5f65daa7..c07232ce2 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleDependencyGraphDumper.java +++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleDependencyGraphDumper.java @@ -24,13 +24,13 @@ import java.util.Iterator; import java.util.List; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.graph.DependencyVisitor; -import org.eclipse.aether.util.artifact.ArtifactIdUtils; -import org.eclipse.aether.util.graph.manager.DependencyManagerUtils; -import org.eclipse.aether.util.graph.transformer.ConflictResolver; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.graph.DependencyVisitor; +import org.apache.maven.resolver.util.artifact.ArtifactIdUtils; +import org.apache.maven.resolver.util.graph.manager.DependencyManagerUtils; +import org.apache.maven.resolver.util.graph.transformer.ConflictResolver; /** * A dependency visitor that dumps the graph to the console. diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleRepositoryListener.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleRepositoryListener.java index 2d5fbafe8..0ed43a2e6 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleRepositoryListener.java +++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleRepositoryListener.java @@ -21,8 +21,8 @@ import java.io.PrintStream; -import org.eclipse.aether.AbstractRepositoryListener; -import org.eclipse.aether.RepositoryEvent; +import org.apache.maven.resolver.AbstractRepositoryListener; +import org.apache.maven.resolver.RepositoryEvent; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleTransferListener.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleTransferListener.java index c5de1e2de..762d00b60 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleTransferListener.java +++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleTransferListener.java @@ -26,10 +26,10 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.eclipse.aether.transfer.AbstractTransferListener; -import org.eclipse.aether.transfer.MetadataNotFoundException; -import org.eclipse.aether.transfer.TransferEvent; -import org.eclipse.aether.transfer.TransferResource; +import org.apache.maven.resolver.transfer.AbstractTransferListener; +import org.apache.maven.resolver.transfer.MetadataNotFoundException; +import org.apache.maven.resolver.transfer.TransferEvent; +import org.apache.maven.resolver.transfer.TransferResource; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ReverseTreeRepositoryListener.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ReverseTreeRepositoryListener.java index a13a768a8..48fbdc67b 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ReverseTreeRepositoryListener.java +++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ReverseTreeRepositoryListener.java @@ -27,13 +27,13 @@ import java.util.ListIterator; import java.util.Objects; -import org.eclipse.aether.AbstractRepositoryListener; -import org.eclipse.aether.RepositoryEvent; -import org.eclipse.aether.RequestTrace; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.collection.CollectStepData; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyNode; +import org.apache.maven.resolver.AbstractRepositoryListener; +import org.apache.maven.resolver.RepositoryEvent; +import org.apache.maven.resolver.RequestTrace; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.collection.CollectStepData; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyNode; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-demos/pom.xml b/maven-resolver-demos/pom.xml index c3528c3f3..61d92bd7d 100644 --- a/maven-resolver-demos/pom.xml +++ b/maven-resolver-demos/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.resolver maven-resolver - 1.8.2-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-demos @@ -38,6 +38,7 @@ 3.8.4 + true diff --git a/maven-resolver-impl/pom.xml b/maven-resolver-impl/pom.xml index ad6ecdea7..5205d4986 100644 --- a/maven-resolver-impl/pom.xml +++ b/maven-resolver-impl/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.resolver maven-resolver - 1.8.2-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-impl diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/ArtifactDescriptorReader.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/ArtifactDescriptorReader.java similarity index 85% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/impl/ArtifactDescriptorReader.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/ArtifactDescriptorReader.java index 1d6787b14..4c2d44450 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/ArtifactDescriptorReader.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/ArtifactDescriptorReader.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.impl; +package org.apache.maven.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,11 +19,11 @@ * under the License. */ -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.resolution.ArtifactDescriptorException; -import org.eclipse.aether.resolution.ArtifactDescriptorRequest; -import org.eclipse.aether.resolution.ArtifactDescriptorResult; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.resolution.ArtifactDescriptorException; +import org.apache.maven.resolver.resolution.ArtifactDescriptorRequest; +import org.apache.maven.resolver.resolution.ArtifactDescriptorResult; /** * Provides information about an artifact that is relevant to transitive dependency resolution. diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/ArtifactResolver.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/ArtifactResolver.java similarity index 88% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/impl/ArtifactResolver.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/ArtifactResolver.java index 3b4359232..b028163e4 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/ArtifactResolver.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/ArtifactResolver.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.impl; +package org.apache.maven.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,12 +22,12 @@ import java.util.Collection; import java.util.List; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.resolution.ArtifactRequest; -import org.eclipse.aether.resolution.ArtifactResolutionException; -import org.eclipse.aether.resolution.ArtifactResult; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.resolution.ArtifactRequest; +import org.apache.maven.resolver.resolution.ArtifactResolutionException; +import org.apache.maven.resolver.resolution.ArtifactResult; /** * Resolves artifacts, that is gets a local filesystem path to their binary contents. diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/DependencyCollector.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/DependencyCollector.java similarity index 87% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/impl/DependencyCollector.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/DependencyCollector.java index 9fa58178c..c8ef97d81 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/DependencyCollector.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/DependencyCollector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.impl; +package org.apache.maven.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,11 +19,11 @@ * under the License. */ -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.collection.CollectRequest; -import org.eclipse.aether.collection.CollectResult; -import org.eclipse.aether.collection.DependencyCollectionException; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.collection.CollectRequest; +import org.apache.maven.resolver.collection.CollectResult; +import org.apache.maven.resolver.collection.DependencyCollectionException; /** * Given a collection of direct dependencies, recursively gathers their transitive dependencies and calculates the diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/Deployer.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/Deployer.java similarity index 84% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/impl/Deployer.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/Deployer.java index 8f6b8fc36..e96380ded 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/Deployer.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/Deployer.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.impl; +package org.apache.maven.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,11 +19,11 @@ * under the License. */ -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.deployment.DeployRequest; -import org.eclipse.aether.deployment.DeployResult; -import org.eclipse.aether.deployment.DeploymentException; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.deployment.DeployRequest; +import org.apache.maven.resolver.deployment.DeployResult; +import org.apache.maven.resolver.deployment.DeploymentException; /** * Publishes artifacts to a remote repository. diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/Installer.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/Installer.java similarity index 84% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/impl/Installer.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/Installer.java index a9ebed638..f6839bf73 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/Installer.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/Installer.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.impl; +package org.apache.maven.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,11 +19,11 @@ * under the License. */ -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.installation.InstallRequest; -import org.eclipse.aether.installation.InstallResult; -import org.eclipse.aether.installation.InstallationException; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.installation.InstallRequest; +import org.apache.maven.resolver.installation.InstallResult; +import org.apache.maven.resolver.installation.InstallationException; /** * Publishes artifacts to the local repository. diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/LocalRepositoryProvider.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/LocalRepositoryProvider.java similarity index 86% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/impl/LocalRepositoryProvider.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/LocalRepositoryProvider.java index d5f4be28d..1cf123f1b 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/LocalRepositoryProvider.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/LocalRepositoryProvider.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.impl; +package org.apache.maven.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,11 +19,11 @@ * under the License. */ -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.repository.LocalRepositoryManager; -import org.eclipse.aether.repository.NoLocalRepositoryManagerException; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.LocalRepository; +import org.apache.maven.resolver.repository.LocalRepositoryManager; +import org.apache.maven.resolver.repository.NoLocalRepositoryManagerException; /** * Retrieves a local repository manager from the installed local repository manager factories. diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/MetadataGenerator.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/MetadataGenerator.java similarity index 93% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/impl/MetadataGenerator.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/MetadataGenerator.java index b4356cc67..1d1f50ef0 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/MetadataGenerator.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/MetadataGenerator.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.impl; +package org.apache.maven.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,8 +21,8 @@ import java.util.Collection; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.metadata.Metadata; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.metadata.Metadata; /** * A metadata generator that participates in the installation/deployment of artifacts. diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/MetadataGeneratorFactory.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/MetadataGeneratorFactory.java similarity index 91% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/impl/MetadataGeneratorFactory.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/MetadataGeneratorFactory.java index 5f2b74052..82da4aebe 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/MetadataGeneratorFactory.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/MetadataGeneratorFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.impl; +package org.apache.maven.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.deployment.DeployRequest; -import org.eclipse.aether.installation.InstallRequest; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.deployment.DeployRequest; +import org.apache.maven.resolver.installation.InstallRequest; /** * A factory to create metadata generators. Metadata generators can contribute additional metadata during the diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/MetadataResolver.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/MetadataResolver.java similarity index 86% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/impl/MetadataResolver.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/MetadataResolver.java index 886e85686..522d1dae1 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/MetadataResolver.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/MetadataResolver.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.impl; +package org.apache.maven.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,11 +22,11 @@ import java.util.Collection; import java.util.List; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.resolution.MetadataRequest; -import org.eclipse.aether.resolution.MetadataResult; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.resolution.MetadataRequest; +import org.apache.maven.resolver.resolution.MetadataResult; /** * Resolves metadata, that is gets a local filesystem path to their binary contents. diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/OfflineController.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/OfflineController.java similarity index 91% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/impl/OfflineController.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/OfflineController.java index 22f5a4b33..15295b85f 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/OfflineController.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/OfflineController.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.impl; +package org.apache.maven.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.transfer.RepositoryOfflineException; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.transfer.RepositoryOfflineException; /** * Determines whether a remote repository is accessible in offline mode. diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/RemoteRepositoryManager.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/RemoteRepositoryManager.java similarity index 94% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/impl/RemoteRepositoryManager.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/RemoteRepositoryManager.java index 94dae527c..56dfed983 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/RemoteRepositoryManager.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/RemoteRepositoryManager.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.impl; +package org.apache.maven.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,9 +21,9 @@ import java.util.List; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.repository.RepositoryPolicy; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.repository.RepositoryPolicy; /** * Helps dealing with remote repository definitions. diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/RepositoryConnectorProvider.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/RepositoryConnectorProvider.java similarity index 86% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/impl/RepositoryConnectorProvider.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/RepositoryConnectorProvider.java index 8d665c0a9..cd431beaa 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/RepositoryConnectorProvider.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/RepositoryConnectorProvider.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.impl; +package org.apache.maven.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,10 +19,10 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.spi.connector.RepositoryConnector; -import org.eclipse.aether.transfer.NoRepositoryConnectorException; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.spi.connector.RepositoryConnector; +import org.apache.maven.resolver.transfer.NoRepositoryConnectorException; /** * Retrieves a repository connector from the installed repository connector factories. diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/RepositoryEventDispatcher.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/RepositoryEventDispatcher.java similarity index 93% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/impl/RepositoryEventDispatcher.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/RepositoryEventDispatcher.java index 2d29eb7c7..5682d9810 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/RepositoryEventDispatcher.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/RepositoryEventDispatcher.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.impl; +package org.apache.maven.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.RepositoryEvent; +import org.apache.maven.resolver.RepositoryEvent; /** * Dispatches repository events to registered listeners. diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/SyncContextFactory.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/SyncContextFactory.java similarity index 87% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/impl/SyncContextFactory.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/SyncContextFactory.java index c6f66332e..602fb619b 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/SyncContextFactory.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/SyncContextFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.impl; +package org.apache.maven.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,6 +25,6 @@ * @deprecated For backward compatibility reasons only, do not use this interface. */ @Deprecated -public interface SyncContextFactory extends org.eclipse.aether.spi.synccontext.SyncContextFactory +public interface SyncContextFactory extends org.apache.maven.resolver.spi.synccontext.SyncContextFactory { } diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/UpdateCheck.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/UpdateCheck.java similarity index 96% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/impl/UpdateCheck.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/UpdateCheck.java index b77d2bcc6..8ebf42844 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/UpdateCheck.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/UpdateCheck.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.impl; +package org.apache.maven.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,8 +21,9 @@ import java.io.File; -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.repository.RepositoryPolicy; +import org.apache.maven.resolver.RepositoryException; +import org.apache.maven.resolver.repository.RemoteRepository; /** * A request to check if an update of an artifact/metadata from a remote repository is needed. @@ -162,7 +163,7 @@ public UpdateCheck setFileValid( boolean fileValid ) * Gets the policy to use for the check. * * @return The policy to use for the check. - * @see org.eclipse.aether.repository.RepositoryPolicy + * @see RepositoryPolicy */ public String getPolicy() { @@ -174,7 +175,7 @@ public String getPolicy() * * @param policy The policy to use for the check, may be {@code null}. * @return This object for chaining. - * @see org.eclipse.aether.repository.RepositoryPolicy + * @see RepositoryPolicy */ public UpdateCheck setPolicy( String policy ) { diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/UpdateCheckManager.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/UpdateCheckManager.java similarity index 89% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/impl/UpdateCheckManager.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/UpdateCheckManager.java index cd35df02d..0702f8ee4 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/UpdateCheckManager.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/UpdateCheckManager.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.impl; +package org.apache.maven.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,11 +19,11 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.transfer.ArtifactTransferException; -import org.eclipse.aether.transfer.MetadataTransferException; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.transfer.ArtifactTransferException; +import org.apache.maven.resolver.transfer.MetadataTransferException; /** * Determines if updates of artifacts and metadata from remote repositories are needed. diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/UpdatePolicyAnalyzer.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/UpdatePolicyAnalyzer.java similarity index 95% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/impl/UpdatePolicyAnalyzer.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/UpdatePolicyAnalyzer.java index ce8018a19..8ba820634 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/UpdatePolicyAnalyzer.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/UpdatePolicyAnalyzer.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.impl; +package org.apache.maven.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; +import org.apache.maven.resolver.RepositorySystemSession; /** * Evaluates update policies. diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/VersionRangeResolver.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/VersionRangeResolver.java similarity index 86% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/impl/VersionRangeResolver.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/VersionRangeResolver.java index 89bf706be..fefc6be83 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/VersionRangeResolver.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/VersionRangeResolver.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.impl; +package org.apache.maven.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,11 +19,11 @@ * under the License. */ -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.resolution.VersionRangeRequest; -import org.eclipse.aether.resolution.VersionRangeResolutionException; -import org.eclipse.aether.resolution.VersionRangeResult; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.resolution.VersionRangeRequest; +import org.apache.maven.resolver.resolution.VersionRangeResolutionException; +import org.apache.maven.resolver.resolution.VersionRangeResult; /** * Parses and evaluates version ranges encountered in dependency declarations. diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/VersionResolver.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/VersionResolver.java similarity index 83% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/impl/VersionResolver.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/VersionResolver.java index e6a8a108f..2625cec0b 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/VersionResolver.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/VersionResolver.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.impl; +package org.apache.maven.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,11 +19,11 @@ * under the License. */ -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.resolution.VersionRequest; -import org.eclipse.aether.resolution.VersionResolutionException; -import org.eclipse.aether.resolution.VersionResult; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.resolution.VersionRequest; +import org.apache.maven.resolver.resolution.VersionResolutionException; +import org.apache.maven.resolver.resolution.VersionResult; /** * Evaluates artifact meta/pseudo versions. diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/guice/AetherModule.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/guice/AetherModule.java similarity index 69% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/impl/guice/AetherModule.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/guice/AetherModule.java index 02bd7b08b..56abc976b 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/guice/AetherModule.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/guice/AetherModule.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.impl.guice; +package org.apache.maven.resolver.impl.guice; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -28,80 +28,80 @@ import javax.inject.Named; import javax.inject.Singleton; -import org.eclipse.aether.RepositoryListener; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.impl.ArtifactResolver; -import org.eclipse.aether.impl.DependencyCollector; -import org.eclipse.aether.impl.Deployer; -import org.eclipse.aether.impl.Installer; -import org.eclipse.aether.impl.LocalRepositoryProvider; -import org.eclipse.aether.impl.MetadataResolver; -import org.eclipse.aether.impl.OfflineController; -import org.eclipse.aether.impl.RemoteRepositoryManager; -import org.eclipse.aether.impl.RepositoryConnectorProvider; -import org.eclipse.aether.impl.RepositoryEventDispatcher; -import org.eclipse.aether.internal.impl.DefaultLocalPathPrefixComposerFactory; -import org.eclipse.aether.internal.impl.LocalPathComposer; -import org.eclipse.aether.internal.impl.DefaultLocalPathComposer; -import org.eclipse.aether.internal.impl.DefaultTrackingFileManager; -import org.eclipse.aether.internal.impl.LocalPathPrefixComposerFactory; -import org.eclipse.aether.internal.impl.FileProvidedChecksumsSource; -import org.eclipse.aether.internal.impl.TrackingFileManager; -import org.eclipse.aether.internal.impl.checksum.Md5ChecksumAlgorithmFactory; -import org.eclipse.aether.internal.impl.checksum.Sha1ChecksumAlgorithmFactory; -import org.eclipse.aether.internal.impl.checksum.Sha256ChecksumAlgorithmFactory; -import org.eclipse.aether.internal.impl.checksum.Sha512ChecksumAlgorithmFactory; -import org.eclipse.aether.internal.impl.checksum.DefaultChecksumAlgorithmFactorySelector; -import org.eclipse.aether.internal.impl.collect.DependencyCollectorDelegate; -import org.eclipse.aether.internal.impl.collect.bf.BfDependencyCollector; -import org.eclipse.aether.internal.impl.collect.df.DfDependencyCollector; -import org.eclipse.aether.internal.impl.synccontext.DefaultSyncContextFactory; -import org.eclipse.aether.internal.impl.synccontext.named.NamedLockFactorySelector; -import org.eclipse.aether.internal.impl.synccontext.named.SimpleNamedLockFactorySelector; -import org.eclipse.aether.internal.impl.synccontext.named.GAVNameMapper; -import org.eclipse.aether.internal.impl.synccontext.named.DiscriminatingNameMapper; -import org.eclipse.aether.internal.impl.synccontext.named.NameMapper; -import org.eclipse.aether.internal.impl.synccontext.named.StaticNameMapper; -import org.eclipse.aether.internal.impl.synccontext.named.FileGAVNameMapper; -import org.eclipse.aether.named.NamedLockFactory; -import org.eclipse.aether.named.providers.FileLockNamedLockFactory; -import org.eclipse.aether.named.providers.LocalReadWriteLockNamedLockFactory; -import org.eclipse.aether.named.providers.LocalSemaphoreNamedLockFactory; -import org.eclipse.aether.impl.UpdateCheckManager; -import org.eclipse.aether.impl.UpdatePolicyAnalyzer; -import org.eclipse.aether.internal.impl.DefaultArtifactResolver; -import org.eclipse.aether.internal.impl.DefaultChecksumPolicyProvider; -import org.eclipse.aether.internal.impl.collect.DefaultDependencyCollector; -import org.eclipse.aether.internal.impl.DefaultDeployer; -import org.eclipse.aether.internal.impl.DefaultFileProcessor; -import org.eclipse.aether.internal.impl.DefaultInstaller; -import org.eclipse.aether.internal.impl.DefaultLocalRepositoryProvider; -import org.eclipse.aether.internal.impl.DefaultMetadataResolver; -import org.eclipse.aether.internal.impl.DefaultOfflineController; -import org.eclipse.aether.internal.impl.DefaultRemoteRepositoryManager; -import org.eclipse.aether.internal.impl.DefaultRepositoryConnectorProvider; -import org.eclipse.aether.internal.impl.DefaultRepositoryEventDispatcher; -import org.eclipse.aether.internal.impl.DefaultRepositoryLayoutProvider; -import org.eclipse.aether.internal.impl.DefaultRepositorySystem; -import org.eclipse.aether.internal.impl.DefaultTransporterProvider; -import org.eclipse.aether.internal.impl.DefaultUpdateCheckManager; -import org.eclipse.aether.internal.impl.DefaultUpdatePolicyAnalyzer; -import org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory; -import org.eclipse.aether.internal.impl.Maven2RepositoryLayoutFactory; -import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory; -import org.eclipse.aether.internal.impl.slf4j.Slf4jLoggerFactory; -import org.eclipse.aether.named.providers.NoopNamedLockFactory; -import org.eclipse.aether.spi.connector.checksum.ProvidedChecksumsSource; -import org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithmFactorySelector; -import org.eclipse.aether.spi.connector.checksum.ChecksumPolicyProvider; -import org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithmFactory; -import org.eclipse.aether.spi.connector.layout.RepositoryLayoutFactory; -import org.eclipse.aether.spi.connector.layout.RepositoryLayoutProvider; -import org.eclipse.aether.spi.connector.transport.TransporterProvider; -import org.eclipse.aether.spi.io.FileProcessor; -import org.eclipse.aether.spi.localrepo.LocalRepositoryManagerFactory; -import org.eclipse.aether.spi.log.LoggerFactory; -import org.eclipse.aether.spi.synccontext.SyncContextFactory; +import org.apache.maven.resolver.internal.impl.synccontext.legacy.DefaultSyncContextFactory; +import org.apache.maven.resolver.RepositoryListener; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.impl.ArtifactResolver; +import org.apache.maven.resolver.impl.DependencyCollector; +import org.apache.maven.resolver.impl.Deployer; +import org.apache.maven.resolver.impl.Installer; +import org.apache.maven.resolver.impl.LocalRepositoryProvider; +import org.apache.maven.resolver.impl.MetadataResolver; +import org.apache.maven.resolver.impl.OfflineController; +import org.apache.maven.resolver.impl.RemoteRepositoryManager; +import org.apache.maven.resolver.impl.RepositoryConnectorProvider; +import org.apache.maven.resolver.impl.RepositoryEventDispatcher; +import org.apache.maven.resolver.internal.impl.DefaultLocalPathPrefixComposerFactory; +import org.apache.maven.resolver.internal.impl.LocalPathComposer; +import org.apache.maven.resolver.internal.impl.DefaultLocalPathComposer; +import org.apache.maven.resolver.internal.impl.DefaultTrackingFileManager; +import org.apache.maven.resolver.internal.impl.LocalPathPrefixComposerFactory; +import org.apache.maven.resolver.internal.impl.FileProvidedChecksumsSource; +import org.apache.maven.resolver.internal.impl.TrackingFileManager; +import org.apache.maven.resolver.internal.impl.checksum.Md5ChecksumAlgorithmFactory; +import org.apache.maven.resolver.internal.impl.checksum.Sha1ChecksumAlgorithmFactory; +import org.apache.maven.resolver.internal.impl.checksum.Sha256ChecksumAlgorithmFactory; +import org.apache.maven.resolver.internal.impl.checksum.Sha512ChecksumAlgorithmFactory; +import org.apache.maven.resolver.internal.impl.checksum.DefaultChecksumAlgorithmFactorySelector; +import org.apache.maven.resolver.internal.impl.collect.DependencyCollectorDelegate; +import org.apache.maven.resolver.internal.impl.collect.bf.BfDependencyCollector; +import org.apache.maven.resolver.internal.impl.collect.df.DfDependencyCollector; +import org.apache.maven.resolver.internal.impl.synccontext.named.NamedLockFactorySelector; +import org.apache.maven.resolver.internal.impl.synccontext.named.SimpleNamedLockFactorySelector; +import org.apache.maven.resolver.internal.impl.synccontext.named.GAVNameMapper; +import org.apache.maven.resolver.internal.impl.synccontext.named.DiscriminatingNameMapper; +import org.apache.maven.resolver.internal.impl.synccontext.named.NameMapper; +import org.apache.maven.resolver.internal.impl.synccontext.named.StaticNameMapper; +import org.apache.maven.resolver.internal.impl.synccontext.named.FileGAVNameMapper; +import org.apache.maven.resolver.named.NamedLockFactory; +import org.apache.maven.resolver.named.providers.FileLockNamedLockFactory; +import org.apache.maven.resolver.named.providers.LocalReadWriteLockNamedLockFactory; +import org.apache.maven.resolver.named.providers.LocalSemaphoreNamedLockFactory; +import org.apache.maven.resolver.impl.UpdateCheckManager; +import org.apache.maven.resolver.impl.UpdatePolicyAnalyzer; +import org.apache.maven.resolver.internal.impl.DefaultArtifactResolver; +import org.apache.maven.resolver.internal.impl.DefaultChecksumPolicyProvider; +import org.apache.maven.resolver.internal.impl.collect.DefaultDependencyCollector; +import org.apache.maven.resolver.internal.impl.DefaultDeployer; +import org.apache.maven.resolver.internal.impl.DefaultFileProcessor; +import org.apache.maven.resolver.internal.impl.DefaultInstaller; +import org.apache.maven.resolver.internal.impl.DefaultLocalRepositoryProvider; +import org.apache.maven.resolver.internal.impl.DefaultMetadataResolver; +import org.apache.maven.resolver.internal.impl.DefaultOfflineController; +import org.apache.maven.resolver.internal.impl.DefaultRemoteRepositoryManager; +import org.apache.maven.resolver.internal.impl.DefaultRepositoryConnectorProvider; +import org.apache.maven.resolver.internal.impl.DefaultRepositoryEventDispatcher; +import org.apache.maven.resolver.internal.impl.DefaultRepositoryLayoutProvider; +import org.apache.maven.resolver.internal.impl.DefaultRepositorySystem; +import org.apache.maven.resolver.internal.impl.DefaultTransporterProvider; +import org.apache.maven.resolver.internal.impl.DefaultUpdateCheckManager; +import org.apache.maven.resolver.internal.impl.DefaultUpdatePolicyAnalyzer; +import org.apache.maven.resolver.internal.impl.EnhancedLocalRepositoryManagerFactory; +import org.apache.maven.resolver.internal.impl.Maven2RepositoryLayoutFactory; +import org.apache.maven.resolver.internal.impl.SimpleLocalRepositoryManagerFactory; +import org.apache.maven.resolver.internal.impl.slf4j.Slf4jLoggerFactory; +import org.apache.maven.resolver.named.providers.NoopNamedLockFactory; +import org.apache.maven.resolver.spi.connector.checksum.ProvidedChecksumsSource; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumAlgorithmFactorySelector; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumPolicyProvider; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumAlgorithmFactory; +import org.apache.maven.resolver.spi.connector.layout.RepositoryLayoutFactory; +import org.apache.maven.resolver.spi.connector.layout.RepositoryLayoutProvider; +import org.apache.maven.resolver.spi.connector.transport.TransporterProvider; +import org.apache.maven.resolver.spi.io.FileProcessor; +import org.apache.maven.resolver.spi.localrepo.LocalRepositoryManagerFactory; +import org.apache.maven.resolver.spi.log.LoggerFactory; +import org.apache.maven.resolver.spi.synccontext.SyncContextFactory; import org.slf4j.ILoggerFactory; import com.google.inject.AbstractModule; @@ -205,8 +205,8 @@ protected void configure() bind( NamedLockFactorySelector.class ).to( SimpleNamedLockFactorySelector.class ).in( Singleton.class ); bind( SyncContextFactory.class ).to( DefaultSyncContextFactory.class ).in( Singleton.class ); - bind( org.eclipse.aether.impl.SyncContextFactory.class ) - .to( org.eclipse.aether.internal.impl.synccontext.legacy.DefaultSyncContextFactory.class ) + bind( org.apache.maven.resolver.impl.SyncContextFactory.class ) + .to( DefaultSyncContextFactory.class ) .in( Singleton.class ); bind( NameMapper.class ).annotatedWith( Names.named( StaticNameMapper.NAME ) ) diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/guice/package-info.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/guice/package-info.java similarity index 95% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/impl/guice/package-info.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/guice/package-info.java index fd14dd7d8..6130f4a21 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/guice/package-info.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/guice/package-info.java @@ -21,5 +21,5 @@ * The integration with the dependency injection framework * Google Guice. */ -package org.eclipse.aether.impl.guice; +package org.apache.maven.resolver.impl.guice; diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/package-info.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/package-info.java similarity index 71% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/impl/package-info.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/package-info.java index 959a431fe..a82e7514c 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/package-info.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/impl/package-info.java @@ -21,10 +21,12 @@ * The provisional interfaces defining the various sub components that implement the repository system. Aether Core * provides stock implementations for most of these components but not all. To obtain a complete/runnable repository * system, the application needs to provide implementations of the following component contracts: - * {@link org.eclipse.aether.impl.ArtifactDescriptorReader}, {@link org.eclipse.aether.impl.VersionResolver}, - * {@link org.eclipse.aether.impl.VersionRangeResolver} and potentially - * {@link org.eclipse.aether.impl.MetadataGeneratorFactory}. Said components basically define the file format of the - * metadata that is used to reason about an artifact's dependencies and available versions. + * {@link org.apache.maven.resolver.impl.ArtifactDescriptorReader}, + * {@link org.apache.maven.resolver.impl.VersionResolver}, + * {@link org.apache.maven.resolver.impl.VersionRangeResolver} and potentially + * {@link org.apache.maven.resolver.impl.MetadataGeneratorFactory}. + * Said components basically define the file format of the metadata that is used to reason + * about an artifact's dependencies and available versions. */ -package org.eclipse.aether.impl; +package org.apache.maven.resolver.impl; diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/AbstractChecksumPolicy.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/AbstractChecksumPolicy.java similarity index 90% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/AbstractChecksumPolicy.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/AbstractChecksumPolicy.java index 1fe9e900d..91d13474f 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/AbstractChecksumPolicy.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/AbstractChecksumPolicy.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.spi.connector.checksum.ChecksumPolicy; -import org.eclipse.aether.transfer.ChecksumFailureException; -import org.eclipse.aether.transfer.TransferResource; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumPolicy; +import org.apache.maven.resolver.transfer.ChecksumFailureException; +import org.apache.maven.resolver.transfer.TransferResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/ArtifactRequestBuilder.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/ArtifactRequestBuilder.java similarity index 85% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/ArtifactRequestBuilder.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/ArtifactRequestBuilder.java index 1c46eae26..3b5ddfb29 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/ArtifactRequestBuilder.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/ArtifactRequestBuilder.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,10 +22,10 @@ import java.util.ArrayList; import java.util.List; -import org.eclipse.aether.RequestTrace; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.graph.DependencyVisitor; -import org.eclipse.aether.resolution.ArtifactRequest; +import org.apache.maven.resolver.RequestTrace; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.graph.DependencyVisitor; +import org.apache.maven.resolver.resolution.ArtifactRequest; /** */ diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultArtifactResolver.java similarity index 89% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultArtifactResolver.java index 430ea3816..5de32e67f 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultArtifactResolver.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -33,48 +33,46 @@ import javax.inject.Named; import javax.inject.Singleton; -import org.eclipse.aether.RepositoryEvent; -import org.eclipse.aether.RepositoryEvent.EventType; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.RequestTrace; -import org.eclipse.aether.SyncContext; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.ArtifactProperties; -import org.eclipse.aether.impl.ArtifactResolver; -import org.eclipse.aether.impl.OfflineController; -import org.eclipse.aether.impl.RemoteRepositoryManager; -import org.eclipse.aether.impl.RepositoryConnectorProvider; -import org.eclipse.aether.impl.RepositoryEventDispatcher; -import org.eclipse.aether.spi.synccontext.SyncContextFactory; -import org.eclipse.aether.impl.UpdateCheck; -import org.eclipse.aether.impl.UpdateCheckManager; -import org.eclipse.aether.impl.VersionResolver; -import org.eclipse.aether.repository.ArtifactRepository; -import org.eclipse.aether.repository.LocalArtifactRegistration; -import org.eclipse.aether.repository.LocalArtifactRequest; -import org.eclipse.aether.repository.LocalArtifactResult; -import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.repository.LocalRepositoryManager; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.repository.RepositoryPolicy; -import org.eclipse.aether.repository.WorkspaceReader; -import org.eclipse.aether.resolution.ArtifactRequest; -import org.eclipse.aether.resolution.ArtifactResolutionException; -import org.eclipse.aether.resolution.ArtifactResult; -import org.eclipse.aether.resolution.ResolutionErrorPolicy; -import org.eclipse.aether.resolution.VersionRequest; -import org.eclipse.aether.resolution.VersionResolutionException; -import org.eclipse.aether.resolution.VersionResult; -import org.eclipse.aether.spi.connector.ArtifactDownload; -import org.eclipse.aether.spi.connector.RepositoryConnector; -import org.eclipse.aether.spi.io.FileProcessor; -import org.eclipse.aether.spi.locator.Service; -import org.eclipse.aether.spi.locator.ServiceLocator; -import org.eclipse.aether.transfer.ArtifactNotFoundException; -import org.eclipse.aether.transfer.ArtifactTransferException; -import org.eclipse.aether.transfer.NoRepositoryConnectorException; -import org.eclipse.aether.transfer.RepositoryOfflineException; -import org.eclipse.aether.util.ConfigUtils; +import org.apache.maven.resolver.RepositoryEvent; +import org.apache.maven.resolver.RepositoryEvent.EventType; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.RequestTrace; +import org.apache.maven.resolver.SyncContext; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.ArtifactProperties; +import org.apache.maven.resolver.impl.ArtifactResolver; +import org.apache.maven.resolver.impl.OfflineController; +import org.apache.maven.resolver.impl.RemoteRepositoryManager; +import org.apache.maven.resolver.impl.RepositoryConnectorProvider; +import org.apache.maven.resolver.impl.RepositoryEventDispatcher; +import org.apache.maven.resolver.spi.synccontext.SyncContextFactory; +import org.apache.maven.resolver.impl.UpdateCheck; +import org.apache.maven.resolver.impl.UpdateCheckManager; +import org.apache.maven.resolver.impl.VersionResolver; +import org.apache.maven.resolver.repository.ArtifactRepository; +import org.apache.maven.resolver.repository.LocalArtifactRegistration; +import org.apache.maven.resolver.repository.LocalArtifactRequest; +import org.apache.maven.resolver.repository.LocalArtifactResult; +import org.apache.maven.resolver.repository.LocalRepository; +import org.apache.maven.resolver.repository.LocalRepositoryManager; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.repository.RepositoryPolicy; +import org.apache.maven.resolver.repository.WorkspaceReader; +import org.apache.maven.resolver.resolution.ArtifactRequest; +import org.apache.maven.resolver.resolution.ArtifactResolutionException; +import org.apache.maven.resolver.resolution.ArtifactResult; +import org.apache.maven.resolver.resolution.ResolutionErrorPolicy; +import org.apache.maven.resolver.resolution.VersionRequest; +import org.apache.maven.resolver.resolution.VersionResolutionException; +import org.apache.maven.resolver.resolution.VersionResult; +import org.apache.maven.resolver.spi.connector.ArtifactDownload; +import org.apache.maven.resolver.spi.connector.RepositoryConnector; +import org.apache.maven.resolver.spi.io.FileProcessor; +import org.apache.maven.resolver.transfer.ArtifactNotFoundException; +import org.apache.maven.resolver.transfer.ArtifactTransferException; +import org.apache.maven.resolver.transfer.NoRepositoryConnectorException; +import org.apache.maven.resolver.transfer.RepositoryOfflineException; +import org.apache.maven.resolver.util.ConfigUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -83,7 +81,7 @@ @Singleton @Named public class DefaultArtifactResolver - implements ArtifactResolver, Service + implements ArtifactResolver { private static final String CONFIG_PROP_SNAPSHOT_NORMALIZATION = "aether.artifactResolver.snapshotNormalization"; @@ -129,23 +127,11 @@ public DefaultArtifactResolver() setOfflineController( offlineController ); } - public void initService( ServiceLocator locator ) - { - setFileProcessor( locator.getService( FileProcessor.class ) ); - setRepositoryEventDispatcher( locator.getService( RepositoryEventDispatcher.class ) ); - setVersionResolver( locator.getService( VersionResolver.class ) ); - setUpdateCheckManager( locator.getService( UpdateCheckManager.class ) ); - setRepositoryConnectorProvider( locator.getService( RepositoryConnectorProvider.class ) ); - setRemoteRepositoryManager( locator.getService( RemoteRepositoryManager.class ) ); - setSyncContextFactory( locator.getService( SyncContextFactory.class ) ); - setOfflineController( locator.getService( OfflineController.class ) ); - } - /** * @deprecated not used any more since MRESOLVER-36 move to slf4j, added back in MRESOLVER-64 for compatibility */ @Deprecated - public DefaultArtifactResolver setLoggerFactory( org.eclipse.aether.spi.log.LoggerFactory loggerFactory ) + public DefaultArtifactResolver setLoggerFactory( org.apache.maven.resolver.spi.log.LoggerFactory loggerFactory ) { // this.logger = NullLoggerFactory.getSafeLogger( loggerFactory, getClass() ); return this; diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProvider.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultChecksumPolicyProvider.java similarity index 89% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProvider.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultChecksumPolicyProvider.java index 270ac86af..cb133b6ce 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProvider.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultChecksumPolicyProvider.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,12 +24,12 @@ import java.util.Objects; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.repository.RepositoryPolicy; -import org.eclipse.aether.spi.connector.checksum.ChecksumPolicy; -import org.eclipse.aether.spi.connector.checksum.ChecksumPolicyProvider; -import org.eclipse.aether.transfer.TransferResource; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.repository.RepositoryPolicy; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumPolicy; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumPolicyProvider; +import org.apache.maven.resolver.transfer.TransferResource; /** */ diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDeployer.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultDeployer.java similarity index 87% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDeployer.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultDeployer.java index f582f50dd..fd47df6c9 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDeployer.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultDeployer.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -35,54 +35,52 @@ import javax.inject.Named; import javax.inject.Singleton; -import org.eclipse.aether.RepositoryEvent; -import org.eclipse.aether.RepositoryEvent.EventType; -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.RequestTrace; -import org.eclipse.aether.SyncContext; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.deployment.DeployRequest; -import org.eclipse.aether.deployment.DeployResult; -import org.eclipse.aether.deployment.DeploymentException; -import org.eclipse.aether.impl.Deployer; -import org.eclipse.aether.impl.MetadataGenerator; -import org.eclipse.aether.impl.MetadataGeneratorFactory; -import org.eclipse.aether.impl.OfflineController; -import org.eclipse.aether.impl.RemoteRepositoryManager; -import org.eclipse.aether.impl.RepositoryConnectorProvider; -import org.eclipse.aether.impl.RepositoryEventDispatcher; -import org.eclipse.aether.spi.synccontext.SyncContextFactory; -import org.eclipse.aether.impl.UpdateCheck; -import org.eclipse.aether.impl.UpdateCheckManager; -import org.eclipse.aether.metadata.MergeableMetadata; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.repository.LocalRepositoryManager; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.repository.RepositoryPolicy; -import org.eclipse.aether.spi.connector.ArtifactUpload; -import org.eclipse.aether.spi.connector.MetadataDownload; -import org.eclipse.aether.spi.connector.MetadataUpload; -import org.eclipse.aether.spi.connector.RepositoryConnector; -import org.eclipse.aether.spi.io.FileProcessor; -import org.eclipse.aether.spi.locator.Service; -import org.eclipse.aether.spi.locator.ServiceLocator; -import org.eclipse.aether.transfer.ArtifactTransferException; -import org.eclipse.aether.transfer.MetadataNotFoundException; -import org.eclipse.aether.transfer.MetadataTransferException; -import org.eclipse.aether.transfer.NoRepositoryConnectorException; -import org.eclipse.aether.transfer.RepositoryOfflineException; -import org.eclipse.aether.transfer.TransferCancelledException; -import org.eclipse.aether.transfer.TransferEvent; -import org.eclipse.aether.transform.FileTransformer; -import org.eclipse.aether.transform.FileTransformerManager; +import org.apache.maven.resolver.RepositoryEvent; +import org.apache.maven.resolver.RepositoryEvent.EventType; +import org.apache.maven.resolver.RepositoryException; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.RequestTrace; +import org.apache.maven.resolver.SyncContext; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.deployment.DeployRequest; +import org.apache.maven.resolver.deployment.DeployResult; +import org.apache.maven.resolver.deployment.DeploymentException; +import org.apache.maven.resolver.impl.Deployer; +import org.apache.maven.resolver.impl.MetadataGenerator; +import org.apache.maven.resolver.impl.MetadataGeneratorFactory; +import org.apache.maven.resolver.impl.OfflineController; +import org.apache.maven.resolver.impl.RemoteRepositoryManager; +import org.apache.maven.resolver.impl.RepositoryConnectorProvider; +import org.apache.maven.resolver.impl.RepositoryEventDispatcher; +import org.apache.maven.resolver.spi.synccontext.SyncContextFactory; +import org.apache.maven.resolver.impl.UpdateCheck; +import org.apache.maven.resolver.impl.UpdateCheckManager; +import org.apache.maven.resolver.metadata.MergeableMetadata; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.repository.LocalRepositoryManager; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.repository.RepositoryPolicy; +import org.apache.maven.resolver.spi.connector.ArtifactUpload; +import org.apache.maven.resolver.spi.connector.MetadataDownload; +import org.apache.maven.resolver.spi.connector.MetadataUpload; +import org.apache.maven.resolver.spi.connector.RepositoryConnector; +import org.apache.maven.resolver.spi.io.FileProcessor; +import org.apache.maven.resolver.transfer.ArtifactTransferException; +import org.apache.maven.resolver.transfer.MetadataNotFoundException; +import org.apache.maven.resolver.transfer.MetadataTransferException; +import org.apache.maven.resolver.transfer.NoRepositoryConnectorException; +import org.apache.maven.resolver.transfer.RepositoryOfflineException; +import org.apache.maven.resolver.transfer.TransferCancelledException; +import org.apache.maven.resolver.transfer.TransferEvent; +import org.apache.maven.resolver.transform.FileTransformer; +import org.apache.maven.resolver.transform.FileTransformerManager; /** */ @Singleton @Named public class DefaultDeployer - implements Deployer, Service + implements Deployer { private FileProcessor fileProcessor; @@ -123,18 +121,6 @@ public DefaultDeployer() setOfflineController( offlineController ); } - public void initService( ServiceLocator locator ) - { - setFileProcessor( locator.getService( FileProcessor.class ) ); - setRepositoryEventDispatcher( locator.getService( RepositoryEventDispatcher.class ) ); - setRepositoryConnectorProvider( locator.getService( RepositoryConnectorProvider.class ) ); - setRemoteRepositoryManager( locator.getService( RemoteRepositoryManager.class ) ); - setUpdateCheckManager( locator.getService( UpdateCheckManager.class ) ); - setMetadataGeneratorFactories( locator.getServices( MetadataGeneratorFactory.class ) ); - setSyncContextFactory( locator.getService( SyncContextFactory.class ) ); - setOfflineController( locator.getService( OfflineController.class ) ); - } - public DefaultDeployer setFileProcessor( FileProcessor fileProcessor ) { this.fileProcessor = requireNonNull( fileProcessor, "file processor cannot be null" ); diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultFileProcessor.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultFileProcessor.java similarity index 97% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultFileProcessor.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultFileProcessor.java index 3aebd7833..441ed8a1f 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultFileProcessor.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultFileProcessor.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -31,8 +31,8 @@ import javax.inject.Named; import javax.inject.Singleton; -import org.eclipse.aether.spi.io.FileProcessor; -import org.eclipse.aether.util.ChecksumUtils; +import org.apache.maven.resolver.spi.io.FileProcessor; +import org.apache.maven.resolver.util.ChecksumUtils; /** * A utility class helping with file-based operations. diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultInstaller.java similarity index 88% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultInstaller.java index 6b3f7a7d1..2dada41c9 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultInstaller.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -34,29 +34,27 @@ import javax.inject.Named; import javax.inject.Singleton; -import org.eclipse.aether.RepositoryEvent; -import org.eclipse.aether.RepositoryEvent.EventType; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.RequestTrace; -import org.eclipse.aether.SyncContext; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.impl.Installer; -import org.eclipse.aether.impl.MetadataGenerator; -import org.eclipse.aether.impl.MetadataGeneratorFactory; -import org.eclipse.aether.impl.RepositoryEventDispatcher; -import org.eclipse.aether.spi.synccontext.SyncContextFactory; -import org.eclipse.aether.installation.InstallRequest; -import org.eclipse.aether.installation.InstallResult; -import org.eclipse.aether.installation.InstallationException; -import org.eclipse.aether.metadata.MergeableMetadata; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.repository.LocalArtifactRegistration; -import org.eclipse.aether.repository.LocalMetadataRegistration; -import org.eclipse.aether.repository.LocalRepositoryManager; -import org.eclipse.aether.spi.io.FileProcessor; -import org.eclipse.aether.spi.locator.Service; -import org.eclipse.aether.spi.locator.ServiceLocator; -import org.eclipse.aether.transform.FileTransformer; +import org.apache.maven.resolver.RepositoryEvent; +import org.apache.maven.resolver.RepositoryEvent.EventType; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.RequestTrace; +import org.apache.maven.resolver.SyncContext; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.impl.Installer; +import org.apache.maven.resolver.impl.MetadataGenerator; +import org.apache.maven.resolver.impl.MetadataGeneratorFactory; +import org.apache.maven.resolver.impl.RepositoryEventDispatcher; +import org.apache.maven.resolver.spi.synccontext.SyncContextFactory; +import org.apache.maven.resolver.installation.InstallRequest; +import org.apache.maven.resolver.installation.InstallResult; +import org.apache.maven.resolver.installation.InstallationException; +import org.apache.maven.resolver.metadata.MergeableMetadata; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.repository.LocalArtifactRegistration; +import org.apache.maven.resolver.repository.LocalMetadataRegistration; +import org.apache.maven.resolver.repository.LocalRepositoryManager; +import org.apache.maven.resolver.spi.io.FileProcessor; +import org.apache.maven.resolver.transform.FileTransformer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -65,7 +63,7 @@ @Singleton @Named public class DefaultInstaller - implements Installer, Service + implements Installer { private static final Logger LOGGER = LoggerFactory.getLogger( DefaultInstaller.class ); @@ -93,14 +91,6 @@ public DefaultInstaller() setSyncContextFactory( syncContextFactory ); } - public void initService( ServiceLocator locator ) - { - setFileProcessor( locator.getService( FileProcessor.class ) ); - setRepositoryEventDispatcher( locator.getService( RepositoryEventDispatcher.class ) ); - setMetadataGeneratorFactories( locator.getServices( MetadataGeneratorFactory.class ) ); - setSyncContextFactory( locator.getService( SyncContextFactory.class ) ); - } - public DefaultInstaller setFileProcessor( FileProcessor fileProcessor ) { this.fileProcessor = requireNonNull( fileProcessor, "file processor cannot be null" ); diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalPathComposer.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultLocalPathComposer.java similarity index 95% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalPathComposer.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultLocalPathComposer.java index 548816073..e5b5433a7 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalPathComposer.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultLocalPathComposer.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,8 +22,8 @@ import javax.inject.Named; import javax.inject.Singleton; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.metadata.Metadata; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.metadata.Metadata; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalPathPrefixComposerFactory.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultLocalPathPrefixComposerFactory.java similarity index 95% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalPathPrefixComposerFactory.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultLocalPathPrefixComposerFactory.java index 7fce1a042..7a86ad911 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalPathPrefixComposerFactory.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultLocalPathPrefixComposerFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,7 +22,7 @@ import javax.inject.Named; import javax.inject.Singleton; -import org.eclipse.aether.RepositorySystemSession; +import org.apache.maven.resolver.RepositorySystemSession; /** * Default local path prefix composer factory: it fully reuses {@link LocalPathPrefixComposerFactorySupport} class diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalRepositoryProvider.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultLocalRepositoryProvider.java similarity index 87% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalRepositoryProvider.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultLocalRepositoryProvider.java index 26110ec8a..8f8ef3a81 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalRepositoryProvider.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultLocalRepositoryProvider.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -29,14 +29,12 @@ import javax.inject.Named; import javax.inject.Singleton; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.impl.LocalRepositoryProvider; -import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.repository.LocalRepositoryManager; -import org.eclipse.aether.repository.NoLocalRepositoryManagerException; -import org.eclipse.aether.spi.localrepo.LocalRepositoryManagerFactory; -import org.eclipse.aether.spi.locator.Service; -import org.eclipse.aether.spi.locator.ServiceLocator; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.impl.LocalRepositoryProvider; +import org.apache.maven.resolver.repository.LocalRepository; +import org.apache.maven.resolver.repository.LocalRepositoryManager; +import org.apache.maven.resolver.repository.NoLocalRepositoryManagerException; +import org.apache.maven.resolver.spi.localrepo.LocalRepositoryManagerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,7 +43,7 @@ @Singleton @Named public class DefaultLocalRepositoryProvider - implements LocalRepositoryProvider, Service + implements LocalRepositoryProvider { private static final Logger LOGGER = LoggerFactory.getLogger( DefaultLocalRepositoryProvider.class ); @@ -63,11 +61,6 @@ public DefaultLocalRepositoryProvider() setLocalRepositoryManagerFactories( factories ); } - public void initService( ServiceLocator locator ) - { - setLocalRepositoryManagerFactories( locator.getServices( LocalRepositoryManagerFactory.class ) ); - } - public DefaultLocalRepositoryProvider addLocalRepositoryManagerFactory( LocalRepositoryManagerFactory factory ) { managerFactories.add( requireNonNull( factory, "local repository manager factory cannot be null" ) ); diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultMetadataResolver.java similarity index 89% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultMetadataResolver.java index f65f0c2fb..aee2c2e01 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultMetadataResolver.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -37,48 +37,46 @@ import javax.inject.Named; import javax.inject.Singleton; -import org.eclipse.aether.RepositoryEvent; -import org.eclipse.aether.RepositoryEvent.EventType; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.RequestTrace; -import org.eclipse.aether.SyncContext; -import org.eclipse.aether.impl.MetadataResolver; -import org.eclipse.aether.impl.OfflineController; -import org.eclipse.aether.impl.RemoteRepositoryManager; -import org.eclipse.aether.impl.RepositoryConnectorProvider; -import org.eclipse.aether.impl.RepositoryEventDispatcher; -import org.eclipse.aether.spi.synccontext.SyncContextFactory; -import org.eclipse.aether.impl.UpdateCheck; -import org.eclipse.aether.impl.UpdateCheckManager; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.repository.ArtifactRepository; -import org.eclipse.aether.repository.LocalMetadataRegistration; -import org.eclipse.aether.repository.LocalMetadataRequest; -import org.eclipse.aether.repository.LocalMetadataResult; -import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.repository.LocalRepositoryManager; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.repository.RepositoryPolicy; -import org.eclipse.aether.resolution.MetadataRequest; -import org.eclipse.aether.resolution.MetadataResult; -import org.eclipse.aether.spi.connector.MetadataDownload; -import org.eclipse.aether.spi.connector.RepositoryConnector; -import org.eclipse.aether.spi.locator.Service; -import org.eclipse.aether.spi.locator.ServiceLocator; -import org.eclipse.aether.transfer.MetadataNotFoundException; -import org.eclipse.aether.transfer.MetadataTransferException; -import org.eclipse.aether.transfer.NoRepositoryConnectorException; -import org.eclipse.aether.transfer.RepositoryOfflineException; -import org.eclipse.aether.util.ConfigUtils; -import org.eclipse.aether.util.concurrency.RunnableErrorForwarder; -import org.eclipse.aether.util.concurrency.WorkerThreadFactory; +import org.apache.maven.resolver.RepositoryEvent; +import org.apache.maven.resolver.RepositoryEvent.EventType; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.RequestTrace; +import org.apache.maven.resolver.SyncContext; +import org.apache.maven.resolver.impl.MetadataResolver; +import org.apache.maven.resolver.impl.OfflineController; +import org.apache.maven.resolver.impl.RemoteRepositoryManager; +import org.apache.maven.resolver.impl.RepositoryConnectorProvider; +import org.apache.maven.resolver.impl.RepositoryEventDispatcher; +import org.apache.maven.resolver.spi.synccontext.SyncContextFactory; +import org.apache.maven.resolver.impl.UpdateCheck; +import org.apache.maven.resolver.impl.UpdateCheckManager; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.repository.ArtifactRepository; +import org.apache.maven.resolver.repository.LocalMetadataRegistration; +import org.apache.maven.resolver.repository.LocalMetadataRequest; +import org.apache.maven.resolver.repository.LocalMetadataResult; +import org.apache.maven.resolver.repository.LocalRepository; +import org.apache.maven.resolver.repository.LocalRepositoryManager; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.repository.RepositoryPolicy; +import org.apache.maven.resolver.resolution.MetadataRequest; +import org.apache.maven.resolver.resolution.MetadataResult; +import org.apache.maven.resolver.spi.connector.MetadataDownload; +import org.apache.maven.resolver.spi.connector.RepositoryConnector; +import org.apache.maven.resolver.transfer.MetadataNotFoundException; +import org.apache.maven.resolver.transfer.MetadataTransferException; +import org.apache.maven.resolver.transfer.NoRepositoryConnectorException; +import org.apache.maven.resolver.transfer.RepositoryOfflineException; +import org.apache.maven.resolver.util.ConfigUtils; +import org.apache.maven.resolver.util.concurrency.RunnableErrorForwarder; +import org.apache.maven.resolver.util.concurrency.WorkerThreadFactory; /** */ @Singleton @Named public class DefaultMetadataResolver - implements MetadataResolver, Service + implements MetadataResolver { private static final String CONFIG_PROP_THREADS = "aether.metadataResolver.threads"; @@ -115,16 +113,6 @@ public DefaultMetadataResolver() setOfflineController( offlineController ); } - public void initService( ServiceLocator locator ) - { - setRepositoryEventDispatcher( locator.getService( RepositoryEventDispatcher.class ) ); - setUpdateCheckManager( locator.getService( UpdateCheckManager.class ) ); - setRepositoryConnectorProvider( locator.getService( RepositoryConnectorProvider.class ) ); - setRemoteRepositoryManager( locator.getService( RemoteRepositoryManager.class ) ); - setSyncContextFactory( locator.getService( SyncContextFactory.class ) ); - setOfflineController( locator.getService( OfflineController.class ) ); - } - public DefaultMetadataResolver setRepositoryEventDispatcher( RepositoryEventDispatcher repositoryEventDispatcher ) { this.repositoryEventDispatcher = requireNonNull( diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultOfflineController.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultOfflineController.java similarity index 90% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultOfflineController.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultOfflineController.java index 464fd2752..25c5c84cd 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultOfflineController.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultOfflineController.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,11 +24,11 @@ import javax.inject.Named; import javax.inject.Singleton; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.impl.OfflineController; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.transfer.RepositoryOfflineException; -import org.eclipse.aether.util.ConfigUtils; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.impl.OfflineController; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.transfer.RepositoryOfflineException; +import org.apache.maven.resolver.util.ConfigUtils; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultRemoteRepositoryManager.java similarity index 92% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultRemoteRepositoryManager.java index 6c71277a4..83535142b 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultRemoteRepositoryManager.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -30,20 +30,18 @@ import javax.inject.Singleton; import org.apache.commons.lang3.StringUtils; -import org.eclipse.aether.RepositoryCache; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.impl.RemoteRepositoryManager; -import org.eclipse.aether.impl.UpdatePolicyAnalyzer; -import org.eclipse.aether.repository.Authentication; -import org.eclipse.aether.repository.AuthenticationSelector; -import org.eclipse.aether.repository.MirrorSelector; -import org.eclipse.aether.repository.Proxy; -import org.eclipse.aether.repository.ProxySelector; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.repository.RepositoryPolicy; -import org.eclipse.aether.spi.connector.checksum.ChecksumPolicyProvider; -import org.eclipse.aether.spi.locator.Service; -import org.eclipse.aether.spi.locator.ServiceLocator; +import org.apache.maven.resolver.RepositoryCache; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.impl.RemoteRepositoryManager; +import org.apache.maven.resolver.impl.UpdatePolicyAnalyzer; +import org.apache.maven.resolver.repository.Authentication; +import org.apache.maven.resolver.repository.AuthenticationSelector; +import org.apache.maven.resolver.repository.MirrorSelector; +import org.apache.maven.resolver.repository.Proxy; +import org.apache.maven.resolver.repository.ProxySelector; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.repository.RepositoryPolicy; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumPolicyProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,7 +50,7 @@ @Singleton @Named public class DefaultRemoteRepositoryManager - implements RemoteRepositoryManager, Service + implements RemoteRepositoryManager { private static final class LoggedMirror @@ -107,12 +105,6 @@ public DefaultRemoteRepositoryManager() setChecksumPolicyProvider( checksumPolicyProvider ); } - public void initService( ServiceLocator locator ) - { - setUpdatePolicyAnalyzer( locator.getService( UpdatePolicyAnalyzer.class ) ); - setChecksumPolicyProvider( locator.getService( ChecksumPolicyProvider.class ) ); - } - public DefaultRemoteRepositoryManager setUpdatePolicyAnalyzer( UpdatePolicyAnalyzer updatePolicyAnalyzer ) { this.updatePolicyAnalyzer = requireNonNull( updatePolicyAnalyzer, "update policy analyzer cannot be null" ); diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryConnectorProvider.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultRepositoryConnectorProvider.java similarity index 87% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryConnectorProvider.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultRepositoryConnectorProvider.java index e1f0b319b..93bbd8c6c 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryConnectorProvider.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultRepositoryConnectorProvider.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -29,16 +29,14 @@ import javax.inject.Named; import javax.inject.Singleton; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.impl.RepositoryConnectorProvider; -import org.eclipse.aether.repository.Authentication; -import org.eclipse.aether.repository.Proxy; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.spi.connector.RepositoryConnector; -import org.eclipse.aether.spi.connector.RepositoryConnectorFactory; -import org.eclipse.aether.spi.locator.Service; -import org.eclipse.aether.spi.locator.ServiceLocator; -import org.eclipse.aether.transfer.NoRepositoryConnectorException; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.impl.RepositoryConnectorProvider; +import org.apache.maven.resolver.repository.Authentication; +import org.apache.maven.resolver.repository.Proxy; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.spi.connector.RepositoryConnector; +import org.apache.maven.resolver.spi.connector.RepositoryConnectorFactory; +import org.apache.maven.resolver.transfer.NoRepositoryConnectorException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,7 +45,7 @@ @Singleton @Named public class DefaultRepositoryConnectorProvider - implements RepositoryConnectorProvider, Service + implements RepositoryConnectorProvider { private static final Logger LOGGER = LoggerFactory.getLogger( DefaultRepositoryConnectorProvider.class ); @@ -65,11 +63,6 @@ public DefaultRepositoryConnectorProvider() setRepositoryConnectorFactories( connectorFactories ); } - public void initService( ServiceLocator locator ) - { - connectorFactories = locator.getServices( RepositoryConnectorFactory.class ); - } - public DefaultRepositoryConnectorProvider addRepositoryConnectorFactory( RepositoryConnectorFactory factory ) { connectorFactories.add( requireNonNull( factory, "repository connector factory cannot be null" ) ); diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcher.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultRepositoryEventDispatcher.java similarity index 92% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcher.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultRepositoryEventDispatcher.java index 864b1b29c..3b379792d 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcher.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/DefaultRepositoryEventDispatcher.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -28,11 +28,9 @@ import javax.inject.Named; import javax.inject.Singleton; -import org.eclipse.aether.RepositoryEvent; -import org.eclipse.aether.RepositoryListener; -import org.eclipse.aether.impl.RepositoryEventDispatcher; -import org.eclipse.aether.spi.locator.Service; -import org.eclipse.aether.spi.locator.ServiceLocator; +import org.apache.maven.resolver.RepositoryEvent; +import org.apache.maven.resolver.RepositoryListener; +import org.apache.maven.resolver.impl.RepositoryEventDispatcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,7 +39,7 @@ @Singleton @Named public class DefaultRepositoryEventDispatcher - implements RepositoryEventDispatcher, Service + implements RepositoryEventDispatcher { private static final Logger LOGGER = LoggerFactory.getLogger( DefaultRepositoryEventDispatcher.class ); @@ -78,11 +76,6 @@ public DefaultRepositoryEventDispatcher setRepositoryListeners( Collection dele this.delegates = requireNonNull( delegates ); } - @Override - public void initService( ServiceLocator locator ) - { - BfDependencyCollector bf = new BfDependencyCollector(); - bf.initService( locator ); - DfDependencyCollector df = new DfDependencyCollector(); - df.initService( locator ); - this.delegates.put( BfDependencyCollector.NAME, bf ); - this.delegates.put( DfDependencyCollector.NAME, df ); - } - @Override public CollectResult collectDependencies( RepositorySystemSession session, CollectRequest request ) throws DependencyCollectionException diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCycle.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/DefaultDependencyCycle.java similarity index 93% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCycle.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/DefaultDependencyCycle.java index d417b70e2..4a367011e 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCycle.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/DefaultDependencyCycle.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.collect; +package org.apache.maven.resolver.internal.impl.collect; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,11 +23,11 @@ import java.util.Collections; import java.util.List; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyCycle; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.util.artifact.ArtifactIdUtils; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyCycle; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.util.artifact.ArtifactIdUtils; /** * Default implementation of {@link DependencyCycle}. diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyGraphTransformationContext.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/DefaultDependencyGraphTransformationContext.java similarity index 91% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyGraphTransformationContext.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/DefaultDependencyGraphTransformationContext.java index 721eab5e2..fbe9945b0 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyGraphTransformationContext.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/DefaultDependencyGraphTransformationContext.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.collect; +package org.apache.maven.resolver.internal.impl.collect; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,8 +23,8 @@ import java.util.Map; import static java.util.Objects.requireNonNull; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.collection.DependencyGraphTransformationContext; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.collection.DependencyGraphTransformationContext; /** * Default implementation of {@link DependencyGraphTransformationContext}. diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultVersionFilterContext.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/DefaultVersionFilterContext.java similarity index 83% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultVersionFilterContext.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/DefaultVersionFilterContext.java index 97c16c63b..ebed4b2ef 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultVersionFilterContext.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/DefaultVersionFilterContext.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.collect; +package org.apache.maven.resolver.internal.impl.collect; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,14 +24,14 @@ import java.util.Iterator; import java.util.List; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.collection.VersionFilter; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.repository.ArtifactRepository; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.resolution.VersionRangeResult; -import org.eclipse.aether.version.Version; -import org.eclipse.aether.version.VersionConstraint; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.collection.VersionFilter; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.repository.ArtifactRepository; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.resolution.VersionRangeResult; +import org.apache.maven.resolver.version.Version; +import org.apache.maven.resolver.version.VersionConstraint; /** * Default implementation of {@link VersionFilter.VersionFilterContext}. diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegate.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/DependencyCollectorDelegate.java similarity index 91% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegate.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/DependencyCollectorDelegate.java index 0897cc683..6b2e1054b 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegate.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/DependencyCollectorDelegate.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.collect; +package org.apache.maven.resolver.internal.impl.collect; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -27,37 +27,36 @@ import java.util.List; import java.util.Map; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.RequestTrace; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.ArtifactProperties; -import org.eclipse.aether.collection.CollectRequest; -import org.eclipse.aether.collection.CollectResult; -import org.eclipse.aether.collection.DependencyCollectionException; -import org.eclipse.aether.collection.DependencyGraphTransformer; -import org.eclipse.aether.collection.DependencyTraverser; -import org.eclipse.aether.collection.VersionFilter; -import org.eclipse.aether.graph.DefaultDependencyNode; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.impl.ArtifactDescriptorReader; -import org.eclipse.aether.impl.DependencyCollector; -import org.eclipse.aether.impl.RemoteRepositoryManager; -import org.eclipse.aether.impl.VersionRangeResolver; -import org.eclipse.aether.repository.ArtifactRepository; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.resolution.ArtifactDescriptorException; -import org.eclipse.aether.resolution.ArtifactDescriptorRequest; -import org.eclipse.aether.resolution.ArtifactDescriptorResult; -import org.eclipse.aether.resolution.VersionRangeRequest; -import org.eclipse.aether.resolution.VersionRangeResolutionException; -import org.eclipse.aether.resolution.VersionRangeResult; -import org.eclipse.aether.spi.locator.ServiceLocator; -import org.eclipse.aether.util.ConfigUtils; -import org.eclipse.aether.util.graph.transformer.TransformationContextKeys; -import org.eclipse.aether.version.Version; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.RepositoryException; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.RequestTrace; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.ArtifactProperties; +import org.apache.maven.resolver.collection.CollectRequest; +import org.apache.maven.resolver.collection.CollectResult; +import org.apache.maven.resolver.collection.DependencyCollectionException; +import org.apache.maven.resolver.collection.DependencyGraphTransformer; +import org.apache.maven.resolver.collection.DependencyTraverser; +import org.apache.maven.resolver.collection.VersionFilter; +import org.apache.maven.resolver.graph.DefaultDependencyNode; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.impl.ArtifactDescriptorReader; +import org.apache.maven.resolver.impl.DependencyCollector; +import org.apache.maven.resolver.impl.RemoteRepositoryManager; +import org.apache.maven.resolver.impl.VersionRangeResolver; +import org.apache.maven.resolver.repository.ArtifactRepository; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.resolution.ArtifactDescriptorException; +import org.apache.maven.resolver.resolution.ArtifactDescriptorRequest; +import org.apache.maven.resolver.resolution.ArtifactDescriptorResult; +import org.apache.maven.resolver.resolution.VersionRangeRequest; +import org.apache.maven.resolver.resolution.VersionRangeResolutionException; +import org.apache.maven.resolver.resolution.VersionRangeResult; +import org.apache.maven.resolver.util.ConfigUtils; +import org.apache.maven.resolver.util.graph.transformer.TransformationContextKeys; +import org.apache.maven.resolver.version.Version; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -106,13 +105,6 @@ protected DependencyCollectorDelegate( RemoteRepositoryManager remoteRepositoryM setVersionRangeResolver( versionRangeResolver ); } - public void initService( ServiceLocator locator ) - { - setRemoteRepositoryManager( locator.getService( RemoteRepositoryManager.class ) ); - setArtifactDescriptorReader( locator.getService( ArtifactDescriptorReader.class ) ); - setVersionRangeResolver( locator.getService( VersionRangeResolver.class ) ); - } - public DependencyCollector setRemoteRepositoryManager( RemoteRepositoryManager remoteRepositoryManager ) { this.remoteRepositoryManager = diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/ObjectPool.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/ObjectPool.java similarity index 96% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/ObjectPool.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/ObjectPool.java index 0d5f37997..d33bf333d 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/ObjectPool.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/ObjectPool.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.collect; +package org.apache.maven.resolver.internal.impl.collect; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/PremanagedDependency.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/PremanagedDependency.java similarity index 91% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/PremanagedDependency.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/PremanagedDependency.java index 2d259c632..6112808df 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/PremanagedDependency.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/PremanagedDependency.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.collect; +package org.apache.maven.resolver.internal.impl.collect; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,14 +19,14 @@ * under the License. */ -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.collection.DependencyManagement; -import org.eclipse.aether.collection.DependencyManager; -import org.eclipse.aether.graph.DefaultDependencyNode; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.graph.Exclusion; -import org.eclipse.aether.util.graph.manager.DependencyManagerUtils; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.collection.DependencyManagement; +import org.apache.maven.resolver.collection.DependencyManager; +import org.apache.maven.resolver.graph.DefaultDependencyNode; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.graph.Exclusion; +import org.apache.maven.resolver.util.graph.manager.DependencyManagerUtils; import java.util.ArrayList; import java.util.Collection; diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollector.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/bf/BfDependencyCollector.java similarity index 88% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollector.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/bf/BfDependencyCollector.java index c82eed941..454308d46 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollector.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/bf/BfDependencyCollector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.collect.bf; +package org.apache.maven.resolver.internal.impl.collect.bf; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -29,48 +29,48 @@ import java.util.List; import java.util.Queue; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.RequestTrace; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.collection.CollectRequest; -import org.eclipse.aether.collection.DependencyManager; -import org.eclipse.aether.collection.DependencySelector; -import org.eclipse.aether.collection.DependencyTraverser; -import org.eclipse.aether.collection.VersionFilter; -import org.eclipse.aether.graph.DefaultDependencyNode; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.impl.ArtifactDescriptorReader; -import org.eclipse.aether.impl.RemoteRepositoryManager; -import org.eclipse.aether.impl.VersionRangeResolver; -import org.eclipse.aether.internal.impl.collect.DataPool; -import org.eclipse.aether.internal.impl.collect.DefaultDependencyCollectionContext; -import org.eclipse.aether.internal.impl.collect.DefaultVersionFilterContext; -import org.eclipse.aether.internal.impl.collect.DependencyCollectorDelegate; -import org.eclipse.aether.internal.impl.collect.PremanagedDependency; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.resolution.ArtifactDescriptorException; -import org.eclipse.aether.resolution.ArtifactDescriptorRequest; -import org.eclipse.aether.resolution.ArtifactDescriptorResult; -import org.eclipse.aether.resolution.VersionRangeRequest; -import org.eclipse.aether.resolution.VersionRangeResolutionException; -import org.eclipse.aether.resolution.VersionRangeResult; -import org.eclipse.aether.spi.locator.Service; -import org.eclipse.aether.util.ConfigUtils; -import org.eclipse.aether.util.graph.manager.DependencyManagerUtils; -import org.eclipse.aether.version.Version; - -import static org.eclipse.aether.internal.impl.collect.DefaultDependencyCycle.find; +import org.apache.maven.resolver.impl.DependencyCollector; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.RequestTrace; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.collection.CollectRequest; +import org.apache.maven.resolver.collection.DependencyManager; +import org.apache.maven.resolver.collection.DependencySelector; +import org.apache.maven.resolver.collection.DependencyTraverser; +import org.apache.maven.resolver.collection.VersionFilter; +import org.apache.maven.resolver.graph.DefaultDependencyNode; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.impl.ArtifactDescriptorReader; +import org.apache.maven.resolver.impl.RemoteRepositoryManager; +import org.apache.maven.resolver.impl.VersionRangeResolver; +import org.apache.maven.resolver.internal.impl.collect.DataPool; +import org.apache.maven.resolver.internal.impl.collect.DefaultDependencyCollectionContext; +import org.apache.maven.resolver.internal.impl.collect.DefaultVersionFilterContext; +import org.apache.maven.resolver.internal.impl.collect.DependencyCollectorDelegate; +import org.apache.maven.resolver.internal.impl.collect.PremanagedDependency; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.resolution.ArtifactDescriptorException; +import org.apache.maven.resolver.resolution.ArtifactDescriptorRequest; +import org.apache.maven.resolver.resolution.ArtifactDescriptorResult; +import org.apache.maven.resolver.resolution.VersionRangeRequest; +import org.apache.maven.resolver.resolution.VersionRangeResolutionException; +import org.apache.maven.resolver.resolution.VersionRangeResult; +import org.apache.maven.resolver.util.ConfigUtils; +import org.apache.maven.resolver.util.graph.manager.DependencyManagerUtils; +import org.apache.maven.resolver.version.Version; + +import static org.apache.maven.resolver.internal.impl.collect.DefaultDependencyCycle.find; /** - * Breadth-first {@link org.eclipse.aether.impl.DependencyCollector} + * Breadth-first {@link DependencyCollector} * * @since 1.8.0 */ @Singleton @Named( BfDependencyCollector.NAME ) public class BfDependencyCollector - extends DependencyCollectorDelegate implements Service + extends DependencyCollectorDelegate { public static final String NAME = "bf"; diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/DependencyProcessingContext.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/bf/DependencyProcessingContext.java similarity index 83% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/DependencyProcessingContext.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/bf/DependencyProcessingContext.java index ee2e77204..760a8e81c 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/DependencyProcessingContext.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/bf/DependencyProcessingContext.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.collect.bf; +package org.apache.maven.resolver.internal.impl.collect.bf; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,13 +21,13 @@ import java.util.List; -import org.eclipse.aether.collection.DependencyManager; -import org.eclipse.aether.collection.DependencySelector; -import org.eclipse.aether.collection.DependencyTraverser; -import org.eclipse.aether.collection.VersionFilter; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.collection.DependencyManager; +import org.apache.maven.resolver.collection.DependencySelector; +import org.apache.maven.resolver.collection.DependencyTraverser; +import org.apache.maven.resolver.collection.VersionFilter; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.repository.RemoteRepository; /** * Internal helper for {@link BfDependencyCollector}. diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/DependencyResolutionSkipper.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/bf/DependencyResolutionSkipper.java similarity index 98% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/DependencyResolutionSkipper.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/bf/DependencyResolutionSkipper.java index b82a8799c..97622e167 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/DependencyResolutionSkipper.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/bf/DependencyResolutionSkipper.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.collect.bf; +package org.apache.maven.resolver.internal.impl.collect.bf; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.util.artifact.ArtifactIdUtils; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.util.artifact.ArtifactIdUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/df/DfDependencyCollector.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/df/DfDependencyCollector.java similarity index 87% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/df/DfDependencyCollector.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/df/DfDependencyCollector.java index 268100f0e..b2d23a693 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/df/DfDependencyCollector.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/df/DfDependencyCollector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.collect.df; +package org.apache.maven.resolver.internal.impl.collect.df; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,40 +26,40 @@ import javax.inject.Named; import javax.inject.Singleton; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.RequestTrace; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.collection.CollectRequest; -import org.eclipse.aether.collection.DependencyManager; -import org.eclipse.aether.collection.DependencySelector; -import org.eclipse.aether.collection.DependencyTraverser; -import org.eclipse.aether.collection.VersionFilter; -import org.eclipse.aether.graph.DefaultDependencyNode; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.impl.ArtifactDescriptorReader; -import org.eclipse.aether.impl.RemoteRepositoryManager; -import org.eclipse.aether.impl.VersionRangeResolver; -import org.eclipse.aether.internal.impl.collect.DataPool; -import org.eclipse.aether.internal.impl.collect.DefaultDependencyCollectionContext; -import org.eclipse.aether.internal.impl.collect.DefaultDependencyCycle; -import org.eclipse.aether.internal.impl.collect.DefaultVersionFilterContext; -import org.eclipse.aether.internal.impl.collect.DependencyCollectorDelegate; -import org.eclipse.aether.internal.impl.collect.PremanagedDependency; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.resolution.ArtifactDescriptorException; -import org.eclipse.aether.resolution.ArtifactDescriptorRequest; -import org.eclipse.aether.resolution.ArtifactDescriptorResult; -import org.eclipse.aether.resolution.VersionRangeRequest; -import org.eclipse.aether.resolution.VersionRangeResolutionException; -import org.eclipse.aether.resolution.VersionRangeResult; -import org.eclipse.aether.spi.locator.Service; -import org.eclipse.aether.util.ConfigUtils; -import org.eclipse.aether.util.graph.manager.DependencyManagerUtils; -import org.eclipse.aether.version.Version; +import org.apache.maven.resolver.impl.DependencyCollector; +import org.apache.maven.resolver.internal.impl.collect.DataPool; +import org.apache.maven.resolver.internal.impl.collect.DefaultDependencyCollectionContext; +import org.apache.maven.resolver.internal.impl.collect.DefaultDependencyCycle; +import org.apache.maven.resolver.internal.impl.collect.DefaultVersionFilterContext; +import org.apache.maven.resolver.internal.impl.collect.DependencyCollectorDelegate; +import org.apache.maven.resolver.internal.impl.collect.PremanagedDependency; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.RequestTrace; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.collection.CollectRequest; +import org.apache.maven.resolver.collection.DependencyManager; +import org.apache.maven.resolver.collection.DependencySelector; +import org.apache.maven.resolver.collection.DependencyTraverser; +import org.apache.maven.resolver.collection.VersionFilter; +import org.apache.maven.resolver.graph.DefaultDependencyNode; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.impl.ArtifactDescriptorReader; +import org.apache.maven.resolver.impl.RemoteRepositoryManager; +import org.apache.maven.resolver.impl.VersionRangeResolver; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.resolution.ArtifactDescriptorException; +import org.apache.maven.resolver.resolution.ArtifactDescriptorRequest; +import org.apache.maven.resolver.resolution.ArtifactDescriptorResult; +import org.apache.maven.resolver.resolution.VersionRangeRequest; +import org.apache.maven.resolver.resolution.VersionRangeResolutionException; +import org.apache.maven.resolver.resolution.VersionRangeResult; +import org.apache.maven.resolver.util.ConfigUtils; +import org.apache.maven.resolver.util.graph.manager.DependencyManagerUtils; +import org.apache.maven.resolver.version.Version; /** - * Depth-first {@link org.eclipse.aether.impl.DependencyCollector} (the "original" default). Originally + * Depth-first {@link DependencyCollector} (the "original" default). Originally * this class was located a package higher (as "default" implementation). * * @since 1.8.0 @@ -67,7 +67,7 @@ @Singleton @Named( DfDependencyCollector.NAME ) public class DfDependencyCollector - extends DependencyCollectorDelegate implements Service + extends DependencyCollectorDelegate { public static final String NAME = "df"; diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/df/NodeStack.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/df/NodeStack.java similarity index 94% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/df/NodeStack.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/df/NodeStack.java index dafe7a2fe..72d3d5350 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/df/NodeStack.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/df/NodeStack.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.collect.df; +package org.apache.maven.resolver.internal.impl.collect.df; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,7 +21,7 @@ import java.util.ArrayList; -import org.eclipse.aether.graph.DependencyNode; +import org.apache.maven.resolver.graph.DependencyNode; /** * Internal helper for {@link DfDependencyCollector}. Originally (pre-1.8.0) this same class was located a diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/package-info.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/package-info.java similarity index 94% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/package-info.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/package-info.java index 85baeedcb..0e9a56b16 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/package-info.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/collect/package-info.java @@ -2,7 +2,7 @@ /** * Internal helper classes for dependency collector. */ -package org.eclipse.aether.internal.impl.collect; +package org.apache.maven.resolver.internal.impl.collect; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/package-info.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/package-info.java similarity index 95% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/package-info.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/package-info.java index 813b21df3..95445efd7 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/package-info.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/package-info.java @@ -20,5 +20,5 @@ /** * The various sub components that collectively implement the repository system. */ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/slf4j/Slf4jLoggerFactory.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/slf4j/Slf4jLoggerFactory.java similarity index 91% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/slf4j/Slf4jLoggerFactory.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/slf4j/Slf4jLoggerFactory.java index d9a634649..6fd8225b2 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/slf4j/Slf4jLoggerFactory.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/slf4j/Slf4jLoggerFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.slf4j; +package org.apache.maven.resolver.internal.impl.slf4j; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,10 +23,8 @@ import javax.inject.Named; import javax.inject.Singleton; -import org.eclipse.aether.spi.locator.Service; -import org.eclipse.aether.spi.locator.ServiceLocator; -import org.eclipse.aether.spi.log.Logger; -import org.eclipse.aether.spi.log.LoggerFactory; +import org.apache.maven.resolver.spi.log.Logger; +import org.apache.maven.resolver.spi.log.LoggerFactory; import org.eclipse.sisu.Nullable; import org.slf4j.ILoggerFactory; import org.slf4j.spi.LocationAwareLogger; @@ -40,7 +38,7 @@ @Named( "slf4j" ) @Deprecated public class Slf4jLoggerFactory - implements LoggerFactory, Service + implements LoggerFactory { private static final boolean AVAILABLE; @@ -81,11 +79,6 @@ public Slf4jLoggerFactory() setLoggerFactory( factory ); } - public void initService( ServiceLocator locator ) - { - setLoggerFactory( locator.getService( ILoggerFactory.class ) ); - } - public Slf4jLoggerFactory setLoggerFactory( ILoggerFactory factory ) { this.factory = factory; diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/DefaultSyncContextFactory.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/DefaultSyncContextFactory.java similarity index 68% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/DefaultSyncContextFactory.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/DefaultSyncContextFactory.java index b488cb4b9..99183911f 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/DefaultSyncContextFactory.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/DefaultSyncContextFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.synccontext; +package org.apache.maven.resolver.internal.impl.synccontext; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,20 +19,16 @@ * under the License. */ -import java.util.Objects; - import javax.annotation.PreDestroy; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.SyncContext; -import org.eclipse.aether.internal.impl.synccontext.named.NamedLockFactoryAdapter; -import org.eclipse.aether.internal.impl.synccontext.named.NamedLockFactorySelector; -import org.eclipse.aether.spi.locator.Service; -import org.eclipse.aether.spi.locator.ServiceLocator; -import org.eclipse.aether.spi.synccontext.SyncContextFactory; +import org.apache.maven.resolver.internal.impl.synccontext.named.NamedLockFactoryAdapter; +import org.apache.maven.resolver.internal.impl.synccontext.named.NamedLockFactorySelector; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.SyncContext; +import org.apache.maven.resolver.spi.synccontext.SyncContextFactory; import static java.util.Objects.requireNonNull; @@ -42,7 +38,7 @@ @Singleton @Named public final class DefaultSyncContextFactory - implements SyncContextFactory, Service + implements SyncContextFactory { private NamedLockFactoryAdapter namedLockFactoryAdapter; @@ -63,17 +59,6 @@ public DefaultSyncContextFactory() // ctor for ServiceLoader } - @Override - public void initService( final ServiceLocator locator ) - { - NamedLockFactorySelector selector = Objects.requireNonNull( - locator.getService( NamedLockFactorySelector.class ) ); - this.namedLockFactoryAdapter = new NamedLockFactoryAdapter( - selector.getSelectedNameMapper(), - selector.getSelectedNamedLockFactory() - ); - } - @Override public SyncContext newInstance( final RepositorySystemSession session, final boolean shared ) { diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/legacy/DefaultSyncContextFactory.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/legacy/DefaultSyncContextFactory.java similarity index 72% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/legacy/DefaultSyncContextFactory.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/legacy/DefaultSyncContextFactory.java index 669f5587a..0ca8fc882 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/legacy/DefaultSyncContextFactory.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/legacy/DefaultSyncContextFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.synccontext.legacy; +package org.apache.maven.resolver.internal.impl.synccontext.legacy; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,16 +25,14 @@ import javax.inject.Named; import javax.inject.Singleton; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.SyncContext; -import org.eclipse.aether.spi.locator.Service; -import org.eclipse.aether.spi.locator.ServiceLocator; -import org.eclipse.aether.spi.synccontext.SyncContextFactory; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.SyncContext; +import org.apache.maven.resolver.spi.synccontext.SyncContextFactory; import static java.util.Objects.requireNonNull; /** - * Deprecated {@link org.eclipse.aether.impl.SyncContextFactory} implementation that delegates to proper + * Deprecated {@link org.apache.maven.resolver.impl.SyncContextFactory} implementation that delegates to proper * {@link SyncContextFactory} implementation. Used in Guice/SISU where we cannot bind same instance to two keys, * this component "bridges" from deprecated to current. * @@ -44,7 +42,7 @@ @Named @Deprecated public final class DefaultSyncContextFactory - implements org.eclipse.aether.impl.SyncContextFactory, Service + implements org.apache.maven.resolver.impl.SyncContextFactory { private SyncContextFactory delegate; @@ -59,12 +57,6 @@ public DefaultSyncContextFactory( final SyncContextFactory delegate ) this.delegate = Objects.requireNonNull( delegate ); } - @Override - public void initService( final ServiceLocator locator ) - { - this.delegate = Objects.requireNonNull( locator.getService( SyncContextFactory.class ) ); - } - @Override public SyncContext newInstance( final RepositorySystemSession session, final boolean shared ) { diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/DiscriminatingNameMapper.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/DiscriminatingNameMapper.java similarity index 93% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/DiscriminatingNameMapper.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/DiscriminatingNameMapper.java index 862403e11..9840bcff8 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/DiscriminatingNameMapper.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/DiscriminatingNameMapper.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.synccontext.named; +package org.apache.maven.resolver.internal.impl.synccontext.named; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,11 +19,11 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.util.ChecksumUtils; -import org.eclipse.aether.util.ConfigUtils; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.util.ChecksumUtils; +import org.apache.maven.resolver.util.ConfigUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/FileGAVNameMapper.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/FileGAVNameMapper.java similarity index 93% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/FileGAVNameMapper.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/FileGAVNameMapper.java index 500b3306e..df3af977f 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/FileGAVNameMapper.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/FileGAVNameMapper.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.synccontext.named; +package org.apache.maven.resolver.internal.impl.synccontext.named; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,10 +19,10 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.named.support.FileSystemFriendly; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.named.support.FileSystemFriendly; import javax.inject.Named; import javax.inject.Singleton; diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/GAVNameMapper.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/GAVNameMapper.java similarity index 92% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/GAVNameMapper.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/GAVNameMapper.java index ea0149c47..848df64a8 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/GAVNameMapper.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/GAVNameMapper.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.synccontext.named; +package org.apache.maven.resolver.internal.impl.synccontext.named; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.metadata.Metadata; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.metadata.Metadata; import javax.inject.Named; import javax.inject.Singleton; diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/NameMapper.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/NameMapper.java similarity index 87% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/NameMapper.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/NameMapper.java index b5fd2f0e5..768d7c01e 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/NameMapper.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/NameMapper.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.synccontext.named; +package org.apache.maven.resolver.internal.impl.synccontext.named; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.metadata.Metadata; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.metadata.Metadata; import java.util.Collection; diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/NamedLockFactoryAdapter.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/NamedLockFactoryAdapter.java similarity index 93% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/NamedLockFactoryAdapter.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/NamedLockFactoryAdapter.java index b59b26c79..de7e70938 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/NamedLockFactoryAdapter.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/NamedLockFactoryAdapter.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.synccontext.named; +package org.apache.maven.resolver.internal.impl.synccontext.named; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,14 +19,14 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.SyncContext; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.named.NamedLock; -import org.eclipse.aether.named.NamedLockFactory; -import org.eclipse.aether.named.support.FileSystemFriendly; -import org.eclipse.aether.util.ConfigUtils; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.SyncContext; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.named.NamedLock; +import org.apache.maven.resolver.named.NamedLockFactory; +import org.apache.maven.resolver.named.support.FileSystemFriendly; +import org.apache.maven.resolver.util.ConfigUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/NamedLockFactorySelector.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/NamedLockFactorySelector.java similarity index 91% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/NamedLockFactorySelector.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/NamedLockFactorySelector.java index 653d39b23..be5d9d36b 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/NamedLockFactorySelector.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/NamedLockFactorySelector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.synccontext.named; +package org.apache.maven.resolver.internal.impl.synccontext.named; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.named.NamedLockFactory; +import org.apache.maven.resolver.named.NamedLockFactory; /** * Selector for {@link NamedLockFactory} and {@link NameMapper} that selects and exposes selected ones. Essentially diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/NamedLockFactorySelectorSupport.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/NamedLockFactorySelectorSupport.java similarity index 96% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/NamedLockFactorySelectorSupport.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/NamedLockFactorySelectorSupport.java index 9e525d8f8..c0ef7d714 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/NamedLockFactorySelectorSupport.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/NamedLockFactorySelectorSupport.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.synccontext.named; +package org.apache.maven.resolver.internal.impl.synccontext.named; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.named.NamedLockFactory; +import org.apache.maven.resolver.named.NamedLockFactory; import java.util.Map; diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/SimpleNamedLockFactorySelector.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/SimpleNamedLockFactorySelector.java similarity index 86% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/SimpleNamedLockFactorySelector.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/SimpleNamedLockFactorySelector.java index 964136227..79c52c3a9 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/SimpleNamedLockFactorySelector.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/SimpleNamedLockFactorySelector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.synccontext.named; +package org.apache.maven.resolver.internal.impl.synccontext.named; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,11 +19,11 @@ * under the License. */ -import org.eclipse.aether.named.NamedLockFactory; -import org.eclipse.aether.named.providers.FileLockNamedLockFactory; -import org.eclipse.aether.named.providers.LocalReadWriteLockNamedLockFactory; -import org.eclipse.aether.named.providers.LocalSemaphoreNamedLockFactory; -import org.eclipse.aether.named.providers.NoopNamedLockFactory; +import org.apache.maven.resolver.named.NamedLockFactory; +import org.apache.maven.resolver.named.providers.FileLockNamedLockFactory; +import org.apache.maven.resolver.named.providers.LocalReadWriteLockNamedLockFactory; +import org.apache.maven.resolver.named.providers.LocalSemaphoreNamedLockFactory; +import org.apache.maven.resolver.named.providers.NoopNamedLockFactory; import javax.inject.Inject; import javax.inject.Named; diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/StaticNameMapper.java b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/StaticNameMapper.java similarity index 88% rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/StaticNameMapper.java rename to maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/StaticNameMapper.java index 14fc7e79a..f39fecaa7 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/StaticNameMapper.java +++ b/maven-resolver-impl/src/main/java/org/apache/maven/resolver/internal/impl/synccontext/named/StaticNameMapper.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.synccontext.named; +package org.apache.maven.resolver.internal.impl.synccontext.named; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,10 +19,10 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.util.ConfigUtils; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.util.ConfigUtils; import javax.inject.Inject; import javax.inject.Named; diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/DefaultServiceLocator.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/DefaultServiceLocator.java deleted file mode 100644 index 815c07cd7..000000000 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/DefaultServiceLocator.java +++ /dev/null @@ -1,343 +0,0 @@ -package org.eclipse.aether.impl; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import java.lang.reflect.Constructor; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import static java.util.Objects.requireNonNull; - -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.internal.impl.LocalPathComposer; -import org.eclipse.aether.internal.impl.DefaultLocalPathComposer; -import org.eclipse.aether.internal.impl.DefaultArtifactResolver; -import org.eclipse.aether.internal.impl.DefaultChecksumPolicyProvider; -import org.eclipse.aether.internal.impl.DefaultTrackingFileManager; -import org.eclipse.aether.internal.impl.TrackingFileManager; -import org.eclipse.aether.internal.impl.checksum.DefaultChecksumAlgorithmFactorySelector; -import org.eclipse.aether.internal.impl.collect.DefaultDependencyCollector; -import org.eclipse.aether.internal.impl.DefaultDeployer; -import org.eclipse.aether.internal.impl.DefaultFileProcessor; -import org.eclipse.aether.internal.impl.DefaultInstaller; -import org.eclipse.aether.internal.impl.DefaultLocalRepositoryProvider; -import org.eclipse.aether.internal.impl.DefaultMetadataResolver; -import org.eclipse.aether.internal.impl.DefaultOfflineController; -import org.eclipse.aether.internal.impl.DefaultRemoteRepositoryManager; -import org.eclipse.aether.internal.impl.DefaultRepositoryConnectorProvider; -import org.eclipse.aether.internal.impl.DefaultRepositoryEventDispatcher; -import org.eclipse.aether.internal.impl.DefaultRepositoryLayoutProvider; -import org.eclipse.aether.internal.impl.DefaultRepositorySystem; -import org.eclipse.aether.internal.impl.DefaultTransporterProvider; -import org.eclipse.aether.internal.impl.DefaultUpdateCheckManager; -import org.eclipse.aether.internal.impl.DefaultUpdatePolicyAnalyzer; -import org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory; -import org.eclipse.aether.internal.impl.Maven2RepositoryLayoutFactory; -import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory; -import org.eclipse.aether.internal.impl.slf4j.Slf4jLoggerFactory; -import org.eclipse.aether.internal.impl.synccontext.DefaultSyncContextFactory; -import org.eclipse.aether.internal.impl.synccontext.named.NamedLockFactorySelector; -import org.eclipse.aether.internal.impl.synccontext.named.SimpleNamedLockFactorySelector; -import org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithmFactorySelector; -import org.eclipse.aether.spi.connector.checksum.ChecksumPolicyProvider; -import org.eclipse.aether.spi.connector.layout.RepositoryLayoutFactory; -import org.eclipse.aether.spi.connector.layout.RepositoryLayoutProvider; -import org.eclipse.aether.spi.connector.transport.TransporterProvider; -import org.eclipse.aether.spi.io.FileProcessor; -import org.eclipse.aether.spi.localrepo.LocalRepositoryManagerFactory; -import org.eclipse.aether.spi.locator.Service; -import org.eclipse.aether.spi.locator.ServiceLocator; -import org.eclipse.aether.spi.log.LoggerFactory; -import org.eclipse.aether.spi.synccontext.SyncContextFactory; - -/** - * A simple service locator that is already setup with all components from this library. To acquire a complete - * repository system, clients need to add an artifact descriptor reader, a version resolver, a version range resolver - * and optionally some repository connector and transporter factories to access remote repositories. Once the locator is - * fully populated, the repository system can be created like this: - * - * 
- * RepositorySystem repoSystem = serviceLocator.getService( RepositorySystem.class );
- *
- * - * Note: This class is not thread-safe. Clients are expected to create the service locator and the repository - * system on a single thread. - * - * @deprecated Use some out-of-the-box DI implementation instead. - */ -@Deprecated -public final class DefaultServiceLocator - implements ServiceLocator -{ - - private class Entry - { - - private final Class type; - - private final Collection providers; - - private List instances; - - Entry( Class type ) - { - this.type = requireNonNull( type, "service type cannot be null" ); - providers = new LinkedHashSet<>( 8 ); - } - - public synchronized void setServices( T... services ) - { - providers.clear(); - if ( services != null ) - { - for ( T service : services ) - { - providers.add( requireNonNull( service, "service instance cannot be null" ) ); - } - } - instances = null; - } - - public synchronized void setService( Class impl ) - { - providers.clear(); - addService( impl ); - } - - public synchronized void addService( Class impl ) - { - providers.add( requireNonNull( impl, "implementation class cannot be null" ) ); - instances = null; - } - - public T getInstance() - { - List instances = getInstances(); - return instances.isEmpty() ? null : instances.get( 0 ); - } - - public synchronized List getInstances() - { - if ( instances == null ) - { - instances = new ArrayList<>( providers.size() ); - for ( Object provider : providers ) - { - T instance; - if ( provider instanceof Class ) - { - instance = newInstance( (Class) provider ); - } - else - { - instance = type.cast( provider ); - } - if ( instance != null ) - { - instances.add( instance ); - } - } - instances = Collections.unmodifiableList( instances ); - } - return instances; - } - - private T newInstance( Class impl ) - { - try - { - Constructor constr = impl.getDeclaredConstructor(); - if ( !Modifier.isPublic( constr.getModifiers() ) ) - { - constr.setAccessible( true ); - } - Object obj = constr.newInstance(); - - T instance = type.cast( obj ); - if ( instance instanceof Service ) - { - ( (Service) instance ).initService( DefaultServiceLocator.this ); - } - return instance; - } - catch ( Exception | LinkageError e ) - { - serviceCreationFailed( type, impl, e ); - } - return null; - } - - } - - private final Map, Entry> entries; - - private ErrorHandler errorHandler; - - /** - * Creates a new service locator that already knows about all service implementations included this library. - */ - public DefaultServiceLocator() - { - entries = new HashMap<>(); - - addService( RepositorySystem.class, DefaultRepositorySystem.class ); - addService( ArtifactResolver.class, DefaultArtifactResolver.class ); - addService( DependencyCollector.class, DefaultDependencyCollector.class ); - addService( Deployer.class, DefaultDeployer.class ); - addService( Installer.class, DefaultInstaller.class ); - addService( MetadataResolver.class, DefaultMetadataResolver.class ); - addService( RepositoryLayoutProvider.class, DefaultRepositoryLayoutProvider.class ); - addService( RepositoryLayoutFactory.class, Maven2RepositoryLayoutFactory.class ); - addService( TransporterProvider.class, DefaultTransporterProvider.class ); - addService( ChecksumPolicyProvider.class, DefaultChecksumPolicyProvider.class ); - addService( RepositoryConnectorProvider.class, DefaultRepositoryConnectorProvider.class ); - addService( RemoteRepositoryManager.class, DefaultRemoteRepositoryManager.class ); - addService( UpdateCheckManager.class, DefaultUpdateCheckManager.class ); - addService( UpdatePolicyAnalyzer.class, DefaultUpdatePolicyAnalyzer.class ); - addService( FileProcessor.class, DefaultFileProcessor.class ); - addService( org.eclipse.aether.impl.SyncContextFactory.class, - org.eclipse.aether.internal.impl.synccontext.legacy.DefaultSyncContextFactory.class ); - addService( SyncContextFactory.class, DefaultSyncContextFactory.class ); - addService( RepositoryEventDispatcher.class, DefaultRepositoryEventDispatcher.class ); - addService( OfflineController.class, DefaultOfflineController.class ); - addService( LocalRepositoryProvider.class, DefaultLocalRepositoryProvider.class ); - addService( LocalRepositoryManagerFactory.class, SimpleLocalRepositoryManagerFactory.class ); - addService( LocalRepositoryManagerFactory.class, EnhancedLocalRepositoryManagerFactory.class ); - addService( LoggerFactory.class, Slf4jLoggerFactory.class ); - addService( TrackingFileManager.class, DefaultTrackingFileManager.class ); - addService( NamedLockFactorySelector.class, SimpleNamedLockFactorySelector.class ); - addService( ChecksumAlgorithmFactorySelector.class, DefaultChecksumAlgorithmFactorySelector.class ); - addService( LocalPathComposer.class, DefaultLocalPathComposer.class ); - } - - private Entry getEntry( Class type, boolean create ) - { - @SuppressWarnings( "unchecked" ) - Entry entry = (Entry) entries.get( requireNonNull( type, "service type cannot be null" ) ); - if ( entry == null && create ) - { - entry = new Entry<>( type ); - entries.put( type, entry ); - } - return entry; - } - - /** - * Sets the implementation class for a service. The specified class must have a no-arg constructor (of any - * visibility). If the service implementation itself requires other services for its operation, it should implement - * {@link Service} to gain access to this service locator. - * - * @param The service type. - * @param type The interface describing the service, must not be {@code null}. - * @param impl The implementation class of the service, must not be {@code null}. - * @return This locator for chaining, never {@code null}. - */ - public DefaultServiceLocator setService( Class type, Class impl ) - { - getEntry( type, true ).setService( impl ); - return this; - } - - /** - * Adds an implementation class for a service. The specified class must have a no-arg constructor (of any - * visibility). If the service implementation itself requires other services for its operation, it should implement - * {@link Service} to gain access to this service locator. - * - * @param The service type. - * @param type The interface describing the service, must not be {@code null}. - * @param impl The implementation class of the service, must not be {@code null}. - * @return This locator for chaining, never {@code null}. - */ - public DefaultServiceLocator addService( Class type, Class impl ) - { - getEntry( type, true ).addService( impl ); - return this; - } - - /** - * Sets the instances for a service. - * - * @param The service type. - * @param type The interface describing the service, must not be {@code null}. - * @param services The instances of the service, may be {@code null} but must not contain {@code null} elements. - * @return This locator for chaining, never {@code null}. - */ - public DefaultServiceLocator setServices( Class type, T... services ) - { - getEntry( type, true ).setServices( services ); - return this; - } - - public T getService( Class type ) - { - Entry entry = getEntry( type, false ); - return ( entry != null ) ? entry.getInstance() : null; - } - - public List getServices( Class type ) - { - Entry entry = getEntry( type, false ); - return ( entry != null ) ? entry.getInstances() : null; - } - - private void serviceCreationFailed( Class type, Class impl, Throwable exception ) - { - if ( errorHandler != null ) - { - errorHandler.serviceCreationFailed( type, impl, exception ); - } - } - - /** - * Sets the error handler to use. - * - * @param errorHandler The error handler to use, may be {@code null} to ignore/swallow errors. - */ - public void setErrorHandler( ErrorHandler errorHandler ) - { - this.errorHandler = errorHandler; - } - - /** - * A hook to customize the handling of errors encountered while locating a service implementation. - */ - public abstract static class ErrorHandler - { - - /** - * Handles errors during creation of a service. The default implemention does nothing. - * - * @param type The interface describing the service, must not be {@code null}. - * @param impl The implementation class of the service, must not be {@code null}. - * @param exception The error that occurred while trying to instantiate the implementation class, must not be - * {@code null}. - */ - public void serviceCreationFailed( Class type, Class impl, Throwable exception ) - { - } - - } - -} diff --git a/maven-resolver-impl/src/site/markdown/synccontextfactory.md.vm b/maven-resolver-impl/src/site/markdown/synccontextfactory.md.vm index 9c1f492e1..d0316dff1 100644 --- a/maven-resolver-impl/src/site/markdown/synccontextfactory.md.vm +++ b/maven-resolver-impl/src/site/markdown/synccontextfactory.md.vm @@ -38,7 +38,7 @@ a cross process, and in MP multi-host case a cross process and cross host coordi The defaults in Maven Resolver cover ST and MT cases out of the box (by default). -This module implementation for the interface `org.eclipse.aether.spi.synccontext.SyncContextFactory` +This module implementation for the interface `SyncContextFactory` uses resolver named locks. ${esc.hash}${esc.hash} Configuration Options for "named" `SyncContextFactory` diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/StubArtifactDescriptorReader.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/impl/StubArtifactDescriptorReader.java similarity index 79% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/impl/StubArtifactDescriptorReader.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/impl/StubArtifactDescriptorReader.java index 2882dc2c1..4caa7d31e 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/StubArtifactDescriptorReader.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/impl/StubArtifactDescriptorReader.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.impl; +package org.apache.maven.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,10 +19,10 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.resolution.ArtifactDescriptorException; -import org.eclipse.aether.resolution.ArtifactDescriptorRequest; -import org.eclipse.aether.resolution.ArtifactDescriptorResult; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.resolution.ArtifactDescriptorException; +import org.apache.maven.resolver.resolution.ArtifactDescriptorRequest; +import org.apache.maven.resolver.resolution.ArtifactDescriptorResult; public class StubArtifactDescriptorReader implements ArtifactDescriptorReader diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/StubVersionRangeResolver.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/impl/StubVersionRangeResolver.java similarity index 84% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/impl/StubVersionRangeResolver.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/impl/StubVersionRangeResolver.java index d3ba16440..432d28093 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/StubVersionRangeResolver.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/impl/StubVersionRangeResolver.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.impl; +package org.apache.maven.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.resolution.VersionRangeRequest; -import org.eclipse.aether.resolution.VersionRangeResult; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.resolution.VersionRangeRequest; +import org.apache.maven.resolver.resolution.VersionRangeResult; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/StubVersionResolver.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/impl/StubVersionResolver.java similarity index 81% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/impl/StubVersionResolver.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/impl/StubVersionResolver.java index f760f4c72..559e20973 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/StubVersionResolver.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/impl/StubVersionResolver.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.impl; +package org.apache.maven.resolver.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,10 +19,10 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.resolution.VersionRequest; -import org.eclipse.aether.resolution.VersionResolutionException; -import org.eclipse.aether.resolution.VersionResult; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.resolution.VersionRequest; +import org.apache.maven.resolver.resolution.VersionResolutionException; +import org.apache.maven.resolver.resolution.VersionResult; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/guice/AetherModuleTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/impl/guice/AetherModuleTest.java similarity index 75% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/impl/guice/AetherModuleTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/impl/guice/AetherModuleTest.java index efcda199f..c7b9541a1 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/guice/AetherModuleTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/impl/guice/AetherModuleTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.impl.guice; +package org.apache.maven.resolver.impl.guice; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,16 +24,16 @@ import java.util.Collections; import java.util.Set; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.impl.ArtifactDescriptorReader; -import org.eclipse.aether.impl.MetadataGeneratorFactory; -import org.eclipse.aether.impl.StubArtifactDescriptorReader; -import org.eclipse.aether.impl.StubVersionRangeResolver; -import org.eclipse.aether.impl.StubVersionResolver; -import org.eclipse.aether.impl.VersionRangeResolver; -import org.eclipse.aether.impl.VersionResolver; -import org.eclipse.aether.spi.connector.RepositoryConnectorFactory; -import org.eclipse.aether.spi.connector.transport.TransporterFactory; +import org.apache.maven.resolver.impl.StubArtifactDescriptorReader; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.impl.ArtifactDescriptorReader; +import org.apache.maven.resolver.impl.MetadataGeneratorFactory; +import org.apache.maven.resolver.impl.StubVersionRangeResolver; +import org.apache.maven.resolver.impl.StubVersionResolver; +import org.apache.maven.resolver.impl.VersionRangeResolver; +import org.apache.maven.resolver.impl.VersionResolver; +import org.apache.maven.resolver.spi.connector.RepositoryConnectorFactory; +import org.apache.maven.resolver.spi.connector.transport.TransporterFactory; import org.junit.Test; import com.google.inject.AbstractModule; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultArtifactResolverTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultArtifactResolverTest.java similarity index 92% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultArtifactResolverTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultArtifactResolverTest.java index 65ad48807..d8bdcf2ca 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultArtifactResolverTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultArtifactResolverTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -29,43 +29,43 @@ import java.util.List; import java.util.Map; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositoryEvent; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.RepositoryEvent.EventType; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.ArtifactProperties; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.impl.UpdateCheckManager; -import org.eclipse.aether.impl.VersionResolver; -import org.eclipse.aether.internal.test.util.TestFileProcessor; -import org.eclipse.aether.internal.test.util.TestFileUtils; -import org.eclipse.aether.internal.test.util.TestLocalRepositoryManager; -import org.eclipse.aether.internal.test.util.TestUtils; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.repository.LocalArtifactRegistration; -import org.eclipse.aether.repository.LocalArtifactRequest; -import org.eclipse.aether.repository.LocalArtifactResult; -import org.eclipse.aether.repository.LocalMetadataRegistration; -import org.eclipse.aether.repository.LocalMetadataRequest; -import org.eclipse.aether.repository.LocalMetadataResult; -import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.repository.LocalRepositoryManager; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.repository.RepositoryPolicy; -import org.eclipse.aether.repository.WorkspaceReader; -import org.eclipse.aether.repository.WorkspaceRepository; -import org.eclipse.aether.resolution.ArtifactRequest; -import org.eclipse.aether.resolution.ArtifactResolutionException; -import org.eclipse.aether.resolution.ArtifactResult; -import org.eclipse.aether.resolution.VersionRequest; -import org.eclipse.aether.resolution.VersionResolutionException; -import org.eclipse.aether.resolution.VersionResult; -import org.eclipse.aether.spi.connector.ArtifactDownload; -import org.eclipse.aether.spi.connector.MetadataDownload; -import org.eclipse.aether.transfer.ArtifactNotFoundException; -import org.eclipse.aether.transfer.ArtifactTransferException; -import org.eclipse.aether.util.repository.SimpleResolutionErrorPolicy; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.RepositoryEvent; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.RepositoryEvent.EventType; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.ArtifactProperties; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.impl.UpdateCheckManager; +import org.apache.maven.resolver.impl.VersionResolver; +import org.apache.maven.resolver.internal.test.util.TestFileProcessor; +import org.apache.maven.resolver.internal.test.util.TestFileUtils; +import org.apache.maven.resolver.internal.test.util.TestLocalRepositoryManager; +import org.apache.maven.resolver.internal.test.util.TestUtils; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.repository.LocalArtifactRegistration; +import org.apache.maven.resolver.repository.LocalArtifactRequest; +import org.apache.maven.resolver.repository.LocalArtifactResult; +import org.apache.maven.resolver.repository.LocalMetadataRegistration; +import org.apache.maven.resolver.repository.LocalMetadataRequest; +import org.apache.maven.resolver.repository.LocalMetadataResult; +import org.apache.maven.resolver.repository.LocalRepository; +import org.apache.maven.resolver.repository.LocalRepositoryManager; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.repository.RepositoryPolicy; +import org.apache.maven.resolver.repository.WorkspaceReader; +import org.apache.maven.resolver.repository.WorkspaceRepository; +import org.apache.maven.resolver.resolution.ArtifactRequest; +import org.apache.maven.resolver.resolution.ArtifactResolutionException; +import org.apache.maven.resolver.resolution.ArtifactResult; +import org.apache.maven.resolver.resolution.VersionRequest; +import org.apache.maven.resolver.resolution.VersionResolutionException; +import org.apache.maven.resolver.resolution.VersionResult; +import org.apache.maven.resolver.spi.connector.ArtifactDownload; +import org.apache.maven.resolver.spi.connector.MetadataDownload; +import org.apache.maven.resolver.transfer.ArtifactNotFoundException; +import org.apache.maven.resolver.transfer.ArtifactTransferException; +import org.apache.maven.resolver.util.repository.SimpleResolutionErrorPolicy; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProviderTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultChecksumPolicyProviderTest.java similarity index 92% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProviderTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultChecksumPolicyProviderTest.java index 7025771c0..77310fc89 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProviderTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultChecksumPolicyProviderTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,12 +24,12 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThrows; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.internal.test.util.TestUtils; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.repository.RepositoryPolicy; -import org.eclipse.aether.spi.connector.checksum.ChecksumPolicy; -import org.eclipse.aether.transfer.TransferResource; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.internal.test.util.TestUtils; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.repository.RepositoryPolicy; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumPolicy; +import org.apache.maven.resolver.transfer.TransferResource; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import org.junit.After; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultDeployerTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultDeployerTest.java similarity index 89% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultDeployerTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultDeployerTest.java index 6664d28bb..e8bfce4dc 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultDeployerTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultDeployerTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -36,30 +36,30 @@ import java.util.Map; import java.util.Properties; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositoryEvent; -import org.eclipse.aether.RepositoryEvent.EventType; -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.deployment.DeployRequest; -import org.eclipse.aether.deployment.DeploymentException; -import org.eclipse.aether.internal.test.util.TestFileProcessor; -import org.eclipse.aether.internal.test.util.TestFileUtils; -import org.eclipse.aether.internal.test.util.TestUtils; -import org.eclipse.aether.metadata.DefaultMetadata; -import org.eclipse.aether.metadata.MergeableMetadata; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.metadata.Metadata.Nature; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.spi.connector.ArtifactDownload; -import org.eclipse.aether.spi.connector.ArtifactUpload; -import org.eclipse.aether.spi.connector.MetadataDownload; -import org.eclipse.aether.spi.connector.MetadataUpload; -import org.eclipse.aether.spi.connector.RepositoryConnector; -import org.eclipse.aether.transfer.MetadataNotFoundException; -import org.eclipse.aether.transform.FileTransformer; -import org.eclipse.aether.util.artifact.SubArtifact; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.RepositoryEvent; +import org.apache.maven.resolver.RepositoryEvent.EventType; +import org.apache.maven.resolver.RepositoryException; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.deployment.DeployRequest; +import org.apache.maven.resolver.deployment.DeploymentException; +import org.apache.maven.resolver.internal.test.util.TestFileProcessor; +import org.apache.maven.resolver.internal.test.util.TestFileUtils; +import org.apache.maven.resolver.internal.test.util.TestUtils; +import org.apache.maven.resolver.metadata.DefaultMetadata; +import org.apache.maven.resolver.metadata.MergeableMetadata; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.metadata.Metadata.Nature; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.spi.connector.ArtifactDownload; +import org.apache.maven.resolver.spi.connector.ArtifactUpload; +import org.apache.maven.resolver.spi.connector.MetadataDownload; +import org.apache.maven.resolver.spi.connector.MetadataUpload; +import org.apache.maven.resolver.spi.connector.RepositoryConnector; +import org.apache.maven.resolver.transfer.MetadataNotFoundException; +import org.apache.maven.resolver.transform.FileTransformer; +import org.apache.maven.resolver.util.artifact.SubArtifact; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultFileProcessorTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultFileProcessorTest.java similarity index 93% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultFileProcessorTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultFileProcessorTest.java index 6793977e3..1b5d761e3 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultFileProcessorTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultFileProcessorTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,9 +26,8 @@ import java.nio.ByteBuffer; import java.util.concurrent.atomic.AtomicInteger; -import org.eclipse.aether.internal.impl.DefaultFileProcessor; -import org.eclipse.aether.internal.test.util.TestFileUtils; -import org.eclipse.aether.spi.io.FileProcessor.ProgressListener; +import org.apache.maven.resolver.internal.test.util.TestFileUtils; +import org.apache.maven.resolver.spi.io.FileProcessor.ProgressListener; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultInstallerTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultInstallerTest.java similarity index 93% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultInstallerTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultInstallerTest.java index 0fb0e567d..844c8a66d 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultInstallerTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultInstallerTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -35,23 +35,23 @@ import java.nio.charset.StandardCharsets; import java.util.List; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositoryEvent; -import org.eclipse.aether.RepositoryEvent.EventType; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.installation.InstallRequest; -import org.eclipse.aether.installation.InstallResult; -import org.eclipse.aether.installation.InstallationException; -import org.eclipse.aether.internal.test.util.TestFileProcessor; -import org.eclipse.aether.internal.test.util.TestFileUtils; -import org.eclipse.aether.internal.test.util.TestLocalRepositoryManager; -import org.eclipse.aether.internal.test.util.TestUtils; -import org.eclipse.aether.metadata.DefaultMetadata; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.metadata.Metadata.Nature; -import org.eclipse.aether.transform.FileTransformer; -import org.eclipse.aether.util.artifact.SubArtifact; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.RepositoryEvent; +import org.apache.maven.resolver.RepositoryEvent.EventType; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.installation.InstallRequest; +import org.apache.maven.resolver.installation.InstallResult; +import org.apache.maven.resolver.installation.InstallationException; +import org.apache.maven.resolver.internal.test.util.TestFileProcessor; +import org.apache.maven.resolver.internal.test.util.TestFileUtils; +import org.apache.maven.resolver.internal.test.util.TestLocalRepositoryManager; +import org.apache.maven.resolver.internal.test.util.TestUtils; +import org.apache.maven.resolver.metadata.DefaultMetadata; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.metadata.Metadata.Nature; +import org.apache.maven.resolver.transform.FileTransformer; +import org.apache.maven.resolver.util.artifact.SubArtifact; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultLocalPathPrefixComposerFactoryTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultLocalPathPrefixComposerFactoryTest.java similarity index 95% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultLocalPathPrefixComposerFactoryTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultLocalPathPrefixComposerFactoryTest.java index 2728c5bbb..ddad66d82 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultLocalPathPrefixComposerFactoryTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultLocalPathPrefixComposerFactoryTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,13 +19,13 @@ * under the License. */ -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.internal.test.util.TestUtils; -import org.eclipse.aether.metadata.DefaultMetadata; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.internal.test.util.TestUtils; +import org.apache.maven.resolver.metadata.DefaultMetadata; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.repository.RemoteRepository; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultMetadataResolverTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultMetadataResolverTest.java similarity index 91% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultMetadataResolverTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultMetadataResolverTest.java index 27fec64cf..4886ac3dd 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultMetadataResolverTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultMetadataResolverTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -29,20 +29,19 @@ import java.util.List; import java.util.Set; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.internal.impl.DefaultMetadataResolver; -import org.eclipse.aether.internal.test.util.TestFileUtils; -import org.eclipse.aether.internal.test.util.TestLocalRepositoryManager; -import org.eclipse.aether.internal.test.util.TestUtils; -import org.eclipse.aether.metadata.DefaultMetadata; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.repository.LocalMetadataRegistration; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.resolution.MetadataRequest; -import org.eclipse.aether.resolution.MetadataResult; -import org.eclipse.aether.spi.connector.ArtifactDownload; -import org.eclipse.aether.spi.connector.MetadataDownload; -import org.eclipse.aether.transfer.MetadataNotFoundException; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.internal.test.util.TestFileUtils; +import org.apache.maven.resolver.internal.test.util.TestLocalRepositoryManager; +import org.apache.maven.resolver.internal.test.util.TestUtils; +import org.apache.maven.resolver.metadata.DefaultMetadata; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.repository.LocalMetadataRegistration; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.resolution.MetadataRequest; +import org.apache.maven.resolver.resolution.MetadataResult; +import org.apache.maven.resolver.spi.connector.ArtifactDownload; +import org.apache.maven.resolver.spi.connector.MetadataDownload; +import org.apache.maven.resolver.transfer.MetadataNotFoundException; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultOfflineControllerTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultOfflineControllerTest.java similarity index 92% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultOfflineControllerTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultOfflineControllerTest.java index 7e427075c..7346040cd 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultOfflineControllerTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultOfflineControllerTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,10 +19,10 @@ * under the License. */ -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.transfer.RepositoryOfflineException; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.transfer.RepositoryOfflineException; import org.junit.Before; import org.junit.Test; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultRemoteRepositoryManagerTest.java similarity index 94% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultRemoteRepositoryManagerTest.java index 3700aa4b9..92018ec97 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultRemoteRepositoryManagerTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,16 +26,16 @@ import java.util.Collections; import java.util.List; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.impl.UpdatePolicyAnalyzer; -import org.eclipse.aether.internal.test.util.TestUtils; -import org.eclipse.aether.repository.MirrorSelector; -import org.eclipse.aether.repository.Proxy; -import org.eclipse.aether.repository.ProxySelector; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.repository.RepositoryPolicy; -import org.eclipse.aether.util.repository.AuthenticationBuilder; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.impl.UpdatePolicyAnalyzer; +import org.apache.maven.resolver.internal.test.util.TestUtils; +import org.apache.maven.resolver.repository.MirrorSelector; +import org.apache.maven.resolver.repository.Proxy; +import org.apache.maven.resolver.repository.ProxySelector; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.repository.RepositoryPolicy; +import org.apache.maven.resolver.util.repository.AuthenticationBuilder; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcherTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultRepositoryEventDispatcherTest.java similarity index 89% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcherTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultRepositoryEventDispatcherTest.java index 14b165804..55efeef8d 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcherTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultRepositoryEventDispatcherTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,11 +26,10 @@ import java.lang.reflect.Proxy; import java.util.Locale; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositoryEvent; -import org.eclipse.aether.RepositoryListener; -import org.eclipse.aether.internal.impl.DefaultRepositoryEventDispatcher; -import org.eclipse.aether.internal.test.util.TestUtils; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.RepositoryEvent; +import org.apache.maven.resolver.RepositoryListener; +import org.apache.maven.resolver.internal.test.util.TestUtils; import org.junit.Test; /** diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositorySystemTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultRepositorySystemTest.java similarity index 87% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositorySystemTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultRepositorySystemTest.java index 65acfdb6f..99444dfca 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositorySystemTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultRepositorySystemTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,15 +24,15 @@ import java.util.Arrays; import java.util.List; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.internal.test.util.TestUtils; -import org.eclipse.aether.repository.Authentication; -import org.eclipse.aether.repository.Proxy; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.util.repository.AuthenticationBuilder; -import org.eclipse.aether.util.repository.DefaultAuthenticationSelector; -import org.eclipse.aether.util.repository.DefaultMirrorSelector; -import org.eclipse.aether.util.repository.DefaultProxySelector; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.internal.test.util.TestUtils; +import org.apache.maven.resolver.repository.Authentication; +import org.apache.maven.resolver.repository.Proxy; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.util.repository.AuthenticationBuilder; +import org.apache.maven.resolver.util.repository.DefaultAuthenticationSelector; +import org.apache.maven.resolver.util.repository.DefaultMirrorSelector; +import org.apache.maven.resolver.util.repository.DefaultProxySelector; import org.junit.Before; import org.junit.Test; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultTrackingFileManagerTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultTrackingFileManagerTest.java similarity index 95% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultTrackingFileManagerTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultTrackingFileManagerTest.java index e6e29672e..a29b28c38 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultTrackingFileManagerTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultTrackingFileManagerTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -27,8 +27,7 @@ import java.util.Map; import java.util.Properties; -import org.eclipse.aether.internal.impl.TrackingFileManager; -import org.eclipse.aether.internal.test.util.TestFileUtils; +import org.apache.maven.resolver.internal.test.util.TestFileUtils; import org.junit.Test; /** diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultUpdateCheckManagerTest.java similarity index 96% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultUpdateCheckManagerTest.java index a85f5b039..3fe6c0a69 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultUpdateCheckManagerTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -27,24 +27,22 @@ import java.util.Date; import java.util.TimeZone; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.impl.UpdateCheck; -import org.eclipse.aether.impl.UpdateCheckManager; -import org.eclipse.aether.internal.impl.DefaultUpdateCheckManager; -import org.eclipse.aether.internal.test.util.TestFileUtils; -import org.eclipse.aether.internal.test.util.TestUtils; -import org.eclipse.aether.metadata.DefaultMetadata; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.repository.RepositoryPolicy; -import org.eclipse.aether.transfer.ArtifactNotFoundException; -import org.eclipse.aether.transfer.ArtifactTransferException; -import org.eclipse.aether.transfer.MetadataNotFoundException; -import org.eclipse.aether.transfer.MetadataTransferException; -import org.eclipse.aether.util.repository.SimpleResolutionErrorPolicy; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.impl.UpdateCheck; +import org.apache.maven.resolver.internal.test.util.TestFileUtils; +import org.apache.maven.resolver.internal.test.util.TestUtils; +import org.apache.maven.resolver.metadata.DefaultMetadata; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.repository.RepositoryPolicy; +import org.apache.maven.resolver.transfer.ArtifactNotFoundException; +import org.apache.maven.resolver.transfer.ArtifactTransferException; +import org.apache.maven.resolver.transfer.MetadataNotFoundException; +import org.apache.maven.resolver.transfer.MetadataTransferException; +import org.apache.maven.resolver.util.repository.SimpleResolutionErrorPolicy; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzerTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultUpdatePolicyAnalyzerTest.java similarity index 84% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzerTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultUpdatePolicyAnalyzerTest.java index 857d3cccb..a708dc7cb 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzerTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DefaultUpdatePolicyAnalyzerTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,14 +19,17 @@ * under the License. */ -import static org.eclipse.aether.repository.RepositoryPolicy.*; +import static org.apache.maven.resolver.repository.RepositoryPolicy.UPDATE_POLICY_ALWAYS; +import static org.apache.maven.resolver.repository.RepositoryPolicy.UPDATE_POLICY_DAILY; +import static org.apache.maven.resolver.repository.RepositoryPolicy.UPDATE_POLICY_INTERVAL; +import static org.apache.maven.resolver.repository.RepositoryPolicy.UPDATE_POLICY_NEVER; import static org.junit.Assert.*; import java.util.Calendar; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.internal.test.util.TestUtils; -import org.eclipse.aether.repository.RepositoryPolicy; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.internal.test.util.TestUtils; +import org.apache.maven.resolver.repository.RepositoryPolicy; import org.junit.Before; import org.junit.Test; @@ -54,7 +57,7 @@ private long now() @Test public void testIsUpdateRequired_PolicyNever() { - String policy = RepositoryPolicy.UPDATE_POLICY_NEVER; + String policy = UPDATE_POLICY_NEVER; assertFalse( analyzer.isUpdatedRequired( session, Long.MIN_VALUE, policy ) ); assertFalse( analyzer.isUpdatedRequired( session, Long.MAX_VALUE, policy ) ); assertFalse( analyzer.isUpdatedRequired( session, 0, policy ) ); @@ -65,7 +68,7 @@ public void testIsUpdateRequired_PolicyNever() @Test public void testIsUpdateRequired_PolicyAlways() { - String policy = RepositoryPolicy.UPDATE_POLICY_ALWAYS; + String policy = UPDATE_POLICY_ALWAYS; assertTrue( analyzer.isUpdatedRequired( session, Long.MIN_VALUE, policy ) ); assertTrue( analyzer.isUpdatedRequired( session, Long.MAX_VALUE, policy ) ); assertTrue( analyzer.isUpdatedRequired( session, 0, policy ) ); @@ -83,7 +86,7 @@ public void testIsUpdateRequired_PolicyDaily() cal.set( Calendar.MILLISECOND, 0 ); long localMidnight = cal.getTimeInMillis(); - String policy = RepositoryPolicy.UPDATE_POLICY_DAILY; + String policy = UPDATE_POLICY_DAILY; assertTrue( analyzer.isUpdatedRequired( session, Long.MIN_VALUE, policy ) ); assertFalse( analyzer.isUpdatedRequired( session, Long.MAX_VALUE, policy ) ); assertFalse( analyzer.isUpdatedRequired( session, localMidnight, policy ) ); @@ -94,7 +97,7 @@ public void testIsUpdateRequired_PolicyDaily() @Test public void testIsUpdateRequired_PolicyInterval() { - String policy = RepositoryPolicy.UPDATE_POLICY_INTERVAL + ":5"; + String policy = UPDATE_POLICY_INTERVAL + ":5"; assertTrue( analyzer.isUpdatedRequired( session, Long.MIN_VALUE, policy ) ); assertFalse( analyzer.isUpdatedRequired( session, Long.MAX_VALUE, policy ) ); assertFalse( analyzer.isUpdatedRequired( session, now(), policy ) ); @@ -102,7 +105,7 @@ public void testIsUpdateRequired_PolicyInterval() assertFalse( analyzer.isUpdatedRequired( session, now() - 1000 * 5 - 1, policy ) ); assertTrue( analyzer.isUpdatedRequired( session, now() - 1000 * 60 * 5 - 1, policy ) ); - policy = RepositoryPolicy.UPDATE_POLICY_INTERVAL + ":invalid"; + policy = UPDATE_POLICY_INTERVAL + ":invalid"; assertFalse( analyzer.isUpdatedRequired( session, now(), policy ) ); } diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DependencyGraphDumper.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DependencyGraphDumper.java similarity index 97% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DependencyGraphDumper.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DependencyGraphDumper.java index 8c8b1a6cb..df02bcc99 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DependencyGraphDumper.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/DependencyGraphDumper.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -27,8 +27,8 @@ import java.util.List; import java.util.Map; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyNode; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyNode; /** * A helper to visualize dependency graphs. diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/EnhancedLocalRepositoryManagerTest.java similarity index 92% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/EnhancedLocalRepositoryManagerTest.java index f69d8bd75..c93d46dd4 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/EnhancedLocalRepositoryManagerTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -28,20 +28,20 @@ import java.util.Collection; import java.util.Collections; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.internal.test.util.TestFileUtils; -import org.eclipse.aether.internal.test.util.TestUtils; -import org.eclipse.aether.metadata.DefaultMetadata; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.metadata.Metadata.Nature; -import org.eclipse.aether.repository.LocalArtifactRegistration; -import org.eclipse.aether.repository.LocalArtifactRequest; -import org.eclipse.aether.repository.LocalArtifactResult; -import org.eclipse.aether.repository.LocalMetadataRequest; -import org.eclipse.aether.repository.LocalMetadataResult; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.internal.test.util.TestFileUtils; +import org.apache.maven.resolver.internal.test.util.TestUtils; +import org.apache.maven.resolver.metadata.DefaultMetadata; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.metadata.Metadata.Nature; +import org.apache.maven.resolver.repository.LocalArtifactRegistration; +import org.apache.maven.resolver.repository.LocalArtifactRequest; +import org.apache.maven.resolver.repository.LocalArtifactResult; +import org.apache.maven.resolver.repository.LocalMetadataRequest; +import org.apache.maven.resolver.repository.LocalMetadataResult; +import org.apache.maven.resolver.repository.RemoteRepository; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedSplitLocalRepositoryManagerTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/EnhancedSplitLocalRepositoryManagerTest.java similarity index 92% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedSplitLocalRepositoryManagerTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/EnhancedSplitLocalRepositoryManagerTest.java index 540364604..014b84e5a 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedSplitLocalRepositoryManagerTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/EnhancedSplitLocalRepositoryManagerTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.repository.RemoteRepository; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/FailChecksumPolicyTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/FailChecksumPolicyTest.java similarity index 92% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/FailChecksumPolicyTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/FailChecksumPolicyTest.java index 6ba71889c..54e31d17d 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/FailChecksumPolicyTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/FailChecksumPolicyTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,9 +21,9 @@ import static org.junit.Assert.*; -import org.eclipse.aether.spi.connector.checksum.ChecksumPolicy.ChecksumKind; -import org.eclipse.aether.transfer.ChecksumFailureException; -import org.eclipse.aether.transfer.TransferResource; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumPolicy.ChecksumKind; +import org.apache.maven.resolver.transfer.ChecksumFailureException; +import org.apache.maven.resolver.transfer.TransferResource; import org.junit.Before; import org.junit.Test; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/FileProvidedChecksumsSourceTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/FileProvidedChecksumsSourceTest.java similarity index 81% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/FileProvidedChecksumsSourceTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/FileProvidedChecksumsSourceTest.java index 680889fd1..40a107bd5 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/FileProvidedChecksumsSourceTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/FileProvidedChecksumsSourceTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,16 +26,16 @@ import java.nio.file.Path; import java.util.Map; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.internal.impl.checksum.Sha1ChecksumAlgorithmFactory; -import org.eclipse.aether.internal.test.util.TestFileProcessor; -import org.eclipse.aether.internal.test.util.TestUtils; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.repository.RepositoryPolicy; -import org.eclipse.aether.spi.connector.ArtifactDownload; -import org.eclipse.aether.spi.connector.layout.RepositoryLayout; -import org.eclipse.aether.transfer.NoRepositoryLayoutException; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.internal.impl.checksum.Sha1ChecksumAlgorithmFactory; +import org.apache.maven.resolver.internal.test.util.TestFileProcessor; +import org.apache.maven.resolver.internal.test.util.TestUtils; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.repository.RepositoryPolicy; +import org.apache.maven.resolver.spi.connector.ArtifactDownload; +import org.apache.maven.resolver.spi.connector.layout.RepositoryLayout; +import org.apache.maven.resolver.transfer.NoRepositoryLayoutException; import org.junit.Before; import org.junit.Test; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/IniArtifactDescriptorReader.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/IniArtifactDescriptorReader.java similarity index 84% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/IniArtifactDescriptorReader.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/IniArtifactDescriptorReader.java index 4ae2b9b9d..1f89471db 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/IniArtifactDescriptorReader.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/IniArtifactDescriptorReader.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,12 +19,12 @@ * under the License. */ -import org.eclipse.aether.impl.ArtifactDescriptorReader; +import org.apache.maven.resolver.impl.ArtifactDescriptorReader; /** */ public class IniArtifactDescriptorReader - extends org.eclipse.aether.internal.test.util.IniArtifactDescriptorReader + extends org.apache.maven.resolver.internal.test.util.IniArtifactDescriptorReader implements ArtifactDescriptorReader { diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactoryTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/Maven2RepositoryLayoutFactoryTest.java similarity index 94% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactoryTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/Maven2RepositoryLayoutFactoryTest.java index 0fc7a293f..f7df8744e 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactoryTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/Maven2RepositoryLayoutFactoryTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,18 +26,18 @@ import java.util.List; import java.util.stream.Collectors; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.internal.test.util.TestUtils; -import org.eclipse.aether.metadata.DefaultMetadata; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithm; -import org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithmFactory; -import org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithmFactorySupport; -import org.eclipse.aether.spi.connector.layout.RepositoryLayout; -import org.eclipse.aether.spi.connector.layout.RepositoryLayout.ChecksumLocation; -import org.eclipse.aether.transfer.NoRepositoryLayoutException; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.internal.test.util.TestUtils; +import org.apache.maven.resolver.metadata.DefaultMetadata; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumAlgorithm; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumAlgorithmFactory; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumAlgorithmFactorySupport; +import org.apache.maven.resolver.spi.connector.layout.RepositoryLayout; +import org.apache.maven.resolver.spi.connector.layout.RepositoryLayout.ChecksumLocation; +import org.apache.maven.resolver.transfer.NoRepositoryLayoutException; import org.junit.Before; import org.junit.Test; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/PrioritizedComponentTest.java similarity index 98% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/PrioritizedComponentTest.java index 1644f720d..db2bf00c2 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/PrioritizedComponentTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentsTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/PrioritizedComponentsTest.java similarity index 97% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentsTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/PrioritizedComponentsTest.java index 379fe53be..302c4152b 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentsTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/PrioritizedComponentsTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -29,7 +29,7 @@ import java.util.Map; import java.util.concurrent.ThreadFactory; -import org.eclipse.aether.ConfigurationProperties; +import org.apache.maven.resolver.ConfigurationProperties; import org.junit.Test; public class PrioritizedComponentsTest diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/RecordingRepositoryConnector.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/RecordingRepositoryConnector.java similarity index 90% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/RecordingRepositoryConnector.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/RecordingRepositoryConnector.java index 05d0890ff..a2de78b79 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/RecordingRepositoryConnector.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/RecordingRepositoryConnector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,21 +25,21 @@ import java.util.Collection; import java.util.List; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.internal.test.util.TestFileUtils; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.spi.connector.ArtifactDownload; -import org.eclipse.aether.spi.connector.ArtifactUpload; -import org.eclipse.aether.spi.connector.MetadataDownload; -import org.eclipse.aether.spi.connector.MetadataUpload; -import org.eclipse.aether.spi.connector.RepositoryConnector; -import org.eclipse.aether.spi.connector.Transfer; -import org.eclipse.aether.transfer.ArtifactTransferException; -import org.eclipse.aether.transfer.MetadataTransferException; -import org.eclipse.aether.transfer.TransferEvent; -import org.eclipse.aether.transfer.TransferListener; -import org.eclipse.aether.transfer.TransferResource; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.internal.test.util.TestFileUtils; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.spi.connector.ArtifactDownload; +import org.apache.maven.resolver.spi.connector.ArtifactUpload; +import org.apache.maven.resolver.spi.connector.MetadataDownload; +import org.apache.maven.resolver.spi.connector.MetadataUpload; +import org.apache.maven.resolver.spi.connector.RepositoryConnector; +import org.apache.maven.resolver.spi.connector.Transfer; +import org.apache.maven.resolver.transfer.ArtifactTransferException; +import org.apache.maven.resolver.transfer.MetadataTransferException; +import org.apache.maven.resolver.transfer.TransferEvent; +import org.apache.maven.resolver.transfer.TransferListener; +import org.apache.maven.resolver.transfer.TransferResource; /** * A repository connector recording all get/put-requests and faking the results. diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/RecordingRepositoryListener.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/RecordingRepositoryListener.java similarity index 96% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/RecordingRepositoryListener.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/RecordingRepositoryListener.java index a9956da92..168f46dd8 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/RecordingRepositoryListener.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/RecordingRepositoryListener.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,8 +23,8 @@ import java.util.Collections; import java.util.List; -import org.eclipse.aether.RepositoryEvent; -import org.eclipse.aether.RepositoryListener; +import org.apache.maven.resolver.RepositoryEvent; +import org.apache.maven.resolver.RepositoryListener; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/SafeTransferListenerTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/SafeTransferListenerTest.java similarity index 92% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/SafeTransferListenerTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/SafeTransferListenerTest.java index 6d7a6fea1..1cfd2eb6c 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/SafeTransferListenerTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/SafeTransferListenerTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,7 +23,7 @@ import java.lang.reflect.Method; -import org.eclipse.aether.transfer.TransferListener; +import org.apache.maven.resolver.transfer.TransferListener; import org.junit.Test; /** diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/SimpleLocalRepositoryManagerTest.java similarity index 87% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/SimpleLocalRepositoryManagerTest.java index a46721efe..139c8ec0a 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/SimpleLocalRepositoryManagerTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,14 +24,14 @@ import java.io.File; import java.io.IOException; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.internal.test.util.TestFileUtils; -import org.eclipse.aether.internal.test.util.TestUtils; -import org.eclipse.aether.repository.LocalArtifactRequest; -import org.eclipse.aether.repository.LocalArtifactResult; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.internal.test.util.TestFileUtils; +import org.apache.maven.resolver.internal.test.util.TestUtils; +import org.apache.maven.resolver.repository.LocalArtifactRequest; +import org.apache.maven.resolver.repository.LocalArtifactResult; +import org.apache.maven.resolver.repository.RemoteRepository; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StaticUpdateCheckManager.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/StaticUpdateCheckManager.java similarity index 83% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StaticUpdateCheckManager.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/StaticUpdateCheckManager.java index c9889d03d..7ba4b5b9a 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StaticUpdateCheckManager.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/StaticUpdateCheckManager.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,15 +19,15 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.impl.UpdateCheck; -import org.eclipse.aether.impl.UpdateCheckManager; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.transfer.ArtifactNotFoundException; -import org.eclipse.aether.transfer.ArtifactTransferException; -import org.eclipse.aether.transfer.MetadataNotFoundException; -import org.eclipse.aether.transfer.MetadataTransferException; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.impl.UpdateCheck; +import org.apache.maven.resolver.impl.UpdateCheckManager; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.transfer.ArtifactNotFoundException; +import org.apache.maven.resolver.transfer.ArtifactTransferException; +import org.apache.maven.resolver.transfer.MetadataNotFoundException; +import org.apache.maven.resolver.transfer.MetadataTransferException; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubFileTransformerManager.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/StubFileTransformerManager.java similarity index 87% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubFileTransformerManager.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/StubFileTransformerManager.java index a079a2ae1..aa9ace17e 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubFileTransformerManager.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/StubFileTransformerManager.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,9 +24,9 @@ import java.util.HashSet; import java.util.Map; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.transform.FileTransformer; -import org.eclipse.aether.transform.FileTransformerManager; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.transform.FileTransformer; +import org.apache.maven.resolver.transform.FileTransformerManager; public class StubFileTransformerManager implements FileTransformerManager { diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubRemoteRepositoryManager.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/StubRemoteRepositoryManager.java similarity index 89% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubRemoteRepositoryManager.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/StubRemoteRepositoryManager.java index af66f34cc..1287e9a55 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubRemoteRepositoryManager.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/StubRemoteRepositoryManager.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,10 +22,10 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.impl.RemoteRepositoryManager; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.repository.RepositoryPolicy; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.impl.RemoteRepositoryManager; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.repository.RepositoryPolicy; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubRepositoryConnectorProvider.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/StubRepositoryConnectorProvider.java similarity index 79% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubRepositoryConnectorProvider.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/StubRepositoryConnectorProvider.java index 3cb5e38f8..722f82bf2 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubRepositoryConnectorProvider.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/StubRepositoryConnectorProvider.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,11 +19,11 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.impl.RepositoryConnectorProvider; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.spi.connector.RepositoryConnector; -import org.eclipse.aether.transfer.NoRepositoryConnectorException; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.impl.RepositoryConnectorProvider; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.spi.connector.RepositoryConnector; +import org.apache.maven.resolver.transfer.NoRepositoryConnectorException; class StubRepositoryConnectorProvider implements RepositoryConnectorProvider diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubRepositoryEventDispatcher.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/StubRepositoryEventDispatcher.java similarity index 94% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubRepositoryEventDispatcher.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/StubRepositoryEventDispatcher.java index b1e9db451..a0771381d 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubRepositoryEventDispatcher.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/StubRepositoryEventDispatcher.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.RepositoryEvent; -import org.eclipse.aether.RepositoryListener; -import org.eclipse.aether.impl.RepositoryEventDispatcher; +import org.apache.maven.resolver.RepositoryEvent; +import org.apache.maven.resolver.RepositoryListener; +import org.apache.maven.resolver.impl.RepositoryEventDispatcher; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubSyncContextFactory.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/StubSyncContextFactory.java similarity index 81% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubSyncContextFactory.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/StubSyncContextFactory.java index 7cea5e6e6..bb6ef79d3 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubSyncContextFactory.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/StubSyncContextFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,11 +21,11 @@ import java.util.Collection; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.SyncContext; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.spi.synccontext.SyncContextFactory; -import org.eclipse.aether.metadata.Metadata; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.SyncContext; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.spi.synccontext.SyncContextFactory; +import org.apache.maven.resolver.metadata.Metadata; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubVersionRangeResolver.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/StubVersionRangeResolver.java similarity index 78% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubVersionRangeResolver.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/StubVersionRangeResolver.java index 5ace7618a..21b415b3b 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubVersionRangeResolver.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/StubVersionRangeResolver.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,16 +19,16 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.impl.VersionRangeResolver; -import org.eclipse.aether.resolution.VersionRangeRequest; -import org.eclipse.aether.resolution.VersionRangeResolutionException; -import org.eclipse.aether.resolution.VersionRangeResult; -import org.eclipse.aether.util.version.GenericVersionScheme; -import org.eclipse.aether.version.InvalidVersionSpecificationException; -import org.eclipse.aether.version.Version; -import org.eclipse.aether.version.VersionConstraint; -import org.eclipse.aether.version.VersionScheme; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.impl.VersionRangeResolver; +import org.apache.maven.resolver.resolution.VersionRangeRequest; +import org.apache.maven.resolver.resolution.VersionRangeResolutionException; +import org.apache.maven.resolver.resolution.VersionRangeResult; +import org.apache.maven.resolver.util.version.GenericVersionScheme; +import org.apache.maven.resolver.version.InvalidVersionSpecificationException; +import org.apache.maven.resolver.version.Version; +import org.apache.maven.resolver.version.VersionConstraint; +import org.apache.maven.resolver.version.VersionScheme; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubVersionResolver.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/StubVersionResolver.java similarity index 83% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubVersionResolver.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/StubVersionResolver.java index 9ef7e7a5f..8f45f1558 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubVersionResolver.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/StubVersionResolver.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,10 +19,10 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.impl.VersionResolver; -import org.eclipse.aether.resolution.VersionRequest; -import org.eclipse.aether.resolution.VersionResult; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.impl.VersionResolver; +import org.apache.maven.resolver.resolution.VersionRequest; +import org.apache.maven.resolver.resolution.VersionResult; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/WarnChecksumPolicyTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/WarnChecksumPolicyTest.java similarity index 92% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/WarnChecksumPolicyTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/WarnChecksumPolicyTest.java index 6124a022a..5e8a9a552 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/WarnChecksumPolicyTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/WarnChecksumPolicyTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl; +package org.apache.maven.resolver.internal.impl; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,9 +21,9 @@ import static org.junit.Assert.*; -import org.eclipse.aether.spi.connector.checksum.ChecksumPolicy.ChecksumKind; -import org.eclipse.aether.transfer.ChecksumFailureException; -import org.eclipse.aether.transfer.TransferResource; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumPolicy.ChecksumKind; +import org.apache.maven.resolver.transfer.ChecksumFailureException; +import org.apache.maven.resolver.transfer.TransferResource; import org.junit.Before; import org.junit.Test; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DataPoolTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/collect/DataPoolTest.java similarity index 86% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DataPoolTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/collect/DataPoolTest.java index d8f5524cc..47104d3a5 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DataPoolTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/collect/DataPoolTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.collect; +package org.apache.maven.resolver.internal.impl.collect; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,13 +19,13 @@ * under the License. */ -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.resolution.ArtifactDescriptorRequest; -import org.eclipse.aether.resolution.ArtifactDescriptorResult; -import org.eclipse.aether.resolution.VersionRangeRequest; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.resolution.ArtifactDescriptorRequest; +import org.apache.maven.resolver.resolution.ArtifactDescriptorResult; +import org.apache.maven.resolver.resolution.VersionRangeRequest; import org.junit.Test; import java.util.Collections; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCycleTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/collect/DefaultDependencyCycleTest.java similarity index 82% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCycleTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/collect/DefaultDependencyCycleTest.java index 66dade8c1..4bada4145 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCycleTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/collect/DefaultDependencyCycleTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.collect; +package org.apache.maven.resolver.internal.impl.collect; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,11 +22,11 @@ import java.util.ArrayList; import java.util.List; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.graph.DefaultDependencyNode; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyCycle; -import org.eclipse.aether.graph.DependencyNode; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.graph.DefaultDependencyNode; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyCycle; +import org.apache.maven.resolver.graph.DependencyNode; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultVersionFilterContextTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/collect/DefaultVersionFilterContextTest.java similarity index 93% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultVersionFilterContextTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/collect/DefaultVersionFilterContextTest.java index b6fbf5fdb..a5ad74085 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DefaultVersionFilterContextTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/collect/DefaultVersionFilterContextTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.collect; +package org.apache.maven.resolver.internal.impl.collect; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,13 +19,13 @@ * under the License. */ -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.internal.test.util.TestVersion; -import org.eclipse.aether.resolution.VersionRangeRequest; -import org.eclipse.aether.resolution.VersionRangeResult; -import org.eclipse.aether.version.Version; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.internal.test.util.TestVersion; +import org.apache.maven.resolver.resolution.VersionRangeRequest; +import org.apache.maven.resolver.resolution.VersionRangeResult; +import org.apache.maven.resolver.version.Version; import org.junit.Test; import java.util.Arrays; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegateTestSupport.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/collect/DependencyCollectorDelegateTestSupport.java similarity index 91% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegateTestSupport.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/collect/DependencyCollectorDelegateTestSupport.java index c7759ced8..7110dad56 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegateTestSupport.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/collect/DependencyCollectorDelegateTestSupport.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.collect; +package org.apache.maven.resolver.internal.impl.collect; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -30,41 +30,41 @@ import java.util.List; import java.util.Map; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.ArtifactProperties; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.collection.CollectRequest; -import org.eclipse.aether.collection.CollectResult; -import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.collection.DependencyCollectionException; -import org.eclipse.aether.collection.DependencyManagement; -import org.eclipse.aether.collection.DependencyManager; -import org.eclipse.aether.graph.DefaultDependencyNode; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyCycle; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.graph.Exclusion; -import org.eclipse.aether.impl.ArtifactDescriptorReader; -import org.eclipse.aether.internal.impl.IniArtifactDescriptorReader; -import org.eclipse.aether.internal.test.util.DependencyGraphParser; -import org.eclipse.aether.internal.test.util.TestUtils; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.resolution.ArtifactDescriptorException; -import org.eclipse.aether.resolution.ArtifactDescriptorRequest; -import org.eclipse.aether.resolution.ArtifactDescriptorResult; -import org.eclipse.aether.util.artifact.ArtifactIdUtils; -import org.eclipse.aether.util.graph.manager.ClassicDependencyManager; -import org.eclipse.aether.util.graph.manager.DefaultDependencyManager; -import org.eclipse.aether.util.graph.manager.DependencyManagerUtils; -import org.eclipse.aether.util.graph.manager.TransitiveDependencyManager; -import org.eclipse.aether.util.graph.transformer.ConflictResolver; -import org.eclipse.aether.util.graph.transformer.JavaScopeDeriver; -import org.eclipse.aether.util.graph.transformer.JavaScopeSelector; -import org.eclipse.aether.util.graph.transformer.NearestVersionSelector; -import org.eclipse.aether.util.graph.transformer.SimpleOptionalitySelector; -import org.eclipse.aether.util.graph.version.HighestVersionFilter; +import org.apache.maven.resolver.internal.impl.IniArtifactDescriptorReader; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.ArtifactProperties; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.collection.CollectRequest; +import org.apache.maven.resolver.collection.CollectResult; +import org.apache.maven.resolver.collection.DependencyCollectionContext; +import org.apache.maven.resolver.collection.DependencyCollectionException; +import org.apache.maven.resolver.collection.DependencyManagement; +import org.apache.maven.resolver.collection.DependencyManager; +import org.apache.maven.resolver.graph.DefaultDependencyNode; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyCycle; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.graph.Exclusion; +import org.apache.maven.resolver.impl.ArtifactDescriptorReader; +import org.apache.maven.resolver.internal.test.util.DependencyGraphParser; +import org.apache.maven.resolver.internal.test.util.TestUtils; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.resolution.ArtifactDescriptorException; +import org.apache.maven.resolver.resolution.ArtifactDescriptorRequest; +import org.apache.maven.resolver.resolution.ArtifactDescriptorResult; +import org.apache.maven.resolver.util.artifact.ArtifactIdUtils; +import org.apache.maven.resolver.util.graph.manager.ClassicDependencyManager; +import org.apache.maven.resolver.util.graph.manager.DefaultDependencyManager; +import org.apache.maven.resolver.util.graph.manager.DependencyManagerUtils; +import org.apache.maven.resolver.util.graph.manager.TransitiveDependencyManager; +import org.apache.maven.resolver.util.graph.transformer.ConflictResolver; +import org.apache.maven.resolver.util.graph.transformer.JavaScopeDeriver; +import org.apache.maven.resolver.util.graph.transformer.JavaScopeSelector; +import org.apache.maven.resolver.util.graph.transformer.NearestVersionSelector; +import org.apache.maven.resolver.util.graph.transformer.SimpleOptionalitySelector; +import org.apache.maven.resolver.util.graph.version.HighestVersionFilter; import org.junit.Before; import org.junit.Test; @@ -92,7 +92,7 @@ public abstract class DependencyCollectorDelegateTestSupport protected DependencyCollectorDelegate collector; - protected IniArtifactDescriptorReader newReader( String prefix ) + protected IniArtifactDescriptorReader newReader(String prefix ) { return new IniArtifactDescriptorReader( "artifact-descriptions/" + prefix ); } diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollectorTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/collect/bf/BfDependencyCollectorTest.java similarity index 81% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollectorTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/collect/bf/BfDependencyCollectorTest.java index 6f3ea1dcc..520d2907c 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollectorTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/collect/bf/BfDependencyCollectorTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.collect.bf; +package org.apache.maven.resolver.internal.impl.collect.bf; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,20 +23,19 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import java.util.concurrent.ArrayBlockingQueue; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.collection.CollectRequest; -import org.eclipse.aether.collection.CollectResult; -import org.eclipse.aether.collection.DependencyCollectionException; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.Exclusion; -import org.eclipse.aether.internal.impl.StubRemoteRepositoryManager; -import org.eclipse.aether.internal.impl.StubVersionRangeResolver; -import org.eclipse.aether.internal.impl.collect.DependencyCollectorDelegateTestSupport; -import org.eclipse.aether.internal.test.util.DependencyGraphParser; -import org.eclipse.aether.util.graph.manager.TransitiveDependencyManager; -import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector; +import org.apache.maven.resolver.internal.impl.StubRemoteRepositoryManager; +import org.apache.maven.resolver.internal.impl.StubVersionRangeResolver; +import org.apache.maven.resolver.internal.impl.collect.DependencyCollectorDelegateTestSupport; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.collection.CollectRequest; +import org.apache.maven.resolver.collection.CollectResult; +import org.apache.maven.resolver.collection.DependencyCollectionException; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.Exclusion; +import org.apache.maven.resolver.internal.test.util.DependencyGraphParser; +import org.apache.maven.resolver.util.graph.manager.TransitiveDependencyManager; +import org.apache.maven.resolver.util.graph.selector.ExclusionDependencySelector; import org.junit.Assume; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/bf/DependencyResolutionSkipperTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/collect/bf/DependencyResolutionSkipperTest.java similarity index 96% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/bf/DependencyResolutionSkipperTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/collect/bf/DependencyResolutionSkipperTest.java index eeb0a02d7..a510e39d2 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/bf/DependencyResolutionSkipperTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/collect/bf/DependencyResolutionSkipperTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.collect.bf; +package org.apache.maven.resolver.internal.impl.collect.bf; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -24,12 +24,12 @@ import java.util.Map; import java.util.stream.Collectors; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.graph.DefaultDependencyNode; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.internal.test.util.TestVersion; -import org.eclipse.aether.internal.test.util.TestVersionConstraint; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.graph.DefaultDependencyNode; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.internal.test.util.TestVersion; +import org.apache.maven.resolver.internal.test.util.TestVersionConstraint; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/df/DfDependencyCollectorTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/collect/df/DfDependencyCollectorTest.java similarity index 80% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/df/DfDependencyCollectorTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/collect/df/DfDependencyCollectorTest.java index 131e24c41..dea722032 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/df/DfDependencyCollectorTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/collect/df/DfDependencyCollectorTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.collect.df; +package org.apache.maven.resolver.internal.impl.collect.df; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.internal.impl.StubRemoteRepositoryManager; -import org.eclipse.aether.internal.impl.StubVersionRangeResolver; -import org.eclipse.aether.internal.impl.collect.DependencyCollectorDelegateTestSupport; +import org.apache.maven.resolver.internal.impl.StubRemoteRepositoryManager; +import org.apache.maven.resolver.internal.impl.StubVersionRangeResolver; +import org.apache.maven.resolver.internal.impl.collect.DependencyCollectorDelegateTestSupport; /** * UT for {@link DfDependencyCollector}. diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/FileLockAdapterTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/synccontext/FileLockAdapterTest.java similarity index 83% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/FileLockAdapterTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/synccontext/FileLockAdapterTest.java index bebd3674f..88e3dd575 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/FileLockAdapterTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/synccontext/FileLockAdapterTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.synccontext; +package org.apache.maven.resolver.internal.impl.synccontext; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,8 +19,8 @@ * under the License. */ -import org.eclipse.aether.internal.impl.synccontext.named.FileGAVNameMapper; -import org.eclipse.aether.named.providers.FileLockNamedLockFactory; +import org.apache.maven.resolver.internal.impl.synccontext.named.FileGAVNameMapper; +import org.apache.maven.resolver.named.providers.FileLockNamedLockFactory; import org.junit.BeforeClass; public class FileLockAdapterTest diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/LocalReadWriteLockAdapterTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/synccontext/LocalReadWriteLockAdapterTest.java similarity index 88% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/LocalReadWriteLockAdapterTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/synccontext/LocalReadWriteLockAdapterTest.java index 82a2f019e..a439b29de 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/LocalReadWriteLockAdapterTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/synccontext/LocalReadWriteLockAdapterTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.synccontext; +package org.apache.maven.resolver.internal.impl.synccontext; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.named.providers.LocalReadWriteLockNamedLockFactory; +import org.apache.maven.resolver.named.providers.LocalReadWriteLockNamedLockFactory; import org.junit.BeforeClass; public class LocalReadWriteLockAdapterTest diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/LocalSemaphoreAdapterTest.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/synccontext/LocalSemaphoreAdapterTest.java similarity index 88% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/LocalSemaphoreAdapterTest.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/synccontext/LocalSemaphoreAdapterTest.java index adf88fbbb..6107d5487 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/LocalSemaphoreAdapterTest.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/synccontext/LocalSemaphoreAdapterTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.synccontext; +package org.apache.maven.resolver.internal.impl.synccontext; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.named.providers.LocalSemaphoreNamedLockFactory; +import org.apache.maven.resolver.named.providers.LocalSemaphoreNamedLockFactory; import org.junit.BeforeClass; public class LocalSemaphoreAdapterTest diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/NamedLockFactoryAdapterTestSupport.java b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/synccontext/NamedLockFactoryAdapterTestSupport.java similarity index 93% rename from maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/NamedLockFactoryAdapterTestSupport.java rename to maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/synccontext/NamedLockFactoryAdapterTestSupport.java index ce176a762..91e6d8b24 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/NamedLockFactoryAdapterTestSupport.java +++ b/maven-resolver-impl/src/test/java/org/apache/maven/resolver/internal/impl/synccontext/NamedLockFactoryAdapterTestSupport.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.impl.synccontext; +package org.apache.maven.resolver.internal.impl.synccontext; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,13 +19,16 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.SyncContext; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.internal.impl.synccontext.named.*; -import org.eclipse.aether.named.NamedLockFactory; -import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.spi.synccontext.SyncContextFactory; +import org.apache.maven.resolver.internal.impl.synccontext.named.DiscriminatingNameMapper; +import org.apache.maven.resolver.internal.impl.synccontext.named.GAVNameMapper; +import org.apache.maven.resolver.internal.impl.synccontext.named.NameMapper; +import org.apache.maven.resolver.internal.impl.synccontext.named.NamedLockFactoryAdapter; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.SyncContext; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.named.NamedLockFactory; +import org.apache.maven.resolver.repository.LocalRepository; +import org.apache.maven.resolver.spi.synccontext.SyncContextFactory; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/DefaultServiceLocatorTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/DefaultServiceLocatorTest.java deleted file mode 100644 index 72317d798..000000000 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/DefaultServiceLocatorTest.java +++ /dev/null @@ -1,99 +0,0 @@ -package org.eclipse.aether.impl; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import static org.junit.Assert.*; - -import java.util.Arrays; -import java.util.List; - -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.spi.locator.Service; -import org.eclipse.aether.spi.locator.ServiceLocator; -import org.junit.Test; - -/** - */ -public class DefaultServiceLocatorTest -{ - - @Test - public void testGetRepositorySystem() - { - DefaultServiceLocator locator = new DefaultServiceLocator(); - locator.addService( ArtifactDescriptorReader.class, StubArtifactDescriptorReader.class ); - locator.addService( VersionResolver.class, StubVersionResolver.class ); - locator.addService( VersionRangeResolver.class, StubVersionRangeResolver.class ); - - RepositorySystem repoSys = locator.getService( RepositorySystem.class ); - assertNotNull( repoSys ); - } - - @Test - public void testGetServicesUnmodifiable() - { - DefaultServiceLocator locator = new DefaultServiceLocator(); - locator.setServices( String.class, "one", "two" ); - List services = locator.getServices( String.class ); - assertNotNull( services ); - try - { - services.set( 0, "fail" ); - fail( "service list is modifable" ); - } - catch ( UnsupportedOperationException e ) - { - // expected - } - } - - @Test - public void testSetInstancesAddClass() - { - DefaultServiceLocator locator = new DefaultServiceLocator(); - locator.setServices( String.class, "one", "two" ); - locator.addService( String.class, String.class ); - assertEquals( Arrays.asList( "one", "two", "" ), locator.getServices( String.class ) ); - } - - @Test - public void testInitService() - { - DefaultServiceLocator locator = new DefaultServiceLocator(); - locator.setService( DummyService.class, DummyService.class ); - DummyService service = locator.getService( DummyService.class ); - assertNotNull( service ); - assertNotNull( service.locator ); - } - - private static class DummyService - implements Service - { - - public ServiceLocator locator; - - public void initService( ServiceLocator locator ) - { - this.locator = locator; - } - - } - -} diff --git a/maven-resolver-named-locks-hazelcast/pom.xml b/maven-resolver-named-locks-hazelcast/pom.xml index afc3dc40a..1f741de3e 100644 --- a/maven-resolver-named-locks-hazelcast/pom.xml +++ b/maven-resolver-named-locks-hazelcast/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.resolver maven-resolver - 1.8.2-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-named-locks-hazelcast diff --git a/maven-resolver-named-locks-hazelcast/src/main/java/org/eclipse/aether/named/hazelcast/DirectHazelcastSemaphoreProvider.java b/maven-resolver-named-locks-hazelcast/src/main/java/org/apache/maven/resolver/named/hazelcast/DirectHazelcastSemaphoreProvider.java similarity index 96% rename from maven-resolver-named-locks-hazelcast/src/main/java/org/eclipse/aether/named/hazelcast/DirectHazelcastSemaphoreProvider.java rename to maven-resolver-named-locks-hazelcast/src/main/java/org/apache/maven/resolver/named/hazelcast/DirectHazelcastSemaphoreProvider.java index 6901dafe5..aca3722d8 100644 --- a/maven-resolver-named-locks-hazelcast/src/main/java/org/eclipse/aether/named/hazelcast/DirectHazelcastSemaphoreProvider.java +++ b/maven-resolver-named-locks-hazelcast/src/main/java/org/apache/maven/resolver/named/hazelcast/DirectHazelcastSemaphoreProvider.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.hazelcast; +package org.apache.maven.resolver.named.hazelcast; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-named-locks-hazelcast/src/main/java/org/eclipse/aether/named/hazelcast/HazelcastCPSemaphoreNamedLockFactory.java b/maven-resolver-named-locks-hazelcast/src/main/java/org/apache/maven/resolver/named/hazelcast/HazelcastCPSemaphoreNamedLockFactory.java similarity index 97% rename from maven-resolver-named-locks-hazelcast/src/main/java/org/eclipse/aether/named/hazelcast/HazelcastCPSemaphoreNamedLockFactory.java rename to maven-resolver-named-locks-hazelcast/src/main/java/org/apache/maven/resolver/named/hazelcast/HazelcastCPSemaphoreNamedLockFactory.java index 3f110eadb..cb8ef7aab 100644 --- a/maven-resolver-named-locks-hazelcast/src/main/java/org/eclipse/aether/named/hazelcast/HazelcastCPSemaphoreNamedLockFactory.java +++ b/maven-resolver-named-locks-hazelcast/src/main/java/org/apache/maven/resolver/named/hazelcast/HazelcastCPSemaphoreNamedLockFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.hazelcast; +package org.apache.maven.resolver.named.hazelcast; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-named-locks-hazelcast/src/main/java/org/eclipse/aether/named/hazelcast/HazelcastClientCPSemaphoreNamedLockFactory.java b/maven-resolver-named-locks-hazelcast/src/main/java/org/apache/maven/resolver/named/hazelcast/HazelcastClientCPSemaphoreNamedLockFactory.java similarity index 97% rename from maven-resolver-named-locks-hazelcast/src/main/java/org/eclipse/aether/named/hazelcast/HazelcastClientCPSemaphoreNamedLockFactory.java rename to maven-resolver-named-locks-hazelcast/src/main/java/org/apache/maven/resolver/named/hazelcast/HazelcastClientCPSemaphoreNamedLockFactory.java index 138f7bb2d..cd000437c 100644 --- a/maven-resolver-named-locks-hazelcast/src/main/java/org/eclipse/aether/named/hazelcast/HazelcastClientCPSemaphoreNamedLockFactory.java +++ b/maven-resolver-named-locks-hazelcast/src/main/java/org/apache/maven/resolver/named/hazelcast/HazelcastClientCPSemaphoreNamedLockFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.hazelcast; +package org.apache.maven.resolver.named.hazelcast; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-named-locks-hazelcast/src/main/java/org/eclipse/aether/named/hazelcast/HazelcastSemaphoreNamedLockFactory.java b/maven-resolver-named-locks-hazelcast/src/main/java/org/apache/maven/resolver/named/hazelcast/HazelcastSemaphoreNamedLockFactory.java similarity index 92% rename from maven-resolver-named-locks-hazelcast/src/main/java/org/eclipse/aether/named/hazelcast/HazelcastSemaphoreNamedLockFactory.java rename to maven-resolver-named-locks-hazelcast/src/main/java/org/apache/maven/resolver/named/hazelcast/HazelcastSemaphoreNamedLockFactory.java index 18a30fa63..e37e4261d 100644 --- a/maven-resolver-named-locks-hazelcast/src/main/java/org/eclipse/aether/named/hazelcast/HazelcastSemaphoreNamedLockFactory.java +++ b/maven-resolver-named-locks-hazelcast/src/main/java/org/apache/maven/resolver/named/hazelcast/HazelcastSemaphoreNamedLockFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.hazelcast; +package org.apache.maven.resolver.named.hazelcast; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,9 +25,9 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.cp.ISemaphore; -import org.eclipse.aether.named.support.AdaptedSemaphoreNamedLock; -import org.eclipse.aether.named.support.AdaptedSemaphoreNamedLock.AdaptedSemaphore; -import org.eclipse.aether.named.support.NamedLockFactorySupport; +import org.apache.maven.resolver.named.support.NamedLockFactorySupport; +import org.apache.maven.resolver.named.support.AdaptedSemaphoreNamedLock; +import org.apache.maven.resolver.named.support.AdaptedSemaphoreNamedLock.AdaptedSemaphore; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-named-locks-hazelcast/src/main/java/org/eclipse/aether/named/hazelcast/HazelcastSemaphoreProvider.java b/maven-resolver-named-locks-hazelcast/src/main/java/org/apache/maven/resolver/named/hazelcast/HazelcastSemaphoreProvider.java similarity index 96% rename from maven-resolver-named-locks-hazelcast/src/main/java/org/eclipse/aether/named/hazelcast/HazelcastSemaphoreProvider.java rename to maven-resolver-named-locks-hazelcast/src/main/java/org/apache/maven/resolver/named/hazelcast/HazelcastSemaphoreProvider.java index 7ffc98072..509681284 100644 --- a/maven-resolver-named-locks-hazelcast/src/main/java/org/eclipse/aether/named/hazelcast/HazelcastSemaphoreProvider.java +++ b/maven-resolver-named-locks-hazelcast/src/main/java/org/apache/maven/resolver/named/hazelcast/HazelcastSemaphoreProvider.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.hazelcast; +package org.apache.maven.resolver.named.hazelcast; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-named-locks-hazelcast/src/site/markdown/index.md.vm b/maven-resolver-named-locks-hazelcast/src/site/markdown/index.md.vm index 55f2ebb62..fd66437d0 100644 --- a/maven-resolver-named-locks-hazelcast/src/site/markdown/index.md.vm +++ b/maven-resolver-named-locks-hazelcast/src/site/markdown/index.md.vm @@ -24,9 +24,9 @@ rely on Hazelcast ISemaphore instances. Out of the box "hazelcast" (distributed) named lock implementations are the following: -- `semaphore-hazelcast` implemented in `org.eclipse.aether.named.hazelcast.HazelcastCPSemaphoreNamedLockFactory`. +- `semaphore-hazelcast` implemented in `HazelcastCPSemaphoreNamedLockFactory`. Full Hazelcast member is used here. -- `semaphore-hazelcast-client` implemented in `org.eclipse.aether.named.hazelcast.HazelcastClientCPSemaphoreNamedLockFactory` +- `semaphore-hazelcast-client` implemented in `HazelcastClientCPSemaphoreNamedLockFactory` This implementation uses Hazelcast Client, so existing Hazelcast cluster to connect to is a requirement. The semaphore name prefix is `maven:resolver:` and pre-configuring semaphores in Hazelcast is a must. The Hazelcast diff --git a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastCPSemaphoreAdapterIT.java b/maven-resolver-named-locks-hazelcast/src/test/java/org/apache/maven/resolver/named/hazelcast/HazelcastCPSemaphoreAdapterIT.java similarity index 96% rename from maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastCPSemaphoreAdapterIT.java rename to maven-resolver-named-locks-hazelcast/src/test/java/org/apache/maven/resolver/named/hazelcast/HazelcastCPSemaphoreAdapterIT.java index 8f69655ca..2a3df796f 100644 --- a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastCPSemaphoreAdapterIT.java +++ b/maven-resolver-named-locks-hazelcast/src/test/java/org/apache/maven/resolver/named/hazelcast/HazelcastCPSemaphoreAdapterIT.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.hazelcast; +package org.apache.maven.resolver.named.hazelcast; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastCPSemaphoreNamedLockFactoryIT.java b/maven-resolver-named-locks-hazelcast/src/test/java/org/apache/maven/resolver/named/hazelcast/HazelcastCPSemaphoreNamedLockFactoryIT.java similarity index 96% rename from maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastCPSemaphoreNamedLockFactoryIT.java rename to maven-resolver-named-locks-hazelcast/src/test/java/org/apache/maven/resolver/named/hazelcast/HazelcastCPSemaphoreNamedLockFactoryIT.java index cd1a091e3..97f671ffe 100644 --- a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastCPSemaphoreNamedLockFactoryIT.java +++ b/maven-resolver-named-locks-hazelcast/src/test/java/org/apache/maven/resolver/named/hazelcast/HazelcastCPSemaphoreNamedLockFactoryIT.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.hazelcast; +package org.apache.maven.resolver.named.hazelcast; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastClientCPSemaphoreAdapterIT.java b/maven-resolver-named-locks-hazelcast/src/test/java/org/apache/maven/resolver/named/hazelcast/HazelcastClientCPSemaphoreAdapterIT.java similarity index 96% rename from maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastClientCPSemaphoreAdapterIT.java rename to maven-resolver-named-locks-hazelcast/src/test/java/org/apache/maven/resolver/named/hazelcast/HazelcastClientCPSemaphoreAdapterIT.java index c770b7a39..5d7d70b59 100644 --- a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastClientCPSemaphoreAdapterIT.java +++ b/maven-resolver-named-locks-hazelcast/src/test/java/org/apache/maven/resolver/named/hazelcast/HazelcastClientCPSemaphoreAdapterIT.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.hazelcast; +package org.apache.maven.resolver.named.hazelcast; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastClientCPSemaphoreNamedLockFactoryIT.java b/maven-resolver-named-locks-hazelcast/src/test/java/org/apache/maven/resolver/named/hazelcast/HazelcastClientCPSemaphoreNamedLockFactoryIT.java similarity index 96% rename from maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastClientCPSemaphoreNamedLockFactoryIT.java rename to maven-resolver-named-locks-hazelcast/src/test/java/org/apache/maven/resolver/named/hazelcast/HazelcastClientCPSemaphoreNamedLockFactoryIT.java index be50ed5be..87b77787f 100644 --- a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastClientCPSemaphoreNamedLockFactoryIT.java +++ b/maven-resolver-named-locks-hazelcast/src/test/java/org/apache/maven/resolver/named/hazelcast/HazelcastClientCPSemaphoreNamedLockFactoryIT.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.hazelcast; +package org.apache.maven.resolver.named.hazelcast; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastClientUtils.java b/maven-resolver-named-locks-hazelcast/src/test/java/org/apache/maven/resolver/named/hazelcast/HazelcastClientUtils.java similarity index 98% rename from maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastClientUtils.java rename to maven-resolver-named-locks-hazelcast/src/test/java/org/apache/maven/resolver/named/hazelcast/HazelcastClientUtils.java index ec547069c..e08846dc3 100644 --- a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastClientUtils.java +++ b/maven-resolver-named-locks-hazelcast/src/test/java/org/apache/maven/resolver/named/hazelcast/HazelcastClientUtils.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.hazelcast; +package org.apache.maven.resolver.named.hazelcast; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/NamedLockFactoryAdapterTestSupport.java b/maven-resolver-named-locks-hazelcast/src/test/java/org/apache/maven/resolver/named/hazelcast/NamedLockFactoryAdapterTestSupport.java similarity index 93% rename from maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/NamedLockFactoryAdapterTestSupport.java rename to maven-resolver-named-locks-hazelcast/src/test/java/org/apache/maven/resolver/named/hazelcast/NamedLockFactoryAdapterTestSupport.java index db5beb2c5..fc951cbc7 100644 --- a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/NamedLockFactoryAdapterTestSupport.java +++ b/maven-resolver-named-locks-hazelcast/src/test/java/org/apache/maven/resolver/named/hazelcast/NamedLockFactoryAdapterTestSupport.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.hazelcast; +package org.apache.maven.resolver.named.hazelcast; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -27,15 +27,15 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.SyncContext; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.internal.impl.synccontext.named.DiscriminatingNameMapper; -import org.eclipse.aether.internal.impl.synccontext.named.GAVNameMapper; -import org.eclipse.aether.internal.impl.synccontext.named.NamedLockFactoryAdapter; -import org.eclipse.aether.named.NamedLockFactory; -import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.spi.synccontext.SyncContextFactory; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.SyncContext; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.internal.impl.synccontext.named.DiscriminatingNameMapper; +import org.apache.maven.resolver.internal.impl.synccontext.named.GAVNameMapper; +import org.apache.maven.resolver.internal.impl.synccontext.named.NamedLockFactoryAdapter; +import org.apache.maven.resolver.named.NamedLockFactory; +import org.apache.maven.resolver.repository.LocalRepository; +import org.apache.maven.resolver.spi.synccontext.SyncContextFactory; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; diff --git a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/NamedLockFactoryTestSupport.java b/maven-resolver-named-locks-hazelcast/src/test/java/org/apache/maven/resolver/named/hazelcast/NamedLockFactoryTestSupport.java similarity index 97% rename from maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/NamedLockFactoryTestSupport.java rename to maven-resolver-named-locks-hazelcast/src/test/java/org/apache/maven/resolver/named/hazelcast/NamedLockFactoryTestSupport.java index 04b009c8a..a6d6ff78e 100644 --- a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/NamedLockFactoryTestSupport.java +++ b/maven-resolver-named-locks-hazelcast/src/test/java/org/apache/maven/resolver/named/hazelcast/NamedLockFactoryTestSupport.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.hazelcast; +package org.apache.maven.resolver.named.hazelcast; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,8 +22,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.eclipse.aether.named.NamedLock; -import org.eclipse.aether.named.NamedLockFactory; +import org.apache.maven.resolver.named.NamedLock; +import org.apache.maven.resolver.named.NamedLockFactory; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Rule; diff --git a/maven-resolver-named-locks-redisson/pom.xml b/maven-resolver-named-locks-redisson/pom.xml index 46d2ebe6c..b3aa8f3bb 100644 --- a/maven-resolver-named-locks-redisson/pom.xml +++ b/maven-resolver-named-locks-redisson/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.resolver maven-resolver - 1.8.2-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-named-locks-redisson diff --git a/maven-resolver-named-locks-redisson/src/main/java/org/eclipse/aether/named/redisson/RedissonNamedLockFactorySupport.java b/maven-resolver-named-locks-redisson/src/main/java/org/apache/maven/resolver/named/redisson/RedissonNamedLockFactorySupport.java similarity index 96% rename from maven-resolver-named-locks-redisson/src/main/java/org/eclipse/aether/named/redisson/RedissonNamedLockFactorySupport.java rename to maven-resolver-named-locks-redisson/src/main/java/org/apache/maven/resolver/named/redisson/RedissonNamedLockFactorySupport.java index d49c19e4e..5df02d680 100644 --- a/maven-resolver-named-locks-redisson/src/main/java/org/eclipse/aether/named/redisson/RedissonNamedLockFactorySupport.java +++ b/maven-resolver-named-locks-redisson/src/main/java/org/apache/maven/resolver/named/redisson/RedissonNamedLockFactorySupport.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.redisson; +package org.apache.maven.resolver.named.redisson; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.named.support.NamedLockFactorySupport; +import org.apache.maven.resolver.named.support.NamedLockFactorySupport; import org.redisson.Redisson; import org.redisson.api.RedissonClient; import org.redisson.config.Config; diff --git a/maven-resolver-named-locks-redisson/src/main/java/org/eclipse/aether/named/redisson/RedissonReadWriteLockNamedLockFactory.java b/maven-resolver-named-locks-redisson/src/main/java/org/apache/maven/resolver/named/redisson/RedissonReadWriteLockNamedLockFactory.java similarity index 92% rename from maven-resolver-named-locks-redisson/src/main/java/org/eclipse/aether/named/redisson/RedissonReadWriteLockNamedLockFactory.java rename to maven-resolver-named-locks-redisson/src/main/java/org/apache/maven/resolver/named/redisson/RedissonReadWriteLockNamedLockFactory.java index 30b7a93db..d226e5396 100644 --- a/maven-resolver-named-locks-redisson/src/main/java/org/eclipse/aether/named/redisson/RedissonReadWriteLockNamedLockFactory.java +++ b/maven-resolver-named-locks-redisson/src/main/java/org/apache/maven/resolver/named/redisson/RedissonReadWriteLockNamedLockFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.redisson; +package org.apache.maven.resolver.named.redisson; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.named.support.ReadWriteLockNamedLock; +import org.apache.maven.resolver.named.support.ReadWriteLockNamedLock; import org.redisson.api.RReadWriteLock; import javax.inject.Named; diff --git a/maven-resolver-named-locks-redisson/src/main/java/org/eclipse/aether/named/redisson/RedissonSemaphoreNamedLockFactory.java b/maven-resolver-named-locks-redisson/src/main/java/org/apache/maven/resolver/named/redisson/RedissonSemaphoreNamedLockFactory.java similarity index 96% rename from maven-resolver-named-locks-redisson/src/main/java/org/eclipse/aether/named/redisson/RedissonSemaphoreNamedLockFactory.java rename to maven-resolver-named-locks-redisson/src/main/java/org/apache/maven/resolver/named/redisson/RedissonSemaphoreNamedLockFactory.java index 80156b578..5904bb82d 100644 --- a/maven-resolver-named-locks-redisson/src/main/java/org/eclipse/aether/named/redisson/RedissonSemaphoreNamedLockFactory.java +++ b/maven-resolver-named-locks-redisson/src/main/java/org/apache/maven/resolver/named/redisson/RedissonSemaphoreNamedLockFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.redisson; +package org.apache.maven.resolver.named.redisson; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.named.support.AdaptedSemaphoreNamedLock; +import org.apache.maven.resolver.named.support.AdaptedSemaphoreNamedLock; import org.redisson.api.RSemaphore; import javax.inject.Named; diff --git a/maven-resolver-named-locks-redisson/src/site/markdown/index.md.vm b/maven-resolver-named-locks-redisson/src/site/markdown/index.md.vm index 951d4e5a4..59eb4ed6a 100644 --- a/maven-resolver-named-locks-redisson/src/site/markdown/index.md.vm +++ b/maven-resolver-named-locks-redisson/src/site/markdown/index.md.vm @@ -24,9 +24,9 @@ Redisson distributed objects feature. Out of the box "redisson" (distributed) named lock implementations are the following: -- `rwlock-redisson` implemented in `org.eclipse.aether.named.redisson.RedissonReadWriteLockNamedLockFactory` +- `rwlock-redisson` implemented in `RedissonReadWriteLockNamedLockFactory` that uses Redisson backed `org.redisson.api.RReadWriteLock`. -- `semaphore-redisson` implemented in `org.eclipse.aether.named.redisson.RedissonSemaphoreNamedLockFactory` +- `semaphore-redisson` implemented in `RedissonSemaphoreNamedLockFactory` that uses Redisson backed `org.redisson.api.RSemaphore`. ${esc.hash}${esc.hash} Open Issues/Notes diff --git a/maven-resolver-named-locks/pom.xml b/maven-resolver-named-locks/pom.xml index 4515e5093..cdc15afce 100644 --- a/maven-resolver-named-locks/pom.xml +++ b/maven-resolver-named-locks/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.resolver maven-resolver - 1.8.2-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-named-locks diff --git a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/NamedLock.java b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/NamedLock.java similarity index 98% rename from maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/NamedLock.java rename to maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/NamedLock.java index 81ebe5e16..030502714 100644 --- a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/NamedLock.java +++ b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/NamedLock.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named; +package org.apache.maven.resolver.named; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/NamedLockFactory.java b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/NamedLockFactory.java similarity index 96% rename from maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/NamedLockFactory.java rename to maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/NamedLockFactory.java index 5b7490974..e843cfdf2 100644 --- a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/NamedLockFactory.java +++ b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/NamedLockFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named; +package org.apache.maven.resolver.named; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/providers/FileLockNamedLockFactory.java b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/providers/FileLockNamedLockFactory.java similarity index 90% rename from maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/providers/FileLockNamedLockFactory.java rename to maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/providers/FileLockNamedLockFactory.java index d15b1be5d..123bb5196 100644 --- a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/providers/FileLockNamedLockFactory.java +++ b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/providers/FileLockNamedLockFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.providers; +package org.apache.maven.resolver.named.providers; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -32,10 +32,10 @@ import javax.inject.Named; import javax.inject.Singleton; -import org.eclipse.aether.named.support.FileLockNamedLock; -import org.eclipse.aether.named.support.FileSystemFriendly; -import org.eclipse.aether.named.support.NamedLockFactorySupport; -import org.eclipse.aether.named.support.NamedLockSupport; +import org.apache.maven.resolver.named.support.FileLockNamedLock; +import org.apache.maven.resolver.named.support.FileSystemFriendly; +import org.apache.maven.resolver.named.support.NamedLockFactorySupport; +import org.apache.maven.resolver.named.support.NamedLockSupport; /** * Named locks factory of {@link FileLockNamedLock}s. This is a bit special implementation, as it diff --git a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/providers/LocalReadWriteLockNamedLockFactory.java b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/providers/LocalReadWriteLockNamedLockFactory.java similarity index 87% rename from maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/providers/LocalReadWriteLockNamedLockFactory.java rename to maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/providers/LocalReadWriteLockNamedLockFactory.java index 34b242ac1..8a11c73eb 100644 --- a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/providers/LocalReadWriteLockNamedLockFactory.java +++ b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/providers/LocalReadWriteLockNamedLockFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.providers; +package org.apache.maven.resolver.named.providers; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,8 +19,8 @@ * under the License. */ -import org.eclipse.aether.named.support.NamedLockFactorySupport; -import org.eclipse.aether.named.support.ReadWriteLockNamedLock; +import org.apache.maven.resolver.named.support.NamedLockFactorySupport; +import org.apache.maven.resolver.named.support.ReadWriteLockNamedLock; import javax.inject.Named; import javax.inject.Singleton; diff --git a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/providers/LocalSemaphoreNamedLockFactory.java b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/providers/LocalSemaphoreNamedLockFactory.java similarity index 91% rename from maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/providers/LocalSemaphoreNamedLockFactory.java rename to maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/providers/LocalSemaphoreNamedLockFactory.java index 3be7f4ea3..d8bc3b871 100644 --- a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/providers/LocalSemaphoreNamedLockFactory.java +++ b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/providers/LocalSemaphoreNamedLockFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.providers; +package org.apache.maven.resolver.named.providers; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,8 +25,8 @@ import javax.inject.Named; import javax.inject.Singleton; -import org.eclipse.aether.named.support.AdaptedSemaphoreNamedLock; -import org.eclipse.aether.named.support.NamedLockFactorySupport; +import org.apache.maven.resolver.named.support.AdaptedSemaphoreNamedLock; +import org.apache.maven.resolver.named.support.NamedLockFactorySupport; /** * A JVM-local named lock factory that uses named {@link Semaphore}s. diff --git a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/providers/NoopNamedLockFactory.java b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/providers/NoopNamedLockFactory.java similarity index 90% rename from maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/providers/NoopNamedLockFactory.java rename to maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/providers/NoopNamedLockFactory.java index 66b45ed6c..b89fba09d 100644 --- a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/providers/NoopNamedLockFactory.java +++ b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/providers/NoopNamedLockFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.providers; +package org.apache.maven.resolver.named.providers; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,8 +24,8 @@ import javax.inject.Named; import javax.inject.Singleton; -import org.eclipse.aether.named.support.NamedLockFactorySupport; -import org.eclipse.aether.named.support.NamedLockSupport; +import org.apache.maven.resolver.named.support.NamedLockFactorySupport; +import org.apache.maven.resolver.named.support.NamedLockSupport; /** * A no-op lock factory, that creates no-op locks. diff --git a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/AdaptedSemaphoreNamedLock.java b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/support/AdaptedSemaphoreNamedLock.java similarity index 98% rename from maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/AdaptedSemaphoreNamedLock.java rename to maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/support/AdaptedSemaphoreNamedLock.java index 2f4a0b803..458cbe6e4 100644 --- a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/AdaptedSemaphoreNamedLock.java +++ b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/support/AdaptedSemaphoreNamedLock.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.support; +package org.apache.maven.resolver.named.support; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/FileLockNamedLock.java b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/support/FileLockNamedLock.java similarity index 97% rename from maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/FileLockNamedLock.java rename to maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/support/FileLockNamedLock.java index 729ff8613..71c5b03f6 100644 --- a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/FileLockNamedLock.java +++ b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/support/FileLockNamedLock.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.support; +package org.apache.maven.resolver.named.support; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -32,8 +32,6 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.ReentrantLock; -import static org.eclipse.aether.named.support.Retry.retry; - /** * Named lock that uses {@link FileLock}. An instance of this class is about ONE LOCK (one file) * and is possibly used by multiple threads. Each thread (if properly coded re boxing) will try to @@ -91,13 +89,13 @@ public FileLockNamedLock( final String name, @Override public boolean lockShared( final long time, final TimeUnit unit ) throws InterruptedException { - return retry( time, unit, RETRY_SLEEP_MILLIS, this::doLockShared, null, false ); + return Retry.retry( time, unit, RETRY_SLEEP_MILLIS, this::doLockShared, null, false ); } @Override public boolean lockExclusively( final long time, final TimeUnit unit ) throws InterruptedException { - return retry( time, unit, RETRY_SLEEP_MILLIS, this::doLockExclusively, null, false ); + return Retry.retry( time, unit, RETRY_SLEEP_MILLIS, this::doLockExclusively, null, false ); } private Boolean doLockShared() diff --git a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/FileSystemFriendly.java b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/support/FileSystemFriendly.java similarity index 96% rename from maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/FileSystemFriendly.java rename to maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/support/FileSystemFriendly.java index d029e4e91..a8eeae4d4 100644 --- a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/FileSystemFriendly.java +++ b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/support/FileSystemFriendly.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.support; +package org.apache.maven.resolver.named.support; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/NamedLockFactorySupport.java b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/support/NamedLockFactorySupport.java similarity index 97% rename from maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/NamedLockFactorySupport.java rename to maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/support/NamedLockFactorySupport.java index 9b9a2b48f..45ff50fa4 100644 --- a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/NamedLockFactorySupport.java +++ b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/support/NamedLockFactorySupport.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.support; +package org.apache.maven.resolver.named.support; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.named.NamedLockFactory; +import org.apache.maven.resolver.named.NamedLockFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/NamedLockSupport.java b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/support/NamedLockSupport.java similarity index 93% rename from maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/NamedLockSupport.java rename to maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/support/NamedLockSupport.java index 38915b200..a4ba5dcd5 100644 --- a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/NamedLockSupport.java +++ b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/support/NamedLockSupport.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.support; +package org.apache.maven.resolver.named.support; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.named.NamedLock; +import org.apache.maven.resolver.named.NamedLock; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/ReadWriteLockNamedLock.java b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/support/ReadWriteLockNamedLock.java similarity index 98% rename from maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/ReadWriteLockNamedLock.java rename to maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/support/ReadWriteLockNamedLock.java index 2168832d0..cacc0955f 100644 --- a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/ReadWriteLockNamedLock.java +++ b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/support/ReadWriteLockNamedLock.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.support; +package org.apache.maven.resolver.named.support; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/Retry.java b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/support/Retry.java similarity index 98% rename from maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/Retry.java rename to maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/support/Retry.java index b0914ed4b..38ba9e9a3 100644 --- a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/Retry.java +++ b/maven-resolver-named-locks/src/main/java/org/apache/maven/resolver/named/support/Retry.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named.support; +package org.apache.maven.resolver.named.support; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-named-locks/src/site/markdown/index.md.vm b/maven-resolver-named-locks/src/site/markdown/index.md.vm index 0d8d40166..5a5b8fcec 100644 --- a/maven-resolver-named-locks/src/site/markdown/index.md.vm +++ b/maven-resolver-named-locks/src/site/markdown/index.md.vm @@ -27,20 +27,20 @@ Named locks provide support classes for implementations, and provide out of the Out of the box, "local" (local to JVM) named lock implementations are the following: -- `rwlock-local` implemented in `org.eclipse.aether.named.providers.LocalReadWriteLockNamedLockFactory` that uses +- `rwlock-local` implemented in `LocalReadWriteLockNamedLockFactory` that uses JVM `java.util.concurrent.locks.ReentrantReadWriteLock`. -- `semaphore-local` implemented in `org.eclipse.aether.named.providers.LocalSemaphoreNamedLockFactory` that uses +- `semaphore-local` implemented in `LocalSemaphoreNamedLockFactory` that uses JVM `java.util.concurrent.Semaphore`. -- `file-lock` implemented in `org.eclipse.aether.named.providers.FileLockNamedLockFactory` that uses +- `file-lock` implemented in `FileLockNamedLockFactory` that uses JVM `java.nio.channels.FileLock`. -- `noop` implemented in `org.eclipse.aether.named.providers.NoopNamedLockFactory` that uses no locking. +- `noop` implemented in `NoopNamedLockFactory` that uses no locking. Out of the box, "distributed" named lock implementations are the following (separate modules which require additional dependencies): -- `rwlock-redisson` implemented in `org.eclipse.aether.named.redisson.RedissonReadWriteLockNamedLockFactory`. -- `semaphore-redisson` implemented in `org.eclipse.aether.named.redisson.RedissonSemaphoreNamedLockFactory`. -- `semaphore-hazelcast-client` implemented in `org.eclipse.aether.named.hazelcast.HazelcastClientCPSemaphoreNamedLockFactory`. -- `semaphore-hazelcast` implemented in `org.eclipse.aether.named.hazelcast.HazelcastCPSemaphoreNamedLockFactory`. +- `rwlock-redisson` implemented in `RedissonReadWriteLockNamedLockFactory`. +- `semaphore-redisson` implemented in `RedissonSemaphoreNamedLockFactory`. +- `semaphore-hazelcast-client` implemented in `HazelcastClientCPSemaphoreNamedLockFactory`. +- `semaphore-hazelcast` implemented in `HazelcastCPSemaphoreNamedLockFactory`. Local named locks are only suited within one JVM with a multithreaded build. Sharing a local repository between multiple Maven processes (i.e., on a busy CI server) requires a distributed named lock! @@ -50,7 +50,7 @@ The aforementioned (opaque) IDs need to be mapped from artifacts and metadata. Out of the box, name mapper implementations are the following: -- `static` implemented in `org.eclipse.aether.internal.impl.synccontext.named.StaticNameMapper`. -- `gav` implemented in `org.eclipse.aether.internal.impl.synccontext.named.GAVNameMapper`. -- `discriminating` implemented in `org.eclipse.aether.internal.impl.synccontext.named.DiscriminatingNameMapper`. -- `file-gav` implemented in `org.eclipse.aether.internal.impl.synccontext.named.FileGAVNameMapper`. +- `static` implemented in `StaticNameMapper`. +- `gav` implemented in `GAVNameMapper`. +- `discriminating` implemented in `DiscriminatingNameMapper`. +- `file-gav` implemented in `FileGAVNameMapper`. diff --git a/maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/FileLockNamedLockFactorySupportTest.java b/maven-resolver-named-locks/src/test/java/org/apache/maven/resolver/named/FileLockNamedLockFactorySupportTest.java similarity index 93% rename from maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/FileLockNamedLockFactorySupportTest.java rename to maven-resolver-named-locks/src/test/java/org/apache/maven/resolver/named/FileLockNamedLockFactorySupportTest.java index 03f08569d..e2884c204 100644 --- a/maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/FileLockNamedLockFactorySupportTest.java +++ b/maven-resolver-named-locks/src/test/java/org/apache/maven/resolver/named/FileLockNamedLockFactorySupportTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named; +package org.apache.maven.resolver.named; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,7 +24,7 @@ import java.nio.file.Path; import java.nio.file.Paths; -import org.eclipse.aether.named.providers.FileLockNamedLockFactory; +import org.apache.maven.resolver.named.providers.FileLockNamedLockFactory; import org.junit.BeforeClass; public class FileLockNamedLockFactorySupportTest diff --git a/maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/LocalReadWriteLockNamedLockFactoryTest.java b/maven-resolver-named-locks/src/test/java/org/apache/maven/resolver/named/LocalReadWriteLockNamedLockFactoryTest.java similarity index 89% rename from maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/LocalReadWriteLockNamedLockFactoryTest.java rename to maven-resolver-named-locks/src/test/java/org/apache/maven/resolver/named/LocalReadWriteLockNamedLockFactoryTest.java index 3fb6ca21c..fa9cf3bd8 100644 --- a/maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/LocalReadWriteLockNamedLockFactoryTest.java +++ b/maven-resolver-named-locks/src/test/java/org/apache/maven/resolver/named/LocalReadWriteLockNamedLockFactoryTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named; +package org.apache.maven.resolver.named; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.named.providers.LocalReadWriteLockNamedLockFactory; +import org.apache.maven.resolver.named.providers.LocalReadWriteLockNamedLockFactory; import org.junit.BeforeClass; public class LocalReadWriteLockNamedLockFactoryTest diff --git a/maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/LocalSemaphoreNamedLockFactoryTest.java b/maven-resolver-named-locks/src/test/java/org/apache/maven/resolver/named/LocalSemaphoreNamedLockFactoryTest.java similarity index 89% rename from maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/LocalSemaphoreNamedLockFactoryTest.java rename to maven-resolver-named-locks/src/test/java/org/apache/maven/resolver/named/LocalSemaphoreNamedLockFactoryTest.java index df8c247e7..d4a5e563a 100644 --- a/maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/LocalSemaphoreNamedLockFactoryTest.java +++ b/maven-resolver-named-locks/src/test/java/org/apache/maven/resolver/named/LocalSemaphoreNamedLockFactoryTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named; +package org.apache.maven.resolver.named; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.named.providers.LocalSemaphoreNamedLockFactory; +import org.apache.maven.resolver.named.providers.LocalSemaphoreNamedLockFactory; import org.junit.BeforeClass; public class LocalSemaphoreNamedLockFactoryTest diff --git a/maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/NamedLockFactoryTestSupport.java b/maven-resolver-named-locks/src/test/java/org/apache/maven/resolver/named/NamedLockFactoryTestSupport.java similarity index 99% rename from maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/NamedLockFactoryTestSupport.java rename to maven-resolver-named-locks/src/test/java/org/apache/maven/resolver/named/NamedLockFactoryTestSupport.java index de4a8fe12..fb9a0b57a 100644 --- a/maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/NamedLockFactoryTestSupport.java +++ b/maven-resolver-named-locks/src/test/java/org/apache/maven/resolver/named/NamedLockFactoryTestSupport.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named; +package org.apache.maven.resolver.named; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/RetryTest.java b/maven-resolver-named-locks/src/test/java/org/apache/maven/resolver/named/RetryTest.java similarity index 76% rename from maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/RetryTest.java rename to maven-resolver-named-locks/src/test/java/org/apache/maven/resolver/named/RetryTest.java index c26aeea33..30bf03376 100644 --- a/maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/RetryTest.java +++ b/maven-resolver-named-locks/src/test/java/org/apache/maven/resolver/named/RetryTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.named; +package org.apache.maven.resolver.named; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,17 +22,17 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.LongAdder; +import org.apache.maven.resolver.named.support.Retry; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestName; -import static org.eclipse.aether.named.support.Retry.retry; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; /** - * UT for {@link org.eclipse.aether.named.support.Retry}. + * UT for {@link Retry}. */ public class RetryTest { @@ -45,7 +45,7 @@ public class RetryTest public void happy() throws InterruptedException { LongAdder retries = new LongAdder(); - String result = retry( 1L, TimeUnit.SECONDS, RETRY_SLEEP_MILLIS, () -> { retries.increment(); return "happy"; }, null, "notHappy" ); + String result = Retry.retry( 1L, TimeUnit.SECONDS, RETRY_SLEEP_MILLIS, () -> { retries.increment(); return "happy"; }, null, "notHappy" ); assertThat( result, equalTo( "happy" ) ); assertThat( retries.sum(), equalTo( 1L ) ); } @@ -54,7 +54,7 @@ public void happy() throws InterruptedException public void notHappy() throws InterruptedException { LongAdder retries = new LongAdder(); - String result = retry( 1L, TimeUnit.SECONDS, RETRY_SLEEP_MILLIS, () -> { retries.increment(); return null; }, null, "notHappy" ); + String result = Retry.retry( 1L, TimeUnit.SECONDS, RETRY_SLEEP_MILLIS, () -> { retries.increment(); return null; }, null, "notHappy" ); assertThat( result, equalTo( "notHappy" ) ); assertThat( retries.sum(), greaterThan( 1L ) ); } @@ -63,7 +63,7 @@ public void notHappy() throws InterruptedException public void happyOnSomeAttempt() throws InterruptedException { LongAdder retries = new LongAdder(); - String result = retry( 1L, TimeUnit.SECONDS, RETRY_SLEEP_MILLIS, () -> { retries.increment(); return retries.sum() == 2 ? "got it" : null; }, null, "notHappy" ); + String result = Retry.retry( 1L, TimeUnit.SECONDS, RETRY_SLEEP_MILLIS, () -> { retries.increment(); return retries.sum() == 2 ? "got it" : null; }, null, "notHappy" ); assertThat( result, equalTo( "got it" ) ); assertThat( retries.sum(), equalTo( 2L ) ); } diff --git a/maven-resolver-spi/pom.xml b/maven-resolver-spi/pom.xml index 702644d50..a9b31f384 100644 --- a/maven-resolver-spi/pom.xml +++ b/maven-resolver-spi/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.resolver maven-resolver - 1.8.2-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-spi diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/ArtifactDownload.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/ArtifactDownload.java similarity index 94% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/ArtifactDownload.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/ArtifactDownload.java index 5c1fe7f1d..9e20121d3 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/ArtifactDownload.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/ArtifactDownload.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector; +package org.apache.maven.resolver.spi.connector; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,11 +24,11 @@ import java.util.Collections; import java.util.List; -import org.eclipse.aether.RequestTrace; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.transfer.ArtifactTransferException; -import org.eclipse.aether.transfer.TransferListener; +import org.apache.maven.resolver.RequestTrace; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.transfer.ArtifactTransferException; +import org.apache.maven.resolver.transfer.TransferListener; /** * A download of an artifact from a remote repository. A repository connector processing this download has to use @@ -90,7 +90,7 @@ public ArtifactDownload setFile( File file ) /** * Indicates whether this transfer shall only verify the existence of the artifact in the remote repository rather * than actually downloading the file. Just like with an actual transfer, a connector is expected to signal the - * non-existence of the artifact by associating an {@link org.eclipse.aether.transfer.ArtifactNotFoundException + * non-existence of the artifact by associating an {@link ArtifactNotFoundException * ArtifactNotFoundException} with this download. Note: If an existence check is requested, * {@link #getFile()} may be {@code null}, i.e. the connector must not try to access the local file. * diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/ArtifactTransfer.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/ArtifactTransfer.java similarity index 94% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/ArtifactTransfer.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/ArtifactTransfer.java index 83995121e..ae6acbb54 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/ArtifactTransfer.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/ArtifactTransfer.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector; +package org.apache.maven.resolver.spi.connector; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,8 +21,8 @@ import java.io.File; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.transfer.ArtifactTransferException; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.transfer.ArtifactTransferException; /** * A download/upload of an artifact. diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/ArtifactUpload.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/ArtifactUpload.java similarity index 91% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/ArtifactUpload.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/ArtifactUpload.java index 90323b17d..4d67d0aaf 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/ArtifactUpload.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/ArtifactUpload.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector; +package org.apache.maven.resolver.spi.connector; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,11 +21,11 @@ import java.io.File; -import org.eclipse.aether.RequestTrace; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.transfer.ArtifactTransferException; -import org.eclipse.aether.transfer.TransferListener; -import org.eclipse.aether.transform.FileTransformer; +import org.apache.maven.resolver.RequestTrace; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.transfer.ArtifactTransferException; +import org.apache.maven.resolver.transfer.TransferListener; +import org.apache.maven.resolver.transform.FileTransformer; /** * An upload of an artifact to a remote repository. A repository connector processing this upload has to use diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataDownload.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/MetadataDownload.java similarity index 93% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataDownload.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/MetadataDownload.java index be3a2d0d7..5257bf660 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataDownload.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/MetadataDownload.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector; +package org.apache.maven.resolver.spi.connector; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,11 +23,11 @@ import java.util.Collections; import java.util.List; -import org.eclipse.aether.RequestTrace; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.transfer.MetadataTransferException; -import org.eclipse.aether.transfer.TransferListener; +import org.apache.maven.resolver.RequestTrace; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.transfer.MetadataTransferException; +import org.apache.maven.resolver.transfer.TransferListener; /** * A download of metadata from a remote repository. A repository connector processing this download has to use diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataTransfer.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/MetadataTransfer.java similarity index 94% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataTransfer.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/MetadataTransfer.java index 94eb46e79..a2703c8c8 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataTransfer.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/MetadataTransfer.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector; +package org.apache.maven.resolver.spi.connector; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,8 +21,8 @@ import java.io.File; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.transfer.MetadataTransferException; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.transfer.MetadataTransferException; /** * A download/upload of metadata. diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataUpload.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/MetadataUpload.java similarity index 89% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataUpload.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/MetadataUpload.java index d992757c7..f4f7e5da7 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataUpload.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/MetadataUpload.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector; +package org.apache.maven.resolver.spi.connector; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,10 +21,10 @@ import java.io.File; -import org.eclipse.aether.RequestTrace; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.transfer.MetadataTransferException; -import org.eclipse.aether.transfer.TransferListener; +import org.apache.maven.resolver.RequestTrace; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.transfer.MetadataTransferException; +import org.apache.maven.resolver.transfer.TransferListener; /** * An upload of metadata to a remote repository. A repository connector processing this upload has to use diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/RepositoryConnector.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/RepositoryConnector.java similarity index 87% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/RepositoryConnector.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/RepositoryConnector.java index 059262304..c310c8003 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/RepositoryConnector.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/RepositoryConnector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector; +package org.apache.maven.resolver.spi.connector; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,6 +19,11 @@ * under the License. */ +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumPolicyProvider; +import org.apache.maven.resolver.spi.connector.layout.RepositoryLayoutProvider; +import org.apache.maven.resolver.spi.connector.transport.TransporterProvider; + import java.io.Closeable; import java.util.Collection; @@ -27,7 +32,7 @@ * from/to a remote repository. *

* If applicable, a connector should obey connect/request timeouts and other relevant settings from the - * {@link org.eclipse.aether.RepositorySystemSession#getConfigProperties() configuration properties} of the repository + * {@link RepositorySystemSession#getConfigProperties() configuration properties} of the repository * session it has been obtained for. However, a connector must not emit any events to the transfer listener configured * for the session. Instead, transfer events must be emitted only to the listener (if any) specified for a given * download/upload request. @@ -35,9 +40,9 @@ * Note: While a connector itself can use multiple threads internally to performs the transfers, * clients must not call a connector concurrently, i.e. connectors are generally not thread-safe. * - * @see org.eclipse.aether.spi.connector.transport.TransporterProvider - * @see org.eclipse.aether.spi.connector.layout.RepositoryLayoutProvider - * @see org.eclipse.aether.spi.connector.checksum.ChecksumPolicyProvider + * @see TransporterProvider + * @see RepositoryLayoutProvider + * @see ChecksumPolicyProvider */ public interface RepositoryConnector extends Closeable diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/RepositoryConnectorFactory.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/RepositoryConnectorFactory.java similarity index 91% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/RepositoryConnectorFactory.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/RepositoryConnectorFactory.java index 0d401c448..0dae448a3 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/RepositoryConnectorFactory.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/RepositoryConnectorFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector; +package org.apache.maven.resolver.spi.connector; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.transfer.NoRepositoryConnectorException; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.transfer.NoRepositoryConnectorException; /** * A factory to create repository connectors. A repository connector is responsible for uploads/downloads to/from a diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/Transfer.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/Transfer.java similarity index 94% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/Transfer.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/Transfer.java index fc77011bc..fe9a52232 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/Transfer.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/Transfer.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector; +package org.apache.maven.resolver.spi.connector; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,8 +19,8 @@ * under the License. */ -import org.eclipse.aether.RequestTrace; -import org.eclipse.aether.transfer.TransferListener; +import org.apache.maven.resolver.RequestTrace; +import org.apache.maven.resolver.transfer.TransferListener; /** * An artifact/metadata transfer. diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumAlgorithm.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/ChecksumAlgorithm.java similarity index 96% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumAlgorithm.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/ChecksumAlgorithm.java index ade3c6212..af6050ce2 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumAlgorithm.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/ChecksumAlgorithm.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector.checksum; +package org.apache.maven.resolver.spi.connector.checksum; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumAlgorithmFactory.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/ChecksumAlgorithmFactory.java similarity index 97% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumAlgorithmFactory.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/ChecksumAlgorithmFactory.java index f8196d0fc..bd0e3eed1 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumAlgorithmFactory.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/ChecksumAlgorithmFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector.checksum; +package org.apache.maven.resolver.spi.connector.checksum; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumAlgorithmFactorySelector.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/ChecksumAlgorithmFactorySelector.java similarity index 88% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumAlgorithmFactorySelector.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/ChecksumAlgorithmFactorySelector.java index 4b958a6de..62e4fefc1 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumAlgorithmFactorySelector.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/ChecksumAlgorithmFactorySelector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector.checksum; +package org.apache.maven.resolver.spi.connector.checksum; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -38,8 +38,8 @@ public interface ChecksumAlgorithmFactorySelector /** * Returns a collection of supported algorithms. This set represents ALL the algorithms supported by Resolver, * and is NOT in any relation to given repository layout used checksums, returned by method {@link - * org.eclipse.aether.spi.connector.layout.RepositoryLayout#getChecksumAlgorithmFactories()} (in fact, is super set - * of it). + * org.apache.maven.resolver.spi.connector.layout.RepositoryLayout#getChecksumAlgorithmFactories()} + * (in fact, is super set of it). */ Collection getChecksumAlgorithmFactories(); } diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumAlgorithmFactorySupport.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/ChecksumAlgorithmFactorySupport.java similarity index 96% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumAlgorithmFactorySupport.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/ChecksumAlgorithmFactorySupport.java index 7fd398e60..d4e76059a 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumAlgorithmFactorySupport.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/ChecksumAlgorithmFactorySupport.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector.checksum; +package org.apache.maven.resolver.spi.connector.checksum; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumAlgorithmHelper.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/ChecksumAlgorithmHelper.java similarity index 98% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumAlgorithmHelper.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/ChecksumAlgorithmHelper.java index 5238dbbf4..6229ab6c9 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumAlgorithmHelper.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/ChecksumAlgorithmHelper.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector.checksum; +package org.apache.maven.resolver.spi.connector.checksum; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumPolicy.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/ChecksumPolicy.java similarity index 96% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumPolicy.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/ChecksumPolicy.java index 065fe429c..72965cb30 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumPolicy.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/ChecksumPolicy.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector.checksum; +package org.apache.maven.resolver.spi.connector.checksum; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,8 @@ * under the License. */ -import org.eclipse.aether.transfer.ChecksumFailureException; +import org.apache.maven.resolver.spi.connector.transport.GetTask; +import org.apache.maven.resolver.transfer.ChecksumFailureException; /** * A checksum policy gets employed by repository connectors to validate the integrity of a downloaded file. For each @@ -82,7 +83,7 @@ enum ChecksumKind /** * Included checksums may be received from remote repository during the retrieval of the main file, for example * from response headers in case of HTTP transport. They may be set with - * {@link org.eclipse.aether.spi.connector.transport.GetTask#setChecksum(String, String)}. If no included + * {@link GetTask#setChecksum(String, String)}. If no included * checksum present, {@link #REMOTE_EXTERNAL} is tried for. */ REMOTE_INCLUDED, diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumPolicyProvider.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/ChecksumPolicyProvider.java similarity index 91% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumPolicyProvider.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/ChecksumPolicyProvider.java index f50230063..5d6551446 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumPolicyProvider.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/ChecksumPolicyProvider.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector.checksum; +package org.apache.maven.resolver.spi.connector.checksum; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.transfer.TransferResource; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.transfer.TransferResource; /** * Assists repository connectors in applying checksum policies to downloaded resources. diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ProvidedChecksumsSource.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/ProvidedChecksumsSource.java similarity index 86% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ProvidedChecksumsSource.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/ProvidedChecksumsSource.java index b1d70b014..cc50d0c14 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ProvidedChecksumsSource.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/ProvidedChecksumsSource.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector.checksum; +package org.apache.maven.resolver.spi.connector.checksum; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,12 +22,12 @@ import java.util.List; import java.util.Map; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.spi.connector.ArtifactDownload; +import org.apache.maven.resolver.spi.connector.ArtifactDownload; +import org.apache.maven.resolver.RepositorySystemSession; /** * Component able to provide (expected) checksums beforehand the download happens. Checksum provided by this component - * are of kind {@link org.eclipse.aether.spi.connector.checksum.ChecksumPolicy.ChecksumKind#PROVIDED}. + * are of kind {@link ChecksumPolicy.ChecksumKind#PROVIDED}. * * @since 1.8.0 */ diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/package-info.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/package-info.java similarity index 94% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/package-info.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/package-info.java index 94d0653ea..0fa6b79c1 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/package-info.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/checksum/package-info.java @@ -21,5 +21,5 @@ * The support infrastructure for repository connectors to apply checksum policies when validating the integrity of * downloaded files. */ -package org.eclipse.aether.spi.connector.checksum; +package org.apache.maven.resolver.spi.connector.checksum; diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/layout/RepositoryLayout.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/layout/RepositoryLayout.java similarity index 93% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/layout/RepositoryLayout.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/layout/RepositoryLayout.java index 83b43528c..5d48bfb67 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/layout/RepositoryLayout.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/layout/RepositoryLayout.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector.layout; +package org.apache.maven.resolver.spi.connector.layout; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,9 +24,9 @@ import static java.util.Objects.requireNonNull; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithmFactory; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumAlgorithmFactory; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.metadata.Metadata; /** * The layout for a remote repository whose artifacts/metadata can be addressed via URIs. @@ -129,7 +129,7 @@ public String toString() * Returns immutable list of {@link ChecksumAlgorithmFactory} this instance of layout uses, never {@code null}. * The order also represents the order how remote external checksums are retrieved and validated. * - * @see org.eclipse.aether.spi.connector.checksum.ChecksumPolicy.ChecksumKind + * @see org.apache.maven.resolver.spi.connector.checksum.ChecksumPolicy.ChecksumKind * @since 1.8.0 */ List getChecksumAlgorithmFactories(); @@ -143,14 +143,14 @@ public String toString() * calculated and deployed, and on download they will be not retrieved nor validated. * * The result affects only layout provided checksums. See - * {@link org.eclipse.aether.spi.connector.checksum.ChecksumPolicy.ChecksumKind#REMOTE_EXTERNAL}. - * On download, the {@link org.eclipse.aether.spi.connector.layout.RepositoryLayout#getChecksumAlgorithmFactories()} + * {@link org.apache.maven.resolver.spi.connector.checksum.ChecksumPolicy.ChecksumKind#REMOTE_EXTERNAL}. + * On download, the {@link RepositoryLayout#getChecksumAlgorithmFactories()} * layout required checksums are calculated, and non layout-provided checksums are still utilized. * * Typical case to return {@code false} (to omit checksums) is for artifact signatures, that are already a * "sub-artifact" of some main artifact (for example a JAR), and they can be validated by some other means. * - * @see org.eclipse.aether.spi.connector.checksum.ChecksumPolicy.ChecksumKind + * @see org.apache.maven.resolver.spi.connector.checksum.ChecksumPolicy.ChecksumKind * @see #getChecksumAlgorithmFactories() * @since 1.8.0 */ diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/layout/RepositoryLayoutFactory.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/layout/RepositoryLayoutFactory.java similarity index 90% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/layout/RepositoryLayoutFactory.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/layout/RepositoryLayoutFactory.java index 8aa71d7ab..59c0f1fe3 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/layout/RepositoryLayoutFactory.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/layout/RepositoryLayoutFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector.layout; +package org.apache.maven.resolver.spi.connector.layout; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.transfer.NoRepositoryLayoutException; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.transfer.NoRepositoryLayoutException; /** * A factory to obtain repository layouts. A repository layout is responsible to map an artifact or some metadata to a diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/layout/RepositoryLayoutProvider.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/layout/RepositoryLayoutProvider.java similarity index 87% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/layout/RepositoryLayoutProvider.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/layout/RepositoryLayoutProvider.java index 5cdf53b1b..69372d799 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/layout/RepositoryLayoutProvider.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/layout/RepositoryLayoutProvider.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector.layout; +package org.apache.maven.resolver.spi.connector.layout; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.transfer.NoRepositoryLayoutException; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.transfer.NoRepositoryLayoutException; /** * Retrieves a repository layout from the installed layout factories. diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/layout/package-info.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/layout/package-info.java similarity index 85% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/layout/package-info.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/layout/package-info.java index 2b36f7cd3..b44d2f640 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/layout/package-info.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/layout/package-info.java @@ -19,8 +19,8 @@ */ /** * The contract to locate URI-based resources using custom repository layouts. By implementing a - * {@link org.eclipse.aether.spi.connector.layout.RepositoryLayoutFactory} and registering it with the repository + * {@link org.apache.maven.resolver.spi.connector.layout.RepositoryLayoutFactory} and registering it with the repository * system, an application enables access to remote repositories that use new content types/layouts. */ -package org.eclipse.aether.spi.connector.layout; +package org.apache.maven.resolver.spi.connector.layout; diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/package-info.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/package-info.java similarity index 73% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/package-info.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/package-info.java index f31a2a8aa..3b36db340 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/package-info.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/package-info.java @@ -19,12 +19,13 @@ */ /** * The contract to access artifacts/metadata in remote repositories. By implementing a - * {@link org.eclipse.aether.spi.connector.RepositoryConnectorFactory} and registering it with the repository system, + * {@link org.apache.maven.resolver.spi.connector.RepositoryConnectorFactory} + * and registering it with the repository system, * an application can enable access to arbitrary remote repositories. It should be noted that a repository connector is * powerful yet burdensome to implement. In many cases, implementing a - * {@link org.eclipse.aether.spi.connector.transport.TransporterFactory} or - * {@link org.eclipse.aether.spi.connector.layout.RepositoryLayoutFactory} will be sufficient and easier to access a - * custom remote repository. + * {@link org.apache.maven.resolver.spi.connector.transport.TransporterFactory} or + * {@link org.apache.maven.resolver.spi.connector.layout.RepositoryLayoutFactory} + * will be sufficient and easier to access a custom remote repository. */ -package org.eclipse.aether.spi.connector; +package org.apache.maven.resolver.spi.connector; diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/AbstractTransporter.java similarity index 98% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/AbstractTransporter.java index 4bb276c56..b6cdb56a4 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/AbstractTransporter.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector.transport; +package org.apache.maven.resolver.spi.connector.transport; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,7 +26,7 @@ import java.util.Objects; import java.util.concurrent.atomic.AtomicBoolean; -import org.eclipse.aether.transfer.TransferCancelledException; +import org.apache.maven.resolver.transfer.TransferCancelledException; /** * A skeleton implementation for custom transporters. diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/GetTask.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/GetTask.java similarity index 98% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/GetTask.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/GetTask.java index e6eb9a412..999fd941b 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/GetTask.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/GetTask.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector.transport; +package org.apache.maven.resolver.spi.connector.transport; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -212,7 +212,7 @@ public GetTask setListener( TransportListener listener ) * and the values are hexadecimal representations of the corresponding value. Note: This is optional * data that a transporter may return if the underlying transport protocol provides metadata (e.g. HTTP headers) * along with the actual resource data. Checksums returned by this method have kind of - * {@link org.eclipse.aether.spi.connector.checksum.ChecksumPolicy.ChecksumKind#REMOTE_INCLUDED}. + * {@link org.apache.maven.resolver.spi.connector.checksum.ChecksumPolicy.ChecksumKind#REMOTE_INCLUDED}. * * @return The (read-only) checksums advertised for the downloaded resource, possibly empty but never {@code null}. */ diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/PeekTask.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/PeekTask.java similarity index 96% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/PeekTask.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/PeekTask.java index d1fb9056d..5d40b2de2 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/PeekTask.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/PeekTask.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector.transport; +package org.apache.maven.resolver.spi.connector.transport; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/PutTask.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/PutTask.java similarity index 98% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/PutTask.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/PutTask.java index 1c30e0715..00afec8f4 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/PutTask.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/PutTask.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector.transport; +package org.apache.maven.resolver.spi.connector.transport; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransportListener.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/TransportListener.java similarity index 94% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransportListener.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/TransportListener.java index 473036b0a..70e6121ac 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransportListener.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/TransportListener.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector.transport; +package org.apache.maven.resolver.spi.connector.transport; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,7 +21,7 @@ import java.nio.ByteBuffer; -import org.eclipse.aether.transfer.TransferCancelledException; +import org.apache.maven.resolver.transfer.TransferCancelledException; /** * A skeleton class for listeners used to monitor transport operations. Reusing common regular expression syntax, the diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransportTask.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/TransportTask.java similarity index 97% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransportTask.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/TransportTask.java index 05525b108..61bb4a91d 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransportTask.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/TransportTask.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector.transport; +package org.apache.maven.resolver.spi.connector.transport; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/Transporter.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/Transporter.java similarity index 95% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/Transporter.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/Transporter.java index b8d221c05..a0aa94e3f 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/Transporter.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/Transporter.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector.transport; +package org.apache.maven.resolver.spi.connector.transport; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,6 +19,8 @@ * under the License. */ +import org.apache.maven.resolver.RepositorySystemSession; + import java.io.Closeable; /** @@ -27,7 +29,7 @@ * {@link TransportListener} configured on the underlying task. *

* If applicable, a transporter should obey connect/request timeouts and other relevant settings from the - * {@link org.eclipse.aether.RepositorySystemSession#getConfigProperties() configuration properties} of the repository + * {@link RepositorySystemSession#getConfigProperties() configuration properties} of the repository * system session. *

* Note: Implementations must be thread-safe such that a given transporter instance can safely be used diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransporterFactory.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/TransporterFactory.java similarity index 91% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransporterFactory.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/TransporterFactory.java index 999908af5..18f598d34 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransporterFactory.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/TransporterFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector.transport; +package org.apache.maven.resolver.spi.connector.transport; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.transfer.NoTransporterException; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.transfer.NoTransporterException; /** * A factory to create transporters. A transporter is responsible for uploads/downloads to/from a remote repository diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransporterProvider.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/TransporterProvider.java similarity index 87% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransporterProvider.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/TransporterProvider.java index b855042d9..b5499deb5 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransporterProvider.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/TransporterProvider.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector.transport; +package org.apache.maven.resolver.spi.connector.transport; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.transfer.NoTransporterException; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.transfer.NoTransporterException; /** * Retrieves a transporter from the installed transporter factories. diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/package-info.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/package-info.java similarity index 84% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/package-info.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/package-info.java index 26796ba1f..8e114128f 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/package-info.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/connector/transport/package-info.java @@ -19,8 +19,9 @@ */ /** * The contract to download/upload URI-based resources using custom transport protocols. By implementing a - * {@link org.eclipse.aether.spi.connector.transport.TransporterFactory} and registering it with the repository system, + * {@link org.apache.maven.resolver.spi.connector.transport.TransporterFactory} + * and registering it with the repository system, * an application enables access to remote repositories that use new URI schemes. */ -package org.eclipse.aether.spi.connector.transport; +package org.apache.maven.resolver.spi.connector.transport; diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/io/FileProcessor.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/io/FileProcessor.java similarity index 99% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/io/FileProcessor.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/io/FileProcessor.java index 0a84eb1e8..d0119d209 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/io/FileProcessor.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/io/FileProcessor.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.io; +package org.apache.maven.resolver.spi.io; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/io/package-info.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/io/package-info.java similarity index 95% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/io/package-info.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/io/package-info.java index ec5c12214..939888c06 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/io/package-info.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/io/package-info.java @@ -20,5 +20,5 @@ /** * I/O related support infrastructure for components. */ -package org.eclipse.aether.spi.io; +package org.apache.maven.resolver.spi.io; diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/localrepo/LocalRepositoryManagerFactory.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/localrepo/LocalRepositoryManagerFactory.java similarity index 88% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/localrepo/LocalRepositoryManagerFactory.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/localrepo/LocalRepositoryManagerFactory.java index 518f90e2a..7b1147386 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/localrepo/LocalRepositoryManagerFactory.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/localrepo/LocalRepositoryManagerFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.localrepo; +package org.apache.maven.resolver.spi.localrepo; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,10 +19,10 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.repository.LocalRepositoryManager; -import org.eclipse.aether.repository.NoLocalRepositoryManagerException; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.LocalRepository; +import org.apache.maven.resolver.repository.LocalRepositoryManager; +import org.apache.maven.resolver.repository.NoLocalRepositoryManagerException; /** * A factory to create managers for the local repository. A local repository manager needs to keep track of artifacts diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/localrepo/package-info.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/localrepo/package-info.java similarity index 94% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/localrepo/package-info.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/localrepo/package-info.java index afd64cf2f..b90771846 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/localrepo/package-info.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/localrepo/package-info.java @@ -20,5 +20,5 @@ /** * The contract for custom local repository implementations. */ -package org.eclipse.aether.spi.localrepo; +package org.apache.maven.resolver.spi.localrepo; diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/Logger.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/log/Logger.java similarity index 98% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/Logger.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/log/Logger.java index dbe67782a..5a504d5bd 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/Logger.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/log/Logger.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.log; +package org.apache.maven.resolver.spi.log; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/LoggerFactory.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/log/LoggerFactory.java similarity index 96% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/LoggerFactory.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/log/LoggerFactory.java index 3258e04cb..3f7193dce 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/LoggerFactory.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/log/LoggerFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.log; +package org.apache.maven.resolver.spi.log; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/NullLogger.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/log/NullLogger.java similarity index 96% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/NullLogger.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/log/NullLogger.java index c1bacbac6..247576259 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/NullLogger.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/log/NullLogger.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.log; +package org.apache.maven.resolver.spi.log; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/NullLoggerFactory.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/log/NullLoggerFactory.java similarity index 98% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/NullLoggerFactory.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/log/NullLoggerFactory.java index 8bf8a242c..735e037ea 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/NullLoggerFactory.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/log/NullLoggerFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.log; +package org.apache.maven.resolver.spi.log; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/package-info.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/log/package-info.java similarity index 68% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/package-info.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/log/package-info.java index 9584292b9..d0daf62b3 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/package-info.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/log/package-info.java @@ -19,10 +19,10 @@ */ /** * A simple logging infrastructure for diagnostic messages. The primary purpose of the - * {@link org.eclipse.aether.spi.log.LoggerFactory} defined here is to avoid a mandatory dependency on a 3rd party - * logging system/facade. Some applications might find the events fired by the repository system sufficient and prefer - * a small footprint. Components that do not share this concern are free to ignore this package and directly employ - * whatever logging system they desire. + * {@link org.apache.maven.resolver.spi.log.LoggerFactory} defined here is to avoid a mandatory dependency + * on a 3rd party logging system/facade. Some applications might find the events fired by the repository system + * sufficient and prefer a small footprint. Components that do not share this concern are free + * to ignore this package and directly employ whatever logging system they desire. */ -package org.eclipse.aether.spi.log; +package org.apache.maven.resolver.spi.log; diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/synccontext/SyncContextFactory.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/synccontext/SyncContextFactory.java similarity index 88% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/synccontext/SyncContextFactory.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/synccontext/SyncContextFactory.java index bb2628209..5d9a4110b 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/synccontext/SyncContextFactory.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/synccontext/SyncContextFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.synccontext; +package org.apache.maven.resolver.spi.synccontext; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.SyncContext; +import org.apache.maven.resolver.RepositorySystem; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.SyncContext; /** * A factory to create synchronization contexts. A synchronization context is used to coordinate concurrent access to diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/synccontext/package-info.java b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/synccontext/package-info.java similarity index 94% rename from maven-resolver-spi/src/main/java/org/eclipse/aether/spi/synccontext/package-info.java rename to maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/synccontext/package-info.java index 268aa3caa..64113cdf4 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/synccontext/package-info.java +++ b/maven-resolver-spi/src/main/java/org/apache/maven/resolver/spi/synccontext/package-info.java @@ -20,5 +20,5 @@ /** * The contract for synchronization context implementations. */ -package org.eclipse.aether.spi.synccontext; +package org.apache.maven.resolver.spi.synccontext; diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/locator/Service.java b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/locator/Service.java deleted file mode 100644 index bbd6713fb..000000000 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/locator/Service.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.eclipse.aether.spi.locator; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/** - * A stateless component of the repository system. The primary purpose of this interface is to provide a convenient - * means to programmatically wire the several components of the repository system together when it is used outside of an - * IoC container. - * - * @deprecated Use some out-of-the-box DI implementation instead. - */ -@Deprecated -public interface Service -{ - - /** - * Provides the opportunity to initialize this service and to acquire other services for its operation from the - * locator. A service must not save the reference to the provided service locator. - * - * @param locator The service locator, must not be {@code null}. - */ - void initService( ServiceLocator locator ); - -} diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/locator/ServiceLocator.java b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/locator/ServiceLocator.java deleted file mode 100644 index bb376b6d6..000000000 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/locator/ServiceLocator.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.eclipse.aether.spi.locator; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import java.util.List; - -/** - * A simple infrastructure to programmatically wire the various components of the repository system together when it is - * used outside of an IoC container. Once a concrete implementation of a service locator has been setup, clients could - * use - * - * 

- * RepositorySystem repoSystem = serviceLocator.getService( RepositorySystem.class );
- *
- * - * to acquire the repository system. Components that implement {@link Service} will be given an opportunity to acquire - * further components from the locator, thereby allowing to create the complete object graph of the repository system. - * - * @deprecated Use some out-of-the-box DI implementation instead. - */ -@Deprecated -public interface ServiceLocator -{ - - /** - * Gets an instance of the specified service. - * - * @param The service type. - * @param type The interface describing the service, must not be {@code null}. - * @return The service instance or {@code null} if the service could not be located/initialized. - */ - T getService( Class type ); - - /** - * Gets all available instances of the specified service. - * - * @param The service type. - * @param type The interface describing the service, must not be {@code null}. - * @return The (read-only) list of available service instances, never {@code null}. - */ - List getServices( Class type ); - -} diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/locator/package-info.java b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/locator/package-info.java deleted file mode 100644 index 32e48874d..000000000 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/locator/package-info.java +++ /dev/null @@ -1,33 +0,0 @@ -// CHECKSTYLE_OFF: RegexpHeader -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/** - * A lightweight service locator infrastructure to help components acquire dependent components. The implementation of - * the repository system is decomposed into many sub components that interact with each other via interfaces, allowing - * an application to customize the system by swapping in different implementation classes for these interfaces. The - * service locator defined by this package is one means for components to get hold of the proper implementation for its - * dependencies. While not the most popular approach to component wiring, this service locator enables applications - * that do not wish to pull in more sophisticated solutions like dependency injection containers to have a small - * footprint. Therefore, all components should implement {@link org.eclipse.aether.spi.locator.Service} to support this - * goal. - * - * @deprecated Use some out-of-the-box DI implementation instead. - */ -package org.eclipse.aether.spi.locator; - diff --git a/maven-resolver-spi/src/test/java/org/eclipse/aether/spi/connector/layout/ChecksumLocationTest.java b/maven-resolver-spi/src/test/java/org/apache/maven/resolver/spi/connector/layout/ChecksumLocationTest.java similarity index 89% rename from maven-resolver-spi/src/test/java/org/eclipse/aether/spi/connector/layout/ChecksumLocationTest.java rename to maven-resolver-spi/src/test/java/org/apache/maven/resolver/spi/connector/layout/ChecksumLocationTest.java index c8b53fa9e..ddf5b02b4 100644 --- a/maven-resolver-spi/src/test/java/org/eclipse/aether/spi/connector/layout/ChecksumLocationTest.java +++ b/maven-resolver-spi/src/test/java/org/apache/maven/resolver/spi/connector/layout/ChecksumLocationTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.spi.connector.layout; +package org.apache.maven.resolver.spi.connector.layout; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,12 +21,12 @@ import java.net.URI; -import org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithm; -import org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithmFactory; -import org.eclipse.aether.spi.connector.checksum.ChecksumAlgorithmFactorySupport; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumAlgorithm; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumAlgorithmFactory; +import org.apache.maven.resolver.spi.connector.checksum.ChecksumAlgorithmFactorySupport; import org.junit.Test; -import org.eclipse.aether.spi.connector.layout.RepositoryLayout.ChecksumLocation; +import org.apache.maven.resolver.spi.connector.layout.RepositoryLayout.ChecksumLocation; import static org.junit.Assert.assertEquals; diff --git a/maven-resolver-test-util/pom.xml b/maven-resolver-test-util/pom.xml index 1b38528b5..b987fb8c5 100644 --- a/maven-resolver-test-util/pom.xml +++ b/maven-resolver-test-util/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.resolver maven-resolver - 1.8.2-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-test-util diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/ArtifactDefinition.java b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/ArtifactDefinition.java similarity index 98% rename from maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/ArtifactDefinition.java rename to maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/ArtifactDefinition.java index 00dac9293..07252a51e 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/ArtifactDefinition.java +++ b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/ArtifactDefinition.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.test.util; +package org.apache.maven.resolver.internal.test.util; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/ArtifactDescription.java b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/ArtifactDescription.java similarity index 89% rename from maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/ArtifactDescription.java rename to maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/ArtifactDescription.java index 5c1f530e4..916eefb51 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/ArtifactDescription.java +++ b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/ArtifactDescription.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.test.util; +package org.apache.maven.resolver.internal.test.util; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,9 +21,9 @@ import java.util.List; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.repository.RemoteRepository; /** */ diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/DependencyGraphParser.java similarity index 97% rename from maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java rename to maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/DependencyGraphParser.java index 09b048912..08e5eaf62 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java +++ b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/DependencyGraphParser.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.test.util; +package org.apache.maven.resolver.internal.test.util; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -35,13 +35,13 @@ import java.util.List; import java.util.Map; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.graph.DefaultDependencyNode; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.version.InvalidVersionSpecificationException; -import org.eclipse.aether.version.VersionScheme; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.graph.DefaultDependencyNode; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.version.InvalidVersionSpecificationException; +import org.apache.maven.resolver.version.VersionScheme; /** * Creates a dependency graph from a text description.

Definition

Each (non-empty) line in the input defines diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDataReader.java b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/IniArtifactDataReader.java similarity index 96% rename from maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDataReader.java rename to maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/IniArtifactDataReader.java index 08a693b81..e87dfc7a0 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDataReader.java +++ b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/IniArtifactDataReader.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.test.util; +package org.apache.maven.resolver.internal.test.util; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -33,11 +33,11 @@ import java.util.Locale; import java.util.Map; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.Exclusion; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.Exclusion; +import org.apache.maven.resolver.repository.RemoteRepository; /** * @see IniArtifactDescriptorReader diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReader.java b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/IniArtifactDescriptorReader.java similarity index 91% rename from maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReader.java rename to maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/IniArtifactDescriptorReader.java index 17f98b3b2..61aef71b7 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReader.java +++ b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/IniArtifactDescriptorReader.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.test.util; +package org.apache.maven.resolver.internal.test.util; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,11 +19,11 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.resolution.ArtifactDescriptorException; -import org.eclipse.aether.resolution.ArtifactDescriptorRequest; -import org.eclipse.aether.resolution.ArtifactDescriptorResult; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.resolution.ArtifactDescriptorException; +import org.apache.maven.resolver.resolution.ArtifactDescriptorRequest; +import org.apache.maven.resolver.resolution.ArtifactDescriptorResult; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeBuilder.java b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/NodeBuilder.java similarity index 90% rename from maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeBuilder.java rename to maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/NodeBuilder.java index 446c0c2e1..f42e97c3e 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeBuilder.java +++ b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/NodeBuilder.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.test.util; +package org.apache.maven.resolver.internal.test.util; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,13 +26,13 @@ import java.util.List; import java.util.Map; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.graph.DefaultDependencyNode; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.version.InvalidVersionSpecificationException; -import org.eclipse.aether.version.VersionScheme; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.graph.DefaultDependencyNode; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.version.InvalidVersionSpecificationException; +import org.apache.maven.resolver.version.VersionScheme; /** * A builder to create dependency nodes for unit testing. diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeDefinition.java b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/NodeDefinition.java similarity index 98% rename from maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeDefinition.java rename to maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/NodeDefinition.java index 5d2145533..01cb76e9a 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeDefinition.java +++ b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/NodeDefinition.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.test.util; +package org.apache.maven.resolver.internal.test.util; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestDependencyCollectionContext.java b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestDependencyCollectionContext.java similarity index 87% rename from maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestDependencyCollectionContext.java rename to maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestDependencyCollectionContext.java index c99326ee7..1f544540a 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestDependencyCollectionContext.java +++ b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestDependencyCollectionContext.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.test.util; +package org.apache.maven.resolver.internal.test.util; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,10 +21,10 @@ import java.util.List; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.graph.Dependency; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.collection.DependencyCollectionContext; +import org.apache.maven.resolver.graph.Dependency; /** */ diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestDependencyGraphTransformationContext.java b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestDependencyGraphTransformationContext.java similarity index 90% rename from maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestDependencyGraphTransformationContext.java rename to maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestDependencyGraphTransformationContext.java index ee6fe606a..6e3d152cb 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestDependencyGraphTransformationContext.java +++ b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestDependencyGraphTransformationContext.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.test.util; +package org.apache.maven.resolver.internal.test.util; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,8 +23,8 @@ import java.util.Map; import static java.util.Objects.requireNonNull; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.collection.DependencyGraphTransformationContext; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.collection.DependencyGraphTransformationContext; /** */ diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileProcessor.java b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestFileProcessor.java similarity index 98% rename from maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileProcessor.java rename to maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestFileProcessor.java index ae5d9f812..0f82a0403 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileProcessor.java +++ b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestFileProcessor.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.test.util; +package org.apache.maven.resolver.internal.test.util; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -31,7 +31,7 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; -import org.eclipse.aether.spi.io.FileProcessor; +import org.apache.maven.resolver.spi.io.FileProcessor; /** * A simple file processor implementation to help satisfy component requirements during tests. diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileUtils.java b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestFileUtils.java similarity index 99% rename from maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileUtils.java rename to maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestFileUtils.java index a2f3560c3..5306b46a9 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileUtils.java +++ b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestFileUtils.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.test.util; +package org.apache.maven.resolver.internal.test.util; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLocalRepositoryManager.java b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestLocalRepositoryManager.java similarity index 87% rename from maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLocalRepositoryManager.java rename to maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestLocalRepositoryManager.java index c927d4491..1f00bcce5 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLocalRepositoryManager.java +++ b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestLocalRepositoryManager.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.test.util; +package org.apache.maven.resolver.internal.test.util; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,18 +24,18 @@ import java.util.HashSet; import java.util.Set; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.repository.LocalArtifactRegistration; -import org.eclipse.aether.repository.LocalArtifactRequest; -import org.eclipse.aether.repository.LocalArtifactResult; -import org.eclipse.aether.repository.LocalMetadataRegistration; -import org.eclipse.aether.repository.LocalMetadataRequest; -import org.eclipse.aether.repository.LocalMetadataResult; -import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.repository.LocalRepositoryManager; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.repository.LocalArtifactRegistration; +import org.apache.maven.resolver.repository.LocalArtifactRequest; +import org.apache.maven.resolver.repository.LocalArtifactResult; +import org.apache.maven.resolver.repository.LocalMetadataRegistration; +import org.apache.maven.resolver.repository.LocalMetadataRequest; +import org.apache.maven.resolver.repository.LocalMetadataResult; +import org.apache.maven.resolver.repository.LocalRepository; +import org.apache.maven.resolver.repository.LocalRepositoryManager; +import org.apache.maven.resolver.repository.RemoteRepository; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLoggerFactory.java b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestLoggerFactory.java similarity index 94% rename from maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLoggerFactory.java rename to maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestLoggerFactory.java index ae58a16c6..bdf74ffb3 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLoggerFactory.java +++ b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestLoggerFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.test.util; +package org.apache.maven.resolver.internal.test.util; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,8 +21,8 @@ import java.io.PrintStream; -import org.eclipse.aether.spi.log.Logger; -import org.eclipse.aether.spi.log.LoggerFactory; +import org.apache.maven.resolver.spi.log.Logger; +import org.apache.maven.resolver.spi.log.LoggerFactory; /** * A logger factory that writes to some {@link PrintStream}. diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestUtils.java b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestUtils.java similarity index 84% rename from maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestUtils.java rename to maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestUtils.java index cc0c4cb0f..d93062601 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestUtils.java +++ b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestUtils.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.test.util; +package org.apache.maven.resolver.internal.test.util; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,14 +21,14 @@ import java.util.List; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.collection.DependencyGraphTransformationContext; -import org.eclipse.aether.collection.VersionFilter; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.resolution.VersionRangeResult; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.collection.DependencyCollectionContext; +import org.apache.maven.resolver.collection.DependencyGraphTransformationContext; +import org.apache.maven.resolver.collection.VersionFilter; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.resolution.VersionRangeResult; /** * Utility methods to help unit testing. diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersion.java b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestVersion.java similarity index 95% rename from maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersion.java rename to maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestVersion.java index d9d29e2b1..eec0f9d37 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersion.java +++ b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestVersion.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.test.util; +package org.apache.maven.resolver.internal.test.util; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.version.Version; +import org.apache.maven.resolver.version.Version; /** * Version ordering by {@link String#compareToIgnoreCase(String)}. diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionConstraint.java b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestVersionConstraint.java similarity index 93% rename from maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionConstraint.java rename to maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestVersionConstraint.java index 9edd1c9a5..825e255ec 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionConstraint.java +++ b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestVersionConstraint.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.test.util; +package org.apache.maven.resolver.internal.test.util; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,9 +21,9 @@ import static java.util.Objects.requireNonNull; -import org.eclipse.aether.version.Version; -import org.eclipse.aether.version.VersionConstraint; -import org.eclipse.aether.version.VersionRange; +import org.apache.maven.resolver.version.Version; +import org.apache.maven.resolver.version.VersionConstraint; +import org.apache.maven.resolver.version.VersionRange; import java.util.Objects; diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionFilterContext.java b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestVersionFilterContext.java similarity index 80% rename from maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionFilterContext.java rename to maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestVersionFilterContext.java index 44f4f5613..86881bae6 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionFilterContext.java +++ b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestVersionFilterContext.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.test.util; +package org.apache.maven.resolver.internal.test.util; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,14 +24,14 @@ import java.util.Iterator; import java.util.List; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.collection.VersionFilter; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.repository.ArtifactRepository; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.resolution.VersionRangeResult; -import org.eclipse.aether.version.Version; -import org.eclipse.aether.version.VersionConstraint; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.collection.VersionFilter; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.repository.ArtifactRepository; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.resolution.VersionRangeResult; +import org.apache.maven.resolver.version.Version; +import org.apache.maven.resolver.version.VersionConstraint; /** */ diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionRange.java b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestVersionRange.java similarity index 96% rename from maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionRange.java rename to maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestVersionRange.java index 750a63f0d..9784a7057 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionRange.java +++ b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestVersionRange.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.test.util; +package org.apache.maven.resolver.internal.test.util; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.version.InvalidVersionSpecificationException; -import org.eclipse.aether.version.Version; -import org.eclipse.aether.version.VersionRange; +import org.apache.maven.resolver.version.InvalidVersionSpecificationException; +import org.apache.maven.resolver.version.Version; +import org.apache.maven.resolver.version.VersionRange; import java.util.Objects; diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionScheme.java b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestVersionScheme.java similarity index 90% rename from maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionScheme.java rename to maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestVersionScheme.java index 5fd5c8a30..f5e8c9dc8 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionScheme.java +++ b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/TestVersionScheme.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.test.util; +package org.apache.maven.resolver.internal.test.util; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,11 +22,11 @@ import java.util.ArrayList; import java.util.Collection; -import org.eclipse.aether.version.InvalidVersionSpecificationException; -import org.eclipse.aether.version.Version; -import org.eclipse.aether.version.VersionConstraint; -import org.eclipse.aether.version.VersionRange; -import org.eclipse.aether.version.VersionScheme; +import org.apache.maven.resolver.version.InvalidVersionSpecificationException; +import org.apache.maven.resolver.version.Version; +import org.apache.maven.resolver.version.VersionConstraint; +import org.apache.maven.resolver.version.VersionRange; +import org.apache.maven.resolver.version.VersionScheme; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/package-info.java b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/package-info.java similarity index 95% rename from maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/package-info.java rename to maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/package-info.java index 4d874dac0..60ed565a4 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/package-info.java +++ b/maven-resolver-test-util/src/main/java/org/apache/maven/resolver/internal/test/util/package-info.java @@ -22,5 +22,5 @@ * extensions might find some of these classes useful, too, as long as they understand that these classes do not denote * a stable API and are subject to change without prior notice. */ -package org.eclipse.aether.internal.test.util; +package org.apache.maven.resolver.internal.test.util; diff --git a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/DependencyGraphParserTest.java b/maven-resolver-test-util/src/test/java/org/apache/maven/resolver/internal/test/util/DependencyGraphParserTest.java similarity index 95% rename from maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/DependencyGraphParserTest.java rename to maven-resolver-test-util/src/test/java/org/apache/maven/resolver/internal/test/util/DependencyGraphParserTest.java index 10f257b45..e8c1853b0 100644 --- a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/DependencyGraphParserTest.java +++ b/maven-resolver-test-util/src/test/java/org/apache/maven/resolver/internal/test/util/DependencyGraphParserTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.test.util; +package org.apache.maven.resolver.internal.test.util; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,10 +26,9 @@ import java.util.List; import java.util.Map; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.internal.test.util.DependencyGraphParser; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyNode; import org.junit.Before; import org.junit.Test; @@ -183,7 +182,7 @@ public void testId() public void testResourceLoading() throws IOException { - String prefix = "org/eclipse/aether/internal/test/util/"; + String prefix = "org/apache/maven/resolver/internal/test/util/"; String name = "testResourceLoading.txt"; DependencyNode node = parser.parseResource( prefix + name ); @@ -195,7 +194,7 @@ public void testResourceLoading() public void testResourceLoadingWithPrefix() throws IOException { - String prefix = "org/eclipse/aether/internal/test/util/"; + String prefix = "org/apache/maven/resolver/internal/test/util/"; parser = new DependencyGraphParser( prefix ); String name = "testResourceLoading.txt"; @@ -246,7 +245,7 @@ public void testSubstitutions() public void testMultiple() throws IOException { - String prefix = "org/eclipse/aether/internal/test/util/"; + String prefix = "org/apache/maven/resolver/internal/test/util/"; String name = "testResourceLoading.txt"; List nodes = parser.parseMultiResource( prefix + name ); diff --git a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDataReaderTest.java b/maven-resolver-test-util/src/test/java/org/apache/maven/resolver/internal/test/util/IniArtifactDataReaderTest.java similarity index 94% rename from maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDataReaderTest.java rename to maven-resolver-test-util/src/test/java/org/apache/maven/resolver/internal/test/util/IniArtifactDataReaderTest.java index 4a509538b..577bf42a1 100644 --- a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDataReaderTest.java +++ b/maven-resolver-test-util/src/test/java/org/apache/maven/resolver/internal/test/util/IniArtifactDataReaderTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.test.util; +package org.apache.maven.resolver.internal.test.util; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,12 +26,10 @@ import java.util.Iterator; import java.util.List; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.Exclusion; -import org.eclipse.aether.internal.test.util.ArtifactDescription; -import org.eclipse.aether.internal.test.util.IniArtifactDataReader; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.Exclusion; +import org.apache.maven.resolver.repository.RemoteRepository; import org.junit.Before; import org.junit.Test; @@ -45,7 +43,7 @@ public class IniArtifactDataReaderTest @Before public void setup() { - this.parser = new IniArtifactDataReader( "org/eclipse/aether/internal/test/util/" ); + this.parser = new IniArtifactDataReader("org/apache/maven/resolver/internal/test/util/"); } @Test diff --git a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReaderTest.java b/maven-resolver-test-util/src/test/java/org/apache/maven/resolver/internal/test/util/IniArtifactDescriptorReaderTest.java similarity index 87% rename from maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReaderTest.java rename to maven-resolver-test-util/src/test/java/org/apache/maven/resolver/internal/test/util/IniArtifactDescriptorReaderTest.java index b98d8d888..b21f2899e 100644 --- a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReaderTest.java +++ b/maven-resolver-test-util/src/test/java/org/apache/maven/resolver/internal/test/util/IniArtifactDescriptorReaderTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.test.util; +package org.apache.maven.resolver.internal.test.util; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,15 +24,15 @@ import java.util.Iterator; import java.util.List; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.Exclusion; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.resolution.ArtifactDescriptorException; -import org.eclipse.aether.resolution.ArtifactDescriptorRequest; -import org.eclipse.aether.resolution.ArtifactDescriptorResult; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.Exclusion; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.resolution.ArtifactDescriptorException; +import org.apache.maven.resolver.resolution.ArtifactDescriptorRequest; +import org.apache.maven.resolver.resolution.ArtifactDescriptorResult; import org.junit.Before; import org.junit.Test; @@ -48,7 +48,7 @@ public class IniArtifactDescriptorReaderTest @Before public void setup() { - reader = new IniArtifactDescriptorReader( "org/eclipse/aether/internal/test/util/" ); + reader = new IniArtifactDescriptorReader("org/apache/maven/resolver/internal/test/util/"); session = TestUtils.newSession(); } diff --git a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/NodeDefinitionTest.java b/maven-resolver-test-util/src/test/java/org/apache/maven/resolver/internal/test/util/NodeDefinitionTest.java similarity index 99% rename from maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/NodeDefinitionTest.java rename to maven-resolver-test-util/src/test/java/org/apache/maven/resolver/internal/test/util/NodeDefinitionTest.java index 769691a13..e72954488 100644 --- a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/NodeDefinitionTest.java +++ b/maven-resolver-test-util/src/test/java/org/apache/maven/resolver/internal/test/util/NodeDefinitionTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.test.util; +package org.apache.maven.resolver.internal.test.util; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-test-util/src/test/resources/org/eclipse/aether/internal/test/util/ArtifactDataReaderTest.ini b/maven-resolver-test-util/src/test/resources/org/apache/maven/resolver/internal/test/util/ArtifactDataReaderTest.ini similarity index 100% rename from maven-resolver-test-util/src/test/resources/org/eclipse/aether/internal/test/util/ArtifactDataReaderTest.ini rename to maven-resolver-test-util/src/test/resources/org/apache/maven/resolver/internal/test/util/ArtifactDataReaderTest.ini diff --git a/maven-resolver-test-util/src/test/resources/org/eclipse/aether/internal/test/util/gid_aid_1.ini b/maven-resolver-test-util/src/test/resources/org/apache/maven/resolver/internal/test/util/gid_aid_1.ini similarity index 100% rename from maven-resolver-test-util/src/test/resources/org/eclipse/aether/internal/test/util/gid_aid_1.ini rename to maven-resolver-test-util/src/test/resources/org/apache/maven/resolver/internal/test/util/gid_aid_1.ini diff --git a/maven-resolver-test-util/src/test/resources/org/eclipse/aether/internal/test/util/gid_aid_ver.ini b/maven-resolver-test-util/src/test/resources/org/apache/maven/resolver/internal/test/util/gid_aid_ver.ini similarity index 100% rename from maven-resolver-test-util/src/test/resources/org/eclipse/aether/internal/test/util/gid_aid_ver.ini rename to maven-resolver-test-util/src/test/resources/org/apache/maven/resolver/internal/test/util/gid_aid_ver.ini diff --git a/maven-resolver-test-util/src/test/resources/org/eclipse/aether/internal/test/util/testResourceLoading.txt b/maven-resolver-test-util/src/test/resources/org/apache/maven/resolver/internal/test/util/testResourceLoading.txt similarity index 100% rename from maven-resolver-test-util/src/test/resources/org/eclipse/aether/internal/test/util/testResourceLoading.txt rename to maven-resolver-test-util/src/test/resources/org/apache/maven/resolver/internal/test/util/testResourceLoading.txt diff --git a/maven-resolver-transport-classpath/pom.xml b/maven-resolver-transport-classpath/pom.xml index f91e490cd..91f2dfaba 100644 --- a/maven-resolver-transport-classpath/pom.xml +++ b/maven-resolver-transport-classpath/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.resolver maven-resolver - 1.8.2-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-transport-classpath diff --git a/maven-resolver-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporter.java b/maven-resolver-transport-classpath/src/main/java/org/apache/maven/resolver/transport/classpath/ClasspathTransporter.java similarity index 85% rename from maven-resolver-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporter.java rename to maven-resolver-transport-classpath/src/main/java/org/apache/maven/resolver/transport/classpath/ClasspathTransporter.java index 968c231a4..b1e3bc09c 100644 --- a/maven-resolver-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporter.java +++ b/maven-resolver-transport-classpath/src/main/java/org/apache/maven/resolver/transport/classpath/ClasspathTransporter.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.classpath; +package org.apache.maven.resolver.transport.classpath; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,15 +24,15 @@ import java.net.URL; import java.net.URLConnection; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.spi.connector.transport.AbstractTransporter; -import org.eclipse.aether.spi.connector.transport.GetTask; -import org.eclipse.aether.spi.connector.transport.PeekTask; -import org.eclipse.aether.spi.connector.transport.PutTask; -import org.eclipse.aether.spi.connector.transport.TransportTask; -import org.eclipse.aether.transfer.NoTransporterException; -import org.eclipse.aether.util.ConfigUtils; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.transfer.NoTransporterException; +import org.apache.maven.resolver.spi.connector.transport.AbstractTransporter; +import org.apache.maven.resolver.spi.connector.transport.GetTask; +import org.apache.maven.resolver.spi.connector.transport.PeekTask; +import org.apache.maven.resolver.spi.connector.transport.PutTask; +import org.apache.maven.resolver.spi.connector.transport.TransportTask; +import org.apache.maven.resolver.util.ConfigUtils; /** * A transporter reading from the classpath. diff --git a/maven-resolver-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporterFactory.java b/maven-resolver-transport-classpath/src/main/java/org/apache/maven/resolver/transport/classpath/ClasspathTransporterFactory.java similarity index 88% rename from maven-resolver-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporterFactory.java rename to maven-resolver-transport-classpath/src/main/java/org/apache/maven/resolver/transport/classpath/ClasspathTransporterFactory.java index 9ed2147e6..864760f70 100644 --- a/maven-resolver-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporterFactory.java +++ b/maven-resolver-transport-classpath/src/main/java/org/apache/maven/resolver/transport/classpath/ClasspathTransporterFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.classpath; +package org.apache.maven.resolver.transport.classpath; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,11 +23,11 @@ import java.util.Objects; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.spi.connector.transport.Transporter; -import org.eclipse.aether.spi.connector.transport.TransporterFactory; -import org.eclipse.aether.transfer.NoTransporterException; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.transfer.NoTransporterException; +import org.apache.maven.resolver.spi.connector.transport.Transporter; +import org.apache.maven.resolver.spi.connector.transport.TransporterFactory; /** * A transporter factory for repositories using the {@code classpath:} protocol. As example, getting an item named diff --git a/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/ResourceNotFoundException.java b/maven-resolver-transport-classpath/src/main/java/org/apache/maven/resolver/transport/classpath/ResourceNotFoundException.java similarity index 95% rename from maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/ResourceNotFoundException.java rename to maven-resolver-transport-classpath/src/main/java/org/apache/maven/resolver/transport/classpath/ResourceNotFoundException.java index 4f2736676..b051d45ad 100644 --- a/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/ResourceNotFoundException.java +++ b/maven-resolver-transport-classpath/src/main/java/org/apache/maven/resolver/transport/classpath/ResourceNotFoundException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.file; +package org.apache.maven.resolver.transport.classpath; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/package-info.java b/maven-resolver-transport-classpath/src/main/java/org/apache/maven/resolver/transport/classpath/package-info.java similarity index 94% rename from maven-resolver-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/package-info.java rename to maven-resolver-transport-classpath/src/main/java/org/apache/maven/resolver/transport/classpath/package-info.java index 8bcda932e..c020d2423 100644 --- a/maven-resolver-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/package-info.java +++ b/maven-resolver-transport-classpath/src/main/java/org/apache/maven/resolver/transport/classpath/package-info.java @@ -20,5 +20,5 @@ /** * Support for downloads that utilize the classpath as "remote" storage. */ -package org.eclipse.aether.transport.classpath; +package org.apache.maven.resolver.transport.classpath; diff --git a/maven-resolver-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/ClasspathTransporterTest.java b/maven-resolver-transport-classpath/src/test/java/org/apache/maven/resolver/transport/classpath/ClasspathTransporterTest.java similarity index 93% rename from maven-resolver-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/ClasspathTransporterTest.java rename to maven-resolver-transport-classpath/src/test/java/org/apache/maven/resolver/transport/classpath/ClasspathTransporterTest.java index d61dec9c1..03afa7eef 100644 --- a/maven-resolver-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/ClasspathTransporterTest.java +++ b/maven-resolver-transport-classpath/src/test/java/org/apache/maven/resolver/transport/classpath/ClasspathTransporterTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.classpath; +package org.apache.maven.resolver.transport.classpath; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,17 +26,17 @@ import java.net.URI; import java.nio.charset.StandardCharsets; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.internal.test.util.TestFileUtils; -import org.eclipse.aether.internal.test.util.TestUtils; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.spi.connector.transport.GetTask; -import org.eclipse.aether.spi.connector.transport.PeekTask; -import org.eclipse.aether.spi.connector.transport.PutTask; -import org.eclipse.aether.spi.connector.transport.Transporter; -import org.eclipse.aether.spi.connector.transport.TransporterFactory; -import org.eclipse.aether.transfer.NoTransporterException; -import org.eclipse.aether.transfer.TransferCancelledException; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.transfer.NoTransporterException; +import org.apache.maven.resolver.transfer.TransferCancelledException; +import org.apache.maven.resolver.internal.test.util.TestFileUtils; +import org.apache.maven.resolver.internal.test.util.TestUtils; +import org.apache.maven.resolver.spi.connector.transport.GetTask; +import org.apache.maven.resolver.spi.connector.transport.PeekTask; +import org.apache.maven.resolver.spi.connector.transport.PutTask; +import org.apache.maven.resolver.spi.connector.transport.Transporter; +import org.apache.maven.resolver.spi.connector.transport.TransporterFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -52,7 +52,7 @@ public class ClasspathTransporterTest private Transporter transporter; - private RemoteRepository newRepo( String url ) + private RemoteRepository newRepo(String url ) { return new RemoteRepository.Builder( "test", "default", url ).build(); } diff --git a/maven-resolver-transport-file/src/test/java/org/eclipse/aether/transport/file/RecordingTransportListener.java b/maven-resolver-transport-classpath/src/test/java/org/apache/maven/resolver/transport/classpath/RecordingTransportListener.java similarity index 90% rename from maven-resolver-transport-file/src/test/java/org/eclipse/aether/transport/file/RecordingTransportListener.java rename to maven-resolver-transport-classpath/src/test/java/org/apache/maven/resolver/transport/classpath/RecordingTransportListener.java index 76e35859f..77c0d3729 100644 --- a/maven-resolver-transport-file/src/test/java/org/eclipse/aether/transport/file/RecordingTransportListener.java +++ b/maven-resolver-transport-classpath/src/test/java/org/apache/maven/resolver/transport/classpath/RecordingTransportListener.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.file; +package org.apache.maven.resolver.transport.classpath; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,8 +23,8 @@ import java.nio.Buffer; import java.nio.ByteBuffer; -import org.eclipse.aether.spi.connector.transport.TransportListener; -import org.eclipse.aether.transfer.TransferCancelledException; +import org.apache.maven.resolver.spi.connector.transport.TransportListener; +import org.apache.maven.resolver.transfer.TransferCancelledException; class RecordingTransportListener extends TransportListener diff --git a/maven-resolver-transport-file/pom.xml b/maven-resolver-transport-file/pom.xml index 8a28dd736..72e3bf3c8 100644 --- a/maven-resolver-transport-file/pom.xml +++ b/maven-resolver-transport-file/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.resolver maven-resolver - 1.8.2-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-transport-file diff --git a/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporter.java b/maven-resolver-transport-file/src/main/java/org/apache/maven/resolver/transport/file/FileTransporter.java similarity index 85% rename from maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporter.java rename to maven-resolver-transport-file/src/main/java/org/apache/maven/resolver/transport/file/FileTransporter.java index 7da42f2da..35ecd69fa 100644 --- a/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporter.java +++ b/maven-resolver-transport-file/src/main/java/org/apache/maven/resolver/transport/file/FileTransporter.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.file; +package org.apache.maven.resolver.transport.file; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,13 +23,13 @@ import java.io.FileInputStream; import java.io.FileOutputStream; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.spi.connector.transport.AbstractTransporter; -import org.eclipse.aether.spi.connector.transport.GetTask; -import org.eclipse.aether.spi.connector.transport.PeekTask; -import org.eclipse.aether.spi.connector.transport.PutTask; -import org.eclipse.aether.spi.connector.transport.TransportTask; -import org.eclipse.aether.transfer.NoTransporterException; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.spi.connector.transport.AbstractTransporter; +import org.apache.maven.resolver.spi.connector.transport.GetTask; +import org.apache.maven.resolver.spi.connector.transport.PeekTask; +import org.apache.maven.resolver.spi.connector.transport.PutTask; +import org.apache.maven.resolver.spi.connector.transport.TransportTask; +import org.apache.maven.resolver.transfer.NoTransporterException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporterFactory.java b/maven-resolver-transport-file/src/main/java/org/apache/maven/resolver/transport/file/FileTransporterFactory.java similarity index 84% rename from maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporterFactory.java rename to maven-resolver-transport-file/src/main/java/org/apache/maven/resolver/transport/file/FileTransporterFactory.java index 349b4369d..7bce3d03e 100644 --- a/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporterFactory.java +++ b/maven-resolver-transport-file/src/main/java/org/apache/maven/resolver/transport/file/FileTransporterFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.file; +package org.apache.maven.resolver.transport.file; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,11 +23,11 @@ import java.util.Objects; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.spi.connector.transport.Transporter; -import org.eclipse.aether.spi.connector.transport.TransporterFactory; -import org.eclipse.aether.transfer.NoTransporterException; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.spi.connector.transport.Transporter; +import org.apache.maven.resolver.spi.connector.transport.TransporterFactory; +import org.apache.maven.resolver.transfer.NoTransporterException; /** * A transporter factory for repositories using the {@code file:} protocol. diff --git a/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/PathUtils.java b/maven-resolver-transport-file/src/main/java/org/apache/maven/resolver/transport/file/PathUtils.java similarity index 98% rename from maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/PathUtils.java rename to maven-resolver-transport-file/src/main/java/org/apache/maven/resolver/transport/file/PathUtils.java index ac3f8fd3e..6a2c12f21 100644 --- a/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/PathUtils.java +++ b/maven-resolver-transport-file/src/main/java/org/apache/maven/resolver/transport/file/PathUtils.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.file; +package org.apache.maven.resolver.transport.file; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ResourceNotFoundException.java b/maven-resolver-transport-file/src/main/java/org/apache/maven/resolver/transport/file/ResourceNotFoundException.java similarity index 95% rename from maven-resolver-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ResourceNotFoundException.java rename to maven-resolver-transport-file/src/main/java/org/apache/maven/resolver/transport/file/ResourceNotFoundException.java index 737aade60..df5f35b2f 100644 --- a/maven-resolver-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ResourceNotFoundException.java +++ b/maven-resolver-transport-file/src/main/java/org/apache/maven/resolver/transport/file/ResourceNotFoundException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.classpath; +package org.apache.maven.resolver.transport.file; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/package-info.java b/maven-resolver-transport-file/src/main/java/org/apache/maven/resolver/transport/file/package-info.java similarity index 94% rename from maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/package-info.java rename to maven-resolver-transport-file/src/main/java/org/apache/maven/resolver/transport/file/package-info.java index 8220bf413..1116e8404 100644 --- a/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/package-info.java +++ b/maven-resolver-transport-file/src/main/java/org/apache/maven/resolver/transport/file/package-info.java @@ -20,5 +20,5 @@ /** * Support for downloads/uploads using the local filesystem as "remote" storage. */ -package org.eclipse.aether.transport.file; +package org.apache.maven.resolver.transport.file; diff --git a/maven-resolver-transport-file/src/test/java/org/eclipse/aether/transport/file/FileTransporterTest.java b/maven-resolver-transport-file/src/test/java/org/apache/maven/resolver/transport/file/FileTransporterTest.java similarity index 95% rename from maven-resolver-transport-file/src/test/java/org/eclipse/aether/transport/file/FileTransporterTest.java rename to maven-resolver-transport-file/src/test/java/org/apache/maven/resolver/transport/file/FileTransporterTest.java index e075dfd88..0b8682525 100644 --- a/maven-resolver-transport-file/src/test/java/org/eclipse/aether/transport/file/FileTransporterTest.java +++ b/maven-resolver-transport-file/src/test/java/org/apache/maven/resolver/transport/file/FileTransporterTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.file; +package org.apache.maven.resolver.transport.file; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,17 +26,17 @@ import java.net.URI; import java.nio.charset.StandardCharsets; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.internal.test.util.TestFileUtils; -import org.eclipse.aether.internal.test.util.TestUtils; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.spi.connector.transport.GetTask; -import org.eclipse.aether.spi.connector.transport.PeekTask; -import org.eclipse.aether.spi.connector.transport.PutTask; -import org.eclipse.aether.spi.connector.transport.Transporter; -import org.eclipse.aether.spi.connector.transport.TransporterFactory; -import org.eclipse.aether.transfer.NoTransporterException; -import org.eclipse.aether.transfer.TransferCancelledException; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.internal.test.util.TestFileUtils; +import org.apache.maven.resolver.internal.test.util.TestUtils; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.spi.connector.transport.GetTask; +import org.apache.maven.resolver.spi.connector.transport.PeekTask; +import org.apache.maven.resolver.spi.connector.transport.PutTask; +import org.apache.maven.resolver.spi.connector.transport.Transporter; +import org.apache.maven.resolver.spi.connector.transport.TransporterFactory; +import org.apache.maven.resolver.transfer.NoTransporterException; +import org.apache.maven.resolver.transfer.TransferCancelledException; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/RecordingTransportListener.java b/maven-resolver-transport-file/src/test/java/org/apache/maven/resolver/transport/file/RecordingTransportListener.java similarity index 91% rename from maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/RecordingTransportListener.java rename to maven-resolver-transport-file/src/test/java/org/apache/maven/resolver/transport/file/RecordingTransportListener.java index 3f1859d22..1c158ee78 100644 --- a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/RecordingTransportListener.java +++ b/maven-resolver-transport-file/src/test/java/org/apache/maven/resolver/transport/file/RecordingTransportListener.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.wagon; +package org.apache.maven.resolver.transport.file; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,8 +23,8 @@ import java.nio.Buffer; import java.nio.ByteBuffer; -import org.eclipse.aether.spi.connector.transport.TransportListener; -import org.eclipse.aether.transfer.TransferCancelledException; +import org.apache.maven.resolver.spi.connector.transport.TransportListener; +import org.apache.maven.resolver.transfer.TransferCancelledException; class RecordingTransportListener extends TransportListener diff --git a/maven-resolver-transport-http/pom.xml b/maven-resolver-transport-http/pom.xml index a0e11ba75..a107aa6d3 100644 --- a/maven-resolver-transport-http/pom.xml +++ b/maven-resolver-transport-http/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.resolver maven-resolver - 1.8.2-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-transport-http diff --git a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/AuthSchemePool.java b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/AuthSchemePool.java similarity index 97% rename from maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/AuthSchemePool.java rename to maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/AuthSchemePool.java index 384227fa4..3183d61b8 100644 --- a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/AuthSchemePool.java +++ b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/AuthSchemePool.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.http; +package org.apache.maven.resolver.transport.http; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/ChecksumExtractor.java b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/ChecksumExtractor.java similarity index 97% rename from maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/ChecksumExtractor.java rename to maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/ChecksumExtractor.java index 8fde9b817..35e7d6c60 100644 --- a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/ChecksumExtractor.java +++ b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/ChecksumExtractor.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.http; +package org.apache.maven.resolver.transport.http; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/DeferredCredentialsProvider.java b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/DeferredCredentialsProvider.java similarity index 98% rename from maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/DeferredCredentialsProvider.java rename to maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/DeferredCredentialsProvider.java index 233eb426a..b03ec0b8b 100644 --- a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/DeferredCredentialsProvider.java +++ b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/DeferredCredentialsProvider.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.http; +package org.apache.maven.resolver.transport.http; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -31,7 +31,7 @@ import org.apache.http.auth.UsernamePasswordCredentials; import org.apache.http.client.CredentialsProvider; import org.apache.http.impl.client.BasicCredentialsProvider; -import org.eclipse.aether.repository.AuthenticationContext; +import org.apache.maven.resolver.repository.AuthenticationContext; /** * Credentials provider that defers calls into the auth context until authentication is actually requested. diff --git a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/DemuxCredentialsProvider.java b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/DemuxCredentialsProvider.java similarity index 98% rename from maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/DemuxCredentialsProvider.java rename to maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/DemuxCredentialsProvider.java index a0d565368..c64cc382c 100644 --- a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/DemuxCredentialsProvider.java +++ b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/DemuxCredentialsProvider.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.http; +package org.apache.maven.resolver.transport.http; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/GlobalState.java b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/GlobalState.java similarity index 97% rename from maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/GlobalState.java rename to maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/GlobalState.java index b8d8c8003..710638cf5 100644 --- a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/GlobalState.java +++ b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/GlobalState.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.http; +package org.apache.maven.resolver.transport.http; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -33,9 +33,9 @@ import org.apache.http.conn.socket.PlainConnectionSocketFactory; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; -import org.eclipse.aether.RepositoryCache; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.util.ConfigUtils; +import org.apache.maven.resolver.RepositoryCache; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.util.ConfigUtils; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLSocketFactory; diff --git a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpMkCol.java b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/HttpMkCol.java similarity index 95% rename from maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpMkCol.java rename to maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/HttpMkCol.java index b3b479e15..32c2e4182 100644 --- a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpMkCol.java +++ b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/HttpMkCol.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.http; +package org.apache.maven.resolver.transport.http; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporter.java b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/HttpTransporter.java similarity index 96% rename from maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporter.java rename to maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/HttpTransporter.java index 91b15aaf6..2d5feecae 100644 --- a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporter.java +++ b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/HttpTransporter.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.http; +package org.apache.maven.resolver.transport.http; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -52,19 +52,19 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.util.EntityUtils; -import org.eclipse.aether.ConfigurationProperties; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.AuthenticationContext; -import org.eclipse.aether.repository.Proxy; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.spi.connector.transport.AbstractTransporter; -import org.eclipse.aether.spi.connector.transport.GetTask; -import org.eclipse.aether.spi.connector.transport.PeekTask; -import org.eclipse.aether.spi.connector.transport.PutTask; -import org.eclipse.aether.spi.connector.transport.TransportTask; -import org.eclipse.aether.transfer.NoTransporterException; -import org.eclipse.aether.transfer.TransferCancelledException; -import org.eclipse.aether.util.ConfigUtils; +import org.apache.maven.resolver.ConfigurationProperties; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.AuthenticationContext; +import org.apache.maven.resolver.repository.Proxy; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.spi.connector.transport.AbstractTransporter; +import org.apache.maven.resolver.spi.connector.transport.GetTask; +import org.apache.maven.resolver.spi.connector.transport.PeekTask; +import org.apache.maven.resolver.spi.connector.transport.PutTask; +import org.apache.maven.resolver.spi.connector.transport.TransportTask; +import org.apache.maven.resolver.transfer.NoTransporterException; +import org.apache.maven.resolver.transfer.TransferCancelledException; +import org.apache.maven.resolver.util.ConfigUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporterFactory.java b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/HttpTransporterFactory.java similarity index 88% rename from maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporterFactory.java rename to maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/HttpTransporterFactory.java index 0143035a7..f167210fb 100644 --- a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporterFactory.java +++ b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/HttpTransporterFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.http; +package org.apache.maven.resolver.transport.http; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,11 +26,11 @@ import java.util.HashMap; import java.util.Map; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.spi.connector.transport.Transporter; -import org.eclipse.aether.spi.connector.transport.TransporterFactory; -import org.eclipse.aether.transfer.NoTransporterException; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.spi.connector.transport.Transporter; +import org.apache.maven.resolver.spi.connector.transport.TransporterFactory; +import org.apache.maven.resolver.transfer.NoTransporterException; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/LocalState.java b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/LocalState.java similarity index 94% rename from maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/LocalState.java rename to maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/LocalState.java index c0f83523f..76b7b1ae0 100644 --- a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/LocalState.java +++ b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/LocalState.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.http; +package org.apache.maven.resolver.transport.http; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,9 +26,9 @@ import org.apache.http.HttpHost; import org.apache.http.auth.AuthScheme; import org.apache.http.conn.HttpClientConnectionManager; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.transport.http.GlobalState.CompoundKey; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.transport.http.GlobalState.CompoundKey; /** * Container for HTTP-related state that can be shared across invocations of the transporter to optimize the diff --git a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/Nexus2ChecksumExtractor.java b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/Nexus2ChecksumExtractor.java similarity index 97% rename from maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/Nexus2ChecksumExtractor.java rename to maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/Nexus2ChecksumExtractor.java index 78332bcca..45a0b7fe5 100644 --- a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/Nexus2ChecksumExtractor.java +++ b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/Nexus2ChecksumExtractor.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.http; +package org.apache.maven.resolver.transport.http; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/SharingAuthCache.java b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/SharingAuthCache.java similarity index 98% rename from maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/SharingAuthCache.java rename to maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/SharingAuthCache.java index 70dca44e4..51ab1a5b9 100644 --- a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/SharingAuthCache.java +++ b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/SharingAuthCache.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.http; +package org.apache.maven.resolver.transport.http; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/SharingHttpContext.java b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/SharingHttpContext.java similarity index 97% rename from maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/SharingHttpContext.java rename to maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/SharingHttpContext.java index 3ccd907bb..7ae58b001 100644 --- a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/SharingHttpContext.java +++ b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/SharingHttpContext.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.http; +package org.apache.maven.resolver.transport.http; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/SslConfig.java b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/SslConfig.java similarity index 93% rename from maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/SslConfig.java rename to maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/SslConfig.java index d90e1777a..a9a908f8f 100644 --- a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/SslConfig.java +++ b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/SslConfig.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.http; +package org.apache.maven.resolver.transport.http; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,9 +25,9 @@ import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.AuthenticationContext; -import org.eclipse.aether.util.ConfigUtils; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.AuthenticationContext; +import org.apache.maven.resolver.util.ConfigUtils; /** * SSL-related configuration and cache key for connection pools (whose scheme registries are derived from this config). diff --git a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/UriUtils.java b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/UriUtils.java similarity index 97% rename from maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/UriUtils.java rename to maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/UriUtils.java index 23502293c..c9d45ba88 100644 --- a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/UriUtils.java +++ b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/UriUtils.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.http; +package org.apache.maven.resolver.transport.http; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/XChecksumChecksumExtractor.java b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/XChecksumChecksumExtractor.java similarity index 98% rename from maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/XChecksumChecksumExtractor.java rename to maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/XChecksumChecksumExtractor.java index 26edf3279..871e5d915 100644 --- a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/XChecksumChecksumExtractor.java +++ b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/XChecksumChecksumExtractor.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.http; +package org.apache.maven.resolver.transport.http; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/package-info.java b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/package-info.java similarity index 95% rename from maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/package-info.java rename to maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/package-info.java index 828299eeb..41086c5c6 100644 --- a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/package-info.java +++ b/maven-resolver-transport-http/src/main/java/org/apache/maven/resolver/transport/http/package-info.java @@ -21,5 +21,5 @@ * Support for downloads/uploads via the HTTP and HTTPS protocols. The current implementation is backed by * Apache HttpClient. */ -package org.eclipse.aether.transport.http; +package org.apache.maven.resolver.transport.http; diff --git a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpServer.java b/maven-resolver-transport-http/src/test/java/org/apache/maven/resolver/transport/http/HttpServer.java similarity index 99% rename from maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpServer.java rename to maven-resolver-transport-http/src/test/java/org/apache/maven/resolver/transport/http/HttpServer.java index 67cb450f6..448d78a7a 100644 --- a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpServer.java +++ b/maven-resolver-transport-http/src/test/java/org/apache/maven/resolver/transport/http/HttpServer.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.http; +package org.apache.maven.resolver.transport.http; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -35,7 +35,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.aether.util.ChecksumUtils; +import org.apache.maven.resolver.util.ChecksumUtils; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpMethod; import org.eclipse.jetty.server.Request; diff --git a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java b/maven-resolver-transport-http/src/test/java/org/apache/maven/resolver/transport/http/HttpTransporterTest.java similarity index 97% rename from maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java rename to maven-resolver-transport-http/src/test/java/org/apache/maven/resolver/transport/http/HttpTransporterTest.java index 745514f9f..f61dadfbe 100644 --- a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java +++ b/maven-resolver-transport-http/src/test/java/org/apache/maven/resolver/transport/http/HttpTransporterTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.http; +package org.apache.maven.resolver.transport.http; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -36,22 +36,22 @@ import org.apache.http.conn.ConnectTimeoutException; import org.apache.http.pool.ConnPoolControl; import org.apache.http.pool.PoolStats; -import org.eclipse.aether.ConfigurationProperties; -import org.eclipse.aether.DefaultRepositoryCache; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.internal.test.util.TestFileUtils; -import org.eclipse.aether.internal.test.util.TestUtils; -import org.eclipse.aether.repository.Authentication; -import org.eclipse.aether.repository.Proxy; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.spi.connector.transport.GetTask; -import org.eclipse.aether.spi.connector.transport.PeekTask; -import org.eclipse.aether.spi.connector.transport.PutTask; -import org.eclipse.aether.spi.connector.transport.Transporter; -import org.eclipse.aether.spi.connector.transport.TransporterFactory; -import org.eclipse.aether.transfer.NoTransporterException; -import org.eclipse.aether.transfer.TransferCancelledException; -import org.eclipse.aether.util.repository.AuthenticationBuilder; +import org.apache.maven.resolver.ConfigurationProperties; +import org.apache.maven.resolver.DefaultRepositoryCache; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.internal.test.util.TestFileUtils; +import org.apache.maven.resolver.internal.test.util.TestUtils; +import org.apache.maven.resolver.repository.Authentication; +import org.apache.maven.resolver.repository.Proxy; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.spi.connector.transport.GetTask; +import org.apache.maven.resolver.spi.connector.transport.PeekTask; +import org.apache.maven.resolver.spi.connector.transport.PutTask; +import org.apache.maven.resolver.spi.connector.transport.Transporter; +import org.apache.maven.resolver.spi.connector.transport.TransporterFactory; +import org.apache.maven.resolver.transfer.NoTransporterException; +import org.apache.maven.resolver.transfer.TransferCancelledException; +import org.apache.maven.resolver.util.repository.AuthenticationBuilder; import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/maven-resolver-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/RecordingTransportListener.java b/maven-resolver-transport-http/src/test/java/org/apache/maven/resolver/transport/http/RecordingTransportListener.java similarity index 91% rename from maven-resolver-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/RecordingTransportListener.java rename to maven-resolver-transport-http/src/test/java/org/apache/maven/resolver/transport/http/RecordingTransportListener.java index 8d453b131..3d1d2216b 100644 --- a/maven-resolver-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/RecordingTransportListener.java +++ b/maven-resolver-transport-http/src/test/java/org/apache/maven/resolver/transport/http/RecordingTransportListener.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.classpath; +package org.apache.maven.resolver.transport.http; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,8 +23,8 @@ import java.nio.Buffer; import java.nio.ByteBuffer; -import org.eclipse.aether.spi.connector.transport.TransportListener; -import org.eclipse.aether.transfer.TransferCancelledException; +import org.apache.maven.resolver.spi.connector.transport.TransportListener; +import org.apache.maven.resolver.transfer.TransferCancelledException; class RecordingTransportListener extends TransportListener diff --git a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/UriUtilsTest.java b/maven-resolver-transport-http/src/test/java/org/apache/maven/resolver/transport/http/UriUtilsTest.java similarity index 99% rename from maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/UriUtilsTest.java rename to maven-resolver-transport-http/src/test/java/org/apache/maven/resolver/transport/http/UriUtilsTest.java index 70fd34d0c..d2168f7a8 100644 --- a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/UriUtilsTest.java +++ b/maven-resolver-transport-http/src/test/java/org/apache/maven/resolver/transport/http/UriUtilsTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.http; +package org.apache.maven.resolver.transport.http; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-transport-wagon/pom.xml b/maven-resolver-transport-wagon/pom.xml index d2479bf64..3ec79a697 100644 --- a/maven-resolver-transport-wagon/pom.xml +++ b/maven-resolver-transport-wagon/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.resolver maven-resolver - 1.8.2-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-transport-wagon diff --git a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonConfigurator.java b/maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/internal/transport/wagon/PlexusWagonConfigurator.java similarity index 96% rename from maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonConfigurator.java rename to maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/internal/transport/wagon/PlexusWagonConfigurator.java index e41b1ee52..a60f02367 100644 --- a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonConfigurator.java +++ b/maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/internal/transport/wagon/PlexusWagonConfigurator.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.transport.wagon; +package org.apache.maven.resolver.internal.transport.wagon; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -32,7 +32,7 @@ import org.codehaus.plexus.configuration.PlexusConfiguration; import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration; import org.codehaus.plexus.util.xml.Xpp3Dom; -import org.eclipse.aether.transport.wagon.WagonConfigurator; +import org.apache.maven.resolver.transport.wagon.WagonConfigurator; import javax.inject.Inject; import javax.inject.Named; diff --git a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonProvider.java b/maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/internal/transport/wagon/PlexusWagonProvider.java similarity index 94% rename from maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonProvider.java rename to maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/internal/transport/wagon/PlexusWagonProvider.java index e46130c6b..ef62d1dcc 100644 --- a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonProvider.java +++ b/maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/internal/transport/wagon/PlexusWagonProvider.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.internal.transport.wagon; +package org.apache.maven.resolver.internal.transport.wagon; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,7 +23,7 @@ import org.apache.maven.wagon.Wagon; import org.codehaus.plexus.PlexusContainer; -import org.eclipse.aether.transport.wagon.WagonProvider; +import org.apache.maven.resolver.transport.wagon.WagonProvider; import javax.inject.Inject; import javax.inject.Named; diff --git a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/package-info.java b/maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/internal/transport/wagon/package-info.java similarity index 94% rename from maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/package-info.java rename to maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/internal/transport/wagon/package-info.java index 1d87669ff..34cc9e069 100644 --- a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/package-info.java +++ b/maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/internal/transport/wagon/package-info.java @@ -21,5 +21,5 @@ * Integration with the IoC container which is the native runtime environment expected by many wagon * implementations. */ -package org.eclipse.aether.internal.transport.wagon; +package org.apache.maven.resolver.internal.transport.wagon; diff --git a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonCancelledException.java b/maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/transport/wagon/WagonCancelledException.java similarity index 91% rename from maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonCancelledException.java rename to maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/transport/wagon/WagonCancelledException.java index 821e596db..eed845abd 100644 --- a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonCancelledException.java +++ b/maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/transport/wagon/WagonCancelledException.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.wagon; +package org.apache.maven.resolver.transport.wagon; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.transfer.TransferCancelledException; +import org.apache.maven.resolver.transfer.TransferCancelledException; /** * Unchecked exception to allow the checked {@link TransferCancelledException} to bubble up from a wagon. diff --git a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonConfigurator.java b/maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/transport/wagon/WagonConfigurator.java similarity index 96% rename from maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonConfigurator.java rename to maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/transport/wagon/WagonConfigurator.java index 42399cba9..21ac6922d 100644 --- a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonConfigurator.java +++ b/maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/transport/wagon/WagonConfigurator.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.wagon; +package org.apache.maven.resolver.transport.wagon; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonProvider.java b/maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/transport/wagon/WagonProvider.java similarity index 97% rename from maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonProvider.java rename to maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/transport/wagon/WagonProvider.java index 77bf9d6b0..e4edf3ffb 100644 --- a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonProvider.java +++ b/maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/transport/wagon/WagonProvider.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.wagon; +package org.apache.maven.resolver.transport.wagon; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransferListener.java b/maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/transport/wagon/WagonTransferListener.java similarity index 91% rename from maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransferListener.java rename to maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/transport/wagon/WagonTransferListener.java index 34363ae14..57acc8b89 100644 --- a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransferListener.java +++ b/maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/transport/wagon/WagonTransferListener.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.wagon; +package org.apache.maven.resolver.transport.wagon; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,8 +23,8 @@ import org.apache.maven.wagon.events.TransferEvent; import org.apache.maven.wagon.observers.AbstractTransferListener; -import org.eclipse.aether.spi.connector.transport.TransportListener; -import org.eclipse.aether.transfer.TransferCancelledException; +import org.apache.maven.resolver.spi.connector.transport.TransportListener; +import org.apache.maven.resolver.transfer.TransferCancelledException; /** * A wagon transfer listener that forwards events to a transport listener. diff --git a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporter.java b/maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/transport/wagon/WagonTransporter.java similarity index 95% rename from maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporter.java rename to maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/transport/wagon/WagonTransporter.java index 4a985633c..0ccfbad6e 100644 --- a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporter.java +++ b/maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/transport/wagon/WagonTransporter.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.wagon; +package org.apache.maven.resolver.transport.wagon; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -46,18 +46,18 @@ import org.apache.maven.wagon.proxy.ProxyInfoProvider; import org.apache.maven.wagon.repository.Repository; import org.apache.maven.wagon.repository.RepositoryPermissions; -import org.eclipse.aether.ConfigurationProperties; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.AuthenticationContext; -import org.eclipse.aether.repository.Proxy; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.spi.connector.transport.GetTask; -import org.eclipse.aether.spi.connector.transport.PeekTask; -import org.eclipse.aether.spi.connector.transport.PutTask; -import org.eclipse.aether.spi.connector.transport.TransportTask; -import org.eclipse.aether.spi.connector.transport.Transporter; -import org.eclipse.aether.transfer.NoTransporterException; -import org.eclipse.aether.util.ConfigUtils; +import org.apache.maven.resolver.ConfigurationProperties; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.AuthenticationContext; +import org.apache.maven.resolver.repository.Proxy; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.spi.connector.transport.GetTask; +import org.apache.maven.resolver.spi.connector.transport.PeekTask; +import org.apache.maven.resolver.spi.connector.transport.PutTask; +import org.apache.maven.resolver.spi.connector.transport.TransportTask; +import org.apache.maven.resolver.spi.connector.transport.Transporter; +import org.apache.maven.resolver.transfer.NoTransporterException; +import org.apache.maven.resolver.util.ConfigUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java b/maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/transport/wagon/WagonTransporterFactory.java similarity index 83% rename from maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java rename to maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/transport/wagon/WagonTransporterFactory.java index 9ef3ecd83..585c83972 100644 --- a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java +++ b/maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/transport/wagon/WagonTransporterFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.wagon; +package org.apache.maven.resolver.transport.wagon; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,13 +24,11 @@ import java.util.Objects; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.spi.connector.transport.Transporter; -import org.eclipse.aether.spi.connector.transport.TransporterFactory; -import org.eclipse.aether.spi.locator.Service; -import org.eclipse.aether.spi.locator.ServiceLocator; -import org.eclipse.aether.transfer.NoTransporterException; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.spi.connector.transport.Transporter; +import org.apache.maven.resolver.spi.connector.transport.TransporterFactory; +import org.apache.maven.resolver.transfer.NoTransporterException; /** * A transporter factory using Apache Maven Wagon. Note @@ -39,7 +37,7 @@ */ @Named( "wagon" ) public final class WagonTransporterFactory - implements TransporterFactory, Service + implements TransporterFactory { private WagonProvider wagonProvider; @@ -65,12 +63,6 @@ public WagonTransporterFactory() setWagonConfigurator( wagonConfigurator ); } - public void initService( ServiceLocator locator ) - { - setWagonProvider( locator.getService( WagonProvider.class ) ); - setWagonConfigurator( locator.getService( WagonConfigurator.class ) ); - } - /** * Sets the wagon provider to use to acquire and release wagon instances. * diff --git a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/package-info.java b/maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/transport/wagon/package-info.java similarity index 95% rename from maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/package-info.java rename to maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/transport/wagon/package-info.java index 82df9aced..21c40592c 100644 --- a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/package-info.java +++ b/maven-resolver-transport-wagon/src/main/java/org/apache/maven/resolver/transport/wagon/package-info.java @@ -20,5 +20,5 @@ /** * Support for downloads/uploads using Apache Maven Wagon. */ -package org.eclipse.aether.transport.wagon; +package org.apache.maven.resolver.transport.wagon; diff --git a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/AbstractWagonTransporterTest.java b/maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/AbstractWagonTransporterTest.java similarity index 94% rename from maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/AbstractWagonTransporterTest.java rename to maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/AbstractWagonTransporterTest.java index cd6bd556b..807ddbf5e 100644 --- a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/AbstractWagonTransporterTest.java +++ b/maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/AbstractWagonTransporterTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.wagon; +package org.apache.maven.resolver.transport.wagon; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -32,21 +32,21 @@ import org.apache.maven.wagon.ResourceDoesNotExistException; import org.apache.maven.wagon.TransferFailedException; import org.apache.maven.wagon.Wagon; -import org.eclipse.aether.ConfigurationProperties; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.internal.test.util.TestFileUtils; -import org.eclipse.aether.internal.test.util.TestUtils; -import org.eclipse.aether.repository.Authentication; -import org.eclipse.aether.repository.Proxy; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.spi.connector.transport.GetTask; -import org.eclipse.aether.spi.connector.transport.PeekTask; -import org.eclipse.aether.spi.connector.transport.PutTask; -import org.eclipse.aether.spi.connector.transport.Transporter; -import org.eclipse.aether.spi.connector.transport.TransporterFactory; -import org.eclipse.aether.transfer.NoTransporterException; -import org.eclipse.aether.transfer.TransferCancelledException; -import org.eclipse.aether.util.repository.AuthenticationBuilder; +import org.apache.maven.resolver.ConfigurationProperties; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.internal.test.util.TestFileUtils; +import org.apache.maven.resolver.internal.test.util.TestUtils; +import org.apache.maven.resolver.repository.Authentication; +import org.apache.maven.resolver.repository.Proxy; +import org.apache.maven.resolver.repository.RemoteRepository; +import org.apache.maven.resolver.spi.connector.transport.GetTask; +import org.apache.maven.resolver.spi.connector.transport.PeekTask; +import org.apache.maven.resolver.spi.connector.transport.PutTask; +import org.apache.maven.resolver.spi.connector.transport.Transporter; +import org.apache.maven.resolver.spi.connector.transport.TransporterFactory; +import org.apache.maven.resolver.transfer.NoTransporterException; +import org.apache.maven.resolver.transfer.TransferCancelledException; +import org.apache.maven.resolver.util.repository.AuthenticationBuilder; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/Configurable.java b/maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/Configurable.java similarity index 94% rename from maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/Configurable.java rename to maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/Configurable.java index 9a90f6ffc..9a95f101b 100644 --- a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/Configurable.java +++ b/maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/Configurable.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.wagon; +package org.apache.maven.resolver.transport.wagon; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemStreamWagon.java b/maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/MemStreamWagon.java similarity index 98% rename from maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemStreamWagon.java rename to maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/MemStreamWagon.java index 6b4be8ffb..0bdfaed7f 100644 --- a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemStreamWagon.java +++ b/maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/MemStreamWagon.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.wagon; +package org.apache.maven.resolver.transport.wagon; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemWagon.java b/maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/MemWagon.java similarity index 99% rename from maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemWagon.java rename to maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/MemWagon.java index bc62d3766..dcebefb00 100644 --- a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemWagon.java +++ b/maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/MemWagon.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.wagon; +package org.apache.maven.resolver.transport.wagon; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemWagonUtils.java b/maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/MemWagonUtils.java similarity index 98% rename from maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemWagonUtils.java rename to maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/MemWagonUtils.java index 993a26af7..1a00bbc81 100644 --- a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemWagonUtils.java +++ b/maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/MemWagonUtils.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.wagon; +package org.apache.maven.resolver.transport.wagon; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/PlexusSupportTest.java b/maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/PlexusSupportTest.java similarity index 91% rename from maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/PlexusSupportTest.java rename to maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/PlexusSupportTest.java index c82e6727f..700794a67 100644 --- a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/PlexusSupportTest.java +++ b/maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/PlexusSupportTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.wagon; +package org.apache.maven.resolver.transport.wagon; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,7 +21,7 @@ import org.codehaus.plexus.ContainerConfiguration; import org.codehaus.plexus.PlexusTestCase; -import org.eclipse.aether.spi.connector.transport.TransporterFactory; +import org.apache.maven.resolver.spi.connector.transport.TransporterFactory; /** */ diff --git a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/RecordingTransportListener.java b/maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/RecordingTransportListener.java similarity index 90% rename from maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/RecordingTransportListener.java rename to maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/RecordingTransportListener.java index e7ca7c969..ebf0d0c1a 100644 --- a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/RecordingTransportListener.java +++ b/maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/RecordingTransportListener.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.http; +package org.apache.maven.resolver.transport.wagon; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,8 +23,8 @@ import java.nio.Buffer; import java.nio.ByteBuffer; -import org.eclipse.aether.spi.connector.transport.TransportListener; -import org.eclipse.aether.transfer.TransferCancelledException; +import org.apache.maven.resolver.spi.connector.transport.TransportListener; +import org.apache.maven.resolver.transfer.TransferCancelledException; class RecordingTransportListener extends TransportListener diff --git a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/StreamWagonTransporterTest.java b/maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/StreamWagonTransporterTest.java similarity index 95% rename from maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/StreamWagonTransporterTest.java rename to maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/StreamWagonTransporterTest.java index c3f3fd47c..2ca22abf2 100644 --- a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/StreamWagonTransporterTest.java +++ b/maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/StreamWagonTransporterTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.wagon; +package org.apache.maven.resolver.transport.wagon; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/WagonTransporterTest.java b/maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/WagonTransporterTest.java similarity index 95% rename from maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/WagonTransporterTest.java rename to maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/WagonTransporterTest.java index 5a1039960..3ddb25c76 100644 --- a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/WagonTransporterTest.java +++ b/maven-resolver-transport-wagon/src/test/java/org/apache/maven/resolver/transport/wagon/WagonTransporterTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.transport.wagon; +package org.apache.maven.resolver.transport.wagon; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-util/pom.xml b/maven-resolver-util/pom.xml index a3d0c64e0..366c36b55 100644 --- a/maven-resolver-util/pom.xml +++ b/maven-resolver-util/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.resolver maven-resolver - 1.8.2-SNAPSHOT + 2.0.0-SNAPSHOT maven-resolver-util diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/ChecksumUtils.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/ChecksumUtils.java similarity index 99% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/ChecksumUtils.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/ChecksumUtils.java index 187edddbf..06e48f80c 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/ChecksumUtils.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/ChecksumUtils.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util; +package org.apache.maven.resolver.util; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/ConfigUtils.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/ConfigUtils.java similarity index 99% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/ConfigUtils.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/ConfigUtils.java index df1ba3e38..7be2f6d45 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/ConfigUtils.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/ConfigUtils.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util; +package org.apache.maven.resolver.util; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; -import org.eclipse.aether.RepositorySystemSession; +import org.apache.maven.resolver.RepositorySystemSession; /** * A utility class to read configuration properties from a repository system session. diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/StringUtils.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/StringUtils.java similarity index 97% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/StringUtils.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/StringUtils.java index 410652b8f..adf99bc82 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/StringUtils.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/StringUtils.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util; +package org.apache.maven.resolver.util; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/ArtifactIdUtils.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/artifact/ArtifactIdUtils.java similarity index 98% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/ArtifactIdUtils.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/artifact/ArtifactIdUtils.java index 27a1f0d01..b6e280fa7 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/ArtifactIdUtils.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/artifact/ArtifactIdUtils.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.artifact; +package org.apache.maven.resolver.util.artifact; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.artifact.Artifact; +import org.apache.maven.resolver.artifact.Artifact; import java.util.Objects; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/DefaultArtifactTypeRegistry.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/artifact/DefaultArtifactTypeRegistry.java similarity index 93% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/DefaultArtifactTypeRegistry.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/artifact/DefaultArtifactTypeRegistry.java index 9fb29af82..38ca7a547 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/DefaultArtifactTypeRegistry.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/artifact/DefaultArtifactTypeRegistry.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.artifact; +package org.apache.maven.resolver.util.artifact; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.artifact.ArtifactType; +import org.apache.maven.resolver.artifact.ArtifactType; /** * A simple artifact type registry. diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/DelegatingArtifact.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/artifact/DelegatingArtifact.java similarity index 96% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/DelegatingArtifact.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/artifact/DelegatingArtifact.java index 00fbcd488..476bb9932 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/DelegatingArtifact.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/artifact/DelegatingArtifact.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.artifact; +package org.apache.maven.resolver.util.artifact; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,8 +23,8 @@ import java.util.Map; import static java.util.Objects.requireNonNull; -import org.eclipse.aether.artifact.AbstractArtifact; -import org.eclipse.aether.artifact.Artifact; +import org.apache.maven.resolver.artifact.AbstractArtifact; +import org.apache.maven.resolver.artifact.Artifact; /** * An artifact that delegates to another artifact instance. This class serves as a base for subclasses that want to diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/JavaScopes.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/artifact/JavaScopes.java similarity index 90% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/JavaScopes.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/artifact/JavaScopes.java index bf4894cf7..b6e160381 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/JavaScopes.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/artifact/JavaScopes.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.artifact; +package org.apache.maven.resolver.util.artifact; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,10 +19,12 @@ * under the License. */ +import org.apache.maven.resolver.graph.Dependency; + /** * The dependency scopes used for Java dependencies. * - * @see org.eclipse.aether.graph.Dependency#getScope() + * @see Dependency#getScope() */ public final class JavaScopes { diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/OverlayArtifactTypeRegistry.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/artifact/OverlayArtifactTypeRegistry.java similarity index 92% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/OverlayArtifactTypeRegistry.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/artifact/OverlayArtifactTypeRegistry.java index 6768b1691..ae3173431 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/OverlayArtifactTypeRegistry.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/artifact/OverlayArtifactTypeRegistry.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.artifact; +package org.apache.maven.resolver.util.artifact; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,8 +19,8 @@ * under the License. */ -import org.eclipse.aether.artifact.ArtifactType; -import org.eclipse.aether.artifact.ArtifactTypeRegistry; +import org.apache.maven.resolver.artifact.ArtifactType; +import org.apache.maven.resolver.artifact.ArtifactTypeRegistry; /** * An artifact type registry which first consults its own mappings and in case of an unknown type falls back to another diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/SimpleArtifactTypeRegistry.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/artifact/SimpleArtifactTypeRegistry.java similarity index 91% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/SimpleArtifactTypeRegistry.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/artifact/SimpleArtifactTypeRegistry.java index 269e42bd7..4566af771 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/SimpleArtifactTypeRegistry.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/artifact/SimpleArtifactTypeRegistry.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.artifact; +package org.apache.maven.resolver.util.artifact; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,8 +22,8 @@ import java.util.HashMap; import java.util.Map; -import org.eclipse.aether.artifact.ArtifactType; -import org.eclipse.aether.artifact.ArtifactTypeRegistry; +import org.apache.maven.resolver.artifact.ArtifactType; +import org.apache.maven.resolver.artifact.ArtifactTypeRegistry; /** * A simple map-based artifact type registry. diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/SubArtifact.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/artifact/SubArtifact.java similarity index 98% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/SubArtifact.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/artifact/SubArtifact.java index 950ccc470..9ece59f49 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/SubArtifact.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/artifact/SubArtifact.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.artifact; +package org.apache.maven.resolver.util.artifact; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,8 +25,8 @@ import static java.util.Objects.requireNonNull; -import org.eclipse.aether.artifact.AbstractArtifact; -import org.eclipse.aether.artifact.Artifact; +import org.apache.maven.resolver.artifact.AbstractArtifact; +import org.apache.maven.resolver.artifact.Artifact; /** * An artifact whose identity is derived from another artifact. Note: Instances of this class are immutable and diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/package-info.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/artifact/package-info.java similarity index 94% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/package-info.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/artifact/package-info.java index 153159fa9..897b4b6ae 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/package-info.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/artifact/package-info.java @@ -20,5 +20,5 @@ /** * Utilities around artifacts and artifact type registries. */ -package org.eclipse.aether.util.artifact; +package org.apache.maven.resolver.util.artifact; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/concurrency/RunnableErrorForwarder.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/concurrency/RunnableErrorForwarder.java similarity index 98% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/concurrency/RunnableErrorForwarder.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/concurrency/RunnableErrorForwarder.java index 6f219f1c2..0f7f926ed 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/concurrency/RunnableErrorForwarder.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/concurrency/RunnableErrorForwarder.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.concurrency; +package org.apache.maven.resolver.util.concurrency; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/concurrency/WorkerThreadFactory.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/concurrency/WorkerThreadFactory.java similarity index 97% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/concurrency/WorkerThreadFactory.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/concurrency/WorkerThreadFactory.java index 26d0fb69c..28ad25514 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/concurrency/WorkerThreadFactory.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/concurrency/WorkerThreadFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.concurrency; +package org.apache.maven.resolver.util.concurrency; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/concurrency/package-info.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/concurrency/package-info.java similarity index 94% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/concurrency/package-info.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/concurrency/package-info.java index 2bb7853ee..32e23f5c0 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/concurrency/package-info.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/concurrency/package-info.java @@ -20,5 +20,5 @@ /** * Utilities for concurrent task processing. */ -package org.eclipse.aether.util.concurrency; +package org.apache.maven.resolver.util.concurrency; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/AbstractPatternDependencyFilter.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/AbstractPatternDependencyFilter.java similarity index 93% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/AbstractPatternDependencyFilter.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/AbstractPatternDependencyFilter.java index 9929074de..14f8ed02b 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/AbstractPatternDependencyFilter.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/AbstractPatternDependencyFilter.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.filter; +package org.apache.maven.resolver.util.filter; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,14 +26,14 @@ import java.util.Objects; import java.util.Set; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyFilter; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.version.InvalidVersionSpecificationException; -import org.eclipse.aether.version.Version; -import org.eclipse.aether.version.VersionRange; -import org.eclipse.aether.version.VersionScheme; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyFilter; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.version.InvalidVersionSpecificationException; +import org.apache.maven.resolver.version.Version; +import org.apache.maven.resolver.version.VersionRange; +import org.apache.maven.resolver.version.VersionScheme; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/AndDependencyFilter.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/AndDependencyFilter.java similarity index 95% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/AndDependencyFilter.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/AndDependencyFilter.java index 326607309..a7817588b 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/AndDependencyFilter.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/AndDependencyFilter.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.filter; +package org.apache.maven.resolver.util.filter; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,8 +25,8 @@ import java.util.List; import java.util.Set; -import org.eclipse.aether.graph.DependencyFilter; -import org.eclipse.aether.graph.DependencyNode; +import org.apache.maven.resolver.graph.DependencyFilter; +import org.apache.maven.resolver.graph.DependencyNode; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/DependencyFilterUtils.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/DependencyFilterUtils.java similarity index 97% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/DependencyFilterUtils.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/DependencyFilterUtils.java index f178d0b5a..8d9f977fc 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/DependencyFilterUtils.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/DependencyFilterUtils.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.filter; +package org.apache.maven.resolver.util.filter; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,8 +24,8 @@ import java.util.Collections; import java.util.HashSet; -import org.eclipse.aether.graph.DependencyFilter; -import org.eclipse.aether.util.artifact.JavaScopes; +import org.apache.maven.resolver.util.artifact.JavaScopes; +import org.apache.maven.resolver.graph.DependencyFilter; /** * A utility class assisting in the creation of dependency node filters. diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/ExclusionsDependencyFilter.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/ExclusionsDependencyFilter.java similarity index 93% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/ExclusionsDependencyFilter.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/ExclusionsDependencyFilter.java index 7513949e7..68e39d78b 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/ExclusionsDependencyFilter.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/ExclusionsDependencyFilter.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.filter; +package org.apache.maven.resolver.util.filter; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,9 +24,9 @@ import java.util.List; import java.util.Set; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyFilter; -import org.eclipse.aether.graph.DependencyNode; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyFilter; +import org.apache.maven.resolver.graph.DependencyNode; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/NotDependencyFilter.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/NotDependencyFilter.java similarity index 92% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/NotDependencyFilter.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/NotDependencyFilter.java index dcb419a63..2b5e8b730 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/NotDependencyFilter.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/NotDependencyFilter.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.filter; +package org.apache.maven.resolver.util.filter; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,8 +22,8 @@ import java.util.List; import static java.util.Objects.requireNonNull; -import org.eclipse.aether.graph.DependencyFilter; -import org.eclipse.aether.graph.DependencyNode; +import org.apache.maven.resolver.graph.DependencyFilter; +import org.apache.maven.resolver.graph.DependencyNode; /** * A dependency filter that negates another filter. diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/OrDependencyFilter.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/OrDependencyFilter.java similarity index 95% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/OrDependencyFilter.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/OrDependencyFilter.java index 2c408e7b6..c62d2cba7 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/OrDependencyFilter.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/OrDependencyFilter.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.filter; +package org.apache.maven.resolver.util.filter; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,8 +25,8 @@ import java.util.List; import java.util.Set; -import org.eclipse.aether.graph.DependencyFilter; -import org.eclipse.aether.graph.DependencyNode; +import org.apache.maven.resolver.graph.DependencyFilter; +import org.apache.maven.resolver.graph.DependencyNode; /** * A dependency filter that combines zero or more other filters using a logical {@code OR}. diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilter.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/PatternExclusionsDependencyFilter.java similarity index 95% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilter.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/PatternExclusionsDependencyFilter.java index e7686147a..a811cf956 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilter.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/PatternExclusionsDependencyFilter.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.filter; +package org.apache.maven.resolver.util.filter; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,8 +21,8 @@ import java.util.Collection; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.version.VersionScheme; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.version.VersionScheme; /** * A simple filter to exclude artifacts from a list of patterns. The artifact pattern syntax is of the form: diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilter.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/PatternInclusionsDependencyFilter.java similarity index 96% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilter.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/PatternInclusionsDependencyFilter.java index e30600b0d..b7c009535 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilter.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/PatternInclusionsDependencyFilter.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.filter; +package org.apache.maven.resolver.util.filter; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,7 +21,7 @@ import java.util.Collection; -import org.eclipse.aether.version.VersionScheme; +import org.apache.maven.resolver.version.VersionScheme; /** * A simple filter to include artifacts from a list of patterns. The artifact pattern syntax is of the form: diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/ScopeDependencyFilter.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/ScopeDependencyFilter.java similarity index 94% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/ScopeDependencyFilter.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/ScopeDependencyFilter.java index d2657d36a..d5bb7f6ba 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/ScopeDependencyFilter.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/ScopeDependencyFilter.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.filter; +package org.apache.maven.resolver.util.filter; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,9 +25,9 @@ import java.util.List; import java.util.Set; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyFilter; -import org.eclipse.aether.graph.DependencyNode; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyFilter; +import org.apache.maven.resolver.graph.DependencyNode; /** * A dependency filter based on dependency scopes. Note: This filter does not assume any relationships between diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/package-info.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/package-info.java similarity index 95% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/package-info.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/package-info.java index 6547d2ebc..cbe90e75c 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/package-info.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/filter/package-info.java @@ -20,5 +20,5 @@ /** * Various dependency filters for selecting nodes in a dependency graph. */ -package org.eclipse.aether.util.filter; +package org.apache.maven.resolver.util.filter; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManager.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/manager/ClassicDependencyManager.java similarity index 95% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManager.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/manager/ClassicDependencyManager.java index aec953629..479388540 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManager.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/manager/ClassicDependencyManager.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.manager; +package org.apache.maven.resolver.util.graph.manager; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,14 +25,14 @@ import java.util.LinkedHashSet; import java.util.Map; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.ArtifactProperties; -import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.collection.DependencyManagement; -import org.eclipse.aether.collection.DependencyManager; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.Exclusion; -import org.eclipse.aether.util.artifact.JavaScopes; +import org.apache.maven.resolver.util.artifact.JavaScopes; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.ArtifactProperties; +import org.apache.maven.resolver.collection.DependencyCollectionContext; +import org.apache.maven.resolver.collection.DependencyManagement; +import org.apache.maven.resolver.collection.DependencyManager; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.Exclusion; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/DefaultDependencyManager.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/manager/DefaultDependencyManager.java similarity index 95% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/DefaultDependencyManager.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/manager/DefaultDependencyManager.java index 2c9760470..2dff36931 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/DefaultDependencyManager.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/manager/DefaultDependencyManager.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.manager; +package org.apache.maven.resolver.util.graph.manager; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,14 +26,14 @@ import java.util.Map; import java.util.Objects; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.ArtifactProperties; -import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.collection.DependencyManagement; -import org.eclipse.aether.collection.DependencyManager; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.Exclusion; -import org.eclipse.aether.util.artifact.JavaScopes; +import org.apache.maven.resolver.util.artifact.JavaScopes; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.ArtifactProperties; +import org.apache.maven.resolver.collection.DependencyCollectionContext; +import org.apache.maven.resolver.collection.DependencyManagement; +import org.apache.maven.resolver.collection.DependencyManager; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.Exclusion; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/DependencyManagerUtils.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/manager/DependencyManagerUtils.java similarity index 96% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/DependencyManagerUtils.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/manager/DependencyManagerUtils.java index 3afcacc27..b46d079eb 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/DependencyManagerUtils.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/manager/DependencyManagerUtils.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.manager; +package org.apache.maven.resolver.util.graph.manager; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,8 +22,8 @@ import java.util.Collection; import java.util.Map; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.graph.Exclusion; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.graph.Exclusion; /** * A utility class assisting in analyzing the effects of dependency management. @@ -32,7 +32,7 @@ public final class DependencyManagerUtils { /** - * The key in the repository session's {@link org.eclipse.aether.RepositorySystemSession#getConfigProperties() + * The key in the repository session's {@link RepositorySystemSession#getConfigProperties() * configuration properties} used to store a {@link Boolean} flag controlling the verbose mode for dependency * management. If enabled, the original attributes of a dependency before its update due to dependency managemnent * will be recorded * in the node's {@link DependencyNode#getData() custom data} when building a dependency graph. diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/NoopDependencyManager.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/manager/NoopDependencyManager.java similarity index 87% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/NoopDependencyManager.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/manager/NoopDependencyManager.java index 245c02433..db61aea64 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/NoopDependencyManager.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/manager/NoopDependencyManager.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.manager; +package org.apache.maven.resolver.util.graph.manager; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,10 +19,10 @@ * under the License. */ -import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.collection.DependencyManagement; -import org.eclipse.aether.collection.DependencyManager; -import org.eclipse.aether.graph.Dependency; +import org.apache.maven.resolver.collection.DependencyCollectionContext; +import org.apache.maven.resolver.collection.DependencyManagement; +import org.apache.maven.resolver.collection.DependencyManager; +import org.apache.maven.resolver.graph.Dependency; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/TransitiveDependencyManager.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/manager/TransitiveDependencyManager.java similarity index 95% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/TransitiveDependencyManager.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/manager/TransitiveDependencyManager.java index 56e00170e..aea539014 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/TransitiveDependencyManager.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/manager/TransitiveDependencyManager.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.manager; +package org.apache.maven.resolver.util.graph.manager; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,14 +26,14 @@ import java.util.Map; import java.util.Objects; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.ArtifactProperties; -import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.collection.DependencyManagement; -import org.eclipse.aether.collection.DependencyManager; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.Exclusion; -import org.eclipse.aether.util.artifact.JavaScopes; +import org.apache.maven.resolver.util.artifact.JavaScopes; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.ArtifactProperties; +import org.apache.maven.resolver.collection.DependencyCollectionContext; +import org.apache.maven.resolver.collection.DependencyManagement; +import org.apache.maven.resolver.collection.DependencyManager; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.Exclusion; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/package-info.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/manager/package-info.java similarity index 94% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/package-info.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/manager/package-info.java index 7c7ae1282..602f9aec0 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/package-info.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/manager/package-info.java @@ -20,5 +20,5 @@ /** * Various dependency managers for building a dependency graph. */ -package org.eclipse.aether.util.graph.manager; +package org.apache.maven.resolver.util.graph.manager; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/AndDependencySelector.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/selector/AndDependencySelector.java similarity index 96% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/AndDependencySelector.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/selector/AndDependencySelector.java index 7e5845820..a230683ae 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/AndDependencySelector.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/selector/AndDependencySelector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.selector; +package org.apache.maven.resolver.util.graph.selector; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,9 +26,9 @@ import java.util.LinkedHashSet; import java.util.Set; -import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.collection.DependencySelector; -import org.eclipse.aether.graph.Dependency; +import org.apache.maven.resolver.collection.DependencyCollectionContext; +import org.apache.maven.resolver.collection.DependencySelector; +import org.apache.maven.resolver.graph.Dependency; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/ExclusionDependencySelector.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/selector/ExclusionDependencySelector.java similarity index 95% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/ExclusionDependencySelector.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/selector/ExclusionDependencySelector.java index 74cf501a2..44faf7b21 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/ExclusionDependencySelector.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/selector/ExclusionDependencySelector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.selector; +package org.apache.maven.resolver.util.graph.selector; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,11 +24,11 @@ import java.util.Comparator; import java.util.TreeSet; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.collection.DependencySelector; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.Exclusion; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.collection.DependencyCollectionContext; +import org.apache.maven.resolver.collection.DependencySelector; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.Exclusion; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/OptionalDependencySelector.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/selector/OptionalDependencySelector.java similarity index 91% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/OptionalDependencySelector.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/selector/OptionalDependencySelector.java index d384eb4a3..54ffa7128 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/OptionalDependencySelector.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/selector/OptionalDependencySelector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.selector; +package org.apache.maven.resolver.util.graph.selector; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.collection.DependencySelector; -import org.eclipse.aether.graph.Dependency; +import org.apache.maven.resolver.collection.DependencyCollectionContext; +import org.apache.maven.resolver.collection.DependencySelector; +import org.apache.maven.resolver.graph.Dependency; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/ScopeDependencySelector.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/selector/ScopeDependencySelector.java similarity index 95% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/ScopeDependencySelector.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/selector/ScopeDependencySelector.java index 00fc26d00..a53a05e64 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/ScopeDependencySelector.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/selector/ScopeDependencySelector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.selector; +package org.apache.maven.resolver.util.graph.selector; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,9 +26,9 @@ import java.util.Objects; import java.util.TreeSet; -import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.collection.DependencySelector; -import org.eclipse.aether.graph.Dependency; +import org.apache.maven.resolver.collection.DependencyCollectionContext; +import org.apache.maven.resolver.collection.DependencySelector; +import org.apache.maven.resolver.graph.Dependency; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/StaticDependencySelector.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/selector/StaticDependencySelector.java similarity index 90% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/StaticDependencySelector.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/selector/StaticDependencySelector.java index edcee4481..4ea8658fe 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/StaticDependencySelector.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/selector/StaticDependencySelector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.selector; +package org.apache.maven.resolver.util.graph.selector; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.collection.DependencySelector; -import org.eclipse.aether.graph.Dependency; +import org.apache.maven.resolver.collection.DependencyCollectionContext; +import org.apache.maven.resolver.collection.DependencySelector; +import org.apache.maven.resolver.graph.Dependency; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/package-info.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/selector/package-info.java similarity index 94% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/package-info.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/selector/package-info.java index 3c3cf3c76..489a91c91 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/package-info.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/selector/package-info.java @@ -20,5 +20,5 @@ /** * Various dependency selectors for building a dependency graph. */ -package org.eclipse.aether.util.graph.selector; +package org.apache.maven.resolver.util.graph.selector; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ChainedDependencyGraphTransformer.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/ChainedDependencyGraphTransformer.java similarity index 90% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ChainedDependencyGraphTransformer.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/ChainedDependencyGraphTransformer.java index 449eeeb4a..c389db8cb 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ChainedDependencyGraphTransformer.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/ChainedDependencyGraphTransformer.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.transformer; +package org.apache.maven.resolver.util.graph.transformer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,10 +19,10 @@ * under the License. */ -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.collection.DependencyGraphTransformationContext; -import org.eclipse.aether.collection.DependencyGraphTransformer; -import org.eclipse.aether.graph.DependencyNode; +import org.apache.maven.resolver.RepositoryException; +import org.apache.maven.resolver.collection.DependencyGraphTransformationContext; +import org.apache.maven.resolver.collection.DependencyGraphTransformer; +import org.apache.maven.resolver.graph.DependencyNode; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictIdSorter.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/ConflictIdSorter.java similarity index 97% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictIdSorter.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/ConflictIdSorter.java index b8cc3addc..768401a84 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictIdSorter.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/ConflictIdSorter.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.transformer; +package org.apache.maven.resolver.util.graph.transformer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -30,10 +30,10 @@ import java.util.Map; import static java.util.Objects.requireNonNull; -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.collection.DependencyGraphTransformationContext; -import org.eclipse.aether.collection.DependencyGraphTransformer; -import org.eclipse.aether.graph.DependencyNode; +import org.apache.maven.resolver.RepositoryException; +import org.apache.maven.resolver.collection.DependencyGraphTransformationContext; +import org.apache.maven.resolver.collection.DependencyGraphTransformer; +import org.apache.maven.resolver.graph.DependencyNode; /** * A dependency graph transformer that creates a topological sorting of the conflict ids which have been assigned to the diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictMarker.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/ConflictMarker.java similarity index 95% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictMarker.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/ConflictMarker.java index 5a0092c65..62d691d52 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictMarker.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/ConflictMarker.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.transformer; +package org.apache.maven.resolver.util.graph.transformer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -28,12 +28,12 @@ import java.util.Set; import static java.util.Objects.requireNonNull; -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.collection.DependencyGraphTransformationContext; -import org.eclipse.aether.collection.DependencyGraphTransformer; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyNode; +import org.apache.maven.resolver.RepositoryException; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.collection.DependencyGraphTransformationContext; +import org.apache.maven.resolver.collection.DependencyGraphTransformer; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyNode; /** * A dependency graph transformer that identifies conflicting dependencies. When this transformer has executed, the diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/ConflictResolver.java similarity index 98% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/ConflictResolver.java index 50ef2f765..3eb0951c6 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/ConflictResolver.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.transformer; +package org.apache.maven.resolver.util.graph.transformer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -32,14 +32,14 @@ import java.util.Map; import static java.util.Objects.requireNonNull; -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.collection.DependencyGraphTransformationContext; -import org.eclipse.aether.collection.DependencyGraphTransformer; -import org.eclipse.aether.graph.DefaultDependencyNode; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.util.ConfigUtils; +import org.apache.maven.resolver.RepositoryException; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.collection.DependencyGraphTransformationContext; +import org.apache.maven.resolver.collection.DependencyGraphTransformer; +import org.apache.maven.resolver.graph.DefaultDependencyNode; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.util.ConfigUtils; /** * A dependency graph transformer that resolves version and scope conflicts among dependencies. For a given set of @@ -66,7 +66,7 @@ public final class ConflictResolver { /** - * The key in the repository session's {@link org.eclipse.aether.RepositorySystemSession#getConfigProperties() + * The key in the repository session's {@link RepositorySystemSession#getConfigProperties() * configuration properties} used to store a {@link Boolean} flag controlling the transformer's verbose mode. */ public static final String CONFIG_PROP_VERBOSE = "aether.conflictResolver.verbose"; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/JavaDependencyContextRefiner.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/JavaDependencyContextRefiner.java similarity index 86% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/JavaDependencyContextRefiner.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/JavaDependencyContextRefiner.java index 5d5b0cc0e..6e6746eed 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/JavaDependencyContextRefiner.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/JavaDependencyContextRefiner.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.transformer; +package org.apache.maven.resolver.util.graph.transformer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,12 +19,12 @@ * under the License. */ -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.collection.DependencyGraphTransformationContext; -import org.eclipse.aether.collection.DependencyGraphTransformer; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.util.artifact.JavaScopes; +import org.apache.maven.resolver.util.artifact.JavaScopes; +import org.apache.maven.resolver.RepositoryException; +import org.apache.maven.resolver.collection.DependencyGraphTransformationContext; +import org.apache.maven.resolver.collection.DependencyGraphTransformer; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyNode; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/JavaScopeDeriver.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/JavaScopeDeriver.java similarity index 84% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/JavaScopeDeriver.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/JavaScopeDeriver.java index 1132f800f..97c29ee86 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/JavaScopeDeriver.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/JavaScopeDeriver.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.transformer; +package org.apache.maven.resolver.util.graph.transformer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,16 +19,14 @@ * under the License. */ -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.util.artifact.JavaScopes; -import org.eclipse.aether.util.graph.transformer.ConflictResolver.ScopeContext; -import org.eclipse.aether.util.graph.transformer.ConflictResolver.ScopeDeriver; +import org.apache.maven.resolver.util.artifact.JavaScopes; +import org.apache.maven.resolver.RepositoryException; /** * A scope deriver for use with {@link ConflictResolver} that supports the scopes from {@link JavaScopes}. */ public final class JavaScopeDeriver - extends ScopeDeriver + extends ConflictResolver.ScopeDeriver { /** @@ -39,7 +37,7 @@ public JavaScopeDeriver() } @Override - public void deriveScope( ScopeContext context ) + public void deriveScope( ConflictResolver.ScopeContext context ) throws RepositoryException { context.setDerivedScope( getDerivedScope( context.getParentScope(), context.getChildScope() ) ); diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelector.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/JavaScopeSelector.java similarity index 82% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelector.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/JavaScopeSelector.java index 0f923a746..db81d5719 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelector.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/JavaScopeSelector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.transformer; +package org.apache.maven.resolver.util.graph.transformer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,11 +23,8 @@ import java.util.HashSet; import java.util.Set; -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.util.artifact.JavaScopes; -import org.eclipse.aether.util.graph.transformer.ConflictResolver.ConflictContext; -import org.eclipse.aether.util.graph.transformer.ConflictResolver.ConflictItem; -import org.eclipse.aether.util.graph.transformer.ConflictResolver.ScopeSelector; +import org.apache.maven.resolver.util.artifact.JavaScopes; +import org.apache.maven.resolver.RepositoryException; /** * A scope selector for use with {@link ConflictResolver} that supports the scopes from {@link JavaScopes}. In general, @@ -35,7 +32,7 @@ * "runtime" which is wider than "test". If however a direct dependency is involved, its scope is selected. */ public final class JavaScopeSelector - extends ScopeSelector + extends ConflictResolver.ScopeSelector { /** @@ -46,7 +43,7 @@ public JavaScopeSelector() } @Override - public void selectScope( ConflictContext context ) + public void selectScope( ConflictResolver.ConflictContext context ) throws RepositoryException { String scope = context.getWinner().getDependency().getScope(); @@ -57,10 +54,10 @@ public void selectScope( ConflictContext context ) context.setScope( scope ); } - private String chooseEffectiveScope( Collection items ) + private String chooseEffectiveScope( Collection items ) { Set scopes = new HashSet<>(); - for ( ConflictItem item : items ) + for ( ConflictResolver.ConflictItem item : items ) { if ( item.getDepth() <= 1 ) { diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/NearestVersionSelector.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/NearestVersionSelector.java similarity index 79% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/NearestVersionSelector.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/NearestVersionSelector.java index 11e1af0d2..77be38d47 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/NearestVersionSelector.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/NearestVersionSelector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.transformer; +package org.apache.maven.resolver.util.graph.transformer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,16 +24,13 @@ import java.util.HashSet; import java.util.Iterator; -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.collection.UnsolvableVersionConflictException; -import org.eclipse.aether.graph.DependencyFilter; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.util.graph.transformer.ConflictResolver.ConflictContext; -import org.eclipse.aether.util.graph.transformer.ConflictResolver.ConflictItem; -import org.eclipse.aether.util.graph.transformer.ConflictResolver.VersionSelector; -import org.eclipse.aether.util.graph.visitor.PathRecordingDependencyVisitor; -import org.eclipse.aether.version.Version; -import org.eclipse.aether.version.VersionConstraint; +import org.apache.maven.resolver.RepositoryException; +import org.apache.maven.resolver.collection.UnsolvableVersionConflictException; +import org.apache.maven.resolver.graph.DependencyFilter; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.util.graph.visitor.PathRecordingDependencyVisitor; +import org.apache.maven.resolver.version.Version; +import org.apache.maven.resolver.version.VersionConstraint; import static java.util.Objects.requireNonNull; @@ -42,7 +39,7 @@ * strategy. If there is no single node that satisfies all encountered version ranges, the selector will fail. */ public final class NearestVersionSelector - extends VersionSelector + extends ConflictResolver.VersionSelector { /** @@ -53,11 +50,11 @@ public NearestVersionSelector() } @Override - public void selectVersion( ConflictContext context ) + public void selectVersion( ConflictResolver.ConflictContext context ) throws RepositoryException { ConflictGroup group = new ConflictGroup(); - for ( ConflictItem item : context.getItems() ) + for ( ConflictResolver.ConflictItem item : context.getItems() ) { DependencyNode node = item.getNode(); VersionConstraint constraint = node.getVersionConstraint(); @@ -97,14 +94,14 @@ else if ( backtrack ) context.setWinner( group.winner ); } - private void backtrack( ConflictGroup group, ConflictContext context ) + private void backtrack( ConflictGroup group, ConflictResolver.ConflictContext context ) throws UnsolvableVersionConflictException { group.winner = null; - for ( Iterator it = group.candidates.iterator(); it.hasNext(); ) + for ( Iterator it = group.candidates.iterator(); it.hasNext(); ) { - ConflictItem candidate = it.next(); + ConflictResolver.ConflictItem candidate = it.next(); if ( !isAcceptable( group, candidate.getNode().getVersion() ) ) { @@ -134,7 +131,7 @@ private boolean isAcceptable( ConflictGroup group, Version version ) return true; } - private boolean isNearer( ConflictItem item1, ConflictItem item2 ) + private boolean isNearer( ConflictResolver.ConflictItem item1, ConflictResolver.ConflictItem item2 ) { if ( item1.isSibling( item2 ) ) { @@ -146,7 +143,7 @@ private boolean isNearer( ConflictItem item1, ConflictItem item2 ) } } - private UnsolvableVersionConflictException newFailure( final ConflictContext context ) + private UnsolvableVersionConflictException newFailure( final ConflictResolver.ConflictContext context ) { DependencyFilter filter = ( node, parents ) -> { @@ -164,9 +161,9 @@ static final class ConflictGroup final Collection constraints; - final Collection candidates; + final Collection candidates; - ConflictItem winner; + ConflictResolver.ConflictItem winner; ConflictGroup() { diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/NoopDependencyGraphTransformer.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/NoopDependencyGraphTransformer.java similarity index 84% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/NoopDependencyGraphTransformer.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/NoopDependencyGraphTransformer.java index f217c4f3c..b3b5637e6 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/NoopDependencyGraphTransformer.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/NoopDependencyGraphTransformer.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.transformer; +package org.apache.maven.resolver.util.graph.transformer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,10 +19,10 @@ * under the License. */ -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.collection.DependencyGraphTransformationContext; -import org.eclipse.aether.collection.DependencyGraphTransformer; -import org.eclipse.aether.graph.DependencyNode; +import org.apache.maven.resolver.RepositoryException; +import org.apache.maven.resolver.collection.DependencyGraphTransformationContext; +import org.apache.maven.resolver.collection.DependencyGraphTransformer; +import org.apache.maven.resolver.graph.DependencyNode; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/SimpleOptionalitySelector.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/SimpleOptionalitySelector.java similarity index 75% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/SimpleOptionalitySelector.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/SimpleOptionalitySelector.java index 0cc7a730f..32835974e 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/SimpleOptionalitySelector.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/SimpleOptionalitySelector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.transformer; +package org.apache.maven.resolver.util.graph.transformer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,10 +21,7 @@ import java.util.Collection; -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.util.graph.transformer.ConflictResolver.ConflictContext; -import org.eclipse.aether.util.graph.transformer.ConflictResolver.ConflictItem; -import org.eclipse.aether.util.graph.transformer.ConflictResolver.OptionalitySelector; +import org.apache.maven.resolver.RepositoryException; /** * An optionality selector for use with {@link ConflictResolver}. In general, this selector only marks a dependency as @@ -32,7 +29,7 @@ * selected. */ public final class SimpleOptionalitySelector - extends OptionalitySelector + extends ConflictResolver.OptionalitySelector { /** @@ -43,23 +40,23 @@ public SimpleOptionalitySelector() } @Override - public void selectOptionality( ConflictContext context ) + public void selectOptionality( ConflictResolver.ConflictContext context ) throws RepositoryException { boolean optional = chooseEffectiveOptionality( context.getItems() ); context.setOptional( optional ); } - private boolean chooseEffectiveOptionality( Collection items ) + private boolean chooseEffectiveOptionality( Collection items ) { boolean optional = true; - for ( ConflictItem item : items ) + for ( ConflictResolver.ConflictItem item : items ) { if ( item.getDepth() <= 1 ) { return item.getDependency().isOptional(); } - if ( ( item.getOptionalities() & ConflictItem.OPTIONAL_FALSE ) != 0 ) + if ( ( item.getOptionalities() & ConflictResolver.ConflictItem.OPTIONAL_FALSE ) != 0 ) { optional = false; } diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/TransformationContextKeys.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/TransformationContextKeys.java similarity index 92% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/TransformationContextKeys.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/TransformationContextKeys.java index a9ebf68de..08b25dd89 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/TransformationContextKeys.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/TransformationContextKeys.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.transformer; +package org.apache.maven.resolver.util.graph.transformer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,11 +19,13 @@ * under the License. */ +import org.apache.maven.resolver.collection.DependencyGraphTransformationContext; + /** * A collection of keys used by the dependency graph transformers when exchanging information via the graph * transformation context. * - * @see org.eclipse.aether.collection.DependencyGraphTransformationContext#get(Object) + * @see DependencyGraphTransformationContext#get(Object) */ public final class TransformationContextKeys { diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/package-info.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/package-info.java similarity index 94% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/package-info.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/package-info.java index a41adcd59..9a10bd79e 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/package-info.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/transformer/package-info.java @@ -20,5 +20,5 @@ /** * Various dependency graph transformers for post-processing a dependency graph. */ -package org.eclipse.aether.util.graph.transformer; +package org.apache.maven.resolver.util.graph.transformer; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/traverser/AndDependencyTraverser.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/traverser/AndDependencyTraverser.java similarity index 96% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/traverser/AndDependencyTraverser.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/traverser/AndDependencyTraverser.java index eda5a9d4e..e9857a2a5 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/traverser/AndDependencyTraverser.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/traverser/AndDependencyTraverser.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.traverser; +package org.apache.maven.resolver.util.graph.traverser; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,9 +25,9 @@ import java.util.LinkedHashSet; import java.util.Set; -import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.collection.DependencyTraverser; -import org.eclipse.aether.graph.Dependency; +import org.apache.maven.resolver.collection.DependencyCollectionContext; +import org.apache.maven.resolver.collection.DependencyTraverser; +import org.apache.maven.resolver.graph.Dependency; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/traverser/FatArtifactTraverser.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/traverser/FatArtifactTraverser.java similarity index 80% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/traverser/FatArtifactTraverser.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/traverser/FatArtifactTraverser.java index 67ba4e33a..69fb4c13f 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/traverser/FatArtifactTraverser.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/traverser/FatArtifactTraverser.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.traverser; +package org.apache.maven.resolver.util.graph.traverser; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,19 +19,20 @@ * under the License. */ -import org.eclipse.aether.artifact.ArtifactProperties; -import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.collection.DependencyTraverser; -import org.eclipse.aether.graph.Dependency; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.ArtifactProperties; +import org.apache.maven.resolver.collection.DependencyCollectionContext; +import org.apache.maven.resolver.collection.DependencyTraverser; +import org.apache.maven.resolver.graph.Dependency; import static java.util.Objects.requireNonNull; /** * A dependency traverser that excludes the dependencies of fat artifacts from the traversal. Fat artifacts are - * artifacts that have the property {@link org.eclipse.aether.artifact.ArtifactProperties#INCLUDES_DEPENDENCIES} set to + * artifacts that have the property {@link ArtifactProperties#INCLUDES_DEPENDENCIES} set to * {@code true}. * - * @see org.eclipse.aether.artifact.Artifact#getProperties() + * @see Artifact#getProperties() */ public final class FatArtifactTraverser implements DependencyTraverser diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/traverser/StaticDependencyTraverser.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/traverser/StaticDependencyTraverser.java similarity index 90% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/traverser/StaticDependencyTraverser.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/traverser/StaticDependencyTraverser.java index 3d605ae6f..6e0677fae 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/traverser/StaticDependencyTraverser.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/traverser/StaticDependencyTraverser.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.traverser; +package org.apache.maven.resolver.util.graph.traverser; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.collection.DependencyTraverser; -import org.eclipse.aether.graph.Dependency; +import org.apache.maven.resolver.collection.DependencyCollectionContext; +import org.apache.maven.resolver.collection.DependencyTraverser; +import org.apache.maven.resolver.graph.Dependency; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/traverser/package-info.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/traverser/package-info.java similarity index 94% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/traverser/package-info.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/traverser/package-info.java index a1b71e04f..aee27ea0e 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/traverser/package-info.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/traverser/package-info.java @@ -20,5 +20,5 @@ /** * Various dependency traversers for building a dependency graph. */ -package org.eclipse.aether.util.graph.traverser; +package org.apache.maven.resolver.util.graph.traverser; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/version/ChainedVersionFilter.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/version/ChainedVersionFilter.java similarity index 95% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/version/ChainedVersionFilter.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/version/ChainedVersionFilter.java index 9be3f6095..4424de71b 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/version/ChainedVersionFilter.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/version/ChainedVersionFilter.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.version; +package org.apache.maven.resolver.util.graph.version; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,9 +22,9 @@ import java.util.Arrays; import java.util.Collection; -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.collection.VersionFilter; +import org.apache.maven.resolver.RepositoryException; +import org.apache.maven.resolver.collection.DependencyCollectionContext; +import org.apache.maven.resolver.collection.VersionFilter; /** * A version filter that combines multiple version filters into a chain where each filter gets invoked one after the diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/version/ContextualSnapshotVersionFilter.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/version/ContextualSnapshotVersionFilter.java similarity index 86% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/version/ContextualSnapshotVersionFilter.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/version/ContextualSnapshotVersionFilter.java index 569bf4cbe..7bdb51a3f 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/version/ContextualSnapshotVersionFilter.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/version/ContextualSnapshotVersionFilter.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.version; +package org.apache.maven.resolver.util.graph.version; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,15 +19,16 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.collection.VersionFilter; -import org.eclipse.aether.util.ConfigUtils; +import org.apache.maven.resolver.collection.CollectRequest; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.collection.DependencyCollectionContext; +import org.apache.maven.resolver.collection.VersionFilter; +import org.apache.maven.resolver.util.ConfigUtils; /** * A version filter that blocks "*-SNAPSHOT" versions if the - * {@link org.eclipse.aether.collection.CollectRequest#getRootArtifact() root artifact} of the dependency graph is not a + * {@link CollectRequest#getRootArtifact() root artifact} of the dependency graph is not a * snapshot. Alternatively, this filter can be forced to always ban snapshot versions by setting the boolean * {@link RepositorySystemSession#getConfigProperties() configuration property} {@link #CONFIG_PROP_ENABLE} to * {@code true}. diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/version/HighestVersionFilter.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/version/HighestVersionFilter.java similarity index 89% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/version/HighestVersionFilter.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/version/HighestVersionFilter.java index 0731c46c7..7a2e3c32d 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/version/HighestVersionFilter.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/version/HighestVersionFilter.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.version; +package org.apache.maven.resolver.util.graph.version; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,9 +21,9 @@ import java.util.Iterator; -import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.collection.VersionFilter; -import org.eclipse.aether.version.Version; +import org.apache.maven.resolver.collection.DependencyCollectionContext; +import org.apache.maven.resolver.collection.VersionFilter; +import org.apache.maven.resolver.version.Version; /** * A version filter that excludes any version except the highest one. diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/version/SnapshotVersionFilter.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/version/SnapshotVersionFilter.java similarity index 89% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/version/SnapshotVersionFilter.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/version/SnapshotVersionFilter.java index 6af7cf57d..17df89d91 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/version/SnapshotVersionFilter.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/version/SnapshotVersionFilter.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.version; +package org.apache.maven.resolver.util.graph.version; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,9 +21,9 @@ import java.util.Iterator; -import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.collection.VersionFilter; -import org.eclipse.aether.version.Version; +import org.apache.maven.resolver.collection.DependencyCollectionContext; +import org.apache.maven.resolver.collection.VersionFilter; +import org.apache.maven.resolver.version.Version; /** * A version filter that (unconditionally) blocks "*-SNAPSHOT" versions. For practical purposes, diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/version/package-info.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/version/package-info.java similarity index 94% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/version/package-info.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/version/package-info.java index a9f4649cf..709b4169c 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/version/package-info.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/version/package-info.java @@ -20,5 +20,5 @@ /** * Various version filters for building a dependency graph. */ -package org.eclipse.aether.util.graph.version; +package org.apache.maven.resolver.util.graph.version; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/AbstractDepthFirstNodeListGenerator.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/AbstractDepthFirstNodeListGenerator.java similarity index 93% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/AbstractDepthFirstNodeListGenerator.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/AbstractDepthFirstNodeListGenerator.java index cf519625d..6ba5b1f0b 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/AbstractDepthFirstNodeListGenerator.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/AbstractDepthFirstNodeListGenerator.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.visitor; +package org.apache.maven.resolver.util.graph.visitor; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,10 +19,10 @@ * under the License. */ -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.graph.DependencyVisitor; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.graph.DependencyVisitor; import java.io.File; import java.util.ArrayList; @@ -37,8 +37,8 @@ * sequence is free of duplicates. *

* Actual vertex ordering (preorder, inorder, postorder) needs to be defined by subclasses through appropriate - * implementations for {@link #visitEnter(org.eclipse.aether.graph.DependencyNode)} and - * {@link #visitLeave(org.eclipse.aether.graph.DependencyNode)} + * implementations for {@link #visitEnter(DependencyNode)} and + * {@link #visitLeave(DependencyNode)} */ abstract class AbstractDepthFirstNodeListGenerator implements DependencyVisitor diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/CloningDependencyVisitor.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/CloningDependencyVisitor.java similarity index 92% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/CloningDependencyVisitor.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/CloningDependencyVisitor.java index 7c57db1cf..e2e27af4f 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/CloningDependencyVisitor.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/CloningDependencyVisitor.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.visitor; +package org.apache.maven.resolver.util.graph.visitor; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,9 +22,9 @@ import java.util.IdentityHashMap; import java.util.Map; -import org.eclipse.aether.graph.DefaultDependencyNode; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.graph.DependencyVisitor; +import org.apache.maven.resolver.graph.DefaultDependencyNode; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.graph.DependencyVisitor; /** * A dependency visitor that constructs a clone of the visited dependency graph. If such a visitor is passed into a diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/FilteringDependencyVisitor.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/FilteringDependencyVisitor.java similarity index 93% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/FilteringDependencyVisitor.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/FilteringDependencyVisitor.java index 130fc575f..a91c1ae30 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/FilteringDependencyVisitor.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/FilteringDependencyVisitor.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.visitor; +package org.apache.maven.resolver.util.graph.visitor; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,9 +21,9 @@ import static java.util.Objects.requireNonNull; -import org.eclipse.aether.graph.DependencyFilter; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.graph.DependencyVisitor; +import org.apache.maven.resolver.graph.DependencyFilter; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.graph.DependencyVisitor; /** * A dependency visitor that delegates to another visitor if nodes match a filter. Note that in case of a mismatching diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/PathRecordingDependencyVisitor.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/PathRecordingDependencyVisitor.java similarity index 94% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/PathRecordingDependencyVisitor.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/PathRecordingDependencyVisitor.java index 3f1c8e2a2..acaa12ada 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/PathRecordingDependencyVisitor.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/PathRecordingDependencyVisitor.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.visitor; +package org.apache.maven.resolver.util.graph.visitor; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,9 +23,9 @@ import java.util.Arrays; import java.util.List; -import org.eclipse.aether.graph.DependencyFilter; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.graph.DependencyVisitor; +import org.apache.maven.resolver.graph.DependencyFilter; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.graph.DependencyVisitor; /** * A dependency visitor that records all paths leading to nodes matching a certain filter criteria. diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/PostorderNodeListGenerator.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/PostorderNodeListGenerator.java similarity index 94% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/PostorderNodeListGenerator.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/PostorderNodeListGenerator.java index b9ed7ad25..764590e97 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/PostorderNodeListGenerator.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/PostorderNodeListGenerator.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.visitor; +package org.apache.maven.resolver.util.graph.visitor; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.graph.DependencyNode; +import org.apache.maven.resolver.graph.DependencyNode; /** * Generates a sequence of dependency nodes from a dependeny graph by traversing the graph in postorder. This visitor diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/PreorderNodeListGenerator.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/PreorderNodeListGenerator.java similarity index 93% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/PreorderNodeListGenerator.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/PreorderNodeListGenerator.java index bd9b52abf..c147d2838 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/PreorderNodeListGenerator.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/PreorderNodeListGenerator.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.visitor; +package org.apache.maven.resolver.util.graph.visitor; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import org.eclipse.aether.graph.DependencyNode; +import org.apache.maven.resolver.graph.DependencyNode; /** * Generates a sequence of dependency nodes from a dependeny graph by traversing the graph in preorder. This visitor diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/Stack.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/Stack.java similarity index 97% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/Stack.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/Stack.java index 5abdc5a42..7164e9162 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/Stack.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/Stack.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.visitor; +package org.apache.maven.resolver.util.graph.visitor; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/TreeDependencyVisitor.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/TreeDependencyVisitor.java similarity index 93% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/TreeDependencyVisitor.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/TreeDependencyVisitor.java index 70a2664c7..945c2e87c 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/TreeDependencyVisitor.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/TreeDependencyVisitor.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.visitor; +package org.apache.maven.resolver.util.graph.visitor; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,8 +23,8 @@ import java.util.Map; import static java.util.Objects.requireNonNull; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.graph.DependencyVisitor; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.graph.DependencyVisitor; /** * A dependency visitor that delegates to another visitor if a node hasn't been visited before. In other words, this diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/package-info.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/package-info.java similarity index 94% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/package-info.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/package-info.java index 3ea9968b1..53a88612d 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/package-info.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/graph/visitor/package-info.java @@ -20,5 +20,5 @@ /** * Various dependency visitors for inspecting a dependency graph. */ -package org.eclipse.aether.util.graph.visitor; +package org.apache.maven.resolver.util.graph.visitor; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/listener/ChainedRepositoryListener.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/listener/ChainedRepositoryListener.java similarity index 98% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/listener/ChainedRepositoryListener.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/listener/ChainedRepositoryListener.java index 1b310fed9..61a2c3c8f 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/listener/ChainedRepositoryListener.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/listener/ChainedRepositoryListener.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.listener; +package org.apache.maven.resolver.util.listener; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,9 +24,9 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import org.eclipse.aether.AbstractRepositoryListener; -import org.eclipse.aether.RepositoryEvent; -import org.eclipse.aether.RepositoryListener; +import org.apache.maven.resolver.AbstractRepositoryListener; +import org.apache.maven.resolver.RepositoryEvent; +import org.apache.maven.resolver.RepositoryListener; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/listener/ChainedTransferListener.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/listener/ChainedTransferListener.java similarity index 95% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/listener/ChainedTransferListener.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/listener/ChainedTransferListener.java index d66488660..c97e82540 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/listener/ChainedTransferListener.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/listener/ChainedTransferListener.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.listener; +package org.apache.maven.resolver.util.listener; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,10 +24,10 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import org.eclipse.aether.transfer.AbstractTransferListener; -import org.eclipse.aether.transfer.TransferCancelledException; -import org.eclipse.aether.transfer.TransferEvent; -import org.eclipse.aether.transfer.TransferListener; +import org.apache.maven.resolver.transfer.AbstractTransferListener; +import org.apache.maven.resolver.transfer.TransferCancelledException; +import org.apache.maven.resolver.transfer.TransferEvent; +import org.apache.maven.resolver.transfer.TransferListener; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/listener/package-info.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/listener/package-info.java similarity index 94% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/listener/package-info.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/listener/package-info.java index 9f0be5800..7464c915b 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/listener/package-info.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/listener/package-info.java @@ -20,5 +20,5 @@ /** * Utilities to build repository and transfer listeners. */ -package org.eclipse.aether.util.listener; +package org.apache.maven.resolver.util.listener; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/package-info.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/package-info.java similarity index 95% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/package-info.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/package-info.java index 605e777ed..bcac81f68 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/package-info.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/package-info.java @@ -20,5 +20,5 @@ /** * Miscellaneous utility classes. */ -package org.eclipse.aether.util; +package org.apache.maven.resolver.util; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/AuthenticationBuilder.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/AuthenticationBuilder.java similarity index 97% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/AuthenticationBuilder.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/AuthenticationBuilder.java index 9988d777e..cba102b45 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/AuthenticationBuilder.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/AuthenticationBuilder.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.repository; +package org.apache.maven.resolver.util.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,8 +24,8 @@ import javax.net.ssl.HostnameVerifier; -import org.eclipse.aether.repository.Authentication; -import org.eclipse.aether.repository.AuthenticationContext; +import org.apache.maven.resolver.repository.Authentication; +import org.apache.maven.resolver.repository.AuthenticationContext; /** * A utility class to build authentication info for repositories and proxies. diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ChainedAuthentication.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/ChainedAuthentication.java similarity index 93% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ChainedAuthentication.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/ChainedAuthentication.java index b7c2dd1dd..6839ad389 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ChainedAuthentication.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/ChainedAuthentication.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.repository; +package org.apache.maven.resolver.util.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,9 +23,9 @@ import java.util.Collection; import java.util.Map; -import org.eclipse.aether.repository.Authentication; -import org.eclipse.aether.repository.AuthenticationContext; -import org.eclipse.aether.repository.AuthenticationDigest; +import org.apache.maven.resolver.repository.Authentication; +import org.apache.maven.resolver.repository.AuthenticationContext; +import org.apache.maven.resolver.repository.AuthenticationDigest; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ChainedWorkspaceReader.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/ChainedWorkspaceReader.java similarity index 95% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ChainedWorkspaceReader.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/ChainedWorkspaceReader.java index 024d718e7..019bf15f2 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ChainedWorkspaceReader.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/ChainedWorkspaceReader.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.repository; +package org.apache.maven.resolver.util.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,9 +26,9 @@ import java.util.LinkedHashSet; import java.util.List; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.repository.WorkspaceReader; -import org.eclipse.aether.repository.WorkspaceRepository; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.repository.WorkspaceReader; +import org.apache.maven.resolver.repository.WorkspaceRepository; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ComponentAuthentication.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/ComponentAuthentication.java similarity index 92% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ComponentAuthentication.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/ComponentAuthentication.java index d73a0f503..f21b33c44 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ComponentAuthentication.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/ComponentAuthentication.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.repository; +package org.apache.maven.resolver.util.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,9 +22,9 @@ import java.util.Map; import static java.util.Objects.requireNonNull; -import org.eclipse.aether.repository.Authentication; -import org.eclipse.aether.repository.AuthenticationContext; -import org.eclipse.aether.repository.AuthenticationDigest; +import org.apache.maven.resolver.repository.Authentication; +import org.apache.maven.resolver.repository.AuthenticationContext; +import org.apache.maven.resolver.repository.AuthenticationDigest; /** * Authentication block that manages a single authentication key and its component value. In this context, component diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ConservativeAuthenticationSelector.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/ConservativeAuthenticationSelector.java similarity index 89% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ConservativeAuthenticationSelector.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/ConservativeAuthenticationSelector.java index 04f60f8c4..7ea9d1756 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ConservativeAuthenticationSelector.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/ConservativeAuthenticationSelector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.repository; +package org.apache.maven.resolver.util.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,9 +21,9 @@ import static java.util.Objects.requireNonNull; -import org.eclipse.aether.repository.Authentication; -import org.eclipse.aether.repository.AuthenticationSelector; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.repository.Authentication; +import org.apache.maven.resolver.repository.AuthenticationSelector; +import org.apache.maven.resolver.repository.RemoteRepository; /** * An authentication selector that delegates to another selector but only if a repository has no authentication data diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ConservativeProxySelector.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/ConservativeProxySelector.java similarity index 89% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ConservativeProxySelector.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/ConservativeProxySelector.java index bc7eebd91..5c088ebb3 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ConservativeProxySelector.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/ConservativeProxySelector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.repository; +package org.apache.maven.resolver.util.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,9 +21,9 @@ import static java.util.Objects.requireNonNull; -import org.eclipse.aether.repository.Proxy; -import org.eclipse.aether.repository.ProxySelector; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.repository.Proxy; +import org.apache.maven.resolver.repository.ProxySelector; +import org.apache.maven.resolver.repository.RemoteRepository; /** * A proxy selector that delegates to another selector but only if a repository has no proxy yet. If a proxy has already diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/DefaultAuthenticationSelector.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/DefaultAuthenticationSelector.java similarity index 89% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/DefaultAuthenticationSelector.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/DefaultAuthenticationSelector.java index d631222ee..e85ddbb97 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/DefaultAuthenticationSelector.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/DefaultAuthenticationSelector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.repository; +package org.apache.maven.resolver.util.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,9 +22,9 @@ import java.util.HashMap; import java.util.Map; -import org.eclipse.aether.repository.Authentication; -import org.eclipse.aether.repository.AuthenticationSelector; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.repository.Authentication; +import org.apache.maven.resolver.repository.AuthenticationSelector; +import org.apache.maven.resolver.repository.RemoteRepository; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/DefaultMirrorSelector.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/DefaultMirrorSelector.java similarity index 98% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/DefaultMirrorSelector.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/DefaultMirrorSelector.java index dfb51c50d..754c659d2 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/DefaultMirrorSelector.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/DefaultMirrorSelector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.repository; +package org.apache.maven.resolver.util.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,8 +23,8 @@ import java.util.Collections; import java.util.List; -import org.eclipse.aether.repository.MirrorSelector; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.repository.MirrorSelector; +import org.apache.maven.resolver.repository.RemoteRepository; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/DefaultProxySelector.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/DefaultProxySelector.java similarity index 95% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/DefaultProxySelector.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/DefaultProxySelector.java index 9e0d52090..0f994659a 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/DefaultProxySelector.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/DefaultProxySelector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.repository; +package org.apache.maven.resolver.util.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -28,9 +28,9 @@ import java.util.StringTokenizer; import java.util.regex.Pattern; -import org.eclipse.aether.repository.Proxy; -import org.eclipse.aether.repository.ProxySelector; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.repository.Proxy; +import org.apache.maven.resolver.repository.ProxySelector; +import org.apache.maven.resolver.repository.RemoteRepository; /** * A simple proxy selector that selects the first matching proxy from a list of configured proxies. diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/JreProxySelector.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/JreProxySelector.java similarity index 93% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/JreProxySelector.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/JreProxySelector.java index b99e7e880..2699690ab 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/JreProxySelector.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/JreProxySelector.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.repository; +package org.apache.maven.resolver.util.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -29,12 +29,12 @@ import java.util.Map; import java.util.UUID; -import org.eclipse.aether.repository.Authentication; -import org.eclipse.aether.repository.AuthenticationContext; -import org.eclipse.aether.repository.AuthenticationDigest; -import org.eclipse.aether.repository.Proxy; -import org.eclipse.aether.repository.ProxySelector; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.repository.Authentication; +import org.apache.maven.resolver.repository.AuthenticationContext; +import org.apache.maven.resolver.repository.AuthenticationDigest; +import org.apache.maven.resolver.repository.Proxy; +import org.apache.maven.resolver.repository.ProxySelector; +import org.apache.maven.resolver.repository.RemoteRepository; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/SecretAuthentication.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/SecretAuthentication.java similarity index 95% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/SecretAuthentication.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/SecretAuthentication.java index bb7c5bc4b..9e89403d4 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/SecretAuthentication.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/SecretAuthentication.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.repository; +package org.apache.maven.resolver.util.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,9 +25,9 @@ import static java.util.Objects.requireNonNull; -import org.eclipse.aether.repository.Authentication; -import org.eclipse.aether.repository.AuthenticationContext; -import org.eclipse.aether.repository.AuthenticationDigest; +import org.apache.maven.resolver.repository.Authentication; +import org.apache.maven.resolver.repository.AuthenticationContext; +import org.apache.maven.resolver.repository.AuthenticationDigest; /** * Authentication block that manages a single authentication key and its secret string value (password, passphrase). diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/SimpleArtifactDescriptorPolicy.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/SimpleArtifactDescriptorPolicy.java similarity index 89% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/SimpleArtifactDescriptorPolicy.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/SimpleArtifactDescriptorPolicy.java index 3f6831d34..ca3856902 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/SimpleArtifactDescriptorPolicy.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/SimpleArtifactDescriptorPolicy.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.repository; +package org.apache.maven.resolver.util.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.resolution.ArtifactDescriptorPolicy; -import org.eclipse.aether.resolution.ArtifactDescriptorPolicyRequest; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.resolution.ArtifactDescriptorPolicy; +import org.apache.maven.resolver.resolution.ArtifactDescriptorPolicyRequest; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/SimpleResolutionErrorPolicy.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/SimpleResolutionErrorPolicy.java similarity index 89% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/SimpleResolutionErrorPolicy.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/SimpleResolutionErrorPolicy.java index d56266ee7..4743a4697 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/SimpleResolutionErrorPolicy.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/SimpleResolutionErrorPolicy.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.repository; +package org.apache.maven.resolver.util.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,11 +19,11 @@ * under the License. */ -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.metadata.Metadata; -import org.eclipse.aether.resolution.ResolutionErrorPolicy; -import org.eclipse.aether.resolution.ResolutionErrorPolicyRequest; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.metadata.Metadata; +import org.apache.maven.resolver.resolution.ResolutionErrorPolicy; +import org.apache.maven.resolver.resolution.ResolutionErrorPolicyRequest; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/StringAuthentication.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/StringAuthentication.java similarity index 91% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/StringAuthentication.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/StringAuthentication.java index 74edfb866..387bf9b3f 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/StringAuthentication.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/StringAuthentication.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.repository; +package org.apache.maven.resolver.util.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,9 +24,9 @@ import static java.util.Objects.requireNonNull; -import org.eclipse.aether.repository.Authentication; -import org.eclipse.aether.repository.AuthenticationContext; -import org.eclipse.aether.repository.AuthenticationDigest; +import org.apache.maven.resolver.repository.Authentication; +import org.apache.maven.resolver.repository.AuthenticationContext; +import org.apache.maven.resolver.repository.AuthenticationDigest; /** * Authentication block that manages a single authentication key and its string value. diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/package-info.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/package-info.java similarity index 94% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/package-info.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/package-info.java index 1c0a194a7..41f8ce911 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/package-info.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/repository/package-info.java @@ -20,5 +20,5 @@ /** * Ready-to-use selectors for authentication, proxies and mirrors and a few other repository related utilities. */ -package org.eclipse.aether.util.repository; +package org.apache.maven.resolver.util.repository; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersion.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/version/GenericVersion.java similarity index 99% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersion.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/version/GenericVersion.java index e4302670f..009304e31 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersion.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/version/GenericVersion.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.version; +package org.apache.maven.resolver.util.version; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -27,7 +27,7 @@ import java.util.Map; import java.util.TreeMap; -import org.eclipse.aether.version.Version; +import org.apache.maven.resolver.version.Version; /** * A generic version, that is a version that accepts any input string and tries to apply common sense sorting. See diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionConstraint.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/version/GenericVersionConstraint.java similarity index 93% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionConstraint.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/version/GenericVersionConstraint.java index 8186941f8..556ddff56 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionConstraint.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/version/GenericVersionConstraint.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.version; +package org.apache.maven.resolver.util.version; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,9 +21,9 @@ import static java.util.Objects.requireNonNull; -import org.eclipse.aether.version.Version; -import org.eclipse.aether.version.VersionConstraint; -import org.eclipse.aether.version.VersionRange; +import org.apache.maven.resolver.version.Version; +import org.apache.maven.resolver.version.VersionConstraint; +import org.apache.maven.resolver.version.VersionRange; import java.util.Objects; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionRange.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/version/GenericVersionRange.java similarity index 96% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionRange.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/version/GenericVersionRange.java index 7346dcf46..cbc75763a 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionRange.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/version/GenericVersionRange.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.version; +package org.apache.maven.resolver.util.version; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.eclipse.aether.version.InvalidVersionSpecificationException; -import org.eclipse.aether.version.Version; -import org.eclipse.aether.version.VersionRange; +import org.apache.maven.resolver.version.InvalidVersionSpecificationException; +import org.apache.maven.resolver.version.Version; +import org.apache.maven.resolver.version.VersionRange; import java.util.Objects; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionScheme.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/version/GenericVersionScheme.java similarity index 93% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionScheme.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/version/GenericVersionScheme.java index 9b87abd46..2e4f7fcc4 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionScheme.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/version/GenericVersionScheme.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.version; +package org.apache.maven.resolver.util.version; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,11 +22,11 @@ import java.util.ArrayList; import java.util.Collection; -import org.eclipse.aether.version.InvalidVersionSpecificationException; -import org.eclipse.aether.version.Version; -import org.eclipse.aether.version.VersionConstraint; -import org.eclipse.aether.version.VersionRange; -import org.eclipse.aether.version.VersionScheme; +import org.apache.maven.resolver.version.InvalidVersionSpecificationException; +import org.apache.maven.resolver.version.Version; +import org.apache.maven.resolver.version.VersionConstraint; +import org.apache.maven.resolver.version.VersionRange; +import org.apache.maven.resolver.version.VersionScheme; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/UnionVersionRange.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/version/UnionVersionRange.java similarity index 96% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/version/UnionVersionRange.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/version/UnionVersionRange.java index 87ec1906e..96b5cc722 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/UnionVersionRange.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/version/UnionVersionRange.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.version; +package org.apache.maven.resolver.util.version; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,8 +25,8 @@ import java.util.HashSet; import java.util.Set; -import org.eclipse.aether.version.Version; -import org.eclipse.aether.version.VersionRange; +import org.apache.maven.resolver.version.Version; +import org.apache.maven.resolver.version.VersionRange; /** * A union of version ranges. diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/package-info.java b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/version/package-info.java similarity index 95% rename from maven-resolver-util/src/main/java/org/eclipse/aether/util/version/package-info.java rename to maven-resolver-util/src/main/java/org/apache/maven/resolver/util/version/package-info.java index 18dc724b4..e4358f139 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/package-info.java +++ b/maven-resolver-util/src/main/java/org/apache/maven/resolver/util/version/package-info.java @@ -20,5 +20,5 @@ /** * Ready-to-use version schemes for parsing/comparing versions. */ -package org.eclipse.aether.util.version; +package org.apache.maven.resolver.util.version; diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/ChecksumUtilTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/ChecksumUtilTest.java similarity index 98% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/ChecksumUtilTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/ChecksumUtilTest.java index 1c5a6173c..4414a9337 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/ChecksumUtilTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/ChecksumUtilTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util; +package org.apache.maven.resolver.util; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ * under the License. */ -import static org.eclipse.aether.internal.test.util.TestFileUtils.*; +import static org.apache.maven.resolver.internal.test.util.TestFileUtils.*; import static org.junit.Assert.*; import java.io.File; diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/ConfigUtilsTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/ConfigUtilsTest.java similarity index 99% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/ConfigUtilsTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/ConfigUtilsTest.java index 0c498121d..1c0d4690e 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/ConfigUtilsTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/ConfigUtilsTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util; +package org.apache.maven.resolver.util; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/StringUtilsTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/StringUtilsTest.java similarity index 93% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/StringUtilsTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/StringUtilsTest.java index d0a373b0b..1fcff4844 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/StringUtilsTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/StringUtilsTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util; +package org.apache.maven.resolver.util; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,7 +21,6 @@ import static org.junit.Assert.*; -import org.eclipse.aether.util.StringUtils; import org.junit.Test; @SuppressWarnings( "deprecation" ) diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/artifact/ArtifactIdUtilsTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/artifact/ArtifactIdUtilsTest.java similarity index 98% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/artifact/ArtifactIdUtilsTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/artifact/ArtifactIdUtilsTest.java index 6b382b72f..955453fc3 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/artifact/ArtifactIdUtilsTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/artifact/ArtifactIdUtilsTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.artifact; +package org.apache.maven.resolver.util.artifact; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,8 +21,8 @@ import static org.junit.Assert.*; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; import org.junit.Test; /** diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/artifact/SubArtifactTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/artifact/SubArtifactTest.java similarity index 96% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/artifact/SubArtifactTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/artifact/SubArtifactTest.java index b03194fed..901fc723b 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/artifact/SubArtifactTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/artifact/SubArtifactTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.artifact; +package org.apache.maven.resolver.util.artifact; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,9 +26,8 @@ import java.util.HashMap; import java.util.Map; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.util.artifact.SubArtifact; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; import org.junit.Test; /** diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/AbstractDependencyFilterTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/filter/AbstractDependencyFilterTest.java similarity index 90% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/AbstractDependencyFilterTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/filter/AbstractDependencyFilterTest.java index f8bc5f4a2..a94ade77a 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/AbstractDependencyFilterTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/filter/AbstractDependencyFilterTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.filter; +package org.apache.maven.resolver.util.filter; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,8 +21,8 @@ import java.util.List; -import org.eclipse.aether.graph.DependencyFilter; -import org.eclipse.aether.graph.DependencyNode; +import org.apache.maven.resolver.graph.DependencyFilter; +import org.apache.maven.resolver.graph.DependencyNode; import static java.util.Objects.requireNonNull; diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/AndDependencyFilterTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/filter/AndDependencyFilterTest.java similarity index 94% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/AndDependencyFilterTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/filter/AndDependencyFilterTest.java index 7ddc666fe..cd696eb9f 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/AndDependencyFilterTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/filter/AndDependencyFilterTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.filter; +package org.apache.maven.resolver.util.filter; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,10 +25,9 @@ import java.util.LinkedList; import java.util.List; -import org.eclipse.aether.graph.DependencyFilter; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.internal.test.util.NodeBuilder; -import org.eclipse.aether.util.filter.AndDependencyFilter; +import org.apache.maven.resolver.graph.DependencyFilter; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.internal.test.util.NodeBuilder; import org.junit.Test; public class AndDependencyFilterTest diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/DependencyFilterUtilsTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/filter/DependencyFilterUtilsTest.java similarity index 95% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/DependencyFilterUtilsTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/filter/DependencyFilterUtilsTest.java index 28bde572f..ada50cf50 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/DependencyFilterUtilsTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/filter/DependencyFilterUtilsTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.filter; +package org.apache.maven.resolver.util.filter; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,10 +24,9 @@ import java.util.Collections; import java.util.List; -import org.eclipse.aether.graph.DependencyFilter; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.internal.test.util.NodeBuilder; -import org.eclipse.aether.util.filter.DependencyFilterUtils; +import org.apache.maven.resolver.graph.DependencyFilter; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.internal.test.util.NodeBuilder; import org.junit.Test; /** diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/ExclusionDependencyFilterTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/filter/ExclusionDependencyFilterTest.java similarity index 90% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/ExclusionDependencyFilterTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/filter/ExclusionDependencyFilterTest.java index 37fca1069..75ac6a3ad 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/ExclusionDependencyFilterTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/filter/ExclusionDependencyFilterTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.filter; +package org.apache.maven.resolver.util.filter; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,9 +25,8 @@ import java.util.LinkedList; import java.util.List; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.internal.test.util.NodeBuilder; -import org.eclipse.aether.util.filter.ExclusionsDependencyFilter; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.internal.test.util.NodeBuilder; import org.junit.Test; public class ExclusionDependencyFilterTest diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/OrDependencyFilterTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/filter/OrDependencyFilterTest.java similarity index 93% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/OrDependencyFilterTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/filter/OrDependencyFilterTest.java index a9f0774e3..eb98b6b9c 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/OrDependencyFilterTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/filter/OrDependencyFilterTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.filter; +package org.apache.maven.resolver.util.filter; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,11 +25,9 @@ import java.util.LinkedList; import java.util.List; -import org.eclipse.aether.graph.DependencyFilter; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.internal.test.util.NodeBuilder; -import org.eclipse.aether.util.filter.AndDependencyFilter; -import org.eclipse.aether.util.filter.OrDependencyFilter; +import org.apache.maven.resolver.graph.DependencyFilter; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.internal.test.util.NodeBuilder; import org.junit.Test; public class OrDependencyFilterTest diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilterTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/filter/PatternExclusionsDependencyFilterTest.java similarity index 96% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilterTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/filter/PatternExclusionsDependencyFilterTest.java index 429668258..a09002ac9 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilterTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/filter/PatternExclusionsDependencyFilterTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.filter; +package org.apache.maven.resolver.util.filter; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,11 +24,10 @@ import java.util.LinkedList; import java.util.List; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.internal.test.util.NodeBuilder; -import org.eclipse.aether.util.filter.PatternExclusionsDependencyFilter; -import org.eclipse.aether.util.version.GenericVersionScheme; -import org.eclipse.aether.version.VersionScheme; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.internal.test.util.NodeBuilder; +import org.apache.maven.resolver.util.version.GenericVersionScheme; +import org.apache.maven.resolver.version.VersionScheme; import org.junit.Test; public class PatternExclusionsDependencyFilterTest diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilterTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/filter/PatternInclusionsDependencyFilterTest.java similarity index 96% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilterTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/filter/PatternInclusionsDependencyFilterTest.java index 50c8b8a5b..859e5dbb3 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilterTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/filter/PatternInclusionsDependencyFilterTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.filter; +package org.apache.maven.resolver.util.filter; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,11 +24,10 @@ import java.util.LinkedList; import java.util.List; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.internal.test.util.NodeBuilder; -import org.eclipse.aether.util.filter.PatternInclusionsDependencyFilter; -import org.eclipse.aether.util.version.GenericVersionScheme; -import org.eclipse.aether.version.VersionScheme; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.internal.test.util.NodeBuilder; +import org.apache.maven.resolver.util.version.GenericVersionScheme; +import org.apache.maven.resolver.version.VersionScheme; import org.junit.Test; public class PatternInclusionsDependencyFilterTest diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/ScopeDependencyFilterTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/filter/ScopeDependencyFilterTest.java similarity index 93% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/ScopeDependencyFilterTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/filter/ScopeDependencyFilterTest.java index 50b2c5486..760a91656 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/ScopeDependencyFilterTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/filter/ScopeDependencyFilterTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.filter; +package org.apache.maven.resolver.util.filter; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,9 +25,8 @@ import java.util.LinkedList; import java.util.List; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.internal.test.util.NodeBuilder; -import org.eclipse.aether.util.filter.ScopeDependencyFilter; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.internal.test.util.NodeBuilder; import org.junit.Test; public class ScopeDependencyFilterTest diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManagerTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/manager/ClassicDependencyManagerTest.java similarity index 81% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManagerTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/manager/ClassicDependencyManagerTest.java index 25935858f..64ee33ffa 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManagerTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/manager/ClassicDependencyManagerTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.manager; +package org.apache.maven.resolver.util.graph.manager; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,14 +23,14 @@ import java.util.Arrays; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.collection.DependencyManagement; -import org.eclipse.aether.collection.DependencyManager; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.internal.test.util.TestUtils; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.collection.DependencyCollectionContext; +import org.apache.maven.resolver.collection.DependencyManagement; +import org.apache.maven.resolver.collection.DependencyManager; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.internal.test.util.TestUtils; import org.junit.Before; import org.junit.Test; diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/AndDependencySelectorTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/selector/AndDependencySelectorTest.java similarity index 94% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/AndDependencySelectorTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/selector/AndDependencySelectorTest.java index f49456b34..4ea2410bb 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/AndDependencySelectorTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/selector/AndDependencySelectorTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.selector; +package org.apache.maven.resolver.util.graph.selector; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,12 +22,12 @@ import static java.util.Objects.requireNonNull; import static org.junit.Assert.*; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.collection.DependencySelector; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.internal.test.util.TestUtils; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.collection.DependencyCollectionContext; +import org.apache.maven.resolver.collection.DependencySelector; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.internal.test.util.TestUtils; import org.junit.Test; import java.util.Collections; diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/ExclusionDependencySelectorTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/selector/ExclusionDependencySelectorTest.java similarity index 91% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/ExclusionDependencySelectorTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/selector/ExclusionDependencySelectorTest.java index 67081ba9a..830754441 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/ExclusionDependencySelectorTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/selector/ExclusionDependencySelectorTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.selector; +package org.apache.maven.resolver.util.graph.selector; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,7 +21,7 @@ import static org.junit.Assert.*; -import org.eclipse.aether.graph.Exclusion; +import org.apache.maven.resolver.graph.Exclusion; import org.junit.Test; import java.util.Collections; diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/OptionalDependencySelectorTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/selector/OptionalDependencySelectorTest.java similarity index 95% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/OptionalDependencySelectorTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/selector/OptionalDependencySelectorTest.java index b2c370826..15e0b5612 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/OptionalDependencySelectorTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/selector/OptionalDependencySelectorTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.selector; +package org.apache.maven.resolver.util.graph.selector; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/ScopeDependencySelectorTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/selector/ScopeDependencySelectorTest.java similarity index 95% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/ScopeDependencySelectorTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/selector/ScopeDependencySelectorTest.java index 7d842586b..7acefe158 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/ScopeDependencySelectorTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/selector/ScopeDependencySelectorTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.selector; +package org.apache.maven.resolver.util.graph.selector; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/StaticDependencySelectorTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/selector/StaticDependencySelectorTest.java similarity index 95% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/StaticDependencySelectorTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/selector/StaticDependencySelectorTest.java index 79ccce63e..ad32845df 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/StaticDependencySelectorTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/selector/StaticDependencySelectorTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.selector; +package org.apache.maven.resolver.util.graph.selector; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/AbstractDependencyGraphTransformerTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/AbstractDependencyGraphTransformerTest.java similarity index 87% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/AbstractDependencyGraphTransformerTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/AbstractDependencyGraphTransformerTest.java index 372be11c4..ec2e3ce7c 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/AbstractDependencyGraphTransformerTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/AbstractDependencyGraphTransformerTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.transformer; +package org.apache.maven.resolver.util.graph.transformer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,12 +24,12 @@ import java.util.LinkedList; import java.util.List; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.collection.DependencyGraphTransformationContext; -import org.eclipse.aether.collection.DependencyGraphTransformer; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.internal.test.util.DependencyGraphParser; -import org.eclipse.aether.internal.test.util.TestUtils; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.collection.DependencyGraphTransformationContext; +import org.apache.maven.resolver.collection.DependencyGraphTransformer; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.internal.test.util.DependencyGraphParser; +import org.apache.maven.resolver.internal.test.util.TestUtils; import org.junit.After; import org.junit.Before; diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictIdSorterTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/ConflictIdSorterTest.java similarity index 90% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictIdSorterTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/ConflictIdSorterTest.java index 4f4e03196..56b1f41d6 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictIdSorterTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/ConflictIdSorterTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.transformer; +package org.apache.maven.resolver.util.graph.transformer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,11 +26,9 @@ import java.util.List; import java.util.Queue; -import org.eclipse.aether.collection.DependencyGraphTransformer; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.internal.test.util.DependencyGraphParser; -import org.eclipse.aether.util.graph.transformer.ConflictIdSorter; -import org.eclipse.aether.util.graph.transformer.TransformationContextKeys; +import org.apache.maven.resolver.collection.DependencyGraphTransformer; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.internal.test.util.DependencyGraphParser; import org.junit.Test; /** diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictMarkerTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/ConflictMarkerTest.java similarity index 91% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictMarkerTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/ConflictMarkerTest.java index 6a81d5176..131044f83 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictMarkerTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/ConflictMarkerTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.transformer; +package org.apache.maven.resolver.util.graph.transformer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,11 +23,9 @@ import java.util.Map; -import org.eclipse.aether.collection.DependencyGraphTransformer; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.internal.test.util.DependencyGraphParser; -import org.eclipse.aether.util.graph.transformer.ConflictMarker; -import org.eclipse.aether.util.graph.transformer.TransformationContextKeys; +import org.apache.maven.resolver.collection.DependencyGraphTransformer; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.internal.test.util.DependencyGraphParser; import org.junit.Test; /** diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictResolverTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/ConflictResolverTest.java similarity index 92% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictResolverTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/ConflictResolverTest.java index 40410a357..f18f565b7 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictResolverTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/ConflictResolverTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.transformer; +package org.apache.maven.resolver.util.graph.transformer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,14 +19,14 @@ * under the License. */ -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.graph.DefaultDependencyNode; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.internal.test.util.TestUtils; -import org.eclipse.aether.internal.test.util.TestVersion; -import org.eclipse.aether.internal.test.util.TestVersionConstraint; +import org.apache.maven.resolver.RepositoryException; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.graph.DefaultDependencyNode; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.internal.test.util.TestUtils; +import org.apache.maven.resolver.internal.test.util.TestVersion; +import org.apache.maven.resolver.internal.test.util.TestVersionConstraint; import org.junit.Test; import java.util.ArrayList; diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaDependencyContextRefinerTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/JavaDependencyContextRefinerTest.java similarity index 91% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaDependencyContextRefinerTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/JavaDependencyContextRefinerTest.java index bb0d65a36..b07982959 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaDependencyContextRefinerTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/JavaDependencyContextRefinerTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.transformer; +package org.apache.maven.resolver.util.graph.transformer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,10 +21,9 @@ import static org.junit.Assert.*; -import org.eclipse.aether.collection.DependencyGraphTransformer; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.internal.test.util.DependencyGraphParser; -import org.eclipse.aether.util.graph.transformer.JavaDependencyContextRefiner; +import org.apache.maven.resolver.collection.DependencyGraphTransformer; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.internal.test.util.DependencyGraphParser; import org.junit.Test; /** diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelectorTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/JavaScopeSelectorTest.java similarity index 96% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelectorTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/JavaScopeSelectorTest.java index 3098910d8..555105a11 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelectorTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/JavaScopeSelectorTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.transformer; +package org.apache.maven.resolver.util.graph.transformer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,9 +23,9 @@ import java.util.Locale; -import org.eclipse.aether.collection.DependencyGraphTransformer; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.internal.test.util.DependencyGraphParser; +import org.apache.maven.resolver.collection.DependencyGraphTransformer; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.internal.test.util.DependencyGraphParser; import org.junit.Test; public class JavaScopeSelectorTest diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/NearestVersionSelectorTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/NearestVersionSelectorTest.java similarity index 96% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/NearestVersionSelectorTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/NearestVersionSelectorTest.java index b71adab2b..efa30f5d3 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/NearestVersionSelectorTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/NearestVersionSelectorTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.transformer; +package org.apache.maven.resolver.util.graph.transformer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,9 +23,9 @@ import java.util.List; -import org.eclipse.aether.collection.UnsolvableVersionConflictException; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.internal.test.util.DependencyGraphParser; +import org.apache.maven.resolver.collection.UnsolvableVersionConflictException; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.internal.test.util.DependencyGraphParser; import org.junit.Test; /** diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/RootQueueTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/RootQueueTest.java similarity index 93% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/RootQueueTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/RootQueueTest.java index f609ed726..724b07ce2 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/RootQueueTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/RootQueueTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.transformer; +package org.apache.maven.resolver.util.graph.transformer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,8 +21,8 @@ import static org.junit.Assert.*; -import org.eclipse.aether.util.graph.transformer.ConflictIdSorter.ConflictId; -import org.eclipse.aether.util.graph.transformer.ConflictIdSorter.RootQueue; +import org.apache.maven.resolver.util.graph.transformer.ConflictIdSorter.ConflictId; +import org.apache.maven.resolver.util.graph.transformer.ConflictIdSorter.RootQueue; import org.junit.Test; public class RootQueueTest diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleConflictMarker.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/SimpleConflictMarker.java similarity index 85% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleConflictMarker.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/SimpleConflictMarker.java index 4a02f6f92..120c30103 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleConflictMarker.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/SimpleConflictMarker.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.transformer; +package org.apache.maven.resolver.util.graph.transformer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,12 +23,12 @@ import java.util.Map; import static java.util.Objects.requireNonNull; -import org.eclipse.aether.RepositoryException; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.collection.DependencyGraphTransformationContext; -import org.eclipse.aether.collection.DependencyGraphTransformer; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyNode; +import org.apache.maven.resolver.RepositoryException; +import org.apache.maven.resolver.artifact.Artifact; +import org.apache.maven.resolver.collection.DependencyGraphTransformationContext; +import org.apache.maven.resolver.collection.DependencyGraphTransformer; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.graph.DependencyNode; /** * Set "groupId:artId:classifier:extension" as conflict marker for every node. diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleOptionalitySelectorTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/SimpleOptionalitySelectorTest.java similarity index 91% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleOptionalitySelectorTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/SimpleOptionalitySelectorTest.java index c2b810237..7986a917d 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleOptionalitySelectorTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/transformer/SimpleOptionalitySelectorTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.transformer; +package org.apache.maven.resolver.util.graph.transformer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,9 +21,9 @@ import static org.junit.Assert.*; -import org.eclipse.aether.collection.DependencyGraphTransformer; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.internal.test.util.DependencyGraphParser; +import org.apache.maven.resolver.collection.DependencyGraphTransformer; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.internal.test.util.DependencyGraphParser; import org.junit.Test; public class SimpleOptionalitySelectorTest diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/traverser/AndDependencyTraverserTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/traverser/AndDependencyTraverserTest.java similarity index 92% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/traverser/AndDependencyTraverserTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/traverser/AndDependencyTraverserTest.java index 991807c94..aca1d7f77 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/traverser/AndDependencyTraverserTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/traverser/AndDependencyTraverserTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.traverser; +package org.apache.maven.resolver.util.graph.traverser; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,13 +22,13 @@ import static java.util.Objects.requireNonNull; import static org.junit.Assert.*; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.collection.DependencyTraverser; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.internal.test.util.TestFileUtils; -import org.eclipse.aether.internal.test.util.TestUtils; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.collection.DependencyCollectionContext; +import org.apache.maven.resolver.collection.DependencyTraverser; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.internal.test.util.TestFileUtils; +import org.apache.maven.resolver.internal.test.util.TestUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/traverser/FatArtifactTraverserTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/traverser/FatArtifactTraverserTest.java similarity index 85% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/traverser/FatArtifactTraverserTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/traverser/FatArtifactTraverserTest.java index a7982e340..a0b317ed9 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/traverser/FatArtifactTraverserTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/traverser/FatArtifactTraverserTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.traverser; +package org.apache.maven.resolver.util.graph.traverser; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,14 +24,14 @@ import java.util.Collections; import java.util.Map; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.ArtifactProperties; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.collection.DependencyTraverser; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.internal.test.util.TestFileUtils; -import org.eclipse.aether.internal.test.util.TestUtils; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.ArtifactProperties; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.collection.DependencyCollectionContext; +import org.apache.maven.resolver.collection.DependencyTraverser; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.internal.test.util.TestFileUtils; +import org.apache.maven.resolver.internal.test.util.TestUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/traverser/StaticDependencyTraverserTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/traverser/StaticDependencyTraverserTest.java similarity index 85% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/traverser/StaticDependencyTraverserTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/traverser/StaticDependencyTraverserTest.java index d47041c62..090b1290e 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/traverser/StaticDependencyTraverserTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/traverser/StaticDependencyTraverserTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.traverser; +package org.apache.maven.resolver.util.graph.traverser; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,13 +21,13 @@ import static org.junit.Assert.*; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.collection.DependencyTraverser; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.internal.test.util.TestFileUtils; -import org.eclipse.aether.internal.test.util.TestUtils; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.collection.DependencyCollectionContext; +import org.apache.maven.resolver.collection.DependencyTraverser; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.internal.test.util.TestFileUtils; +import org.apache.maven.resolver.internal.test.util.TestUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/AbstractVersionFilterTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/versions/AbstractVersionFilterTest.java similarity index 79% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/AbstractVersionFilterTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/versions/AbstractVersionFilterTest.java index 13fd4b01b..8ace96d88 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/AbstractVersionFilterTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/versions/AbstractVersionFilterTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.versions; +package org.apache.maven.resolver.util.graph.versions; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,17 +23,17 @@ import java.util.Iterator; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.collection.VersionFilter; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.internal.test.util.TestUtils; -import org.eclipse.aether.resolution.VersionRangeRequest; -import org.eclipse.aether.resolution.VersionRangeResult; -import org.eclipse.aether.util.version.GenericVersionScheme; -import org.eclipse.aether.version.InvalidVersionSpecificationException; -import org.eclipse.aether.version.Version; -import org.eclipse.aether.version.VersionScheme; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.artifact.DefaultArtifact; +import org.apache.maven.resolver.collection.VersionFilter; +import org.apache.maven.resolver.graph.Dependency; +import org.apache.maven.resolver.internal.test.util.TestUtils; +import org.apache.maven.resolver.resolution.VersionRangeRequest; +import org.apache.maven.resolver.resolution.VersionRangeResult; +import org.apache.maven.resolver.util.version.GenericVersionScheme; +import org.apache.maven.resolver.version.InvalidVersionSpecificationException; +import org.apache.maven.resolver.version.Version; +import org.apache.maven.resolver.version.VersionScheme; import org.junit.After; import org.junit.Before; diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ChainedVersionFilterTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/versions/ChainedVersionFilterTest.java similarity index 84% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ChainedVersionFilterTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/versions/ChainedVersionFilterTest.java index 6c0c75015..ff9e5747c 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ChainedVersionFilterTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/versions/ChainedVersionFilterTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.versions; +package org.apache.maven.resolver.util.graph.versions; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,12 +21,12 @@ import static org.junit.Assert.*; -import org.eclipse.aether.collection.DependencyCollectionContext; -import org.eclipse.aether.collection.VersionFilter; -import org.eclipse.aether.collection.VersionFilter.VersionFilterContext; -import org.eclipse.aether.util.graph.version.ChainedVersionFilter; -import org.eclipse.aether.util.graph.version.HighestVersionFilter; -import org.eclipse.aether.util.graph.version.SnapshotVersionFilter; +import org.apache.maven.resolver.collection.DependencyCollectionContext; +import org.apache.maven.resolver.collection.VersionFilter; +import org.apache.maven.resolver.collection.VersionFilter.VersionFilterContext; +import org.apache.maven.resolver.util.graph.version.ChainedVersionFilter; +import org.apache.maven.resolver.util.graph.version.HighestVersionFilter; +import org.apache.maven.resolver.util.graph.version.SnapshotVersionFilter; import org.junit.Test; public class ChainedVersionFilterTest diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ContextualSnapshotVersionFilterTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/versions/ContextualSnapshotVersionFilterTest.java similarity index 87% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ContextualSnapshotVersionFilterTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/versions/ContextualSnapshotVersionFilterTest.java index a9cb1a886..b1344e4ba 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ContextualSnapshotVersionFilterTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/versions/ContextualSnapshotVersionFilterTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.versions; +package org.apache.maven.resolver.util.graph.versions; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,10 +21,10 @@ import static org.junit.Assert.*; -import org.eclipse.aether.collection.VersionFilter; -import org.eclipse.aether.collection.VersionFilter.VersionFilterContext; -import org.eclipse.aether.util.graph.version.ContextualSnapshotVersionFilter; -import org.eclipse.aether.util.graph.version.SnapshotVersionFilter; +import org.apache.maven.resolver.collection.VersionFilter; +import org.apache.maven.resolver.collection.VersionFilter.VersionFilterContext; +import org.apache.maven.resolver.util.graph.version.ContextualSnapshotVersionFilter; +import org.apache.maven.resolver.util.graph.version.SnapshotVersionFilter; import org.junit.Test; public class ContextualSnapshotVersionFilterTest diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/HighestVersionFilterTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/versions/HighestVersionFilterTest.java similarity index 89% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/HighestVersionFilterTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/versions/HighestVersionFilterTest.java index 35a034a24..a57dec759 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/HighestVersionFilterTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/versions/HighestVersionFilterTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.versions; +package org.apache.maven.resolver.util.graph.versions; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,8 +21,8 @@ import static org.junit.Assert.*; -import org.eclipse.aether.collection.VersionFilter.VersionFilterContext; -import org.eclipse.aether.util.graph.version.HighestVersionFilter; +import org.apache.maven.resolver.collection.VersionFilter.VersionFilterContext; +import org.apache.maven.resolver.util.graph.version.HighestVersionFilter; import org.junit.Test; public class HighestVersionFilterTest diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/SnapshotVersionFilterTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/versions/SnapshotVersionFilterTest.java similarity index 89% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/SnapshotVersionFilterTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/versions/SnapshotVersionFilterTest.java index d7d27fcf7..6d8ab4587 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/SnapshotVersionFilterTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/versions/SnapshotVersionFilterTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.versions; +package org.apache.maven.resolver.util.graph.versions; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,8 +21,8 @@ import static org.junit.Assert.*; -import org.eclipse.aether.collection.VersionFilter.VersionFilterContext; -import org.eclipse.aether.util.graph.version.SnapshotVersionFilter; +import org.apache.maven.resolver.collection.VersionFilter.VersionFilterContext; +import org.apache.maven.resolver.util.graph.version.SnapshotVersionFilter; import org.junit.Test; public class SnapshotVersionFilterTest diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/FilteringDependencyVisitorTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/visitor/FilteringDependencyVisitorTest.java similarity index 90% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/FilteringDependencyVisitorTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/visitor/FilteringDependencyVisitorTest.java index 4e6a54376..5c73bfcc3 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/FilteringDependencyVisitorTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/visitor/FilteringDependencyVisitorTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.visitor; +package org.apache.maven.resolver.util.graph.visitor; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,9 +24,9 @@ import java.util.List; -import org.eclipse.aether.graph.DependencyFilter; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.internal.test.util.DependencyGraphParser; +import org.apache.maven.resolver.graph.DependencyFilter; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.internal.test.util.DependencyGraphParser; import org.junit.Test; public class FilteringDependencyVisitorTest diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PathRecordingDependencyVisitorTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/visitor/PathRecordingDependencyVisitorTest.java similarity index 95% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PathRecordingDependencyVisitorTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/visitor/PathRecordingDependencyVisitorTest.java index efd4f6c50..71ea44224 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PathRecordingDependencyVisitorTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/visitor/PathRecordingDependencyVisitorTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.visitor; +package org.apache.maven.resolver.util.graph.visitor; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,9 +24,9 @@ import java.util.List; -import org.eclipse.aether.graph.DependencyFilter; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.internal.test.util.DependencyGraphParser; +import org.apache.maven.resolver.graph.DependencyFilter; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.internal.test.util.DependencyGraphParser; import org.junit.Test; public class PathRecordingDependencyVisitorTest diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PostorderNodeListGeneratorTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/visitor/PostorderNodeListGeneratorTest.java similarity index 92% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PostorderNodeListGeneratorTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/visitor/PostorderNodeListGeneratorTest.java index 8d6f525f9..be0210a23 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PostorderNodeListGeneratorTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/visitor/PostorderNodeListGeneratorTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.visitor; +package org.apache.maven.resolver.util.graph.visitor; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,8 +23,8 @@ import java.util.List; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.internal.test.util.DependencyGraphParser; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.internal.test.util.DependencyGraphParser; import org.junit.Test; public class PostorderNodeListGeneratorTest diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PreorderNodeListGeneratorTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/visitor/PreorderNodeListGeneratorTest.java similarity index 92% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PreorderNodeListGeneratorTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/visitor/PreorderNodeListGeneratorTest.java index 200dd3bad..dd7d35660 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PreorderNodeListGeneratorTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/visitor/PreorderNodeListGeneratorTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.visitor; +package org.apache.maven.resolver.util.graph.visitor; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,8 +23,8 @@ import java.util.List; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.internal.test.util.DependencyGraphParser; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.internal.test.util.DependencyGraphParser; import org.junit.Test; public class PreorderNodeListGeneratorTest diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/TreeDependencyVisitorTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/visitor/TreeDependencyVisitorTest.java similarity index 89% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/TreeDependencyVisitorTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/visitor/TreeDependencyVisitorTest.java index 36cb6ace4..c239508fe 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/TreeDependencyVisitorTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/graph/visitor/TreeDependencyVisitorTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.graph.visitor; +package org.apache.maven.resolver.util.graph.visitor; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,9 +21,9 @@ import static org.junit.Assert.*; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.graph.DependencyVisitor; -import org.eclipse.aether.internal.test.util.DependencyGraphParser; +import org.apache.maven.resolver.graph.DependencyNode; +import org.apache.maven.resolver.graph.DependencyVisitor; +import org.apache.maven.resolver.internal.test.util.DependencyGraphParser; import org.junit.Test; public class TreeDependencyVisitorTest diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/listener/ChainedRepositoryListenerTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/listener/ChainedRepositoryListenerTest.java similarity index 89% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/listener/ChainedRepositoryListenerTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/listener/ChainedRepositoryListenerTest.java index 6eaa25b8c..b4a9a5e8f 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/listener/ChainedRepositoryListenerTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/listener/ChainedRepositoryListenerTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.listener; +package org.apache.maven.resolver.util.listener; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,8 +23,7 @@ import java.lang.reflect.Method; -import org.eclipse.aether.RepositoryListener; -import org.eclipse.aether.util.listener.ChainedRepositoryListener; +import org.apache.maven.resolver.RepositoryListener; import org.junit.Test; /** diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/listener/ChainedTransferListenerTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/listener/ChainedTransferListenerTest.java similarity index 89% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/listener/ChainedTransferListenerTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/listener/ChainedTransferListenerTest.java index 7e7e96947..ebc4f60a1 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/listener/ChainedTransferListenerTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/listener/ChainedTransferListenerTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.listener; +package org.apache.maven.resolver.util.listener; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,8 +23,7 @@ import java.lang.reflect.Method; -import org.eclipse.aether.transfer.TransferListener; -import org.eclipse.aether.util.listener.ChainedTransferListener; +import org.apache.maven.resolver.transfer.TransferListener; import org.junit.Test; /** diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/ComponentAuthenticationTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/repository/ComponentAuthenticationTest.java similarity index 88% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/ComponentAuthenticationTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/repository/ComponentAuthenticationTest.java index 17386daa3..b0a1edd3a 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/ComponentAuthenticationTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/repository/ComponentAuthenticationTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.repository; +package org.apache.maven.resolver.util.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,12 +21,12 @@ import static org.junit.Assert.*; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.Authentication; -import org.eclipse.aether.repository.AuthenticationContext; -import org.eclipse.aether.repository.AuthenticationDigest; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.Authentication; +import org.apache.maven.resolver.repository.AuthenticationContext; +import org.apache.maven.resolver.repository.AuthenticationDigest; +import org.apache.maven.resolver.repository.RemoteRepository; import org.junit.Test; public class ComponentAuthenticationTest diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/DefaultProxySelectorTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/repository/DefaultProxySelectorTest.java similarity index 95% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/DefaultProxySelectorTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/repository/DefaultProxySelectorTest.java index 3eacbd5c7..8ffa3c836 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/DefaultProxySelectorTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/repository/DefaultProxySelectorTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.repository; +package org.apache.maven.resolver.util.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,7 +21,6 @@ import static org.junit.Assert.*; -import org.eclipse.aether.util.repository.DefaultProxySelector; import org.junit.Test; /** diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/JreProxySelectorTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/repository/JreProxySelectorTest.java similarity index 93% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/JreProxySelectorTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/repository/JreProxySelectorTest.java index 5e8d2740b..074fb5e1f 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/JreProxySelectorTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/repository/JreProxySelectorTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.repository; +package org.apache.maven.resolver.util.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -32,12 +32,12 @@ import java.util.Collections; import java.util.List; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.repository.Authentication; -import org.eclipse.aether.repository.AuthenticationContext; -import org.eclipse.aether.repository.Proxy; -import org.eclipse.aether.repository.ProxySelector; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.repository.Authentication; +import org.apache.maven.resolver.repository.AuthenticationContext; +import org.apache.maven.resolver.repository.Proxy; +import org.apache.maven.resolver.repository.ProxySelector; +import org.apache.maven.resolver.repository.RemoteRepository; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/SecretAuthenticationTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/repository/SecretAuthenticationTest.java similarity index 88% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/SecretAuthenticationTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/repository/SecretAuthenticationTest.java index f7045ac4e..9eda9e0ce 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/SecretAuthenticationTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/repository/SecretAuthenticationTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.repository; +package org.apache.maven.resolver.util.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,12 +21,12 @@ import static org.junit.Assert.*; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.Authentication; -import org.eclipse.aether.repository.AuthenticationContext; -import org.eclipse.aether.repository.AuthenticationDigest; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.Authentication; +import org.apache.maven.resolver.repository.AuthenticationContext; +import org.apache.maven.resolver.repository.AuthenticationDigest; +import org.apache.maven.resolver.repository.RemoteRepository; import org.junit.Test; public class SecretAuthenticationTest diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/StringAuthenticationTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/repository/StringAuthenticationTest.java similarity index 88% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/StringAuthenticationTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/repository/StringAuthenticationTest.java index 6f3c52492..311bac0d2 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/StringAuthenticationTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/repository/StringAuthenticationTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.repository; +package org.apache.maven.resolver.util.repository; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,12 +21,12 @@ import static org.junit.Assert.*; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.repository.Authentication; -import org.eclipse.aether.repository.AuthenticationContext; -import org.eclipse.aether.repository.AuthenticationDigest; -import org.eclipse.aether.repository.RemoteRepository; +import org.apache.maven.resolver.DefaultRepositorySystemSession; +import org.apache.maven.resolver.RepositorySystemSession; +import org.apache.maven.resolver.repository.Authentication; +import org.apache.maven.resolver.repository.AuthenticationContext; +import org.apache.maven.resolver.repository.AuthenticationDigest; +import org.apache.maven.resolver.repository.RemoteRepository; import org.junit.Test; public class StringAuthenticationTest diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/AbstractVersionTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/version/AbstractVersionTest.java similarity index 96% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/version/AbstractVersionTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/version/AbstractVersionTest.java index 32f19f284..27945ae88 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/AbstractVersionTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/version/AbstractVersionTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.version; +package org.apache.maven.resolver.util.version; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,7 +23,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.eclipse.aether.version.Version; +import org.apache.maven.resolver.version.Version; /** */ diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionRangeTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/version/GenericVersionRangeTest.java similarity index 93% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionRangeTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/version/GenericVersionRangeTest.java index 08e9bce53..09f638982 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionRangeTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/version/GenericVersionRangeTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.version; +package org.apache.maven.resolver.util.version; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,11 +21,9 @@ import static org.junit.Assert.*; -import org.eclipse.aether.util.version.GenericVersion; -import org.eclipse.aether.util.version.GenericVersionRange; -import org.eclipse.aether.version.InvalidVersionSpecificationException; -import org.eclipse.aether.version.Version; -import org.eclipse.aether.version.VersionRange; +import org.apache.maven.resolver.version.InvalidVersionSpecificationException; +import org.apache.maven.resolver.version.Version; +import org.apache.maven.resolver.version.VersionRange; import org.junit.Test; public class GenericVersionRangeTest diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionSchemeTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/version/GenericVersionSchemeTest.java similarity index 92% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionSchemeTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/version/GenericVersionSchemeTest.java index 351a62953..90bb7f633 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionSchemeTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/version/GenericVersionSchemeTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.version; +package org.apache.maven.resolver.util.version; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,10 +21,8 @@ import static org.junit.Assert.*; -import org.eclipse.aether.util.version.GenericVersion; -import org.eclipse.aether.util.version.GenericVersionScheme; -import org.eclipse.aether.version.InvalidVersionSpecificationException; -import org.eclipse.aether.version.VersionConstraint; +import org.apache.maven.resolver.version.InvalidVersionSpecificationException; +import org.apache.maven.resolver.version.VersionConstraint; import org.junit.Before; import org.junit.Test; diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/version/GenericVersionTest.java similarity index 98% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/version/GenericVersionTest.java index 8d058e44e..3972130e8 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/version/GenericVersionTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.version; +package org.apache.maven.resolver.util.version; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,8 +21,7 @@ import java.util.Locale; -import org.eclipse.aether.util.version.GenericVersion; -import org.eclipse.aether.version.Version; +import org.apache.maven.resolver.version.Version; import org.junit.Test; /** diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/UnionVersionRangeTest.java b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/version/UnionVersionRangeTest.java similarity index 95% rename from maven-resolver-util/src/test/java/org/eclipse/aether/util/version/UnionVersionRangeTest.java rename to maven-resolver-util/src/test/java/org/apache/maven/resolver/util/version/UnionVersionRangeTest.java index 570b6b778..992da96a4 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/UnionVersionRangeTest.java +++ b/maven-resolver-util/src/test/java/org/apache/maven/resolver/util/version/UnionVersionRangeTest.java @@ -1,4 +1,4 @@ -package org.eclipse.aether.util.version; +package org.apache.maven.resolver.util.version; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,8 +23,8 @@ import java.util.Collections; -import org.eclipse.aether.version.InvalidVersionSpecificationException; -import org.eclipse.aether.version.VersionRange; +import org.apache.maven.resolver.version.InvalidVersionSpecificationException; +import org.apache.maven.resolver.version.VersionRange; import org.junit.Test; public class UnionVersionRangeTest diff --git a/pom.xml b/pom.xml index 27f530d71..3f03e57ac 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ org.apache.maven.resolver maven-resolver - 1.8.2-SNAPSHOT + 2.0.0-SNAPSHOT pom Maven Artifact Resolver @@ -79,7 +79,7 @@ 30.1-jre 1.0.1 1.7.36 - 2022-06-10T15:27:07Z + 2022-06-23T06:01:12Z @@ -330,27 +330,27 @@ API - org.eclipse.aether* + org.apache.mavem.resolver* SPI - org.eclipse.aether.spi* + org.apache.mavem.resolver.spi* Utilities - org.eclipse.aether.util* + org.apache.mavem.resolver.util* Repository Connectors - org.eclipse.aether.connector* + org.apache.mavem.resolver.connector* Transporters - org.eclipse.aether.transport* + org.apache.mavem.resolver.transport* Implementation - org.eclipse.aether.impl* + org.apache.mavem.resolver.impl* Demo Maven Plugin @@ -362,7 +362,7 @@ Internals - org.eclipse.aether.internal* + org.apache.mavem.resolver.internal* diff --git a/src/site/markdown/configuration.md b/src/site/markdown/configuration.md index 9115e0fda..f36265ad0 100644 --- a/src/site/markdown/configuration.md +++ b/src/site/markdown/configuration.md @@ -64,8 +64,8 @@ Option | Type | Description | Default Value | Supports Repo ID Suffix `aether.priority.` | float | The priority to use for a certain extension class. `class` can either be the fully qualified name or the simple name stands for fully qualified class name. If the class name ends with `Factory` that suffix could optionally be left out. | - | no `aether.priority.implicit` | boolean | Flag indicating whether the priorities of pluggable extensions are implicitly given by their iteration order such that the first extension has the highest priority. If set, an extension's built-in priority as well as any corresponding `aether.priority.` configuration properties are ignored when searching for a suitable implementation among the available extensions. This priority mode is meant for cases where the application will present/inject extensions in the desired search order. | `false` | no `aether.snapshotFilter` | boolean | Flag whether the `ContextualSnapshotVersionFilter` should be forced to ban snapshots. By default, snapshots are only filtered if the root artifact is not a snapshot. | `false` | no -`aether.syncContext.named.factory` | String | Name of the named lock factory implementing the `org.eclipse.aether.named.NamedLockFactory` interface. | `"rwlock-local"` | no -`aether.syncContext.named.nameMapper` | String | Name of name mapper implementing the `org.eclipse.aether.internal.impl.synccontext.named.NameMapper` interface. | `"gav"` | no +`aether.syncContext.named.factory` | String | Name of the named lock factory implementing the `NamedLockFactory` interface. | `"rwlock-local"` | no +`aether.syncContext.named.nameMapper` | String | Name of name mapper implementing the `NameMapper` interface. | `"gav"` | no `aether.syncContext.named.time` | long | Amount of time a synchronization context shall wait to obtain a lock. | 30 | no `aether.syncContext.named.time.unit` | long | Unit of the lock wait time. | `"SECONDS"` | no `aether.syncContext.named.static.name` | String | Lock name for the static name mapper. | `"static"` | no