You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2013/08/21 21:38:11 UTC
git commit: code formatting
Updated Branches:
refs/heads/master 6eed1f705 -> 6b2db085c
code formatting
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/6b2db085
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/6b2db085
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/6b2db085
Branch: refs/heads/master
Commit: 6b2db085c0ce5959e9e8006520bcde34a7631f28
Parents: 6eed1f7
Author: Hervé Boutemy <hb...@apache.org>
Authored: Wed Aug 21 21:38:01 2013 +0200
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Wed Aug 21 21:38:01 2013 +0200
----------------------------------------------------------------------
.../DefaultRepositoryMetadataManager.java | 77 +++++++++++++-------
.../maven/profiles/DefaultProfileManager.java | 1 -
.../maven/profiles/ProfilesConversionUtils.java | 1 -
.../usability/plugin/ExpressionDocumenter.java | 6 +-
.../maven/ProjectDependenciesResolver.java | 1 -
.../java/org/apache/maven/ReactorReader.java | 20 ++---
.../java/org/apache/maven/RepositoryUtils.java | 6 +-
.../DefaultLifecycleBindingsInjector.java | 1 -
8 files changed, 67 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/6b2db085/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
index c94d24c..53adc8d 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
@@ -62,7 +62,8 @@ public class DefaultRepositoryMetadataManager
@Requirement
private UpdateCheckManager updateCheckManager;
- public void resolve( RepositoryMetadata metadata, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository )
+ public void resolve( RepositoryMetadata metadata, List<ArtifactRepository> remoteRepositories,
+ ArtifactRepository localRepository )
throws RepositoryMetadataResolutionException
{
RepositoryRequest request = new DefaultRepositoryRequest();
@@ -74,7 +75,7 @@ public class DefaultRepositoryMetadataManager
public void resolve( RepositoryMetadata metadata, RepositoryRequest request )
throws RepositoryMetadataResolutionException
{
- ArtifactRepository localRepository = request.getLocalRepository();
+ ArtifactRepository localRepo = request.getLocalRepository();
List<ArtifactRepository> remoteRepositories = request.getRemoteRepositories();
if ( !request.isOffline() )
@@ -82,7 +83,7 @@ public class DefaultRepositoryMetadataManager
Date localCopyLastModified = null;
if ( metadata.getBaseVersion() != null )
{
- localCopyLastModified = getLocalCopyLastModified( localRepository, metadata );
+ localCopyLastModified = getLocalCopyLastModified( localRepo, metadata );
}
for ( ArtifactRepository repository : remoteRepositories )
@@ -90,8 +91,7 @@ public class DefaultRepositoryMetadataManager
ArtifactRepositoryPolicy policy = metadata.getPolicy( repository );
File file =
- new File( localRepository.getBasedir(), localRepository.pathOfLocalRepositoryMetadata( metadata,
- repository ) );
+ new File( localRepo.getBasedir(), localRepo.pathOfLocalRepositoryMetadata( metadata, repository ) );
boolean update;
if ( !policy.isEnabled() )
@@ -122,7 +122,10 @@ public class DefaultRepositoryMetadataManager
+ ") in favor of local copy" );
}
}
- else update = updateCheckManager.isUpdateRequired( metadata, repository, file );
+ else
+ {
+ update = updateCheckManager.isUpdateRequired( metadata, repository, file );
+ }
if ( update )
{
@@ -164,11 +167,12 @@ public class DefaultRepositoryMetadataManager
try
{
- mergeMetadata( metadata, remoteRepositories, localRepository );
+ mergeMetadata( metadata, remoteRepositories, localRepo );
}
catch ( RepositoryMetadataStoreException e )
{
- throw new RepositoryMetadataResolutionException( "Unable to store local copy of metadata: " + e.getMessage(), e );
+ throw new RepositoryMetadataResolutionException( "Unable to store local copy of metadata: "
+ + e.getMessage(), e );
}
}
@@ -179,7 +183,8 @@ public class DefaultRepositoryMetadataManager
return metadataFile.isFile() ? new Date( metadataFile.lastModified() ) : null;
}
- private void mergeMetadata( RepositoryMetadata metadata, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository )
+ private void mergeMetadata( RepositoryMetadata metadata, List<ArtifactRepository> remoteRepositories,
+ ArtifactRepository localRepository )
throws RepositoryMetadataStoreException
{
// TODO: currently this is first wins, but really we should take the latest by comparing either the
@@ -208,7 +213,9 @@ public class DefaultRepositoryMetadataManager
updateSnapshotMetadata( metadata, previousMetadata, selected, localRepository );
}
- private void updateSnapshotMetadata( RepositoryMetadata metadata, Map<ArtifactRepository, Metadata> previousMetadata, ArtifactRepository selected, ArtifactRepository localRepository )
+ private void updateSnapshotMetadata( RepositoryMetadata metadata,
+ Map<ArtifactRepository, Metadata> previousMetadata,
+ ArtifactRepository selected, ArtifactRepository localRepository )
throws RepositoryMetadataStoreException
{
// TODO: this could be a lot nicer... should really be in the snapshot transformation?
@@ -233,7 +240,8 @@ public class DefaultRepositoryMetadataManager
}
else
{
- if ( ( m.getVersioning() != null ) && ( m.getVersioning().getSnapshot() != null ) && m.getVersioning().getSnapshot().isLocalCopy() )
+ if ( ( m.getVersioning() != null ) && ( m.getVersioning().getSnapshot() != null )
+ && m.getVersioning().getSnapshot().isLocalCopy() )
{
m.getVersioning().getSnapshot().setLocalCopy( false );
metadata.setMetadata( m );
@@ -246,11 +254,15 @@ public class DefaultRepositoryMetadataManager
}
}
- private boolean loadMetadata( RepositoryMetadata repoMetadata, ArtifactRepository remoteRepository, ArtifactRepository localRepository, Map<ArtifactRepository, Metadata> previousMetadata )
+ private boolean loadMetadata( RepositoryMetadata repoMetadata, ArtifactRepository remoteRepository,
+ ArtifactRepository localRepository, Map<ArtifactRepository,
+ Metadata> previousMetadata )
{
boolean setRepository = false;
- File metadataFile = new File( localRepository.getBasedir(), localRepository.pathOfLocalRepositoryMetadata( repoMetadata, remoteRepository ) );
+ File metadataFile =
+ new File( localRepository.getBasedir(), localRepository.pathOfLocalRepositoryMetadata( repoMetadata,
+ remoteRepository ) );
if ( metadataFile.exists() )
{
@@ -312,11 +324,13 @@ public class DefaultRepositoryMetadataManager
}
catch ( IOException e )
{
- throw new RepositoryMetadataReadException( "Cannot read metadata from '" + mappingFile + "': " + e.getMessage(), e );
+ throw new RepositoryMetadataReadException( "Cannot read metadata from '" + mappingFile + "': "
+ + e.getMessage(), e );
}
catch ( XmlPullParserException e )
{
- throw new RepositoryMetadataReadException( "Cannot read metadata from '" + mappingFile + "': " + e.getMessage(), e );
+ throw new RepositoryMetadataReadException( "Cannot read metadata from '" + mappingFile + "': "
+ + e.getMessage(), e );
}
finally
{
@@ -327,8 +341,8 @@ public class DefaultRepositoryMetadataManager
}
/**
- * Ensures the last updated timestamp of the specified metadata does not refer to the future and fixes the local metadata if necessary to allow
- * proper merging/updating of metadata during deployment.
+ * Ensures the last updated timestamp of the specified metadata does not refer to the future and fixes the local
+ * metadata if necessary to allow proper merging/updating of metadata during deployment.
*/
private void fixTimestamp( File metadataFile, Metadata metadata, Metadata reference )
{
@@ -384,7 +398,8 @@ public class DefaultRepositoryMetadataManager
}
}
- public void resolveAlways( RepositoryMetadata metadata, ArtifactRepository localRepository, ArtifactRepository remoteRepository )
+ public void resolveAlways( RepositoryMetadata metadata, ArtifactRepository localRepository,
+ ArtifactRepository remoteRepository )
throws RepositoryMetadataResolutionException
{
File file;
@@ -394,7 +409,8 @@ public class DefaultRepositoryMetadataManager
}
catch ( TransferFailedException e )
{
- throw new RepositoryMetadataResolutionException( metadata + " could not be retrieved from repository: " + remoteRepository.getId() + " due to an error: " + e.getMessage(), e );
+ throw new RepositoryMetadataResolutionException( metadata + " could not be retrieved from repository: "
+ + remoteRepository.getId() + " due to an error: " + e.getMessage(), e );
}
try
@@ -411,18 +427,23 @@ public class DefaultRepositoryMetadataManager
}
}
- private File getArtifactMetadataFromDeploymentRepository( ArtifactMetadata metadata, ArtifactRepository localRepository, ArtifactRepository remoteRepository )
+ private File getArtifactMetadataFromDeploymentRepository( ArtifactMetadata metadata,
+ ArtifactRepository localRepo,
+ ArtifactRepository remoteRepository )
throws TransferFailedException
{
- File file = new File( localRepository.getBasedir(), localRepository.pathOfLocalRepositoryMetadata( metadata, remoteRepository ) );
+ File file =
+ new File( localRepo.getBasedir(), localRepo.pathOfLocalRepositoryMetadata( metadata, remoteRepository ) );
try
{
- wagonManager.getArtifactMetadataFromDeploymentRepository( metadata, remoteRepository, file, ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN );
+ wagonManager.getArtifactMetadataFromDeploymentRepository( metadata, remoteRepository, file,
+ ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN );
}
catch ( ResourceDoesNotExistException e )
{
- getLogger().info( metadata + " could not be found on repository: " + remoteRepository.getId() + ", so will be created" );
+ getLogger().info( metadata + " could not be found on repository: " + remoteRepository.getId()
+ + ", so will be created" );
// delete the local copy so the old details aren't used.
if ( file.exists() )
@@ -440,7 +461,8 @@ public class DefaultRepositoryMetadataManager
return file;
}
- public void deploy( ArtifactMetadata metadata, ArtifactRepository localRepository, ArtifactRepository deploymentRepository )
+ public void deploy( ArtifactMetadata metadata, ArtifactRepository localRepository,
+ ArtifactRepository deploymentRepository )
throws RepositoryMetadataDeploymentException
{
File file;
@@ -453,7 +475,8 @@ public class DefaultRepositoryMetadataManager
}
catch ( TransferFailedException e )
{
- throw new RepositoryMetadataDeploymentException( metadata + " could not be retrieved from repository: " + deploymentRepository.getId() + " due to an error: " + e.getMessage(), e );
+ throw new RepositoryMetadataDeploymentException( metadata + " could not be retrieved from repository: "
+ + deploymentRepository.getId() + " due to an error: " + e.getMessage(), e );
}
if ( file.isFile() )
@@ -471,7 +494,9 @@ public class DefaultRepositoryMetadataManager
else
{
// It's a POM - we don't need to retrieve it first
- file = new File( localRepository.getBasedir(), localRepository.pathOfLocalRepositoryMetadata( metadata, deploymentRepository ) );
+ file =
+ new File( localRepository.getBasedir(),
+ localRepository.pathOfLocalRepositoryMetadata( metadata, deploymentRepository ) );
}
try
http://git-wip-us.apache.org/repos/asf/maven/blob/6b2db085/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
index bfade80..3b99e9e 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
@@ -33,7 +33,6 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti
import org.codehaus.plexus.logging.Logger;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/maven/blob/6b2db085/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java b/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
index 041a9bb..0427d71 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
@@ -25,7 +25,6 @@ import org.apache.maven.model.ActivationProperty;
import org.apache.maven.model.Profile;
import org.apache.maven.model.Repository;
-import java.util.Iterator;
import java.util.List;
@Deprecated
http://git-wip-us.apache.org/repos/asf/maven/blob/6b2db085/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java b/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
index 9a4569f..7d41f0a 100644
--- a/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
+++ b/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
@@ -33,7 +33,6 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -164,9 +163,8 @@ public class ExpressionDocumenter
}
catch ( MalformedURLException e )
{
- throw new ExpressionDocumentationException(
- "Cannot construct expression documentation classpath resource base.",
- e );
+ throw new ExpressionDocumentationException( "Cannot construct expression documentation classpath"
+ + " resource base.", e );
}
return new URLClassLoader( new URL[] { docResource } );
http://git-wip-us.apache.org/repos/asf/maven/blob/6b2db085/maven-core/src/main/java/org/apache/maven/ProjectDependenciesResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/ProjectDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/ProjectDependenciesResolver.java
index 7c1ae45..7ae86fd 100644
--- a/maven-core/src/main/java/org/apache/maven/ProjectDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/ProjectDependenciesResolver.java
@@ -69,7 +69,6 @@ public interface ProjectDependenciesResolver
Collection<String> scopesToResolve, MavenSession session, Set<Artifact> ignoreableArtifacts )
throws ArtifactResolutionException, ArtifactNotFoundException;
-
/**
* Resolves the transitive dependencies of the specified projects. Note that dependencies which can't be resolved
* from any repository but are present among the set of specified projects will not cause an exception. Instead,
http://git-wip-us.apache.org/repos/asf/maven/blob/6b2db085/maven-core/src/main/java/org/apache/maven/ReactorReader.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/ReactorReader.java b/maven-core/src/main/java/org/apache/maven/ReactorReader.java
index 9b19e27..bc37eb7 100644
--- a/maven-core/src/main/java/org/apache/maven/ReactorReader.java
+++ b/maven-core/src/main/java/org/apache/maven/ReactorReader.java
@@ -51,7 +51,7 @@ class ReactorReader
private Map<String, List<MavenProject>> projectsByGA;
private WorkspaceRepository repository;
-
+
public ReactorReader( Map<String, MavenProject> reactorProjects )
{
projectsByGAV = reactorProjects;
@@ -210,18 +210,20 @@ class ReactorReader
return null;
}
-
+
private boolean attachedArtifactComparison( Artifact requested, Artifact attached )
{
- //
- // We are taking as much as we can from the DefaultArtifact.equals(). The requested artifact has no file so
- // we want to remove that from the comparision.
- //
- return requested.getArtifactId().equals( attached.getArtifactId() ) && requested.getGroupId().equals( attached.getGroupId() )
- && requested.getVersion().equals( attached.getVersion() ) && requested.getExtension().equals( attached.getExtension() )
+ //
+ // We are taking as much as we can from the DefaultArtifact.equals(). The requested artifact has no file so
+ // we want to remove that from the comparision.
+ //
+ return requested.getArtifactId().equals( attached.getArtifactId() )
+ && requested.getGroupId().equals( attached.getGroupId() )
+ && requested.getVersion().equals( attached.getVersion() )
+ && requested.getExtension().equals( attached.getExtension() )
&& requested.getClassifier().equals( attached.getClassifier() );
}
-
+
/**
* Determines whether the specified artifact refers to test classes.
*
http://git-wip-us.apache.org/repos/asf/maven/blob/6b2db085/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
index c966e9a..6341d13 100644
--- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
@@ -350,12 +350,12 @@ public class RepositoryUtils
}
- public static Collection<Artifact> toArtifacts(Collection<org.apache.maven.artifact.Artifact> artifactsToConvert )
+ public static Collection<Artifact> toArtifacts( Collection<org.apache.maven.artifact.Artifact> artifactsToConvert )
{
List<Artifact> artifacts = new ArrayList<Artifact>();
- for( org.apache.maven.artifact.Artifact a : artifactsToConvert )
+ for ( org.apache.maven.artifact.Artifact a : artifactsToConvert )
{
- artifacts.add(toArtifact(a));
+ artifacts.add( toArtifact( a ) );
}
return artifacts;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/6b2db085/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
index c3b3753..b45c24c 100644
--- a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
+++ b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
@@ -22,7 +22,6 @@ package org.apache.maven.model.plugin;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;