You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/07/31 14:49:40 UTC
svn commit: r799592 - in /maven/components/trunk:
maven-compat/src/main/java/org/apache/maven/artifact/repository/
maven-compat/src/main/java/org/apache/maven/artifact/resolver/
maven-compat/src/main/java/org/apache/maven/repository/ maven-core/src/tes...
Author: bentmann
Date: Fri Jul 31 12:49:40 2009
New Revision: 799592
URL: http://svn.apache.org/viewvc?rev=799592&view=rev
Log:
[MNG-4231] Snapshots are not checked for updates
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/repository/ideworkspace/TestIdeWorkspaceRepository.java
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java?rev=799592&r1=799591&r2=799592&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java Fri Jul 31 12:49:40 2009
@@ -155,12 +155,7 @@
// We need to set the file here or the resolver will fail with an NPE, not fully equipped to deal
// with multiple local repository implementations yet.
artifact.setFile( artifactFile );
-
- if( artifactFile.exists() )
- {
- artifact.setResolved( true );
- }
-
+
return artifact;
}
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=799592&r1=799591&r2=799592&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java Fri Jul 31 12:49:40 2009
@@ -140,20 +140,13 @@
{
return;
}
-
- if ( artifact.isSnapshot() && artifact.isResolved() )
- {
- return;
- }
-
+
transformationManager.transformForResolve( artifact, remoteRepositories, localRepository );
boolean localCopy = isLocalCopy( artifact );
destination = artifact.getFile();
- boolean resolved = false;
-
if ( force || !destination.exists() || ( artifact.isSnapshot() && !localCopy ) )
{
try
@@ -182,8 +175,6 @@
{
throw new ArtifactResolutionException( e.getMessage(), artifact, remoteRepositories, e );
}
-
- resolved = true;
}
if ( destination.exists() )
@@ -193,7 +184,7 @@
// 1.0-SNAPSHOT
//
- // 1) pom = 1.0-SoNAPSHOT
+ // 1) pom = 1.0-SNAPSHOT
// 2) pom = 1.0-yyyymmdd.hhmmss
// 3) baseVersion = 1.0-SNAPSHOT
if ( artifact.isSnapshot() && !artifact.getBaseVersion().equals( artifact.getVersion() ) )
@@ -209,7 +200,8 @@
// if the timestamped version was resolved or the copy doesn't exist then copy a version
// of the file like 1.0-SNAPSHOT. Even if there is a timestamped version the non-timestamped
// version will be created.
- if ( resolved || !copy.exists() )
+ if ( !copy.exists() || copy.lastModified() != destination.lastModified()
+ || copy.length() != destination.length() )
{
// recopy file if it was reresolved, or doesn't exist.
try
@@ -227,7 +219,7 @@
// We are only going to use the 1.0-SNAPSHOT version
artifact.setFile( copy );
- // Set the version to the 1.0-SNAPSHOT version
+ // Set the version to the 1.0-yyyymmdd.hhmmss version
artifact.selectVersion( version );
}
}
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java?rev=799592&r1=799591&r2=799592&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java Fri Jul 31 12:49:40 2009
@@ -20,7 +20,6 @@
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.MavenArtifactRepository;
public abstract class LocalArtifactRepository
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java?rev=799592&r1=799591&r2=799592&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java Fri Jul 31 12:49:40 2009
@@ -44,12 +44,7 @@
// We need to set the file here or the resolver will fail with an NPE, not fully equipped to deal
// with multiple local repository implementations yet.
artifact.setFile( artifactFile );
-
- if( artifactFile.exists() )
- {
- artifact.setResolved( true );
- }
-
+
return artifact;
}
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/repository/ideworkspace/TestIdeWorkspaceRepository.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/repository/ideworkspace/TestIdeWorkspaceRepository.java?rev=799592&r1=799591&r2=799592&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/repository/ideworkspace/TestIdeWorkspaceRepository.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/repository/ideworkspace/TestIdeWorkspaceRepository.java Fri Jul 31 12:49:40 2009
@@ -27,6 +27,7 @@
{
artifact.setFile( ARTIFACT_FILE );
artifact.setResolved( true );
+ artifact.setFromAuthoritativeRepository( true );
}
return artifact;
}