Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] move to org.apache.maven package #186

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

[WIP] move to org.apache.maven package #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e1c25f1
bump version to 2.0.0-SNAPSHOT
olamy Jun 23, 2022
5d8bd5f
move to package org.apache.maven.resolver, bump version to 2.0.0
olamy Jun 23, 2022
5a851c2
remove ServiceLocator, still demo to fix
olamy Jun 25, 2022
9073a94
checkstyle fixes
olamy Jun 25, 2022
41510fa
skip those tests for now
olamy Jun 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion maven-resolver-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
<version>1.8.2-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>

<artifactId>maven-resolver-api</artifactId>
Expand Down
34 changes: 17 additions & 17 deletions ...actForwardingRepositorySystemSession.java → ...actForwardingRepositorySystemSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.eclipse.aether;
package org.apache.maven.resolver;

/*
* Licensed to the Apache Software Foundation (ASF) under one
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...se/aether/AbstractRepositoryListener.java → .../resolver/AbstractRepositoryListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.eclipse.aether;
package org.apache.maven.resolver;

/*
* Licensed to the Apache Software Foundation (ASF) under one
Expand Down
2 changes: 1 addition & 1 deletion ...lipse/aether/ConfigurationProperties.java → ...ven/resolver/ConfigurationProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.eclipse.aether;
package org.apache.maven.resolver;

/*
* Licensed to the Apache Software Foundation (ASF) under one
Expand Down
2 changes: 1 addition & 1 deletion ...clipse/aether/DefaultRepositoryCache.java → ...aven/resolver/DefaultRepositoryCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.eclipse.aether;
package org.apache.maven.resolver;

/*
* Licensed to the Apache Software Foundation (ASF) under one
Expand Down
52 changes: 26 additions & 26 deletions ...ether/DefaultRepositorySystemSession.java → ...olver/DefaultRepositorySystemSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.eclipse.aether;
package org.apache.maven.resolver;

/*
* Licensed to the Apache Software Foundation (ASF) under one
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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 )
{
Expand All @@ -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 )
{
Expand Down
2 changes: 1 addition & 1 deletion ...rg/eclipse/aether/DefaultSessionData.java → ...he/maven/resolver/DefaultSessionData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.eclipse.aether;
package org.apache.maven.resolver;

/*
* Licensed to the Apache Software Foundation (ASF) under one
Expand Down
2 changes: 1 addition & 1 deletion ...a/org/eclipse/aether/RepositoryCache.java → ...pache/maven/resolver/RepositoryCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.eclipse.aether;
package org.apache.maven.resolver;

/*
* Licensed to the Apache Software Foundation (ASF) under one
Expand Down
8 changes: 4 additions & 4 deletions ...a/org/eclipse/aether/RepositoryEvent.java → ...pache/maven/resolver/RepositoryEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.eclipse.aether;
package org.apache.maven.resolver;

/*
* Licensed to the Apache Software Foundation (ASF) under one
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...g/eclipse/aether/RepositoryException.java → ...e/maven/resolver/RepositoryException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.eclipse.aether;
package org.apache.maven.resolver;

/*
* Licensed to the Apache Software Foundation (ASF) under one
Expand Down
13 changes: 8 additions & 5 deletions ...rg/eclipse/aether/RepositoryListener.java → ...he/maven/resolver/RepositoryListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.eclipse.aether;
package org.apache.maven.resolver;

/*
* Licensed to the Apache Software Foundation (ASF) under one
Expand All @@ -19,15 +19,18 @@
* 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
* listeners need to inspect the event details carefully. Also, the listener may be called from an arbitrary thread.
* <em>Note:</em> 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.
*/
Expand All @@ -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}.
Expand All @@ -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}.
Expand Down
64 changes: 32 additions & 32 deletions .../org/eclipse/aether/RepositorySystem.java → ...ache/maven/resolver/RepositorySystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.eclipse.aether;
package org.apache.maven.resolver;

/*
* Licensed to the Apache Software Foundation (ASF) under one
Expand All @@ -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
Expand Down
41 changes: 21 additions & 20 deletions ...lipse/aether/RepositorySystemSession.java → ...ven/resolver/RepositorySystemSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.eclipse.aether;
package org.apache.maven.resolver;

/*
* Licensed to the Apache Software Foundation (ASF) under one
Expand All @@ -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
Expand Down Expand Up @@ -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();
Expand All @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion ...java/org/eclipse/aether/RequestTrace.java → ...g/apache/maven/resolver/RequestTrace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.eclipse.aether;
package org.apache.maven.resolver;

/*
* Licensed to the Apache Software Foundation (ASF) under one
Expand Down
2 changes: 1 addition & 1 deletion .../java/org/eclipse/aether/SessionData.java → ...rg/apache/maven/resolver/SessionData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.eclipse.aether;
package org.apache.maven.resolver;

/*
* Licensed to the Apache Software Foundation (ASF) under one
Expand Down
Loading