mirror of https://github.com/apache/maven.git
Cleanup checkstyle reported errors.
This commit is contained in:
Karl Heinz Marbaise
parent
b03062d2a0
commit
d4e299acec
|
|
@ -22,7 +22,9 @@ package org.apache.maven.artifact.repository;
|
|||
import org.apache.maven.artifact.UnknownRepositoryLayoutException;
|
||||
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
|
||||
|
||||
/** @author jdcasey */
|
||||
/**
|
||||
* @author jdcasey
|
||||
*/
|
||||
public interface ArtifactRepositoryFactory
|
||||
{
|
||||
String ROLE = ArtifactRepositoryFactory.class.getName();
|
||||
|
|
@ -36,18 +38,20 @@ public interface ArtifactRepositoryFactory
|
|||
throws UnknownRepositoryLayoutException;
|
||||
|
||||
@Deprecated
|
||||
ArtifactRepository createDeploymentArtifactRepository( String id, String url, String layoutId, boolean uniqueVersion )
|
||||
throws UnknownRepositoryLayoutException;
|
||||
ArtifactRepository createDeploymentArtifactRepository( String id, String url, String layoutId,
|
||||
boolean uniqueVersion )
|
||||
throws UnknownRepositoryLayoutException;
|
||||
|
||||
ArtifactRepository createDeploymentArtifactRepository( String id, String url, ArtifactRepositoryLayout layout,
|
||||
boolean uniqueVersion );
|
||||
|
||||
ArtifactRepository createArtifactRepository( String id, String url, String layoutId,
|
||||
ArtifactRepositoryPolicy snapshots, ArtifactRepositoryPolicy releases )
|
||||
throws UnknownRepositoryLayoutException;
|
||||
throws UnknownRepositoryLayoutException;
|
||||
|
||||
ArtifactRepository createArtifactRepository( String id, String url, ArtifactRepositoryLayout repositoryLayout,
|
||||
ArtifactRepositoryPolicy snapshots, ArtifactRepositoryPolicy releases );
|
||||
ArtifactRepositoryPolicy snapshots,
|
||||
ArtifactRepositoryPolicy releases );
|
||||
|
||||
void setGlobalUpdatePolicy( String snapshotPolicy );
|
||||
|
||||
|
|
|
|||
|
|
@ -46,48 +46,54 @@ public interface ArtifactResolver
|
|||
|
||||
// USED BY SUREFIRE, DEPENDENCY PLUGIN
|
||||
@Deprecated
|
||||
ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
|
||||
ArtifactRepository localRepository,
|
||||
List<ArtifactRepository> remoteRepositories,
|
||||
ArtifactMetadataSource source, ArtifactFilter filter )
|
||||
ArtifactResolutionResult resolveTransitively(
|
||||
Set<Artifact> artifacts, Artifact originatingArtifact,
|
||||
ArtifactRepository localRepository,
|
||||
List<ArtifactRepository> remoteRepositories,
|
||||
ArtifactMetadataSource source, ArtifactFilter filter )
|
||||
throws ArtifactResolutionException, ArtifactNotFoundException;
|
||||
|
||||
// USED BY MAVEN ASSEMBLY PLUGIN
|
||||
@Deprecated
|
||||
ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
|
||||
Map<String,Artifact> managedVersions, ArtifactRepository localRepository,
|
||||
List<ArtifactRepository> remoteRepositories,
|
||||
ArtifactMetadataSource source )
|
||||
ArtifactResolutionResult resolveTransitively(
|
||||
Set<Artifact> artifacts, Artifact originatingArtifact,
|
||||
Map<String,Artifact> managedVersions, ArtifactRepository localRepository,
|
||||
List<ArtifactRepository> remoteRepositories,
|
||||
ArtifactMetadataSource source )
|
||||
throws ArtifactResolutionException, ArtifactNotFoundException;
|
||||
|
||||
// USED BY MAVEN ASSEMBLY PLUGIN
|
||||
@Deprecated
|
||||
ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
|
||||
Map<String,Artifact> managedVersions, ArtifactRepository localRepository,
|
||||
List<ArtifactRepository> remoteRepositories,
|
||||
ArtifactMetadataSource source, ArtifactFilter filter )
|
||||
ArtifactResolutionResult resolveTransitively(
|
||||
Set<Artifact> artifacts, Artifact originatingArtifact,
|
||||
Map<String,Artifact> managedVersions, ArtifactRepository localRepository,
|
||||
List<ArtifactRepository> remoteRepositories,
|
||||
ArtifactMetadataSource source, ArtifactFilter filter )
|
||||
throws ArtifactResolutionException, ArtifactNotFoundException;
|
||||
|
||||
// USED BY INVOKER PLUGIN
|
||||
@Deprecated
|
||||
ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
|
||||
List<ArtifactRepository> remoteRepositories,
|
||||
ArtifactRepository localRepository, ArtifactMetadataSource source )
|
||||
ArtifactResolutionResult resolveTransitively(
|
||||
Set<Artifact> artifacts, Artifact originatingArtifact,
|
||||
List<ArtifactRepository> remoteRepositories,
|
||||
ArtifactRepository localRepository, ArtifactMetadataSource source )
|
||||
throws ArtifactResolutionException, ArtifactNotFoundException;
|
||||
|
||||
@Deprecated
|
||||
ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
|
||||
Map<String,Artifact> managedVersions, ArtifactRepository localRepository,
|
||||
List<ArtifactRepository> remoteRepositories,
|
||||
ArtifactMetadataSource source, ArtifactFilter filter,
|
||||
List<ResolutionListener> listeners )
|
||||
ArtifactResolutionResult resolveTransitively(
|
||||
Set<Artifact> artifacts, Artifact originatingArtifact,
|
||||
Map<String,Artifact> managedVersions, ArtifactRepository localRepository,
|
||||
List<ArtifactRepository> remoteRepositories,
|
||||
ArtifactMetadataSource source, ArtifactFilter filter,
|
||||
List<ResolutionListener> listeners )
|
||||
throws ArtifactResolutionException, ArtifactNotFoundException;
|
||||
|
||||
@Deprecated
|
||||
ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
|
||||
List<ArtifactRepository> remoteRepositories,
|
||||
ArtifactRepository localRepository, ArtifactMetadataSource source,
|
||||
List<ResolutionListener> listeners )
|
||||
ArtifactResolutionResult resolveTransitively(
|
||||
Set<Artifact> artifacts, Artifact originatingArtifact,
|
||||
List<ArtifactRepository> remoteRepositories,
|
||||
ArtifactRepository localRepository, ArtifactMetadataSource source,
|
||||
List<ResolutionListener> listeners )
|
||||
throws ArtifactResolutionException, ArtifactNotFoundException;
|
||||
|
||||
// USED BY REMOTE RESOURCES PLUGIN, DEPENDENCY PLUGIN, SHADE PLUGIN
|
||||
|
|
|
|||
|
|
@ -114,9 +114,9 @@ public class DebugResolutionListener
|
|||
|
||||
/**
|
||||
* The logic used here used to be a copy of the logic used in the DefaultArtifactCollector, and this method was
|
||||
* called right before the actual version/artifactScope changes were done. However, a different set of conditionals (and
|
||||
* more information) is needed to be able to determine when and if the version and/or artifactScope changes. See the two
|
||||
* added methods, manageArtifactVersion and manageArtifactScope.
|
||||
* called right before the actual version/artifactScope changes were done. However, a different set of conditionals
|
||||
* (and more information) is needed to be able to determine when and if the version and/or artifactScope changes.
|
||||
* See the two added methods, manageArtifactVersion and manageArtifactScope.
|
||||
*/
|
||||
public void manageArtifact( Artifact artifact, Artifact replacement )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -115,15 +115,15 @@ public class DefaultArtifactResolver
|
|||
}
|
||||
else
|
||||
{
|
||||
executor =
|
||||
new ThreadPoolExecutor( threads, threads, 3, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(),
|
||||
new DaemonThreadCreator() );
|
||||
executor = new ThreadPoolExecutor( threads, threads, 3, TimeUnit.SECONDS,
|
||||
new LinkedBlockingQueue<Runnable>(), new DaemonThreadCreator() );
|
||||
}
|
||||
}
|
||||
|
||||
private RepositorySystemSession getSession( ArtifactRepository localRepository )
|
||||
{
|
||||
return LegacyLocalRepositoryManager.overlay( localRepository, legacySupport.getRepositorySession(), repoSystem );
|
||||
return LegacyLocalRepositoryManager.overlay( localRepository, legacySupport.getRepositorySession(),
|
||||
repoSystem );
|
||||
}
|
||||
|
||||
private void injectSession1( RepositoryRequest request, MavenSession session )
|
||||
|
|
@ -149,21 +149,21 @@ public class DefaultArtifactResolver
|
|||
|
||||
public void resolve( Artifact artifact, List<ArtifactRepository> remoteRepositories,
|
||||
ArtifactRepository localRepository, TransferListener resolutionListener )
|
||||
throws ArtifactResolutionException, ArtifactNotFoundException
|
||||
throws ArtifactResolutionException, ArtifactNotFoundException
|
||||
{
|
||||
resolve( artifact, remoteRepositories, getSession( localRepository ) );
|
||||
}
|
||||
|
||||
public void resolveAlways( Artifact artifact, List<ArtifactRepository> remoteRepositories,
|
||||
ArtifactRepository localRepository )
|
||||
throws ArtifactResolutionException, ArtifactNotFoundException
|
||||
throws ArtifactResolutionException, ArtifactNotFoundException
|
||||
{
|
||||
resolve( artifact, remoteRepositories, getSession( localRepository ) );
|
||||
}
|
||||
|
||||
private void resolve( Artifact artifact, List<ArtifactRepository> remoteRepositories,
|
||||
RepositorySystemSession session )
|
||||
throws ArtifactResolutionException, ArtifactNotFoundException
|
||||
throws ArtifactResolutionException, ArtifactNotFoundException
|
||||
{
|
||||
if ( artifact == null )
|
||||
{
|
||||
|
|
@ -176,17 +176,20 @@ public class DefaultArtifactResolver
|
|||
|
||||
if ( systemFile == null )
|
||||
{
|
||||
throw new ArtifactNotFoundException( "System artifact: " + artifact + " has no file attached", artifact );
|
||||
throw new ArtifactNotFoundException( "System artifact: " + artifact + " has no file attached",
|
||||
artifact );
|
||||
}
|
||||
|
||||
if ( !systemFile.exists() )
|
||||
{
|
||||
throw new ArtifactNotFoundException( "System artifact: " + artifact + " not found in path: " + systemFile, artifact );
|
||||
throw new ArtifactNotFoundException( "System artifact: " + artifact + " not found in path: "
|
||||
+ systemFile, artifact );
|
||||
}
|
||||
|
||||
if ( !systemFile.isFile() )
|
||||
{
|
||||
throw new ArtifactNotFoundException( "System artifact: " + artifact + " is not a file: " + systemFile, artifact );
|
||||
throw new ArtifactNotFoundException( "System artifact: " + artifact + " is not a file: " + systemFile,
|
||||
artifact );
|
||||
}
|
||||
|
||||
artifact.setResolved( true );
|
||||
|
|
@ -252,7 +255,8 @@ public class DefaultArtifactResolver
|
|||
ArtifactRepository localRepository,
|
||||
List<ArtifactRepository> remoteRepositories,
|
||||
ArtifactMetadataSource source, ArtifactFilter filter )
|
||||
throws ArtifactResolutionException, ArtifactNotFoundException
|
||||
throws ArtifactResolutionException,
|
||||
ArtifactNotFoundException
|
||||
{
|
||||
return resolveTransitively( artifacts, originatingArtifact, Collections.EMPTY_MAP, localRepository,
|
||||
remoteRepositories, source, filter );
|
||||
|
|
@ -260,20 +264,24 @@ public class DefaultArtifactResolver
|
|||
}
|
||||
|
||||
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
|
||||
Map<String,Artifact> managedVersions, ArtifactRepository localRepository,
|
||||
Map<String, Artifact> managedVersions,
|
||||
ArtifactRepository localRepository,
|
||||
List<ArtifactRepository> remoteRepositories,
|
||||
ArtifactMetadataSource source )
|
||||
throws ArtifactResolutionException, ArtifactNotFoundException
|
||||
throws ArtifactResolutionException,
|
||||
ArtifactNotFoundException
|
||||
{
|
||||
return resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository,
|
||||
remoteRepositories, source, null );
|
||||
}
|
||||
|
||||
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
|
||||
Map<String,Artifact> managedVersions, ArtifactRepository localRepository,
|
||||
Map<String, Artifact> managedVersions,
|
||||
ArtifactRepository localRepository,
|
||||
List<ArtifactRepository> remoteRepositories,
|
||||
ArtifactMetadataSource source, ArtifactFilter filter )
|
||||
throws ArtifactResolutionException, ArtifactNotFoundException
|
||||
throws ArtifactResolutionException,
|
||||
ArtifactNotFoundException
|
||||
{
|
||||
return resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository,
|
||||
remoteRepositories, source, filter, null );
|
||||
|
|
@ -283,7 +291,8 @@ public class DefaultArtifactResolver
|
|||
List<ArtifactRepository> remoteRepositories,
|
||||
ArtifactRepository localRepository,
|
||||
ArtifactMetadataSource source )
|
||||
throws ArtifactResolutionException, ArtifactNotFoundException
|
||||
throws ArtifactResolutionException,
|
||||
ArtifactNotFoundException
|
||||
{
|
||||
return resolveTransitively( artifacts, originatingArtifact, localRepository, remoteRepositories, source, null );
|
||||
}
|
||||
|
|
@ -293,41 +302,40 @@ public class DefaultArtifactResolver
|
|||
ArtifactRepository localRepository,
|
||||
ArtifactMetadataSource source,
|
||||
List<ResolutionListener> listeners )
|
||||
throws ArtifactResolutionException, ArtifactNotFoundException
|
||||
throws ArtifactResolutionException,
|
||||
ArtifactNotFoundException
|
||||
{
|
||||
return resolveTransitively( artifacts, originatingArtifact, Collections.EMPTY_MAP, localRepository,
|
||||
remoteRepositories, source, null, listeners );
|
||||
}
|
||||
|
||||
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
|
||||
Map<String,Artifact> managedVersions, ArtifactRepository localRepository,
|
||||
Map<String, Artifact> managedVersions,
|
||||
ArtifactRepository localRepository,
|
||||
List<ArtifactRepository> remoteRepositories,
|
||||
ArtifactMetadataSource source, ArtifactFilter filter,
|
||||
List<ResolutionListener> listeners )
|
||||
throws ArtifactResolutionException, ArtifactNotFoundException
|
||||
throws ArtifactResolutionException,
|
||||
ArtifactNotFoundException
|
||||
{
|
||||
return resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository,
|
||||
remoteRepositories, source, filter, listeners, null );
|
||||
}
|
||||
|
||||
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
|
||||
Map<String,Artifact> managedVersions, ArtifactRepository localRepository,
|
||||
Map<String, Artifact> managedVersions,
|
||||
ArtifactRepository localRepository,
|
||||
List<ArtifactRepository> remoteRepositories,
|
||||
ArtifactMetadataSource source, ArtifactFilter filter,
|
||||
List<ResolutionListener> listeners,
|
||||
List<ConflictResolver> conflictResolvers )
|
||||
throws ArtifactResolutionException, ArtifactNotFoundException
|
||||
throws ArtifactResolutionException,
|
||||
ArtifactNotFoundException
|
||||
{
|
||||
ArtifactResolutionRequest request = new ArtifactResolutionRequest()
|
||||
.setArtifact( originatingArtifact )
|
||||
.setResolveRoot( false )
|
||||
ArtifactResolutionRequest request =
|
||||
new ArtifactResolutionRequest().setArtifact( originatingArtifact ).setResolveRoot( false )
|
||||
// This is required by the surefire plugin
|
||||
.setArtifactDependencies( artifacts )
|
||||
.setManagedVersionMap( managedVersions )
|
||||
.setLocalRepository( localRepository )
|
||||
.setRemoteRepositories( remoteRepositories )
|
||||
.setCollectionFilter( filter )
|
||||
.setListeners( listeners );
|
||||
.setArtifactDependencies( artifacts ).setManagedVersionMap( managedVersions ).setLocalRepository( localRepository ).setRemoteRepositories( remoteRepositories ).setCollectionFilter( filter ).setListeners( listeners );
|
||||
|
||||
injectSession2( request, legacySupport.getSession() );
|
||||
|
||||
|
|
@ -362,7 +370,8 @@ public class DefaultArtifactResolver
|
|||
ArtifactFilter resolutionFilter = request.getResolutionFilter();
|
||||
RepositorySystemSession session = getSession( request.getLocalRepository() );
|
||||
|
||||
//TODO: hack because metadata isn't generated in m2e correctly and i want to run the maven i have in the workspace
|
||||
// TODO: hack because metadata isn't generated in m2e correctly and i want to run the maven i have in the
|
||||
// workspace
|
||||
if ( source == null )
|
||||
{
|
||||
try
|
||||
|
|
@ -481,15 +490,15 @@ public class DefaultArtifactResolver
|
|||
}
|
||||
|
||||
// After the collection we will have the artifact object in the result but they will not be resolved yet.
|
||||
result =
|
||||
artifactCollector.collect( artifacts, rootArtifact, managedVersions, collectionRequest, source,
|
||||
collectionFilter, listeners, null );
|
||||
result = artifactCollector.collect( artifacts, rootArtifact, managedVersions, collectionRequest, source,
|
||||
collectionFilter, listeners, null );
|
||||
|
||||
// We have metadata retrieval problems, or there are cycles that have been detected
|
||||
// so we give this back to the calling code and let them deal with this information
|
||||
// appropriately.
|
||||
|
||||
if ( result.hasMetadataResolutionExceptions() || result.hasVersionRangeViolations() || result.hasCircularDependencyExceptions() )
|
||||
if ( result.hasMetadataResolutionExceptions() || result.hasVersionRangeViolations()
|
||||
|| result.hasCircularDependencyExceptions() )
|
||||
{
|
||||
return result;
|
||||
}
|
||||
|
|
@ -539,8 +548,9 @@ public class DefaultArtifactResolver
|
|||
return result;
|
||||
}
|
||||
|
||||
public void resolve( Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository )
|
||||
throws ArtifactResolutionException, ArtifactNotFoundException
|
||||
public void resolve( Artifact artifact, List<ArtifactRepository> remoteRepositories,
|
||||
ArtifactRepository localRepository )
|
||||
throws ArtifactResolutionException, ArtifactNotFoundException
|
||||
{
|
||||
resolve( artifact, remoteRepositories, localRepository, null );
|
||||
}
|
||||
|
|
@ -582,8 +592,9 @@ public class DefaultArtifactResolver
|
|||
|
||||
private final ArtifactResolutionResult result;
|
||||
|
||||
public ResolveTask( ClassLoader classLoader, CountDownLatch latch, Artifact artifact, RepositorySystemSession session,
|
||||
List<ArtifactRepository> remoteRepositories, ArtifactResolutionResult result )
|
||||
public ResolveTask( ClassLoader classLoader, CountDownLatch latch, Artifact artifact,
|
||||
RepositorySystemSession session, List<ArtifactRepository> remoteRepositories,
|
||||
ArtifactResolutionResult result )
|
||||
{
|
||||
this.classLoader = classLoader;
|
||||
this.latch = latch;
|
||||
|
|
|
|||
|
|
@ -674,8 +674,8 @@ public class DefaultLegacyArtifactCollector
|
|||
fireEvent( ResolutionListener.UPDATE_SCOPE, listeners, nearest, farthestArtifact );
|
||||
|
||||
// previously we cloned the artifact, but it is more effecient to just update the artifactScope
|
||||
// if problems are later discovered that the original object needs its original artifactScope value, cloning
|
||||
// may
|
||||
// if problems are later discovered that the original object needs its original artifactScope value,
|
||||
// cloning may
|
||||
// again be appropriate
|
||||
nearestArtifact.setScope( farthestArtifact.getScope() );
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue