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

prevent overzealous deletion of snapshot versions in the same artifact that may not be part of the currently scanned file 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1178312 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2011-10-03 07:18:10 +00:00
parent 28cdacbf13
commit 5c166688a9
1 changed files with 22 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
View File

@ -116,19 +116,25 @@ public class CleanupReleasedSnapshotsRepositoryPurge
reference.setGroupId( artifactRef.getGroupId() ); reference.setGroupId( artifactRef.getGroupId() );
reference.setArtifactId( artifactRef.getArtifactId() ); reference.setArtifactId( artifactRef.getArtifactId() );
// Gather up all of the versions. // Gether the released versions
List<String> allVersions = new ArrayList<String>( repository.getVersions( reference ) ); List<String> releasedVersions = new ArrayList<String>();
List<ManagedRepository> repos = managedRepositoryAdmin.getManagedRepositories(); List<ManagedRepository> repos = managedRepositoryAdmin.getManagedRepositories();
for ( ManagedRepository repo : repos ) for ( ManagedRepository repo : repos )
{ {
if ( repo.isReleases() && !repo.getId().equals( repository.getId() ) ) if ( repo.isReleases() )
{ {
try try
{ {
ManagedRepositoryContent repoContent = ManagedRepositoryContent repoContent =
repoContentFactory.getManagedRepositoryContent( repo.getId() ); repoContentFactory.getManagedRepositoryContent( repo.getId() );
allVersions.addAll( repoContent.getVersions( reference ) ); for ( String version : repoContent.getVersions( reference ) )
{
if ( !VersionUtil.isSnapshot( version ) )
{
releasedVersions.add( version );
}
}
} }
catch ( RepositoryNotFoundException e ) catch ( RepositoryNotFoundException e )
{ {
@ -141,25 +147,7 @@ public class CleanupReleasedSnapshotsRepositoryPurge
} }
} }
// Split the versions into released and snapshots.
List<String> releasedVersions = new ArrayList<String>();
List<String> snapshotVersions = new ArrayList<String>();
for ( String version : allVersions )
{
if ( VersionUtil.isSnapshot( version ) )
{
snapshotVersions.add( version );
}
else
{
releasedVersions.add( version );
}
}
Collections.sort( allVersions, VersionComparator.getInstance() );
Collections.sort( releasedVersions, VersionComparator.getInstance() ); Collections.sort( releasedVersions, VersionComparator.getInstance() );
Collections.sort( snapshotVersions, VersionComparator.getInstance() );
// Now clean out any version that is earlier than the highest released version. // Now clean out any version that is earlier than the highest released version.
boolean needsMetadataUpdate = false; boolean needsMetadataUpdate = false;
@ -168,28 +156,22 @@ public class CleanupReleasedSnapshotsRepositoryPurge
versionRef.setGroupId( artifactRef.getGroupId() ); versionRef.setGroupId( artifactRef.getGroupId() );
versionRef.setArtifactId( artifactRef.getArtifactId() ); versionRef.setArtifactId( artifactRef.getArtifactId() );
ArchivaArtifact artifact =
new ArchivaArtifact( artifactRef.getGroupId(), artifactRef.getArtifactId(), artifactRef.getVersion(),
artifactRef.getClassifier(), artifactRef.getType(), repository.getId() );
MetadataRepository metadataRepository = repositorySession.getRepository(); MetadataRepository metadataRepository = repositorySession.getRepository();
for ( String version : snapshotVersions )
if ( releasedVersions.contains( VersionUtil.getReleaseVersion( artifactRef.getVersion() ) ) )
{ {
if ( releasedVersions.contains( VersionUtil.getReleaseVersion( version ) ) ) versionRef.setVersion( artifactRef.getVersion() );
repository.deleteVersion( versionRef );
// FIXME: looks incomplete, might not delete related metadata?
for ( RepositoryListener listener : listeners )
{ {
versionRef.setVersion( version ); listener.deleteArtifact( metadataRepository, repository.getId(), artifactRef.getGroupId(),
repository.deleteVersion( versionRef ); artifactRef.getArtifactId(), artifactRef.getVersion(),
artifactFile.getName() );
// FIXME: looks incomplete, might not delete related metadata?
for ( RepositoryListener listener : listeners )
{
listener.deleteArtifact( metadataRepository, repository.getId(), artifact.getGroupId(),
artifact.getArtifactId(), artifact.getVersion(),
artifactFile.getName() );
}
needsMetadataUpdate = true;
} }
needsMetadataUpdate = true;
} }
if ( needsMetadataUpdate ) if ( needsMetadataUpdate )