From: Olivier Lamy Date: Tue, 19 Jun 2012 22:02:38 +0000 (+0000) Subject: fix deletion of snapshot artifact X-Git-Tag: archiva-1.4-M3~605 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=74077123a73e274c071b8cf0f4e1c2e1967efa4f;p=archiva.git fix deletion of snapshot artifact git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1351877 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java index 09b74a3cd..d39d8c5d8 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java @@ -98,6 +98,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.List; +import java.util.Set; import java.util.TimeZone; /** @@ -653,6 +654,8 @@ public class DefaultRepositoriesService // TODO more control on artifact fields + boolean snapshotVersion = VersionUtil.isSnapshot( artifact.getVersion() ); + RepositorySession repositorySession = repositorySessionFactory.createSession(); try { @@ -670,6 +673,13 @@ public class DefaultRepositoriesService ManagedRepositoryContent repository = repositoryFactory.getManagedRepositoryContent( repositoryId ); + ArtifactReference artifactReference = new ArtifactReference(); + artifactReference.setArtifactId( artifact.getArtifactId() ); + artifactReference.setGroupId( artifact.getGroupId() ); + artifactReference.setVersion( artifact.getVersion() ); + artifactReference.setClassifier( artifact.getClassifier() ); + artifactReference.setType( artifact.getPackaging() ); + MetadataRepository metadataRepository = repositorySession.getRepository(); String path = repository.toMetadataPath( ref ); @@ -681,12 +691,7 @@ public class DefaultRepositoriesService throw new ArchivaRestServiceException( "You must configure a type/packaging when using classifier", 400, null ); } - ArtifactReference artifactReference = new ArtifactReference(); - artifactReference.setArtifactId( artifact.getArtifactId() ); - artifactReference.setGroupId( artifact.getGroupId() ); - artifactReference.setVersion( artifact.getVersion() ); - artifactReference.setClassifier( artifact.getClassifier() ); - artifactReference.setType( artifact.getPackaging() ); + repository.deleteArtifact( artifactReference ); } @@ -705,8 +710,10 @@ public class DefaultRepositoriesService // TODO: this should be in the storage mechanism so that it is all tied together // delete from file system - repository.deleteVersion( ref ); - + if ( !snapshotVersion ) + { + repository.deleteVersion( ref ); + } File metadataFile = getMetadata( targetPath.getAbsolutePath() ); ArchivaRepositoryMetadata metadata = getMetadata( metadataFile ); @@ -716,6 +723,16 @@ public class DefaultRepositoriesService metadataRepository.getArtifacts( repositoryId, artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion() ); + if ( snapshotVersion ) + { + Set related = repository.getRelatedArtifacts( artifactReference ); + log.debug( "related: {}", related ); + for ( ArtifactReference artifactRef : related ) + { + repository.deleteArtifact( artifactRef ); + } + } + for ( ArtifactMetadata artifactMetadata : artifacts ) { diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java index fdcd8e1ed..8c6633098 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java @@ -28,6 +28,7 @@ import org.apache.archiva.rest.api.model.VersionsList; import org.apache.archiva.rest.api.services.BrowseService; import org.apache.archiva.rest.api.services.ManagedRepositoriesService; import org.apache.archiva.rest.api.services.RepositoriesService; +import org.apache.commons.io.FileUtils; import org.apache.cxf.jaxrs.client.ServerWebApplicationException; import org.fest.assertions.Assertions; import org.junit.Test; @@ -352,4 +353,110 @@ public class RepositoriesServiceTest return getTestManagedRepository( "TEST", "test-repo" ); } + + static final String SNAPSHOT_REPO_ID = "snapshot-repo"; + + @Test + public void deleteSnapshot() + throws Exception + { + File targetRepo = initSnapshotRepo(); + try + { + BrowseService browseService = getBrowseService( authorizationHeader, false ); + List artifacts = + browseService.getArtifactDownloadInfos( "org.apache.archiva.redback.components", "spring-quartz", + "2.0-SNAPSHOT", SNAPSHOT_REPO_ID ); + + log.info( "artifacts: {}", artifacts ); + + Assertions.assertThat( artifacts ).isNotNull().isNotEmpty().hasSize( 10 ); + + RepositoriesService repositoriesService = getRepositoriesService( authorizationHeader ); + + File artifactFile = new File( targetRepo, + "org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214127-1.jar" ); + + File artifactFilemd5 = new File( targetRepo, + "org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214127-1.jar.md5" ); + + File artifactFilepom = new File( targetRepo, + "org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214127-1.pom" ); + + Assertions.assertThat( artifactFile ).exists(); + Assertions.assertThat( artifactFilemd5 ).exists(); + Assertions.assertThat( artifactFilepom ).exists(); + + // we delete only one snapshot + Artifact artifact = + new Artifact( "org.apache.archiva.redback.components", "spring-quartz", "2.0-20120618.214127-1" ); + artifact.setPackaging( "jar" ); + artifact.setRepositoryId( SNAPSHOT_REPO_ID ); + artifact.setContext( SNAPSHOT_REPO_ID ); + repositoriesService.deleteArtifact( artifact ); + + artifacts = + browseService.getArtifactDownloadInfos( "org.apache.archiva.redback.components", "spring-quartz", + "2.0-SNAPSHOT", SNAPSHOT_REPO_ID ); + + log.info( "artifacts: {}", artifacts ); + + Assertions.assertThat( artifacts ).isNotNull().isNotEmpty().hasSize( 8 ); + + Assertions.assertThat( artifactFile ).doesNotExist(); + Assertions.assertThat( artifactFilemd5 ).doesNotExist(); + Assertions.assertThat( artifactFilepom ).doesNotExist(); + } + catch ( Exception e ) + { + log.error( e.getMessage(), e ); + throw e; + } + finally + { + cleanSnapshotRepo(); + } + } + + protected File initSnapshotRepo() + throws Exception + { + File targetRepo = new File( getBasedir(), "target/repo-with-snapshots" ); + if ( targetRepo.exists() ) + { + FileUtils.deleteDirectory( targetRepo ); + } + assertFalse( targetRepo.exists() ); + + FileUtils.copyDirectoryToDirectory( new File( getBasedir(), "src/test/repo-with-snapshots" ), + targetRepo.getParentFile() ); + + if ( getManagedRepositoriesService( authorizationHeader ).getManagedRepository( SNAPSHOT_REPO_ID ) != null ) + { + getManagedRepositoriesService( authorizationHeader ).deleteManagedRepository( SNAPSHOT_REPO_ID, true ); + assertNull( getManagedRepositoriesService( authorizationHeader ).getManagedRepository( SNAPSHOT_REPO_ID ) ); + } + ManagedRepository managedRepository = getTestManagedRepository(); + managedRepository.setId( SNAPSHOT_REPO_ID ); + managedRepository.setLocation( targetRepo.getCanonicalPath() ); + managedRepository.setCronExpression( "* * * * * ?" ); + getManagedRepositoriesService( authorizationHeader ).addManagedRepository( managedRepository ); + assertNotNull( getManagedRepositoriesService( authorizationHeader ).getManagedRepository( SNAPSHOT_REPO_ID ) ); + + return targetRepo; + } + + protected void cleanSnapshotRepo() + throws Exception + { + + if ( getManagedRepositoriesService( authorizationHeader ).getManagedRepository( SNAPSHOT_REPO_ID ) != null ) + { + getManagedRepositoriesService( authorizationHeader ).deleteManagedRepository( SNAPSHOT_REPO_ID, true ); + assertNull( getManagedRepositoriesService( authorizationHeader ).getManagedRepository( SNAPSHOT_REPO_ID ) ); + } + + } + + } diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/maven-metadata.xml new file mode 100644 index 000000000..228a1400c --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/maven-metadata.xml @@ -0,0 +1,25 @@ + + + org.apache.archiva.redback.components + spring-quartz + 2.0-SNAPSHOT + + + 20120618.214200 + 5 + + 20120618214200 + + + jar + 2.0-20120618.214200-5 + 20120618214200 + + + pom + 2.0-20120618.214200-5 + 20120618214200 + + + + diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/maven-metadata.xml.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/maven-metadata.xml.md5 new file mode 100644 index 000000000..7d98d579c --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/maven-metadata.xml.md5 @@ -0,0 +1 @@ +31caca863219e4fba3d68102cccc9ce6 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/maven-metadata.xml.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/maven-metadata.xml.sha1 new file mode 100644 index 000000000..95d1db077 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/maven-metadata.xml.sha1 @@ -0,0 +1 @@ +efa1a9f70cd11abef2037c21afbb3ef9722ecf00 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214127-1.jar b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214127-1.jar new file mode 100644 index 000000000..3789c3846 Binary files /dev/null and b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214127-1.jar differ diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214127-1.jar.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214127-1.jar.md5 new file mode 100644 index 000000000..3ebea0678 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214127-1.jar.md5 @@ -0,0 +1 @@ +081d1ac85a85903168b17fbbdff2e85b \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214127-1.jar.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214127-1.jar.sha1 new file mode 100644 index 000000000..aa8828cf2 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214127-1.jar.sha1 @@ -0,0 +1 @@ +0fc5bdd5bc6014331f6898d8cbb28bdda47e78e9 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214127-1.pom b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214127-1.pom new file mode 100644 index 000000000..353910249 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214127-1.pom @@ -0,0 +1,96 @@ + + + + + org.apache.archiva.redback.components + redback-components + 2.0-SNAPSHOT + ../redback-components-parent/pom.xml + + 4.0.0 + spring-quartz + Spring Quartz Component + 2.0-SNAPSHOT + + http://archiva.apache.org/redback/components/${project.artifactId} + + + + apache.website + scp://people.apache.org/www/archiva.apache.org/redback/components/${project.artifactId} + + + + + scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-quartz/ + scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-quartz/ + http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-quartz/ + + + + + javax.inject + javax.inject + + + javax.annotation + jsr250-api + + + org.springframework + spring-context + + + org.quartz-scheduler + quartz + 2.1.3 + + + c3p0 + c3p0 + + + + + org.slf4j + slf4j-api + + + commons-lang + commons-lang + + + org.springframework + spring-test + test + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + 60 + + + + + diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214127-1.pom.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214127-1.pom.md5 new file mode 100644 index 000000000..971db91a9 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214127-1.pom.md5 @@ -0,0 +1 @@ +b2e12dde927022272b4c316a583da786 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214127-1.pom.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214127-1.pom.sha1 new file mode 100644 index 000000000..273832cb7 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214127-1.pom.sha1 @@ -0,0 +1 @@ +544ac35c8d3e0bf2ef7de9f4b39560603bd18a34 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214135-2.jar b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214135-2.jar new file mode 100644 index 000000000..c3e8ee6ce Binary files /dev/null and b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214135-2.jar differ diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214135-2.jar.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214135-2.jar.md5 new file mode 100644 index 000000000..0a430ef9e --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214135-2.jar.md5 @@ -0,0 +1 @@ +85a99ff86610ccab7ab4575fe168efc8 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214135-2.jar.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214135-2.jar.sha1 new file mode 100644 index 000000000..e7cc128ed --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214135-2.jar.sha1 @@ -0,0 +1 @@ +3b9d0dc2f0c3464a1b3d6b493857b7615aad13bc \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214135-2.pom b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214135-2.pom new file mode 100644 index 000000000..353910249 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214135-2.pom @@ -0,0 +1,96 @@ + + + + + org.apache.archiva.redback.components + redback-components + 2.0-SNAPSHOT + ../redback-components-parent/pom.xml + + 4.0.0 + spring-quartz + Spring Quartz Component + 2.0-SNAPSHOT + + http://archiva.apache.org/redback/components/${project.artifactId} + + + + apache.website + scp://people.apache.org/www/archiva.apache.org/redback/components/${project.artifactId} + + + + + scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-quartz/ + scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-quartz/ + http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-quartz/ + + + + + javax.inject + javax.inject + + + javax.annotation + jsr250-api + + + org.springframework + spring-context + + + org.quartz-scheduler + quartz + 2.1.3 + + + c3p0 + c3p0 + + + + + org.slf4j + slf4j-api + + + commons-lang + commons-lang + + + org.springframework + spring-test + test + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + 60 + + + + + diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214135-2.pom.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214135-2.pom.md5 new file mode 100644 index 000000000..971db91a9 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214135-2.pom.md5 @@ -0,0 +1 @@ +b2e12dde927022272b4c316a583da786 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214135-2.pom.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214135-2.pom.sha1 new file mode 100644 index 000000000..273832cb7 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214135-2.pom.sha1 @@ -0,0 +1 @@ +544ac35c8d3e0bf2ef7de9f4b39560603bd18a34 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214144-3.jar b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214144-3.jar new file mode 100644 index 000000000..f990865bf Binary files /dev/null and b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214144-3.jar differ diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214144-3.jar.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214144-3.jar.md5 new file mode 100644 index 000000000..cc9a6ab13 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214144-3.jar.md5 @@ -0,0 +1 @@ +f55cc0e03e2e28ff7d481511052f94f7 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214144-3.jar.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214144-3.jar.sha1 new file mode 100644 index 000000000..e649ee87c --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214144-3.jar.sha1 @@ -0,0 +1 @@ +ad10f9b50a5e366cee3705956117d4a8aced295b \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214144-3.pom b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214144-3.pom new file mode 100644 index 000000000..353910249 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214144-3.pom @@ -0,0 +1,96 @@ + + + + + org.apache.archiva.redback.components + redback-components + 2.0-SNAPSHOT + ../redback-components-parent/pom.xml + + 4.0.0 + spring-quartz + Spring Quartz Component + 2.0-SNAPSHOT + + http://archiva.apache.org/redback/components/${project.artifactId} + + + + apache.website + scp://people.apache.org/www/archiva.apache.org/redback/components/${project.artifactId} + + + + + scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-quartz/ + scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-quartz/ + http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-quartz/ + + + + + javax.inject + javax.inject + + + javax.annotation + jsr250-api + + + org.springframework + spring-context + + + org.quartz-scheduler + quartz + 2.1.3 + + + c3p0 + c3p0 + + + + + org.slf4j + slf4j-api + + + commons-lang + commons-lang + + + org.springframework + spring-test + test + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + 60 + + + + + diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214144-3.pom.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214144-3.pom.md5 new file mode 100644 index 000000000..971db91a9 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214144-3.pom.md5 @@ -0,0 +1 @@ +b2e12dde927022272b4c316a583da786 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214144-3.pom.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214144-3.pom.sha1 new file mode 100644 index 000000000..273832cb7 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214144-3.pom.sha1 @@ -0,0 +1 @@ +544ac35c8d3e0bf2ef7de9f4b39560603bd18a34 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214150-4.jar b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214150-4.jar new file mode 100644 index 000000000..c0be3b785 Binary files /dev/null and b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214150-4.jar differ diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214150-4.jar.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214150-4.jar.md5 new file mode 100644 index 000000000..9792f30a5 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214150-4.jar.md5 @@ -0,0 +1 @@ +9fe56f9dddae45019db5bca09f57b407 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214150-4.jar.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214150-4.jar.sha1 new file mode 100644 index 000000000..eedd3148c --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214150-4.jar.sha1 @@ -0,0 +1 @@ +8cbbb1cf25f1cd0e87ad38e58777c9ba115887b3 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214150-4.pom b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214150-4.pom new file mode 100644 index 000000000..353910249 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214150-4.pom @@ -0,0 +1,96 @@ + + + + + org.apache.archiva.redback.components + redback-components + 2.0-SNAPSHOT + ../redback-components-parent/pom.xml + + 4.0.0 + spring-quartz + Spring Quartz Component + 2.0-SNAPSHOT + + http://archiva.apache.org/redback/components/${project.artifactId} + + + + apache.website + scp://people.apache.org/www/archiva.apache.org/redback/components/${project.artifactId} + + + + + scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-quartz/ + scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-quartz/ + http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-quartz/ + + + + + javax.inject + javax.inject + + + javax.annotation + jsr250-api + + + org.springframework + spring-context + + + org.quartz-scheduler + quartz + 2.1.3 + + + c3p0 + c3p0 + + + + + org.slf4j + slf4j-api + + + commons-lang + commons-lang + + + org.springframework + spring-test + test + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + 60 + + + + + diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214150-4.pom.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214150-4.pom.md5 new file mode 100644 index 000000000..971db91a9 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214150-4.pom.md5 @@ -0,0 +1 @@ +b2e12dde927022272b4c316a583da786 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214150-4.pom.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214150-4.pom.sha1 new file mode 100644 index 000000000..273832cb7 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214150-4.pom.sha1 @@ -0,0 +1 @@ +544ac35c8d3e0bf2ef7de9f4b39560603bd18a34 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214200-5.jar b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214200-5.jar new file mode 100644 index 000000000..8d23891db Binary files /dev/null and b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214200-5.jar differ diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214200-5.jar.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214200-5.jar.md5 new file mode 100644 index 000000000..4691c4ff5 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214200-5.jar.md5 @@ -0,0 +1 @@ +5a902fd05e63ca8ff0514387f8798427 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214200-5.jar.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214200-5.jar.sha1 new file mode 100644 index 000000000..b3064bcf4 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214200-5.jar.sha1 @@ -0,0 +1 @@ +20bfd12ec5b81763e41ef504a25db86975c2521c \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214200-5.pom b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214200-5.pom new file mode 100644 index 000000000..353910249 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214200-5.pom @@ -0,0 +1,96 @@ + + + + + org.apache.archiva.redback.components + redback-components + 2.0-SNAPSHOT + ../redback-components-parent/pom.xml + + 4.0.0 + spring-quartz + Spring Quartz Component + 2.0-SNAPSHOT + + http://archiva.apache.org/redback/components/${project.artifactId} + + + + apache.website + scp://people.apache.org/www/archiva.apache.org/redback/components/${project.artifactId} + + + + + scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-quartz/ + scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-quartz/ + http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-quartz/ + + + + + javax.inject + javax.inject + + + javax.annotation + jsr250-api + + + org.springframework + spring-context + + + org.quartz-scheduler + quartz + 2.1.3 + + + c3p0 + c3p0 + + + + + org.slf4j + slf4j-api + + + commons-lang + commons-lang + + + org.springframework + spring-test + test + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + 60 + + + + + diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214200-5.pom.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214200-5.pom.md5 new file mode 100644 index 000000000..971db91a9 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214200-5.pom.md5 @@ -0,0 +1 @@ +b2e12dde927022272b4c316a583da786 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214200-5.pom.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214200-5.pom.sha1 new file mode 100644 index 000000000..273832cb7 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214200-5.pom.sha1 @@ -0,0 +1 @@ +544ac35c8d3e0bf2ef7de9f4b39560603bd18a34 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/maven-metadata.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/maven-metadata.xml new file mode 100644 index 000000000..b8e63ee36 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/maven-metadata.xml @@ -0,0 +1,11 @@ + + + org.apache.archiva.redback.components + spring-quartz + + + 2.0-SNAPSHOT + + 20120618214200 + + diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/maven-metadata.xml.md5 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/maven-metadata.xml.md5 new file mode 100644 index 000000000..732813317 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/maven-metadata.xml.md5 @@ -0,0 +1 @@ +bdfe427b0959b3978ab26c76a002ac5d \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/maven-metadata.xml.sha1 b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/maven-metadata.xml.sha1 new file mode 100644 index 000000000..c41fc1a37 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repo-with-snapshots/org/apache/archiva/redback/components/spring-quartz/maven-metadata.xml.sha1 @@ -0,0 +1 @@ +732c5d8c5a60ae8141cadd6033d9b86000a60e5b \ No newline at end of file