Author: brett
Date: Mon Feb 6 22:07:13 2006
New Revision: 375504
URL: http://svn.apache.org/viewcvs?rev=375504&view=rev
Log:
[MNG-1908] merge r375497 to branch
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=375504&r1=375503&r2=375504&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Mon Feb 6 22:07:13 2006
@@ -255,7 +255,8 @@
}
}
- if ( !successful )
+ // if it already exists locally we were just trying to force it -
ignore the update
+ if ( !successful && !artifact.getFile().exists() )
{
throw new ResourceDoesNotExistException( "Unable to download the
artifact from any repository" );
}
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java?rev=375504&r1=375503&r2=375504&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
Mon Feb 6 22:07:13 2006
@@ -78,10 +78,11 @@
File file = new File( localRepository.getBasedir(),
localRepository.pathOfLocalRepositoryMetadata( metadata, repository ) );
- boolean checkForUpdates = policy.checkOutOfDate( new Date(
file.lastModified() ) ) || !file.exists();
+ boolean checkForUpdates =
+ policy.checkOutOfDate( new Date( file.lastModified() )
) || !file.exists();
boolean metadataIsEmpty = true;
-
+
if ( checkForUpdates )
{
getLogger().info( metadata.getKey() + ": checking for
updates from " + repository.getId() );
@@ -201,6 +202,8 @@
if ( !m.getVersioning().getSnapshot().isLocalCopy() )
{
+ // TODO: I think this is incorrect (it results in
localCopy set in a remote profile). Probably
+ // harmless so not removing at this point until full
tests in place.
m.getVersioning().getSnapshot().setLocalCopy( true );
metadata.setMetadata( m );
metadata.storeInLocalRepository( localRepository,
repository );
@@ -372,7 +375,7 @@
getLogger().info( "Repository '" + repository.getId() + "' will be
blacklisted" );
getLogger().debug( "Exception", e );
repository.setBlacklisted( allowBlacklisting );
-
+
throw e;
}
}
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL:
http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=375504&r1=375503&r2=375504&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Mon Feb 6 22:07:13 2006
@@ -152,7 +152,7 @@
wagonManager.getArtifact( artifact, repositories );
}
- if ( !artifact.isResolved() )
+ if ( !artifact.isResolved() && !destination.exists() )
{
throw new ArtifactResolutionException(
"Failed to resolve artifact, possibly due to a
repository list that is not appropriately equipped for this artifact's
metadata.",
