Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRM-1421] Archiva repository purge incorrectly purges based on file timestamps even when the snapshot timestamp is known 

Merged from: r1049391:1049399

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1049407 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2010-12-15 03:39:46 +00:00
parent f475ae1d1b
commit 70537eb036
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurge.java
View File

@ -128,10 +128,6 @@ public class DaysOldRepositoryPurge
{
doPurgeAllRelated( newArtifactReference );
}
else if ( newArtifactFile.lastModified() < olderThanThisDate.getTimeInMillis() )
{
doPurgeAllRelated( newArtifactReference );
}
}
}
}

19
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java
View File

@ -31,6 +31,8 @@ import java.util.Collections;
public class DaysOldRepositoryPurgeTest
extends AbstractRepositoryPurgeTest
{
private static final int OLD_TIMESTAMP = 1179382029;
private void setLastModified( String dirPath, long lastModified )
{
File dir = new File( dirPath );
@ -54,7 +56,7 @@ public class DaysOldRepositoryPurgeTest
String projectRoot = repoRoot + "/org/apache/maven/plugins/maven-install-plugin";
setLastModified( projectRoot + "/2.2-SNAPSHOT/", 1179382029 );
setLastModified( projectRoot + "/2.2-SNAPSHOT/", OLD_TIMESTAMP );
// test listeners for the correct artifacts
listener.deleteArtifact( getRepository().getId(), "org.apache.maven.plugins", "maven-install-plugin",
@ -113,7 +115,7 @@ public class DaysOldRepositoryPurgeTest
String projectRoot = repoRoot + "/org/apache/maven/plugins/maven-assembly-plugin";
setLastModified( projectRoot + "/1.1.2-SNAPSHOT/", 1179382029 );
setLastModified( projectRoot + "/1.1.2-SNAPSHOT/", OLD_TIMESTAMP );
// test listeners for the correct artifacts
listener.deleteArtifact( getRepository().getId(), "org.apache.maven.plugins", "maven-assembly-plugin",
@ -169,8 +171,17 @@ public class DaysOldRepositoryPurgeTest
for ( int i = 5; i <= 7; i++ )
{
new File( versionRoot, "/plexus-utils-1.4.3-" + timestamp + "-" + i + ".jar" ).createNewFile();
new File( versionRoot, "/plexus-utils-1.4.3-" + timestamp + "-" + i + ".pom" ).createNewFile();
File jarFile = new File( versionRoot, "/plexus-utils-1.4.3-" + timestamp + "-" + i + ".jar" );
jarFile.createNewFile();
File pomFile = new File( versionRoot, "/plexus-utils-1.4.3-" + timestamp + "-" + i + ".pom" );
pomFile.createNewFile();
// set timestamp to older than 100 days for the first build, but ensure the filename timestamp is honoured instead
if ( i == 5 )
{
jarFile.setLastModified( OLD_TIMESTAMP );
pomFile.setLastModified( OLD_TIMESTAMP );
}
}
// test listeners for the correct artifacts