From f39e1770446184553877802c014117c924b0db8e Mon Sep 17 00:00:00 2001 From: James William Dumay Date: Mon, 22 Dec 2008 03:18:57 +0000 Subject: @Override git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@728586 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/apache/maven/archiva/cli/ProjectReaderConsumer.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'archiva-cli') diff --git a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ProjectReaderConsumer.java b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ProjectReaderConsumer.java index e2661c99b..2ceb7a0d9 100644 --- a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ProjectReaderConsumer.java +++ b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ProjectReaderConsumer.java @@ -94,6 +94,7 @@ public class ProjectReaderConsumer return includes; } + @Override public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered ) throws ConsumerException { @@ -101,6 +102,7 @@ public class ProjectReaderConsumer this.repo = repository; } + @Override public void processFile( String path ) throws ConsumerException { -- cgit v1.2.3 From 0fcfb7e339c2815c3b90143b4610fb1f6f7af7ee Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Tue, 10 Mar 2009 01:09:34 +0000 Subject: [MRM-1102] don't swallow parsing exception too early where it still has context, and only log the message not the trace in scanning git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@751932 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/archiva/cli/ProjectReaderConsumer.java | 4 +- .../database/ProjectModelToDatabaseConsumer.java | 6 +- .../repository/project/ProjectModelReader.java | 4 +- .../project/readers/ProjectModel300Reader.java | 111 +++++++++------------ .../project/readers/ProjectModel400Reader.java | 93 ++++++++--------- .../ManagedRepositoryProjectResolver.java | 14 ++- .../filters/EffectiveProjectModelFilterTest.java | 3 +- .../ProjectModelExpressionExpanderTest.java | 3 +- .../project/readers/ProjectModel300ReaderTest.java | 8 +- .../project/readers/ProjectModel400ReaderTest.java | 10 +- .../project/writers/ProjectModel400WriterTest.java | 3 +- 11 files changed, 125 insertions(+), 134 deletions(-) (limited to 'archiva-cli') diff --git a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ProjectReaderConsumer.java b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ProjectReaderConsumer.java index 2ceb7a0d9..b0eb6edc0 100644 --- a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ProjectReaderConsumer.java +++ b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ProjectReaderConsumer.java @@ -28,9 +28,9 @@ import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.consumers.ConsumerException; import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer; import org.apache.maven.archiva.model.ArchivaProjectModel; -import org.apache.maven.archiva.repository.project.ProjectModelException; import org.apache.maven.archiva.repository.project.ProjectModelReader; import org.apache.maven.archiva.repository.project.readers.ProjectModel400Reader; +import org.apache.maven.archiva.xml.XMLException; /** * ProjectReaderConsumer @@ -117,7 +117,7 @@ public class ProjectReaderConsumer System.err.println( "Got null model on " + pomFile ); } } - catch ( ProjectModelException e ) + catch ( XMLException e ) { System.err.println( "Unable to process: " + pomFile ); e.printStackTrace( System.out ); diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java index 28f5c0a9d..f06f866ea 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java @@ -41,11 +41,11 @@ import org.apache.maven.archiva.repository.ManagedRepositoryContent; import org.apache.maven.archiva.repository.RepositoryContentFactory; import org.apache.maven.archiva.repository.RepositoryException; import org.apache.maven.archiva.repository.content.ManagedLegacyRepositoryContent; -import org.apache.maven.archiva.repository.project.ProjectModelException; import org.apache.maven.archiva.repository.project.ProjectModelReader; import org.apache.maven.archiva.repository.project.filters.EffectiveProjectModelFilter; import org.apache.maven.archiva.repository.project.readers.ProjectModel300Reader; import org.apache.maven.archiva.repository.project.readers.ProjectModel400Reader; +import org.apache.maven.archiva.xml.XMLException; import org.codehaus.plexus.cache.Cache; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -178,9 +178,9 @@ public class ProjectModelToDatabaseConsumer } } - catch ( ProjectModelException e ) + catch ( XMLException e ) { - log.warn( "Unable to read project model " + artifactFile + " : " + e.getMessage(), e ); + log.warn( "Unable to read project model " + artifactFile + " : " + e.getMessage() ); addProblem( artifact, "Unable to read project model " + artifactFile + " : " + e.getMessage() ); } diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelReader.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelReader.java index 419a905d1..a795a445d 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelReader.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelReader.java @@ -20,6 +20,7 @@ package org.apache.maven.archiva.repository.project; */ import org.apache.maven.archiva.model.ArchivaProjectModel; +import org.apache.maven.archiva.xml.XMLException; import java.io.File; @@ -30,5 +31,6 @@ import java.io.File; */ public interface ProjectModelReader { - public ArchivaProjectModel read( File pomFile ) throws ProjectModelException; + public ArchivaProjectModel read( File pomFile ) + throws XMLException; } diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel300Reader.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel300Reader.java index 34cc0cec6..600f738ae 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel300Reader.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel300Reader.java @@ -19,6 +19,12 @@ package org.apache.maven.archiva.repository.project.readers; * under the License. */ +import java.io.File; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; + import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.model.ArchivaProjectModel; import org.apache.maven.archiva.model.ArtifactReference; @@ -30,18 +36,11 @@ import org.apache.maven.archiva.model.MailingList; import org.apache.maven.archiva.model.Organization; import org.apache.maven.archiva.model.ProjectRepository; import org.apache.maven.archiva.model.Scm; -import org.apache.maven.archiva.repository.project.ProjectModelException; import org.apache.maven.archiva.repository.project.ProjectModelReader; import org.apache.maven.archiva.xml.XMLException; import org.apache.maven.archiva.xml.XMLReader; import org.dom4j.Element; -import java.io.File; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Properties; - /** * ProjectModel300Reader * @@ -52,66 +51,54 @@ public class ProjectModel300Reader { public ArchivaProjectModel read( File pomFile ) - throws ProjectModelException + throws XMLException { - try - { - XMLReader xml = new XMLReader( "project", pomFile ); - - ArchivaProjectModel model = new ArchivaProjectModel(); - - xml.removeNamespaces(); + XMLReader xml = new XMLReader( "project", pomFile ); - Element project = xml.getElement( "//project" ); + ArchivaProjectModel model = new ArchivaProjectModel(); - // TODO: Handle ?? (is this even possible?) + xml.removeNamespaces(); - model.setGroupId( project.elementTextTrim( "groupId" ) ); - model.setArtifactId( project.elementTextTrim( "artifactId" ) ); - // TODO: Handle - model.setVersion( project.elementTextTrim( "currentVersion" ) ); - model.setName( project.elementTextTrim( "name" ) ); - model.setDescription( project.elementTextTrim( "description" ) ); - // TODO: what to do with ? - model.setUrl( project.elementTextTrim( "url" ) ); - // TODO: Handle - // TODO: Handle - - model.setIssueManagement( getIssueManagement( xml ) ); - // TODO: What to do with ? - // TODO: Handle - // TODO: Handle ? - // TODO: Handle - // TODO: Handle - model.setMailingLists( getMailingLists( xml ) ); - model.setIndividuals( getIndividuals( xml ) ); - model.setLicenses( getLicenses( xml ) ); - model.setReports( getReports( xml ) ); - model.setRepositories( getRepositories( xml ) ); - model.setScm( getSCM( xml ) ); - model.setOrganization( getOrganization( xml ) ); - model.setProperties( getProperties( xml.getElement( "//project/properties" ) ) ); - model.setDependencies( getDependencies( xml ) ); - - model.setOrigin("filesystem"); - - /* Following are not valid for 3 / Maven 1 pom files. - * - * model.setDependencyManagement() - * model.setPlugins() - * model.setParentProject() - * model.setPackaging() - * model.setCiManagement() - * model.setBuildExtensions() - * model.setRelocation() - */ + Element project = xml.getElement( "//project" ); - return model; - } - catch ( XMLException e ) - { - throw new ProjectModelException( e.getMessage(), e ); - } + // TODO: Handle ?? (is this even possible?) + + model.setGroupId( project.elementTextTrim( "groupId" ) ); + model.setArtifactId( project.elementTextTrim( "artifactId" ) ); + // TODO: Handle + model.setVersion( project.elementTextTrim( "currentVersion" ) ); + model.setName( project.elementTextTrim( "name" ) ); + model.setDescription( project.elementTextTrim( "description" ) ); + // TODO: what to do with ? + model.setUrl( project.elementTextTrim( "url" ) ); + // TODO: Handle + // TODO: Handle + + model.setIssueManagement( getIssueManagement( xml ) ); + // TODO: What to do with ? + // TODO: Handle + // TODO: Handle ? + // TODO: Handle + // TODO: Handle + model.setMailingLists( getMailingLists( xml ) ); + model.setIndividuals( getIndividuals( xml ) ); + model.setLicenses( getLicenses( xml ) ); + model.setReports( getReports( xml ) ); + model.setRepositories( getRepositories( xml ) ); + model.setScm( getSCM( xml ) ); + model.setOrganization( getOrganization( xml ) ); + model.setProperties( getProperties( xml.getElement( "//project/properties" ) ) ); + model.setDependencies( getDependencies( xml ) ); + + model.setOrigin( "filesystem" ); + + /* + * Following are not valid for 3 / Maven 1 pom files. model.setDependencyManagement() + * model.setPlugins() model.setParentProject() model.setPackaging() model.setCiManagement() + * model.setBuildExtensions() model.setRelocation() + */ + + return model; } private ArtifactReference getArtifactReference( Element elemPlugin, String defaultType ) diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel400Reader.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel400Reader.java index f8aa2c6fb..16f8225a1 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel400Reader.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel400Reader.java @@ -19,6 +19,12 @@ package org.apache.maven.archiva.repository.project.readers; * under the License. */ +import java.io.File; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; + import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.model.ArchivaProjectModel; import org.apache.maven.archiva.model.ArtifactReference; @@ -34,18 +40,11 @@ import org.apache.maven.archiva.model.Organization; import org.apache.maven.archiva.model.ProjectRepository; import org.apache.maven.archiva.model.Scm; import org.apache.maven.archiva.model.VersionedReference; -import org.apache.maven.archiva.repository.project.ProjectModelException; import org.apache.maven.archiva.repository.project.ProjectModelReader; import org.apache.maven.archiva.xml.XMLException; import org.apache.maven.archiva.xml.XMLReader; import org.dom4j.Element; -import java.io.File; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Properties; - /** * ProjectModel400Reader - read in modelVersion 4.0.0 pom files into archiva-model structures. * @@ -54,64 +53,56 @@ import java.util.Properties; public class ProjectModel400Reader implements ProjectModelReader { - public ArchivaProjectModel read( File pomFile ) - throws ProjectModelException + throws XMLException { - try - { - XMLReader xml = new XMLReader( "project", pomFile ); + XMLReader xml = new XMLReader( "project", pomFile ); - ArchivaProjectModel model = new ArchivaProjectModel(); + ArchivaProjectModel model = new ArchivaProjectModel(); - if ( !"http://maven.apache.org/POM/4.0.0".equals( xml.getDefaultNamespaceURI() ) ) - { - // No namespace defined - // TODO: Output to monitor the problem with the Namespace. - } + if ( !"http://maven.apache.org/POM/4.0.0".equals( xml.getDefaultNamespaceURI() ) ) + { + // No namespace defined + // TODO: Output to monitor the problem with the Namespace. + } - xml.removeNamespaces(); + xml.removeNamespaces(); - Element project = xml.getElement( "//project" ); + Element project = xml.getElement( "//project" ); - model.setGroupId( project.elementTextTrim( "groupId" ) ); - model.setArtifactId( project.elementTextTrim( "artifactId" ) ); - model.setVersion( project.elementTextTrim( "version" ) ); - model.setName( project.elementTextTrim( "name" ) ); - model.setDescription( project.elementTextTrim( "description" ) ); - model.setUrl( project.elementTextTrim( "url" ) ); + model.setGroupId( project.elementTextTrim( "groupId" ) ); + model.setArtifactId( project.elementTextTrim( "artifactId" ) ); + model.setVersion( project.elementTextTrim( "version" ) ); + model.setName( project.elementTextTrim( "name" ) ); + model.setDescription( project.elementTextTrim( "description" ) ); + model.setUrl( project.elementTextTrim( "url" ) ); - model.setPackaging( StringUtils.defaultIfEmpty( project.elementTextTrim( "packaging" ), "jar" ) ); + model.setPackaging( StringUtils.defaultIfEmpty( project.elementTextTrim( "packaging" ), "jar" ) ); - model.setParentProject( getParentProject( xml ) ); + model.setParentProject( getParentProject( xml ) ); - model.setMailingLists( getMailingLists( xml ) ); - model.setCiManagement( getCiManagement( xml ) ); - model.setIndividuals( getIndividuals( xml ) ); - model.setIssueManagement( getIssueManagement( xml ) ); - model.setLicenses( getLicenses( xml ) ); - model.setOrganization( getOrganization( xml ) ); - model.setScm( getSCM( xml ) ); - model.setRepositories( getRepositories( xml ) ); + model.setMailingLists( getMailingLists( xml ) ); + model.setCiManagement( getCiManagement( xml ) ); + model.setIndividuals( getIndividuals( xml ) ); + model.setIssueManagement( getIssueManagement( xml ) ); + model.setLicenses( getLicenses( xml ) ); + model.setOrganization( getOrganization( xml ) ); + model.setScm( getSCM( xml ) ); + model.setRepositories( getRepositories( xml ) ); - model.setDependencies( getDependencies( xml ) ); - model.setDependencyManagement( getDependencyManagement( xml ) ); - model.setPlugins( getPlugins( xml ) ); - model.setReports( getReports( xml ) ); - model.setProperties( getProperties( xml.getElement( "//project/properties" ) ) ); + model.setDependencies( getDependencies( xml ) ); + model.setDependencyManagement( getDependencyManagement( xml ) ); + model.setPlugins( getPlugins( xml ) ); + model.setReports( getReports( xml ) ); + model.setProperties( getProperties( xml.getElement( "//project/properties" ) ) ); - model.setBuildExtensions( getBuildExtensions( xml ) ); + model.setBuildExtensions( getBuildExtensions( xml ) ); - model.setRelocation( getRelocation( xml ) ); - - model.setOrigin("filesystem"); + model.setRelocation( getRelocation( xml ) ); - return model; - } - catch ( XMLException e ) - { - throw new ProjectModelException( e.getMessage(), e ); - } + model.setOrigin( "filesystem" ); + + return model; } private ArtifactReference getArtifactReference( Element elemPlugin, String defaultType ) diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/resolvers/ManagedRepositoryProjectResolver.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/resolvers/ManagedRepositoryProjectResolver.java index 691535f31..91e71d6d9 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/resolvers/ManagedRepositoryProjectResolver.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/resolvers/ManagedRepositoryProjectResolver.java @@ -19,6 +19,8 @@ package org.apache.maven.archiva.repository.project.resolvers; * under the License. */ +import java.io.File; + import org.apache.maven.archiva.model.ArchivaArtifact; import org.apache.maven.archiva.model.ArchivaProjectModel; import org.apache.maven.archiva.model.VersionedReference; @@ -26,8 +28,7 @@ import org.apache.maven.archiva.repository.ManagedRepositoryContent; import org.apache.maven.archiva.repository.project.ProjectModelException; import org.apache.maven.archiva.repository.project.ProjectModelReader; import org.apache.maven.archiva.repository.project.ProjectModelResolver; - -import java.io.File; +import org.apache.maven.archiva.xml.XMLException; /** * Resolve Project from managed repository. @@ -55,7 +56,14 @@ public class ManagedRepositoryProjectResolver File repoFile = repository.toFile( artifact ); - return reader.read( repoFile ); + try + { + return reader.read( repoFile ); + } + catch ( XMLException e ) + { + throw new ProjectModelException( e.getMessage(), e ); + } } } diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilterTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilterTest.java index 26ba23322..aa4ec3513 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilterTest.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilterTest.java @@ -32,6 +32,7 @@ import org.apache.maven.archiva.repository.project.ProjectModelResolver; import org.apache.maven.archiva.repository.project.ProjectModelResolverFactory; import org.apache.maven.archiva.repository.project.readers.ProjectModel400Reader; import org.apache.maven.archiva.repository.project.resolvers.ManagedRepositoryProjectResolver; +import org.apache.maven.archiva.xml.XMLException; import java.io.File; import java.util.HashMap; @@ -56,7 +57,7 @@ public class EffectiveProjectModelFilterTest } private ArchivaProjectModel createArchivaProjectModel( String path ) - throws ProjectModelException + throws XMLException { ProjectModelReader reader = new ProjectModel400Reader(); diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionExpanderTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionExpanderTest.java index c99b56023..1bb246d02 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionExpanderTest.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionExpanderTest.java @@ -27,6 +27,7 @@ import org.apache.maven.archiva.repository.project.ProjectModelReader; import org.apache.maven.archiva.repository.project.ProjectModelWriter; import org.apache.maven.archiva.repository.project.readers.ProjectModel400Reader; import org.apache.maven.archiva.repository.project.writers.ProjectModel400Writer; +import org.apache.maven.archiva.xml.XMLException; import org.codehaus.plexus.spring.PlexusInSpringTestCase; import java.io.File; @@ -136,7 +137,7 @@ public class ProjectModelExpressionExpanderTest } private ArchivaProjectModel createArchivaProjectModel( String path ) - throws ProjectModelException + throws XMLException { ProjectModelReader reader = new ProjectModel400Reader(); diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/readers/ProjectModel300ReaderTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/readers/ProjectModel300ReaderTest.java index 99ad25a21..87910d036 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/readers/ProjectModel300ReaderTest.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/readers/ProjectModel300ReaderTest.java @@ -19,14 +19,14 @@ package org.apache.maven.archiva.repository.project.readers; * under the License. */ +import java.io.File; + import org.apache.maven.archiva.model.ArchivaProjectModel; import org.apache.maven.archiva.model.Dependency; -import org.apache.maven.archiva.repository.project.ProjectModelException; import org.apache.maven.archiva.repository.project.ProjectModelReader; +import org.apache.maven.archiva.xml.XMLException; import org.codehaus.plexus.spring.PlexusInSpringTestCase; -import java.io.File; - /** * ProjectModel300ReaderTest * @@ -36,7 +36,7 @@ public class ProjectModel300ReaderTest extends PlexusInSpringTestCase { public void testLoadSimple() - throws ProjectModelException + throws XMLException { File defaultRepoDir = new File( getBasedir(), "src/test/repositories/legacy-repository" ); File pomFile = new File( defaultRepoDir, "org.apache.maven/poms/maven-model-v3-2.0.pom" ); diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/readers/ProjectModel400ReaderTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/readers/ProjectModel400ReaderTest.java index c35483f06..42c64331d 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/readers/ProjectModel400ReaderTest.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/readers/ProjectModel400ReaderTest.java @@ -19,14 +19,14 @@ package org.apache.maven.archiva.repository.project.readers; * under the License. */ +import java.io.File; + import org.apache.maven.archiva.model.ArchivaProjectModel; import org.apache.maven.archiva.model.VersionedReference; -import org.apache.maven.archiva.repository.project.ProjectModelException; import org.apache.maven.archiva.repository.project.ProjectModelReader; +import org.apache.maven.archiva.xml.XMLException; import org.codehaus.plexus.spring.PlexusInSpringTestCase; -import java.io.File; - /** * ProjectModel400ReaderTest * @@ -36,7 +36,7 @@ public class ProjectModel400ReaderTest extends PlexusInSpringTestCase { public void testLoadSimple() - throws ProjectModelException + throws XMLException { File defaultRepoDir = new File( getBasedir(), "src/test/repositories/default-repository" ); File pomFile = new File( defaultRepoDir, @@ -66,7 +66,7 @@ public class ProjectModel400ReaderTest } public void testLoadWithNamespace() - throws ProjectModelException + throws XMLException { File defaultRepoDir = new File( getBasedir(), "src/test/repositories/default-repository" ); File pomFile = new File( defaultRepoDir, diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/writers/ProjectModel400WriterTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/writers/ProjectModel400WriterTest.java index 471010d96..e18b46aa4 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/writers/ProjectModel400WriterTest.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/writers/ProjectModel400WriterTest.java @@ -25,6 +25,7 @@ import org.apache.maven.archiva.repository.project.ProjectModelException; import org.apache.maven.archiva.repository.project.ProjectModelReader; import org.apache.maven.archiva.repository.project.ProjectModelWriter; import org.apache.maven.archiva.repository.project.readers.ProjectModel400Reader; +import org.apache.maven.archiva.xml.XMLException; import org.codehaus.plexus.spring.PlexusInSpringTestCase; import org.custommonkey.xmlunit.DetailedDiff; import org.custommonkey.xmlunit.Diff; @@ -128,7 +129,7 @@ public class ProjectModel400WriterTest } private ArchivaProjectModel createArchivaProjectModel( String path ) - throws ProjectModelException + throws XMLException { ProjectModelReader reader = new ProjectModel400Reader(); -- cgit v1.2.3 From 537ff689e7e39ce7ca4d9f0b94abcece5ee7c569 Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Sat, 14 Mar 2009 02:33:57 +0000 Subject: [MRM-1140] centralise logging through slf4j git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@753590 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-cli/pom.xml | 23 +++++-- .../archiva-artifact-converter/pom.xml | 5 ++ .../archiva-base/archiva-checksum/pom.xml | 5 ++ .../archiva-base/archiva-configuration/pom.xml | 5 ++ .../src/test/resources/log4j.properties | 10 --- .../archiva-core-consumers/pom.xml | 5 ++ .../archiva-database-consumers/pom.xml | 5 ++ .../archiva-dependency-tree-consumer/pom.xml | 5 ++ .../archiva-lucene-consumers/pom.xml | 5 ++ .../archiva-base/archiva-converter/pom.xml | 5 ++ .../src/test/resources/log4j.properties | 10 --- .../archiva-base/archiva-dependency-graph/pom.xml | 5 ++ .../archiva-base/archiva-indexer/pom.xml | 5 ++ .../archiva-indexer/src/test/resources/log4j.xml | 76 ---------------------- archiva-modules/archiva-base/archiva-model/pom.xml | 10 +++ .../archiva-model/src/test/resources/log4j.xml | 76 ---------------------- .../archiva-base/archiva-policies/pom.xml | 10 +++ .../policies/PropagateErrorsDownloadPolicy.java | 7 +- .../PropagateErrorsOnUpdateDownloadPolicy.java | 6 +- .../archiva-policies/src/test/resources/log4j.xml | 55 ---------------- archiva-modules/archiva-base/archiva-proxy/pom.xml | 5 ++ .../archiva-proxy/src/test/resources/log4j.xml | 47 ------------- .../archiva-base/archiva-repository-layer/pom.xml | 5 ++ .../src/test/resources/log4j.xml | 40 ------------ .../archiva-base/archiva-transaction/pom.xml | 10 +++ archiva-modules/archiva-database/pom.xml | 9 +-- .../archiva-database/src/test/resources/log4j.xml | 76 ---------------------- .../archiva-artifact-reports/pom.xml | 5 ++ .../src/test/resources/log4j.xml | 76 ---------------------- .../archiva-report-manager/pom.xml | 5 ++ .../src/test/resources/log4j.properties | 10 --- archiva-modules/archiva-scheduled/pom.xml | 5 ++ .../archiva-scheduled/src/test/resources/log4j.xml | 47 ------------- archiva-modules/archiva-web/archiva-rss/pom.xml | 5 ++ .../archiva-web/archiva-security/pom.xml | 5 ++ .../src/test/resources/log4j.properties | 10 --- archiva-modules/archiva-web/archiva-webapp/pom.xml | 6 ++ .../maven/archiva/web/action/BrowseAction.java | 10 +-- .../archiva/web/action/PlexusActionSupport.java | 24 +++---- .../maven/archiva/web/action/SearchAction.java | 6 +- .../archiva/web/action/ShowArtifactAction.java | 8 +-- .../maven/archiva/web/action/UploadAction.java | 6 +- .../archiva/web/action/admin/SchedulerAction.java | 4 +- .../web/action/admin/database/DatabaseAction.java | 2 +- .../legacy/DeleteLegacyArtifactPathAction.java | 2 +- .../AbstractManagedRepositoriesAction.java | 2 +- .../DeleteManagedRepositoryAction.java | 6 +- .../admin/scanning/RepositoryScanningAction.java | 8 +-- .../archiva-webapp/src/test/resources/log4j.xml | 55 ---------------- .../archiva/web/action/ShowArtifactActionTest.xml | 5 -- .../proxy/AddProxyConnectorActionTest.xml | 6 -- .../proxy/EditProxyConnectorActionTest.xml | 6 -- .../AbstractManagedRepositoriesActionTest.xml | 6 -- .../DeleteManagedRepositoryActionTest.xml | 5 -- .../admin/repositories/RepositoriesActionTest.xml | 5 -- .../maven/archiva/web/rss/RssFeedServletTest.xml | 39 +++++------ archiva-modules/archiva-web/archiva-webdav/pom.xml | 9 ++- .../maven/archiva/webdav/util/MimeTypes.java | 24 +++---- .../archiva-webdav/src/test/resources/log4j.xml | 55 ---------------- .../webdav/RepositoryServletSecurityTest.xml | 12 +--- .../maven/archiva/webdav/RepositoryServletTest.xml | 9 --- .../archiva-xmlrpc/archiva-xmlrpc-client/pom.xml | 47 +++++-------- .../archiva-xmlrpc/archiva-xmlrpc-security/pom.xml | 5 ++ .../archiva-xmlrpc/archiva-xmlrpc-services/pom.xml | 5 ++ pom.xml | 27 +++----- 65 files changed, 259 insertions(+), 838 deletions(-) delete mode 100644 archiva-modules/archiva-base/archiva-configuration/src/test/resources/log4j.properties delete mode 100644 archiva-modules/archiva-base/archiva-converter/src/test/resources/log4j.properties delete mode 100644 archiva-modules/archiva-base/archiva-indexer/src/test/resources/log4j.xml delete mode 100644 archiva-modules/archiva-base/archiva-model/src/test/resources/log4j.xml delete mode 100644 archiva-modules/archiva-base/archiva-policies/src/test/resources/log4j.xml delete mode 100644 archiva-modules/archiva-base/archiva-proxy/src/test/resources/log4j.xml delete mode 100644 archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/log4j.xml delete mode 100644 archiva-modules/archiva-database/src/test/resources/log4j.xml delete mode 100644 archiva-modules/archiva-reporting/archiva-artifact-reports/src/test/resources/log4j.xml delete mode 100644 archiva-modules/archiva-reporting/archiva-report-manager/src/test/resources/log4j.properties delete mode 100644 archiva-modules/archiva-scheduled/src/test/resources/log4j.xml delete mode 100644 archiva-modules/archiva-web/archiva-security/src/test/resources/log4j.properties delete mode 100644 archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml delete mode 100644 archiva-modules/archiva-web/archiva-webdav/src/test/resources/log4j.xml (limited to 'archiva-cli') diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index 70f20a3ce..a18f2ff8a 100644 --- a/archiva-cli/pom.xml +++ b/archiva-cli/pom.xml @@ -55,11 +55,6 @@ cli 7 - - org.slf4j - slf4j-log4j12 - runtime - org.codehaus.plexus plexus-spring @@ -67,6 +62,12 @@ org.slf4j jcl104-over-slf4j + compile + + + org.slf4j + slf4j-log4j12 + compile @@ -74,7 +75,7 @@ org.apache.maven.plugins maven-shade-plugin - 1.0.1 + 1.2 package @@ -111,6 +112,16 @@ + + org.codehaus.mojo + exec-maven-plugin + + java + org.apache.maven.archiva.cli.ArchivaCli + + + + diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml index 2a3232fa4..72d7f5598 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml @@ -53,6 +53,11 @@ org.apache.maven.shared maven-model-converter + + org.slf4j + slf4j-simple + test + diff --git a/archiva-modules/archiva-base/archiva-checksum/pom.xml b/archiva-modules/archiva-base/archiva-checksum/pom.xml index 0764fcc12..2973a6170 100644 --- a/archiva-modules/archiva-base/archiva-checksum/pom.xml +++ b/archiva-modules/archiva-base/archiva-checksum/pom.xml @@ -43,6 +43,11 @@ org.slf4j slf4j-api + + org.slf4j + slf4j-simple + test + commons-lang commons-lang diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index e262e2beb..805d5a2d5 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -58,6 +58,11 @@ xmlunit test + + org.slf4j + slf4j-simple + test + diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/resources/log4j.properties b/archiva-modules/archiva-base/archiva-configuration/src/test/resources/log4j.properties deleted file mode 100644 index 6d107570b..000000000 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/resources/log4j.properties +++ /dev/null @@ -1,10 +0,0 @@ -# Set root logger level to DEBUG and its only appender to A1. -log4j.rootLogger=INFO, A1 - -# A1 is set to be a ConsoleAppender. -log4j.appender.A1=org.apache.log4j.ConsoleAppender - -# A1 uses PatternLayout. -log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n - diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index 538c0cd4d..b620b3b13 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -51,6 +51,11 @@ + + org.slf4j + slf4j-simple + test + hsqldb hsqldb diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml index 798ee845a..270e04f47 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml @@ -63,5 +63,10 @@ hsqldb test + + org.slf4j + slf4j-simple + test + diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml index c675a7c6a..d1a78a39d 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml @@ -43,5 +43,10 @@ xmlunit test + + org.slf4j + slf4j-simple + test + diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml index cc346c218..616aadbd5 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml @@ -59,5 +59,10 @@ bcel 5.2 + + org.slf4j + slf4j-simple + test + diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml index 2c0813c8f..e30c4d9e2 100644 --- a/archiva-modules/archiva-base/archiva-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-converter/pom.xml @@ -49,5 +49,10 @@ plexus-spring test + + org.slf4j + slf4j-simple + test + diff --git a/archiva-modules/archiva-base/archiva-converter/src/test/resources/log4j.properties b/archiva-modules/archiva-base/archiva-converter/src/test/resources/log4j.properties deleted file mode 100644 index 9b2c26ade..000000000 --- a/archiva-modules/archiva-base/archiva-converter/src/test/resources/log4j.properties +++ /dev/null @@ -1,10 +0,0 @@ -# Set root logger level to DEBUG and its only appender to A1. -log4j.rootLogger=WARN, A1 - -# A1 is set to be a ConsoleAppender. -log4j.appender.A1=org.apache.log4j.ConsoleAppender - -# A1 uses PatternLayout. -log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n - diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml index c95065013..741cd0f15 100644 --- a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml +++ b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml @@ -45,6 +45,11 @@ org.apache.archiva archiva-repository-layer + + org.slf4j + slf4j-simple + test + diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml index a5eb3227d..a0d7681f9 100644 --- a/archiva-modules/archiva-base/archiva-indexer/pom.xml +++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml @@ -69,6 +69,11 @@ org.sonatype.nexus nexus-indexer + + org.slf4j + slf4j-simple + test + diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/resources/log4j.xml b/archiva-modules/archiva-base/archiva-indexer/src/test/resources/log4j.xml deleted file mode 100644 index a11494a31..000000000 --- a/archiva-modules/archiva-base/archiva-indexer/src/test/resources/log4j.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml index 16288f304..23229135c 100755 --- a/archiva-modules/archiva-base/archiva-model/pom.xml +++ b/archiva-modules/archiva-base/archiva-model/pom.xml @@ -49,6 +49,16 @@ javax.jdo jdo2-api + + org.slf4j + slf4j-simple + test + + + org.slf4j + jcl104-over-slf4j + runtime + diff --git a/archiva-modules/archiva-base/archiva-model/src/test/resources/log4j.xml b/archiva-modules/archiva-base/archiva-model/src/test/resources/log4j.xml deleted file mode 100644 index 395941ac3..000000000 --- a/archiva-modules/archiva-base/archiva-model/src/test/resources/log4j.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index 0e8c2e01e..ac5f13f09 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -49,6 +49,16 @@ org.codehaus.plexus.cache plexus-cache-ehcache + + org.slf4j + slf4j-simple + test + + + org.slf4j + jcl104-over-slf4j + runtime + diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsDownloadPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsDownloadPolicy.java index cca1c6750..76b688f21 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsDownloadPolicy.java +++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsDownloadPolicy.java @@ -21,6 +21,8 @@ package org.apache.maven.archiva.policies; import org.apache.commons.lang.StringUtils; import org.codehaus.plexus.logging.AbstractLogEnabled; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.util.ArrayList; @@ -35,9 +37,10 @@ import java.util.Properties; * role-hint="propagate-errors" */ public class PropagateErrorsDownloadPolicy - extends AbstractLogEnabled implements DownloadErrorPolicy { + private Logger log = LoggerFactory.getLogger( PropagateErrorsDownloadPolicy.class ); + /** * Signifies any error should stop searching for other proxies. */ @@ -76,7 +79,7 @@ public class PropagateErrorsDownloadPolicy if ( IGNORE.equals( policySetting ) ) { // Ignore. - getLogger().debug( "Error policy set to IGNORE." ); + log.debug( "Error policy set to IGNORE." ); return false; } diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java index d2b471af3..9e20ba524 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java +++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java @@ -19,15 +19,14 @@ package org.apache.maven.archiva.policies; * under the License. */ -import org.apache.commons.lang.StringUtils; -import org.codehaus.plexus.logging.AbstractLogEnabled; - import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Properties; +import org.apache.commons.lang.StringUtils; + /** * PropagateErrorsPolicy - a policy applied on error to determine how to treat the error. * @@ -35,7 +34,6 @@ import java.util.Properties; * role-hint="propagate-errors-on-update" */ public class PropagateErrorsOnUpdateDownloadPolicy - extends AbstractLogEnabled implements DownloadErrorPolicy { /** diff --git a/archiva-modules/archiva-base/archiva-policies/src/test/resources/log4j.xml b/archiva-modules/archiva-base/archiva-policies/src/test/resources/log4j.xml deleted file mode 100644 index 9bb5e1e5a..000000000 --- a/archiva-modules/archiva-base/archiva-policies/src/test/resources/log4j.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index f4b39942a..a5a21015e 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -84,6 +84,11 @@ ${wagon.version} test + + org.slf4j + slf4j-simple + test + diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/log4j.xml b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/log4j.xml deleted file mode 100644 index 901c99f33..000000000 --- a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/log4j.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index 67c967173..e8ebd8734 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -66,6 +66,11 @@ plexus-spring test + + org.slf4j + slf4j-simple + test + diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/log4j.xml b/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/log4j.xml deleted file mode 100644 index 23d4d08d6..000000000 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/log4j.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml index c9655ca90..7c9bae559 100644 --- a/archiva-modules/archiva-base/archiva-transaction/pom.xml +++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml @@ -49,5 +49,15 @@ org.codehaus.plexus plexus-component-api + + org.slf4j + slf4j-simple + test + + + org.slf4j + jcl104-over-slf4j + runtime + diff --git a/archiva-modules/archiva-database/pom.xml b/archiva-modules/archiva-database/pom.xml index 097c4e3c5..7e5e1d23b 100755 --- a/archiva-modules/archiva-database/pom.xml +++ b/archiva-modules/archiva-database/pom.xml @@ -70,10 +70,6 @@ commons-io commons-io - - log4j - log4j - org.codehaus.plexus.registry @@ -90,6 +86,11 @@ derbytools test + + org.slf4j + slf4j-simple + test + diff --git a/archiva-modules/archiva-database/src/test/resources/log4j.xml b/archiva-modules/archiva-database/src/test/resources/log4j.xml deleted file mode 100644 index 395941ac3..000000000 --- a/archiva-modules/archiva-database/src/test/resources/log4j.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml index 30969cb23..0d48e19a8 100755 --- a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml @@ -59,5 +59,10 @@ hsqldb test + + org.slf4j + slf4j-simple + test + diff --git a/archiva-modules/archiva-reporting/archiva-artifact-reports/src/test/resources/log4j.xml b/archiva-modules/archiva-reporting/archiva-artifact-reports/src/test/resources/log4j.xml deleted file mode 100644 index 395941ac3..000000000 --- a/archiva-modules/archiva-reporting/archiva-artifact-reports/src/test/resources/log4j.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml index cf94e84b8..89d6a61f8 100755 --- a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml @@ -53,6 +53,11 @@ plexus-spring test + + org.slf4j + slf4j-simple + test + diff --git a/archiva-modules/archiva-reporting/archiva-report-manager/src/test/resources/log4j.properties b/archiva-modules/archiva-reporting/archiva-report-manager/src/test/resources/log4j.properties deleted file mode 100644 index 9b2c26ade..000000000 --- a/archiva-modules/archiva-reporting/archiva-report-manager/src/test/resources/log4j.properties +++ /dev/null @@ -1,10 +0,0 @@ -# Set root logger level to DEBUG and its only appender to A1. -log4j.rootLogger=WARN, A1 - -# A1 is set to be a ConsoleAppender. -log4j.appender.A1=org.apache.log4j.ConsoleAppender - -# A1 uses PatternLayout. -log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n - diff --git a/archiva-modules/archiva-scheduled/pom.xml b/archiva-modules/archiva-scheduled/pom.xml index ddaa5a251..fb729fbeb 100644 --- a/archiva-modules/archiva-scheduled/pom.xml +++ b/archiva-modules/archiva-scheduled/pom.xml @@ -81,6 +81,11 @@ plexus-registry-commons test + + org.slf4j + slf4j-simple + test + diff --git a/archiva-modules/archiva-scheduled/src/test/resources/log4j.xml b/archiva-modules/archiva-scheduled/src/test/resources/log4j.xml deleted file mode 100644 index 3c782b138..000000000 --- a/archiva-modules/archiva-scheduled/src/test/resources/log4j.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml index be70c4a21..b59182f7e 100644 --- a/archiva-modules/archiva-web/archiva-rss/pom.xml +++ b/archiva-modules/archiva-web/archiva-rss/pom.xml @@ -41,5 +41,10 @@ xmlunit test + + org.slf4j + slf4j-simple + test + diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml index 13cc1d8b5..e4c410a21 100644 --- a/archiva-modules/archiva-web/archiva-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-security/pom.xml @@ -79,5 +79,10 @@ redback-rbac-memory test + + org.slf4j + slf4j-simple + test + diff --git a/archiva-modules/archiva-web/archiva-security/src/test/resources/log4j.properties b/archiva-modules/archiva-web/archiva-security/src/test/resources/log4j.properties deleted file mode 100644 index 6d107570b..000000000 --- a/archiva-modules/archiva-web/archiva-security/src/test/resources/log4j.properties +++ /dev/null @@ -1,10 +0,0 @@ -# Set root logger level to DEBUG and its only appender to A1. -log4j.rootLogger=INFO, A1 - -# A1 is set to be a ConsoleAppender. -log4j.appender.A1=org.apache.log4j.ConsoleAppender - -# A1 uses PatternLayout. -log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n - diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 4fb54638a..ccdbe7130 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -130,6 +130,12 @@ org.slf4j slf4j-log4j12 + runtime + + + httpunit + httpunit + test commons-lang diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java index d2692cb08..aebfb1527 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java @@ -195,11 +195,11 @@ public class BrowseAction } catch ( ObjectNotFoundException e ) { - getLogger().debug( e.getMessage(), e ); + log.debug( e.getMessage(), e ); } catch ( ArchivaDatabaseException e ) { - getLogger().debug( e.getMessage(), e ); + log.debug( e.getMessage(), e ); } } } @@ -217,16 +217,16 @@ public class BrowseAction } catch ( PrincipalNotFoundException e ) { - getLogger().warn( e.getMessage(), e ); + log.warn( e.getMessage(), e ); } catch ( AccessDeniedException e ) { - getLogger().warn( e.getMessage(), e ); + log.warn( e.getMessage(), e ); // TODO: pass this onto the screen. } catch ( ArchivaSecurityException e ) { - getLogger().warn( e.getMessage(), e ); + log.warn( e.getMessage(), e ); } return Collections.emptyList(); } diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java index d68b6be40..de6e508c5 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java @@ -19,36 +19,28 @@ package org.apache.maven.archiva.web.action; * under the License. */ -import com.opensymphony.xwork2.ActionSupport; import java.util.Map; + import org.apache.struts2.interceptor.SessionAware; -import org.codehaus.plexus.logging.LogEnabled; -import org.codehaus.plexus.logging.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.opensymphony.xwork2.ActionSupport; /** * LogEnabled and SessionAware ActionSupport */ public abstract class PlexusActionSupport extends ActionSupport - implements LogEnabled, SessionAware + implements SessionAware { protected Map session; - private Logger logger; - + protected Logger log = LoggerFactory.getLogger( getClass() ); + public void setSession( Map map ) { //noinspection AssignmentToCollectionOrArrayFieldFromParameter this.session = map; } - - public void enableLogging( Logger logger ) - { - this.logger = logger; - } - - protected Logger getLogger() - { - return logger; - } } diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java index 6cbe7e483..c5d017bf7 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java @@ -413,15 +413,15 @@ public class SearchAction } catch ( PrincipalNotFoundException e ) { - getLogger().warn( e.getMessage(), e ); + log.warn( e.getMessage(), e ); } catch ( AccessDeniedException e ) { - getLogger().warn( e.getMessage(), e ); + log.warn( e.getMessage(), e ); } catch ( ArchivaSecurityException e ) { - getLogger().warn( e.getMessage(), e ); + log.warn( e.getMessage(), e ); } return Collections.emptyList(); } diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java index aef774310..9525c7f53 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java @@ -129,7 +129,7 @@ public class ShowArtifactAction } catch ( ObjectNotFoundException e ) { - getLogger().debug( e.getMessage(), e ); + log.debug( e.getMessage(), e ); addActionError( e.getMessage() ); return ERROR; } @@ -213,16 +213,16 @@ public class ShowArtifactAction } catch ( PrincipalNotFoundException e ) { - getLogger().warn( e.getMessage(), e ); + log.warn( e.getMessage(), e ); } catch ( AccessDeniedException e ) { - getLogger().warn( e.getMessage(), e ); + log.warn( e.getMessage(), e ); // TODO: pass this onto the screen. } catch ( ArchivaSecurityException e ) { - getLogger().warn( e.getMessage(), e ); + log.warn( e.getMessage(), e ); } return Collections.emptyList(); } diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java index 242436882..9cc6b5a1a 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java @@ -630,16 +630,16 @@ public class UploadAction } catch ( PrincipalNotFoundException e ) { - getLogger().warn( e.getMessage(), e ); + log.warn( e.getMessage(), e ); } catch ( AccessDeniedException e ) { - getLogger().warn( e.getMessage(), e ); + log.warn( e.getMessage(), e ); // TODO: pass this onto the screen. } catch ( ArchivaSecurityException e ) { - getLogger().warn( e.getMessage(), e ); + log.warn( e.getMessage(), e ); } return Collections.emptyList(); } diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SchedulerAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SchedulerAction.java index a3df57d2d..fa10c51dd 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SchedulerAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SchedulerAction.java @@ -157,14 +157,14 @@ public class SchedulerAction public void addActionMessage( String aMessage ) { super.addActionMessage( aMessage ); - getLogger().info( "[ActionMessage] " + aMessage ); + log.info( "[ActionMessage] " + aMessage ); } @Override public void addActionError( String anErrorMessage ) { super.addActionError( anErrorMessage ); - getLogger().warn( "[ActionError] " + anErrorMessage ); + log.warn( "[ActionError] " + anErrorMessage ); } public SecureActionBundle getSecureActionBundle() diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/DatabaseAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/DatabaseAction.java index 5d83d959a..0bd57b4f0 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/DatabaseAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/DatabaseAction.java @@ -132,7 +132,7 @@ public class DatabaseAction } catch ( RegistryException e ) { - getLogger().error( e.getMessage(), e ); + log.error( e.getMessage(), e ); addActionError( "Error in saving configuration" ); return INPUT; } diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java index 5829e61c0..e337a23db 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java @@ -47,7 +47,7 @@ public class DeleteLegacyArtifactPathAction public String delete() { - getLogger().info( "remove [" + path + "] from legacy artifact path resolution" ); + log.info( "remove [" + path + "] from legacy artifact path resolution" ); Configuration configuration = archivaConfiguration.getConfiguration(); for ( Iterator iterator = configuration.getLegacyArtifactPaths().iterator(); iterator.hasNext(); ) { diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesAction.java index 1bcba9577..c0e724efd 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesAction.java @@ -123,6 +123,6 @@ public abstract class AbstractManagedRepositoriesAction roleManager.removeTemplatedRole( ArchivaRoleConstants.TEMPLATE_REPOSITORY_OBSERVER, repoId ); } - getLogger().debug( "removed user roles associated with repository " + repoId ); + log.debug( "removed user roles associated with repository " + repoId ); } } diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java index 7efe7827b..2ef89df70 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java @@ -175,7 +175,7 @@ public class DeleteManagedRepositoryAction for ( ArchivaArtifact artifact : artifacts ) { - getLogger().info( "Removing artifact " + artifact + " from the database." ); + log.info( "Removing artifact " + artifact + " from the database." ); try { archivaDAO.getArtifactDAO().deleteArtifact( artifact ); @@ -188,12 +188,12 @@ public class DeleteManagedRepositoryAction } catch ( ObjectNotFoundException oe ) { - getLogger().info( "Project model of artifact " + artifact + " does not exist in the database. " + + log.info( "Project model of artifact " + artifact + " does not exist in the database. " + "Moving on to the next artifact." ); } catch ( ArchivaDatabaseException ae ) { - getLogger().info( "Unable to delete artifact " + artifact + " from the database. " + + log.info( "Unable to delete artifact " + artifact + " from the database. " + "Moving on to the next artifact." ); } } diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/RepositoryScanningAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/RepositoryScanningAction.java index becb6d3c6..0d8086c1b 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/RepositoryScanningAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/RepositoryScanningAction.java @@ -96,18 +96,18 @@ public class RepositoryScanningAction public void addActionError( String anErrorMessage ) { super.addActionError( anErrorMessage ); - getLogger().warn( "[ActionError] " + anErrorMessage ); + log.warn( "[ActionError] " + anErrorMessage ); } public void addActionMessage( String aMessage ) { super.addActionMessage( aMessage ); - getLogger().info( "[ActionMessage] " + aMessage ); + log.info( "[ActionMessage] " + aMessage ); } public String addFiletypePattern() { - getLogger().info( "Add New File Type Pattern [" + getFileTypeId() + ":" + getPattern() + "]" ); + log.info( "Add New File Type Pattern [" + getFileTypeId() + ":" + getPattern() + "]" ); if ( !isValidFiletypeCommand() ) { @@ -207,7 +207,7 @@ public class RepositoryScanningAction public String removeFiletypePattern() { - getLogger().info( "Remove File Type Pattern [" + getFileTypeId() + ":" + getPattern() + "]" ); + log.info( "Remove File Type Pattern [" + getFileTypeId() + ":" + getPattern() + "]" ); if ( !isValidFiletypeCommand() ) { diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml deleted file mode 100644 index a2e7ea23d..000000000 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/ShowArtifactActionTest.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/ShowArtifactActionTest.xml index 81c5b43b6..d51572b7f 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/ShowArtifactActionTest.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/ShowArtifactActionTest.xml @@ -19,11 +19,6 @@ - - org.codehaus.plexus.logging.LoggerManager - org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager - basic - org.apache.maven.archiva.database.ArchivaDAO jdo diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.xml index 924f07f7c..dc32d3f3d 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.xml @@ -19,12 +19,6 @@ - - org.codehaus.plexus.logging.LoggerManager - org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager - basic - - org.codehaus.plexus.cache.Cache url-failures-cache diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.xml index 924f07f7c..dc32d3f3d 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.xml @@ -19,12 +19,6 @@ - - org.codehaus.plexus.logging.LoggerManager - org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager - basic - - org.codehaus.plexus.cache.Cache url-failures-cache diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesActionTest.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesActionTest.xml index 5feec48ed..afb64ee15 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesActionTest.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesActionTest.xml @@ -19,12 +19,6 @@ - - org.codehaus.plexus.logging.LoggerManager - org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager - basic - - com.opensymphony.xwork2.Action addManagedRepositoryAction diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.xml index 40c33e013..f4d20ee61 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.xml @@ -19,11 +19,6 @@ - - org.codehaus.plexus.logging.LoggerManager - org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager - basic - org.codehaus.plexus.redback.role.RoleManager default diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.xml index bffa41699..c09e524a2 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.xml @@ -19,11 +19,6 @@ - - org.codehaus.plexus.logging.LoggerManager - org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager - basic - com.opensymphony.xwork2.Action repositoriesAction diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/rss/RssFeedServletTest.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/rss/RssFeedServletTest.xml index 33988de51..0fec42f00 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/rss/RssFeedServletTest.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/rss/RssFeedServletTest.xml @@ -20,31 +20,22 @@ - - org.codehaus.plexus.logging.LoggerManager - org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager - basic + org.apache.maven.archiva.database.ArtifactDAO + jdo + org.apache.maven.archiva.web.rss.ArtifactDAOStub + + + + org.codehaus.plexus.redback.system.SecuritySystem + default + org.apache.maven.archiva.web.rss.SecuritySystemStub + + + + org.apache.maven.archiva.security.UserRepositories + default + org.apache.maven.archiva.security.UserRepositoriesStub - - - org.apache.maven.archiva.database.ArtifactDAO - jdo - org.apache.maven.archiva.web.rss.ArtifactDAOStub - - - - org.codehaus.plexus.redback.system.SecuritySystem - default - org.apache.maven.archiva.web.rss.SecuritySystemStub - - - - org.apache.maven.archiva.security.UserRepositories - default - org.apache.maven.archiva.security.UserRepositoriesStub - diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index 2a825f08a..c9548b53a 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -109,8 +109,8 @@ test - org.codehaus.plexus - plexus-slf4j-logging + org.slf4j + slf4j-simple test @@ -129,5 +129,10 @@ + + httpunit + httpunit + test + diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/MimeTypes.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/MimeTypes.java index 8262ba553..731019cb3 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/MimeTypes.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/MimeTypes.java @@ -19,12 +19,6 @@ package org.apache.maven.archiva.webdav.util; * under the License. */ -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; -import org.codehaus.plexus.logging.AbstractLogEnabled; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException; - import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -37,6 +31,13 @@ import java.util.HashMap; import java.util.Map; import java.util.StringTokenizer; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringUtils; +import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; +import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * MimeTypes * @@ -45,7 +46,6 @@ import java.util.StringTokenizer; * @plexus.component role="org.apache.maven.archiva.webdav.util.MimeTypes" */ public class MimeTypes - extends AbstractLogEnabled implements Initializable { private static final String DEFAULT_MIME_TYPE = "application/octet-stream"; @@ -54,6 +54,8 @@ public class MimeTypes private Map mimeMap = new HashMap(); + private Logger log = LoggerFactory.getLogger( MimeTypes.class ); + /** * Get the Mime Type for the provided filename. * @@ -93,7 +95,7 @@ public class MimeTypes { if ( !file.exists() || !file.isFile() || !file.canRead() ) { - getLogger().error( "Unable to load mime types from file " + file.getAbsolutePath() + " : not a readable file." ); + log.error( "Unable to load mime types from file " + file.getAbsolutePath() + " : not a readable file." ); return; } @@ -105,7 +107,7 @@ public class MimeTypes } catch ( FileNotFoundException e ) { - getLogger().error( "Unable to load mime types from file " + file.getAbsolutePath() + " : " + e.getMessage(), e ); + log.error( "Unable to load mime types from file " + file.getAbsolutePath() + " : " + e.getMessage(), e ); } finally { @@ -134,7 +136,7 @@ public class MimeTypes } catch ( IOException e ) { - getLogger().error( "Unable to load mime map " + resourceName + " : " + e.getMessage(), e ); + log.error( "Unable to load mime map " + resourceName + " : " + e.getMessage(), e ); } finally { @@ -185,7 +187,7 @@ public class MimeTypes } catch ( IOException e ) { - getLogger().error( "Unable to read mime types from input stream : " + e.getMessage(), e ); + log.error( "Unable to read mime types from input stream : " + e.getMessage(), e ); } finally { diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/log4j.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/log4j.xml deleted file mode 100644 index a2e7ea23d..000000000 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/log4j.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml index 7317210ef..b55a4e151 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml @@ -20,15 +20,6 @@ - - - org.codehaus.plexus.logging.LoggerManager - org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager - basic - - @@ -102,8 +93,7 @@ default org.codehaus.plexus.redback.system.DefaultSecuritySystem - - + org.apache.maven.archiva.webdav.ArchivaDavResourceFactory org.apache.maven.archiva.webdav.ArchivaDavResourceFactory diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml index 8392c87c0..e73c0f41f 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml @@ -20,15 +20,6 @@ - - - org.codehaus.plexus.logging.LoggerManager - org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager - basic - - diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml index 07c668a99..2b6357ed0 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml @@ -33,6 +33,24 @@ com.atlassian.xmlrpc atlassian-xmlrpc-binder + + + commons-logging + commons-logging + + + + + org.slf4j + jcl104-over-slf4j + + compile + + + org.slf4j + slf4j-simple + + compile @@ -54,35 +72,6 @@ - - - org.apache.maven.plugins - maven-enforcer-plugin - 1.0-alpha-3 - - - - enforce - - - - - - org.codehaus.plexus:plexus-container-default - velocity:velocity-dep - classworlds:classworlds - javax.transaction:jta - javax.sql:jdbc-stdext - ant:ant-optional - - xom:xom - - - - - - - diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml index bdc0a947a..e246ed386 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml @@ -64,5 +64,10 @@ redback-rbac-memory test + + org.slf4j + slf4j-simple + test + diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml index 0d7e136b1..ddc213e57 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml @@ -45,5 +45,10 @@ plexus-spring test + + org.slf4j + slf4j-simple + test + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 757e9a371..7f3f5e22e 100644 --- a/pom.xml +++ b/pom.xml @@ -75,13 +75,13 @@ org.codehaus.plexus:plexus-container-default + org.codehaus.plexus:plexus-log4j-logging commons-logging:commons-logging velocity:velocity-dep classworlds:classworlds javax.transaction:jta javax.sql:jdbc-stdext ant:ant-optional - xom:xom org.codehaus.plexus:plexus-xwork-integration @@ -213,12 +213,6 @@ 3.8.1 test - - httpunit - httpunit - 1.6.2 - test - easymock easymock @@ -231,19 +225,15 @@ 1.2 test - - org.slf4j - jcl104-over-slf4j - test - - - org.slf4j - slf4j-log4j12 - test - + + httpunit + httpunit + 1.6.2 + test + org.apache.jackrabbit jackrabbit-webdav @@ -890,6 +880,7 @@ org.slf4j jcl104-over-slf4j 1.5.0 + runtime org.slf4j @@ -900,11 +891,13 @@ org.slf4j slf4j-simple 1.5.0 + test org.slf4j slf4j-log4j12 1.5.0 + runtime taglibs -- cgit v1.2.3 From 3cdb8ce93405bb47b021482e798944c2f00bc557 Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Tue, 17 Mar 2009 13:40:10 +0000 Subject: start adding Java5 features to modules git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@755239 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/archiva/cli/ArtifactCountConsumer.java | 8 +-- .../maven/archiva/cli/ProjectReaderConsumer.java | 8 +-- .../converter/artifact/ArtifactConverter.java | 3 +- .../artifact/LegacyToDefaultConverter.java | 52 +++++++++---------- .../artifact/LegacyToDefaultConverterTest.java | 59 ++++++++++------------ .../apache/maven/archiva/database/ArtifactDAO.java | 2 +- .../archiva/database/RepositoryProblemDAO.java | 2 +- .../database/AbstractArchivaDatabaseTestCase.java | 25 ++++----- .../updater/TestDatabaseCleanupConsumer.java | 2 +- .../updater/TestDatabaseUnprocessedConsumer.java | 4 +- .../reporting/artifact/CorruptArtifactReport.java | 5 +- .../artifact/DuplicateArtifactReport.java | 5 +- .../artifact/LocationArtifactsConsumer.java | 37 +++++++------- .../artifact/LocationArtifactsReport.java | 5 +- .../reporting/artifact/OldArtifactReport.java | 9 ++-- .../artifact/OldSnapshotArtifactReport.java | 9 ++-- .../artifact/AbstractArtifactReportsTestCase.java | 19 +++---- .../artifact/DuplicateArtifactReportTest.java | 23 ++++----- .../maven/archiva/applet/ChecksumApplet.java | 11 ++-- .../web/startup/SecuritySynchronization.java | 6 --- 20 files changed, 138 insertions(+), 156 deletions(-) (limited to 'archiva-cli') diff --git a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArtifactCountConsumer.java b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArtifactCountConsumer.java index bb3a7146c..bfc5f6ebc 100644 --- a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArtifactCountConsumer.java +++ b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArtifactCountConsumer.java @@ -47,12 +47,12 @@ public class ArtifactCountConsumer */ private String description; - private List includes; + private List includes; public ArtifactCountConsumer() { // TODO: shouldn't this use filetypes? - includes = new ArrayList(); + includes = new ArrayList(); includes.add( "**/*.pom" ); includes.add( "**/*.jar" ); includes.add( "**/*.war" ); @@ -82,12 +82,12 @@ public class ArtifactCountConsumer return false; } - public List getExcludes() + public List getExcludes() { return null; } - public List getIncludes() + public List getIncludes() { return includes; } diff --git a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ProjectReaderConsumer.java b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ProjectReaderConsumer.java index b0eb6edc0..be19a1a01 100644 --- a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ProjectReaderConsumer.java +++ b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ProjectReaderConsumer.java @@ -59,13 +59,13 @@ public class ProjectReaderConsumer private ManagedRepositoryConfiguration repo; - private List includes; + private List includes; public ProjectReaderConsumer() { reader = new ProjectModel400Reader(); - includes = new ArrayList(); + includes = new ArrayList(); includes.add( "**/*.pom" ); } @@ -84,12 +84,12 @@ public class ProjectReaderConsumer return false; } - public List getExcludes() + public List getExcludes() { return null; } - public List getIncludes() + public List getIncludes() { return includes; } diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConverter.java b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConverter.java index 1c67d8d2a..fc61d16a0 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConverter.java +++ b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConverter.java @@ -22,6 +22,7 @@ package org.apache.maven.archiva.converter.artifact; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.repository.ArtifactRepository; +import java.util.List; import java.util.Map; /** @@ -48,7 +49,7 @@ public interface ArtifactConverter * * @return the {@link Map}<{@link Artifact}, {@link String}> warning messages. */ - Map getWarnings(); + Map> getWarnings(); /** * Clear the list of warning messages. diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java index 8ce135b9f..f1f16601b 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java +++ b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java @@ -19,6 +19,19 @@ package org.apache.maven.archiva.converter.artifact; * under the License. */ +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.io.StringReader; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.regex.Matcher; + import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.maven.archiva.transaction.FileTransaction; @@ -45,20 +58,6 @@ import org.codehaus.plexus.digest.Digester; import org.codehaus.plexus.digest.DigesterException; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.IOException; -import java.io.StringReader; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.regex.Matcher; - /** * LegacyToDefaultConverter * @@ -75,7 +74,7 @@ public class LegacyToDefaultConverter * * @plexus.requirement role="org.codehaus.plexus.digest.Digester" */ - private List digesters; + private List digesters; /** * @plexus.requirement @@ -102,7 +101,7 @@ public class LegacyToDefaultConverter */ private boolean dryrun; - private Map warnings = new HashMap(); + private Map> warnings = new HashMap>(); public void convert( Artifact artifact, ArtifactRepository targetRepository ) throws ArtifactConversionException @@ -168,6 +167,7 @@ public class LegacyToDefaultConverter } } + @SuppressWarnings("unchecked") private boolean copyPom( Artifact artifact, ArtifactRepository targetRepository, FileTransaction transaction ) throws ArtifactConversionException { @@ -250,11 +250,10 @@ public class LegacyToDefaultConverter transaction.createFile( writer.toString(), targetFile, digesters ); - List warnings = translator.getWarnings(); + List warnings = translator.getWarnings(); - for ( Iterator i = warnings.iterator(); i.hasNext(); ) + for ( String message : warnings ) { - String message = (String) i.next(); addWarning( artifact, message ); } } @@ -289,10 +288,8 @@ public class LegacyToDefaultConverter throws IOException { boolean result = true; - Iterator it = digesters.iterator(); - while ( it.hasNext() ) + for ( Digester digester : digesters ) { - Digester digester = (Digester) it.next(); result &= verifyChecksum( file, file.getName() + "." + getDigesterFileExtension( digester ), digester, //$NON-NLS-1$ artifact, "failure.incorrect." + getDigesterFileExtension( digester ) ); //$NON-NLS-1$ } @@ -441,6 +438,7 @@ public class LegacyToDefaultConverter return result; } + @SuppressWarnings("unchecked") private boolean validateMetadata( Metadata metadata, RepositoryMetadata repositoryMetadata, Artifact artifact ) { String groupIdKey; @@ -488,12 +486,12 @@ public class LegacyToDefaultConverter boolean foundVersion = false; if ( metadata.getVersioning() != null ) { - for ( Iterator i = metadata.getVersioning().getVersions().iterator(); i.hasNext() && !foundVersion; ) + for ( String version : (List) metadata.getVersioning().getVersions() ) { - String version = (String) i.next(); if ( version.equals( artifact.getBaseVersion() ) ) { foundVersion = true; + break; } } } @@ -668,10 +666,10 @@ public class LegacyToDefaultConverter private void addWarning( Artifact artifact, String message ) { - List messages = (List) warnings.get( artifact ); + List messages = warnings.get( artifact ); if ( messages == null ) { - messages = new ArrayList(); + messages = new ArrayList(); } messages.add( message ); warnings.put( artifact, messages ); @@ -682,7 +680,7 @@ public class LegacyToDefaultConverter warnings.clear(); } - public Map getWarnings() + public Map> getWarnings() { return warnings; } diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java index a305f1349..8ce2f2c8a 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java +++ b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java @@ -19,6 +19,15 @@ package org.apache.maven.archiva.converter.artifact; * under the License. */ +import java.io.File; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.regex.Matcher; + import org.apache.commons.io.FileUtils; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; @@ -30,17 +39,6 @@ import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata; import org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata; import org.codehaus.plexus.spring.PlexusInSpringTestCase; -import java.io.File; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Map.Entry; -import java.util.regex.Matcher; - /** * LegacyToDefaultConverterTest * @@ -736,19 +734,21 @@ public class LegacyToDefaultConverterTest boolean found = false; String pattern = "^" + Messages.getString( "invalid.source.pom" ).replaceFirst( "\\{0\\}", ".*" ) + "$"; - for ( Iterator it = artifactConverter.getWarnings().values().iterator(); it.hasNext() && !found; ) + for ( List messages : artifactConverter.getWarnings().values() ) { - List messages = (List) it.next(); - - for ( Iterator itmsgs = messages.iterator(); itmsgs.hasNext(); ) + for ( String message : messages ) { - String message = (String) itmsgs.next(); if ( message.matches( pattern ) ) { found = true; break; } } + + if ( found ) + { + break; + } } assertTrue( "Check failure message.", found ); @@ -763,22 +763,19 @@ public class LegacyToDefaultConverterTest { // test multiple artifacts are converted - List artifacts = new ArrayList(); + List artifacts = new ArrayList(); artifacts.add( createArtifact( "test", "artifact-one", "1.0.0" ) ); artifacts.add( createArtifact( "test", "artifact-two", "1.0.0" ) ); artifacts.add( createArtifact( "test", "artifact-three", "1.0.0" ) ); - for ( Iterator it = artifacts.iterator(); it.hasNext(); ) + for ( Artifact artifact : artifacts ) { - Artifact arti = (Artifact) it.next(); - artifactConverter.convert( arti, targetRepository ); + artifactConverter.convert( artifact, targetRepository ); checkSuccess( artifactConverter ); } - for ( Iterator i = artifacts.iterator(); i.hasNext(); ) + for ( Artifact artifact : artifacts ) { - Artifact artifact = (Artifact) i.next(); - File artifactFile = new File( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) ); assertTrue( "Check artifact created", artifactFile.exists() ); assertTrue( "Check artifact matches", FileUtils.contentEquals( artifactFile, artifact.getFile() ) ); @@ -954,9 +951,8 @@ public class LegacyToDefaultConverterTest private int countWarningMessages( ArtifactConverter converter ) { int count = 0; - for ( Iterator it = converter.getWarnings().values().iterator(); it.hasNext(); ) + for ( List values : converter.getWarnings().values() ) { - List values = (List) it.next(); count += values.size(); } return count; @@ -967,28 +963,25 @@ public class LegacyToDefaultConverterTest assertNotNull( "Warnings should never be null.", converter.getWarnings() ); assertTrue( "Expecting 1 or more Warnings", countWarningMessages( converter ) > 0 ); - for ( Iterator it = converter.getWarnings().values().iterator(); it.hasNext(); ) + for ( List messages : converter.getWarnings().values() ) { - List messages = (List) it.next(); if ( messages.contains( reason ) ) { - /* No need to check any furthor */ + /* No need to check any further */ return; } } /* didn't find it. */ - for ( Iterator it = converter.getWarnings().entrySet().iterator(); it.hasNext(); ) + for ( Map.Entry> entry : converter.getWarnings().entrySet() ) { - Map.Entry entry = (Entry) it.next(); Artifact artifact = (Artifact) entry.getKey(); System.out.println( "-Artifact: " + artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" + artifact.getVersion() ); - List messages = (List) entry.getValue(); - for ( Iterator itmsgs = messages.iterator(); itmsgs.hasNext(); ) + List messages = entry.getValue(); + for ( String message : messages ) { - String message = (String) itmsgs.next(); System.out.println( " " + message ); } } diff --git a/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/ArtifactDAO.java b/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/ArtifactDAO.java index baca25660..2c8d901fe 100644 --- a/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/ArtifactDAO.java +++ b/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/ArtifactDAO.java @@ -58,7 +58,7 @@ public interface ArtifactDAO String type, String repositoryId ) throws ObjectNotFoundException, ArchivaDatabaseException; - public List /**/queryArtifacts( Constraint constraint ) + public List queryArtifacts( Constraint constraint ) throws ObjectNotFoundException, ArchivaDatabaseException; public ArchivaArtifact saveArtifact( ArchivaArtifact artifact ) diff --git a/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/RepositoryProblemDAO.java b/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/RepositoryProblemDAO.java index b43a6d746..212a538a9 100644 --- a/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/RepositoryProblemDAO.java +++ b/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/RepositoryProblemDAO.java @@ -51,7 +51,7 @@ public interface RepositoryProblemDAO * This is the only list of options created in this DAO. */ - public List /**/queryRepositoryProblems( Constraint constraint ) + public List queryRepositoryProblems( Constraint constraint ) throws ObjectNotFoundException, ArchivaDatabaseException; public RepositoryProblem saveRepositoryProblem( RepositoryProblem problem ) diff --git a/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/AbstractArchivaDatabaseTestCase.java b/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/AbstractArchivaDatabaseTestCase.java index 0cbc95f9c..6a3aaa8d4 100644 --- a/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/AbstractArchivaDatabaseTestCase.java +++ b/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/AbstractArchivaDatabaseTestCase.java @@ -19,6 +19,16 @@ package org.apache.maven.archiva.database; * under the License. */ +import java.io.File; +import java.net.URL; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Map; +import java.util.Properties; + +import javax.jdo.PersistenceManager; +import javax.jdo.PersistenceManagerFactory; + import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.database.updater.DatabaseCleanupConsumer; import org.apache.maven.archiva.database.updater.DatabaseUnprocessedArtifactConsumer; @@ -31,17 +41,6 @@ import org.codehaus.plexus.jdo.JdoFactory; import org.codehaus.plexus.spring.PlexusInSpringTestCase; import org.jpox.SchemaTool; -import java.io.File; -import java.net.URL; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Iterator; -import java.util.Map; -import java.util.Properties; - -import javax.jdo.PersistenceManager; -import javax.jdo.PersistenceManagerFactory; - /** * AbstractArchivaDatabaseTestCase * @@ -103,10 +102,8 @@ public abstract class AbstractArchivaDatabaseTestCase Properties properties = jdoFactory.getProperties(); - for ( Iterator it = properties.entrySet().iterator(); it.hasNext(); ) + for ( Map.Entry entry : properties.entrySet() ) { - Map.Entry entry = (Map.Entry) it.next(); - System.setProperty( (String) entry.getKey(), (String) entry.getValue() ); } diff --git a/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/TestDatabaseCleanupConsumer.java b/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/TestDatabaseCleanupConsumer.java index 12cc9b6bd..4cc47a0df 100644 --- a/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/TestDatabaseCleanupConsumer.java +++ b/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/TestDatabaseCleanupConsumer.java @@ -55,7 +55,7 @@ public class TestDatabaseCleanupConsumer countComplete++; } - public List getIncludedTypes() + public List getIncludedTypes() { return null; } diff --git a/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/TestDatabaseUnprocessedConsumer.java b/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/TestDatabaseUnprocessedConsumer.java index d059a4a65..f35dd67d6 100644 --- a/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/TestDatabaseUnprocessedConsumer.java +++ b/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/TestDatabaseUnprocessedConsumer.java @@ -62,9 +62,9 @@ public class TestDatabaseUnprocessedConsumer countComplete++; } - public List getIncludedTypes() + public List getIncludedTypes() { - List types = new ArrayList(); + List types = new ArrayList(); types.add( "pom" ); types.add( "jar" ); return types; diff --git a/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/CorruptArtifactReport.java b/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/CorruptArtifactReport.java index 502489310..c9280e853 100644 --- a/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/CorruptArtifactReport.java +++ b/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/CorruptArtifactReport.java @@ -19,6 +19,7 @@ package org.apache.maven.archiva.reporting.artifact; * under the License. */ +import org.apache.maven.archiva.model.RepositoryProblem; import org.apache.maven.archiva.reporting.DynamicReportSource; import org.apache.maven.archiva.reporting.DataLimits; import org.apache.maven.archiva.database.ArchivaDAO; @@ -56,13 +57,13 @@ public class CorruptArtifactReport constraint = new RepositoryProblemByTypeConstraint( PROBLEM_TYPE_CORRUPT_ARTIFACT ); } - public List getData() + public List getData() throws ObjectNotFoundException, ArchivaDatabaseException { return dao.getRepositoryProblemDAO().queryRepositoryProblems( constraint ); } - public List getData( DataLimits limits ) + public List getData( DataLimits limits ) throws ObjectNotFoundException, ArchivaDatabaseException { return dao.getRepositoryProblemDAO().queryRepositoryProblems( constraint ); diff --git a/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactReport.java b/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactReport.java index 1e1d774b0..abf2ccb91 100644 --- a/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactReport.java +++ b/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactReport.java @@ -24,6 +24,7 @@ import org.apache.maven.archiva.database.ArchivaDatabaseException; import org.apache.maven.archiva.database.Constraint; import org.apache.maven.archiva.database.ObjectNotFoundException; import org.apache.maven.archiva.database.constraints.RepositoryProblemByTypeConstraint; +import org.apache.maven.archiva.model.RepositoryProblem; import org.apache.maven.archiva.reporting.DataLimits; import org.apache.maven.archiva.reporting.DynamicReportSource; @@ -59,13 +60,13 @@ public class DuplicateArtifactReport constraint = new RepositoryProblemByTypeConstraint( PROBLEM_TYPE_DUPLICATE_ARTIFACTS ); } - public List getData() + public List getData() throws ObjectNotFoundException, ArchivaDatabaseException { return dao.getRepositoryProblemDAO().queryRepositoryProblems( constraint ); } - public List getData( DataLimits limits ) + public List getData( DataLimits limits ) throws ObjectNotFoundException, ArchivaDatabaseException { // TODO: implement limits. diff --git a/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/LocationArtifactsConsumer.java b/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/LocationArtifactsConsumer.java index ac175ed27..2929abedf 100644 --- a/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/LocationArtifactsConsumer.java +++ b/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/LocationArtifactsConsumer.java @@ -98,7 +98,8 @@ public class LocationArtifactsConsumer */ private RepositoryContentFactory repositoryFactory; - private Map repositoryMap = new HashMap(); + private Map repositoryMap = + new HashMap(); // TODO: why is this not used? If it should be, what about excludes? private List includes = new ArrayList(); @@ -128,7 +129,7 @@ public class LocationArtifactsConsumer /* do nothing */ } - public List getIncludedTypes() + public List getIncludedTypes() { return null; } @@ -203,7 +204,7 @@ public class LocationArtifactsConsumer * indicate that the artifact is, indeed located in the wrong place. */ - List actualPomXmls = findJarEntryPattern( jar, "META-INF/maven/**/pom.xml" ); + List actualPomXmls = findJarEntryPattern( jar, "META-INF/maven/**/pom.xml" ); if ( actualPomXmls.isEmpty() ) { // No check needed. @@ -267,27 +268,27 @@ public class LocationArtifactsConsumer private ArchivaProjectModel readFilesystemModel( File artifactFile ) { - File pomFile = createPomFileReference( artifactFile ); +// File pomFile = createPomFileReference( artifactFile ); // TODO: read and resolve model here. return null; } - private File createPomFileReference( File artifactFile ) - { - String pomFilename = artifactFile.getAbsolutePath(); - - int pos = pomFilename.lastIndexOf( '.' ); - if ( pos <= 0 ) - { - // Invalid filename. - return null; - } - - pomFilename = pomFilename.substring( 0, pos ) + ".pom"; - return new File( pomFilename ); - } +// private File createPomFileReference( File artifactFile ) +// { +// String pomFilename = artifactFile.getAbsolutePath(); +// +// int pos = pomFilename.lastIndexOf( '.' ); +// if ( pos <= 0 ) +// { +// // Invalid filename. +// return null; +// } +// +// pomFilename = pomFilename.substring( 0, pos ) + ".pom"; +// return new File( pomFilename ); +// } private ManagedRepositoryConfiguration findRepository( ArchivaArtifact artifact ) { diff --git a/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/LocationArtifactsReport.java b/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/LocationArtifactsReport.java index d419bcafc..9a3f232ef 100644 --- a/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/LocationArtifactsReport.java +++ b/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/LocationArtifactsReport.java @@ -24,6 +24,7 @@ import org.apache.maven.archiva.database.ArchivaDatabaseException; import org.apache.maven.archiva.database.Constraint; import org.apache.maven.archiva.database.ObjectNotFoundException; import org.apache.maven.archiva.database.constraints.RepositoryProblemByTypeConstraint; +import org.apache.maven.archiva.model.RepositoryProblem; import org.apache.maven.archiva.reporting.DataLimits; import org.apache.maven.archiva.reporting.DynamicReportSource; @@ -59,13 +60,13 @@ public class LocationArtifactsReport constraint = new RepositoryProblemByTypeConstraint( PROBLEM_TYPE_BAD_ARTIFACT_LOCATION ); } - public List getData() + public List getData() throws ObjectNotFoundException, ArchivaDatabaseException { return dao.getRepositoryProblemDAO().queryRepositoryProblems( constraint ); } - public List getData( DataLimits limits ) + public List getData( DataLimits limits ) throws ObjectNotFoundException, ArchivaDatabaseException { // TODO: implement limits. diff --git a/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/OldArtifactReport.java b/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/OldArtifactReport.java index 6cf545d1d..4a40c80bd 100644 --- a/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/OldArtifactReport.java +++ b/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/OldArtifactReport.java @@ -19,15 +19,16 @@ package org.apache.maven.archiva.reporting.artifact; * under the License. */ +import java.util.List; + import org.apache.maven.archiva.database.ArchivaDAO; import org.apache.maven.archiva.database.ArchivaDatabaseException; import org.apache.maven.archiva.database.ObjectNotFoundException; import org.apache.maven.archiva.database.constraints.OlderArtifactsByAgeConstraint; +import org.apache.maven.archiva.model.ArchivaArtifact; import org.apache.maven.archiva.reporting.DataLimits; import org.apache.maven.archiva.reporting.DynamicReportSource; -import java.util.List; - /** * OldArtifactReport * @@ -56,13 +57,13 @@ public class OldArtifactReport */ private int cutoffDays; - public List getData() + public List getData() throws ObjectNotFoundException, ArchivaDatabaseException { return dao.getArtifactDAO().queryArtifacts( new OlderArtifactsByAgeConstraint( cutoffDays ) ); } - public List getData( DataLimits limits ) + public List getData( DataLimits limits ) throws ObjectNotFoundException, ArchivaDatabaseException { return dao.getArtifactDAO().queryArtifacts( new OlderArtifactsByAgeConstraint( cutoffDays ) ); diff --git a/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/OldSnapshotArtifactReport.java b/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/OldSnapshotArtifactReport.java index 82d4160eb..b3c217d03 100644 --- a/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/OldSnapshotArtifactReport.java +++ b/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/OldSnapshotArtifactReport.java @@ -19,15 +19,16 @@ package org.apache.maven.archiva.reporting.artifact; * under the License. */ +import java.util.List; + import org.apache.maven.archiva.database.ArchivaDAO; import org.apache.maven.archiva.database.ArchivaDatabaseException; import org.apache.maven.archiva.database.ObjectNotFoundException; import org.apache.maven.archiva.database.constraints.OlderSnapshotArtifactsByAgeConstraint; +import org.apache.maven.archiva.model.ArchivaArtifact; import org.apache.maven.archiva.reporting.DataLimits; import org.apache.maven.archiva.reporting.DynamicReportSource; -import java.util.List; - /** * OldSnapshotArtifactReport * @@ -56,13 +57,13 @@ public class OldSnapshotArtifactReport */ private int cutoffDays; - public List getData() + public List getData() throws ObjectNotFoundException, ArchivaDatabaseException { return dao.getArtifactDAO().queryArtifacts( new OlderSnapshotArtifactsByAgeConstraint( cutoffDays ) ); } - public List getData( DataLimits limits ) + public List getData( DataLimits limits ) throws ObjectNotFoundException, ArchivaDatabaseException { return dao.getArtifactDAO().queryArtifacts( new OlderSnapshotArtifactsByAgeConstraint( cutoffDays ) ); diff --git a/archiva-modules/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/AbstractArtifactReportsTestCase.java b/archiva-modules/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/AbstractArtifactReportsTestCase.java index a28eb073e..2ff436a08 100644 --- a/archiva-modules/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/AbstractArtifactReportsTestCase.java +++ b/archiva-modules/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/AbstractArtifactReportsTestCase.java @@ -19,21 +19,20 @@ package org.apache.maven.archiva.reporting.artifact; * under the License. */ -import org.apache.maven.archiva.database.ArchivaDAO; -import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory; -import org.codehaus.plexus.jdo.JdoFactory; -import org.codehaus.plexus.spring.PlexusInSpringTestCase; -import org.jpox.SchemaTool; - import java.io.File; import java.net.URL; -import java.util.Iterator; -import java.util.Map; import java.util.Properties; +import java.util.Map.Entry; import javax.jdo.PersistenceManager; import javax.jdo.PersistenceManagerFactory; +import org.apache.maven.archiva.database.ArchivaDAO; +import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory; +import org.codehaus.plexus.jdo.JdoFactory; +import org.codehaus.plexus.spring.PlexusInSpringTestCase; +import org.jpox.SchemaTool; + /** * AbstractArtifactReportsTestCase * @@ -92,10 +91,8 @@ public abstract class AbstractArtifactReportsTestCase Properties properties = jdoFactory.getProperties(); - for ( Iterator it = properties.entrySet().iterator(); it.hasNext(); ) + for ( Entry entry : properties.entrySet() ) { - Map.Entry entry = (Map.Entry) it.next(); - System.setProperty( (String) entry.getKey(), (String) entry.getValue() ); } diff --git a/archiva-modules/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactReportTest.java b/archiva-modules/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactReportTest.java index 96dddd5c8..4f44f7311 100644 --- a/archiva-modules/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactReportTest.java +++ b/archiva-modules/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactReportTest.java @@ -19,6 +19,10 @@ package org.apache.maven.archiva.reporting.artifact; * under the License. */ +import java.io.File; +import java.util.Date; +import java.util.List; + import org.apache.commons.io.FileUtils; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; @@ -28,11 +32,6 @@ import org.apache.maven.archiva.model.ArchivaArtifact; import org.apache.maven.archiva.model.RepositoryProblem; import org.apache.maven.archiva.reporting.DynamicReportSource; -import java.io.File; -import java.util.Date; -import java.util.Iterator; -import java.util.List; - /** * DuplicateArtifactReportTest * @@ -115,20 +114,18 @@ public class DuplicateArtifactReportTest // Setup entries for bad/duplicate in problem DB. pretendToRunDuplicateArtifactsConsumer(); - List allArtifacts = artifactDao.queryArtifacts( null ); + List allArtifacts = artifactDao.queryArtifacts( null ); assertEquals( "Total Artifact Count", 7, allArtifacts.size() ); DuplicateArtifactReport report = (DuplicateArtifactReport) lookup( DynamicReportSource.class.getName(), "duplicate-artifacts" ); - List results = report.getData(); + List results = report.getData(); System.out.println( "Results.size: " + results.size() ); int i = 0; - Iterator it = results.iterator(); - while ( it.hasNext() ) + for ( RepositoryProblem problem : results ) { - RepositoryProblem problem = (RepositoryProblem) it.next(); System.out.println( "[" + ( i++ ) + "] " + problem.getMessage() ); } @@ -144,16 +141,14 @@ public class DuplicateArtifactReportTest private void pretendToRunDuplicateArtifactsConsumer() throws Exception { - List artifacts = dao.getArtifactDAO().queryArtifacts( null ); + List artifacts = dao.getArtifactDAO().queryArtifacts( null ); ArchivaArtifactConsumer consumer = (ArchivaArtifactConsumer) lookup( ArchivaArtifactConsumer.class.getName(), "duplicate-artifacts" ); consumer.beginScan(); try { - Iterator it = artifacts.iterator(); - while ( it.hasNext() ) + for ( ArchivaArtifact artifact : artifacts ) { - ArchivaArtifact artifact = (ArchivaArtifact) it.next(); consumer.processArchivaArtifact( artifact ); } } diff --git a/archiva-modules/archiva-web/archiva-applet/src/main/java/org/apache/maven/archiva/applet/ChecksumApplet.java b/archiva-modules/archiva-web/archiva-applet/src/main/java/org/apache/maven/archiva/applet/ChecksumApplet.java index 03d8e33f1..5fb4752fd 100644 --- a/archiva-modules/archiva-web/archiva-applet/src/main/java/org/apache/maven/archiva/applet/ChecksumApplet.java +++ b/archiva-modules/archiva-web/archiva-applet/src/main/java/org/apache/maven/archiva/applet/ChecksumApplet.java @@ -19,9 +19,8 @@ package org.apache.maven.archiva.applet; * under the License. */ -import javax.swing.*; import java.applet.Applet; -import java.awt.*; +import java.awt.BorderLayout; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -32,6 +31,9 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.PrivilegedAction; +import javax.swing.JLabel; +import javax.swing.JProgressBar; + /** * Applet that takes a file on the local filesystem and checksums it for sending to the server. * @@ -58,9 +60,9 @@ public class ChecksumApplet public String generateMd5( final String file ) throws IOException, NoSuchAlgorithmException { - Object o = AccessController.doPrivileged( new PrivilegedAction() + return AccessController.doPrivileged( new PrivilegedAction() { - public Object run() + public String run() { try { @@ -80,7 +82,6 @@ public class ChecksumApplet } } } ); - return (String) o; } protected String checksumFile( String file ) diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/SecuritySynchronization.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/SecuritySynchronization.java index 267c1b7de..346773abd 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/SecuritySynchronization.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/SecuritySynchronization.java @@ -30,7 +30,6 @@ import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.ConfigurationNames; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.security.ArchivaRoleConstants; -import org.apache.maven.archiva.security.ArchivaXworkUser; import org.codehaus.plexus.redback.rbac.RBACManager; import org.codehaus.plexus.redback.rbac.RbacManagerException; import org.codehaus.plexus.redback.rbac.UserAssignment; @@ -75,11 +74,6 @@ public class SecuritySynchronization */ private ArchivaConfiguration archivaConfiguration; - /** - * @plexus.requirement - */ - private ArchivaXworkUser archivaXworkUser; - public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { if ( ConfigurationNames.isManagedRepositories( propertyName ) ) -- cgit v1.2.3 From 776361e6638cecc4e84169a23f010452d26a9be7 Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Tue, 17 Mar 2009 17:51:45 +0000 Subject: revert shade plugin version to previous one git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@755334 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-cli/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'archiva-cli') diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index a18f2ff8a..64490e31f 100644 --- a/archiva-cli/pom.xml +++ b/archiva-cli/pom.xml @@ -75,7 +75,7 @@ org.apache.maven.plugins maven-shade-plugin - 1.2 + 1.0.1 package -- cgit v1.2.3 From d811b1f00d74d10dda08b123463c06dc81f2affd Mon Sep 17 00:00:00 2001 From: "Maria Odea B. Ching" Date: Sun, 22 Mar 2009 03:15:29 +0000 Subject: [maven-release-plugin] prepare release archiva-1.2 git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@757122 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-cli/pom.xml | 4 +- archiva-docs/pom.xml | 2 +- archiva-jetty/pom.xml | 2 +- .../archiva-artifact-converter/pom.xml | 2 +- .../archiva-base/archiva-checksum/pom.xml | 2 +- .../archiva-base/archiva-common/pom.xml | 2 +- .../archiva-base/archiva-configuration/pom.xml | 2 +- .../archiva-consumers/archiva-consumer-api/pom.xml | 2 +- .../archiva-core-consumers/pom.xml | 2 +- .../archiva-database-consumers/pom.xml | 2 +- .../archiva-dependency-tree-consumer/pom.xml | 2 +- .../archiva-lucene-consumers/pom.xml | 2 +- .../archiva-signature-consumers/pom.xml | 2 +- .../archiva-base/archiva-consumers/pom.xml | 2 +- .../archiva-base/archiva-converter/pom.xml | 2 +- .../archiva-base/archiva-dependency-graph/pom.xml | 2 +- .../archiva-base/archiva-indexer/pom.xml | 2 +- archiva-modules/archiva-base/archiva-model/pom.xml | 28 +-------- .../archiva-base/archiva-policies/pom.xml | 2 +- archiva-modules/archiva-base/archiva-proxy/pom.xml | 2 +- .../archiva-base/archiva-repository-layer/pom.xml | 2 +- .../archiva-base/archiva-transaction/pom.xml | 2 +- .../archiva-base/archiva-xml-tools/pom.xml | 2 +- archiva-modules/archiva-base/pom.xml | 2 +- archiva-modules/archiva-database/pom.xml | 2 +- .../archiva-artifact-reports/pom.xml | 2 +- .../archiva-metadata-reports/pom.xml | 2 +- .../archiva-project-reports/pom.xml | 2 +- .../archiva-report-manager/pom.xml | 2 +- archiva-modules/archiva-reporting/pom.xml | 2 +- archiva-modules/archiva-scheduled/pom.xml | 2 +- archiva-modules/archiva-web/archiva-applet/pom.xml | 2 +- archiva-modules/archiva-web/archiva-rss/pom.xml | 2 +- .../archiva-web/archiva-security/pom.xml | 2 +- archiva-modules/archiva-web/archiva-webapp/pom.xml | 2 +- archiva-modules/archiva-web/archiva-webdav/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-api/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-client/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-security/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-services/pom.xml | 2 +- archiva-modules/archiva-web/archiva-xmlrpc/pom.xml | 2 +- archiva-modules/archiva-web/pom.xml | 2 +- archiva-modules/pom.xml | 2 +- pom.xml | 70 +++++++++++----------- 44 files changed, 81 insertions(+), 103 deletions(-) (limited to 'archiva-cli') diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index 64490e31f..af8a0cf59 100644 --- a/archiva-cli/pom.xml +++ b/archiva-cli/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva - 1.2-SNAPSHOT + 1.2 4.0.0 archiva-cli @@ -35,7 +35,7 @@ org.apache.archiva archiva-dependency-tree-consumer - 1.2-SNAPSHOT + 1.2 runtime diff --git a/archiva-docs/pom.xml b/archiva-docs/pom.xml index c539590b2..73076e915 100644 --- a/archiva-docs/pom.xml +++ b/archiva-docs/pom.xml @@ -21,7 +21,7 @@ org.apache.archiva archiva - 1.2-SNAPSHOT + 1.2 4.0.0 archiva-docs diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml index 3ad936d4c..bd1d5ef14 100644 --- a/archiva-jetty/pom.xml +++ b/archiva-jetty/pom.xml @@ -3,7 +3,7 @@ org.apache.archiva archiva - 1.2-SNAPSHOT + 1.2 archiva-jetty pom diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml index 72d7f5598..8aac71e7c 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2-SNAPSHOT + 1.2 archiva-artifact-converter Archiva Artifact Converter diff --git a/archiva-modules/archiva-base/archiva-checksum/pom.xml b/archiva-modules/archiva-base/archiva-checksum/pom.xml index 2973a6170..2c69cc855 100644 --- a/archiva-modules/archiva-base/archiva-checksum/pom.xml +++ b/archiva-modules/archiva-base/archiva-checksum/pom.xml @@ -19,7 +19,7 @@ org.apache.archiva archiva-base - 1.2-SNAPSHOT + 1.2 archiva-checksum Archiva Checksum diff --git a/archiva-modules/archiva-base/archiva-common/pom.xml b/archiva-modules/archiva-base/archiva-common/pom.xml index 73325003c..74519db89 100644 --- a/archiva-modules/archiva-base/archiva-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-common/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2-SNAPSHOT + 1.2 4.0.0 archiva-common diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index 805d5a2d5..a6a8c5e84 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2-SNAPSHOT + 1.2 4.0.0 archiva-configuration diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml index 9d4777d45..43dfb44b9 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-consumers - 1.2-SNAPSHOT + 1.2 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index b620b3b13..15f4aac13 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2-SNAPSHOT + 1.2 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml index 270e04f47..e02252d0e 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2-SNAPSHOT + 1.2 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml index d1a78a39d..8ddad8c16 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml @@ -3,7 +3,7 @@ org.apache.archiva archiva-consumers - 1.2-SNAPSHOT + 1.2 archiva-dependency-tree-consumer Archiva Consumers :: Dependency Tree Consumer diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml index 616aadbd5..98eb2e456 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2-SNAPSHOT + 1.2 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml index 965fbea00..3ffc3bc48 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2-SNAPSHOT + 1.2 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/pom.xml index eefdbc47a..5773ffe6b 100644 --- a/archiva-modules/archiva-base/archiva-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-base - 1.2-SNAPSHOT + 1.2 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml index e30c4d9e2..ef599a5be 100644 --- a/archiva-modules/archiva-base/archiva-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-converter/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2-SNAPSHOT + 1.2 4.0.0 archiva-converter diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml index 741cd0f15..5f051ac4b 100644 --- a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml +++ b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2-SNAPSHOT + 1.2 4.0.0 archiva-dependency-graph diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml index a0d7681f9..3aec08864 100644 --- a/archiva-modules/archiva-base/archiva-indexer/pom.xml +++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2-SNAPSHOT + 1.2 4.0.0 archiva-indexer diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml index 23229135c..983db8970 100755 --- a/archiva-modules/archiva-base/archiva-model/pom.xml +++ b/archiva-modules/archiva-base/archiva-model/pom.xml @@ -1,28 +1,8 @@ - - - org.apache.archiva archiva-base - 1.2-SNAPSHOT + 1.2 4.0.0 archiva-model @@ -175,9 +155,7 @@ - + @@ -197,4 +175,4 @@ - + \ No newline at end of file diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index ac5f13f09..a4eeffc5c 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2-SNAPSHOT + 1.2 4.0.0 archiva-policies diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index a5a21015e..511548454 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2-SNAPSHOT + 1.2 4.0.0 archiva-proxy diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index e8ebd8734..b57e804fc 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2-SNAPSHOT + 1.2 4.0.0 archiva-repository-layer diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml index 7c9bae559..f2655699b 100644 --- a/archiva-modules/archiva-base/archiva-transaction/pom.xml +++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2-SNAPSHOT + 1.2 archiva-transaction Archiva Transactions diff --git a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml index 20960eed0..1d6c68877 100644 --- a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml +++ b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2-SNAPSHOT + 1.2 4.0.0 archiva-xml-tools diff --git a/archiva-modules/archiva-base/pom.xml b/archiva-modules/archiva-base/pom.xml index f95c75f13..1b5336779 100644 --- a/archiva-modules/archiva-base/pom.xml +++ b/archiva-modules/archiva-base/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2-SNAPSHOT + 1.2 archiva-base diff --git a/archiva-modules/archiva-database/pom.xml b/archiva-modules/archiva-database/pom.xml index 7e5e1d23b..453da0735 100755 --- a/archiva-modules/archiva-database/pom.xml +++ b/archiva-modules/archiva-database/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-modules - 1.2-SNAPSHOT + 1.2 4.0.0 archiva-database diff --git a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml index 0d48e19a8..6c153ca9e 100755 --- a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2-SNAPSHOT + 1.2 4.0.0 archiva-artifact-reports diff --git a/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml index 6d50ef3ee..1a178243b 100755 --- a/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2-SNAPSHOT + 1.2 4.0.0 archiva-metadata-reports diff --git a/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml index b8be1ec34..12dc1b534 100755 --- a/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2-SNAPSHOT + 1.2 4.0.0 archiva-project-reports diff --git a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml index 89d6a61f8..58d31569e 100755 --- a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2-SNAPSHOT + 1.2 4.0.0 archiva-report-manager diff --git a/archiva-modules/archiva-reporting/pom.xml b/archiva-modules/archiva-reporting/pom.xml index bb2193438..534c849b3 100644 --- a/archiva-modules/archiva-reporting/pom.xml +++ b/archiva-modules/archiva-reporting/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2-SNAPSHOT + 1.2 ../pom.xml diff --git a/archiva-modules/archiva-scheduled/pom.xml b/archiva-modules/archiva-scheduled/pom.xml index fb729fbeb..3916b0054 100644 --- a/archiva-modules/archiva-scheduled/pom.xml +++ b/archiva-modules/archiva-scheduled/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-modules - 1.2-SNAPSHOT + 1.2 4.0.0 archiva-scheduled diff --git a/archiva-modules/archiva-web/archiva-applet/pom.xml b/archiva-modules/archiva-web/archiva-applet/pom.xml index 47c848910..4e152a70c 100644 --- a/archiva-modules/archiva-web/archiva-applet/pom.xml +++ b/archiva-modules/archiva-web/archiva-applet/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2-SNAPSHOT + 1.2 archiva-applet Archiva Web :: Applet diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml index b59182f7e..3e040eab5 100644 --- a/archiva-modules/archiva-web/archiva-rss/pom.xml +++ b/archiva-modules/archiva-web/archiva-rss/pom.xml @@ -2,7 +2,7 @@ archiva-web org.apache.archiva - 1.2-SNAPSHOT + 1.2 4.0.0 archiva-rss diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml index e4c410a21..33e86fa56 100644 --- a/archiva-modules/archiva-web/archiva-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-security/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-web - 1.2-SNAPSHOT + 1.2 4.0.0 archiva-security diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index ffb4a5818..b467e5293 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2-SNAPSHOT + 1.2 ../pom.xml archiva-webapp diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index b48e3f9c3..364654cba 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2-SNAPSHOT + 1.2 archiva-webdav diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml index 12dd0224c..6dc91ed3d 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2-SNAPSHOT + 1.2 ../pom.xml archiva-xmlrpc-api diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml index 2b6357ed0..8f12cae97 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml @@ -19,7 +19,7 @@ archiva-xmlrpc org.apache.archiva - 1.2-SNAPSHOT + 1.2 4.0.0 archiva-xmlrpc-client diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml index e246ed386..ac2d212b2 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2-SNAPSHOT + 1.2 ../pom.xml archiva-xmlrpc-security diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml index ddc213e57..9905b5c6d 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2-SNAPSHOT + 1.2 ../pom.xml archiva-xmlrpc-services diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml index df9b70aed..dea4b2224 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-web - 1.2-SNAPSHOT + 1.2 ../pom.xml archiva-xmlrpc diff --git a/archiva-modules/archiva-web/pom.xml b/archiva-modules/archiva-web/pom.xml index e3421d23e..1acde2f3d 100644 --- a/archiva-modules/archiva-web/pom.xml +++ b/archiva-modules/archiva-web/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2-SNAPSHOT + 1.2 ../pom.xml diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml index 65a1868ae..e4517729f 100644 --- a/archiva-modules/pom.xml +++ b/archiva-modules/pom.xml @@ -23,7 +23,7 @@ archiva org.apache.archiva - 1.2-SNAPSHOT + 1.2 4.0.0 archiva-modules diff --git a/pom.xml b/pom.xml index 3b20985d3..c3ec09573 100644 --- a/pom.xml +++ b/pom.xml @@ -34,12 +34,12 @@ Archiva archiva pom - 1.2-SNAPSHOT + 1.2 http://archiva.apache.org - scm:svn:http://svn.apache.org/repos/asf/archiva/trunk - scm:svn:https://svn.apache.org/repos/asf/archiva/trunk - http://svn.apache.org/viewvc/archiva/trunk + scm:svn:http://svn.apache.org/repos/asf/archiva/tags/archiva-1.2 + scm:svn:https://svn.apache.org/repos/asf/archiva/tags/archiva-1.2 + http://svn.apache.org/viewvc/archiva/tags/archiva-1.2 @@ -289,47 +289,47 @@ org.apache.archiva archiva-applet - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-artifact-converter - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-artifact-reports - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-checksum - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-common - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-configuration - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-consumer-api - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-converter - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-dependency-graph - 1.2-SNAPSHOT + 1.2 org.apache.archiva @@ -339,115 +339,115 @@ org.apache.archiva archiva-core-consumers - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-database - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-database-consumers - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-indexer - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-lucene-consumers - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-model - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-policies - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-proxy - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-report-manager - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-repository-layer - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-scheduled - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-security - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-signature-consumers - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-transaction - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-docs - 1.2-SNAPSHOT + 1.2 zip docs org.apache.archiva archiva-webapp - 1.2-SNAPSHOT + 1.2 war org.apache.archiva archiva-xml-tools - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-webdav - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-rss - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-xmlrpc-api - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-xmlrpc-services - 1.2-SNAPSHOT + 1.2 org.apache.archiva archiva-xmlrpc-security - 1.2-SNAPSHOT + 1.2 org.codehaus.plexus -- cgit v1.2.3 From 8dc8cd536a1fd91c97bbd6c1d8ae9e509e9354c0 Mon Sep 17 00:00:00 2001 From: "Maria Odea B. Ching" Date: Sun, 22 Mar 2009 03:19:24 +0000 Subject: [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@757124 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-cli/pom.xml | 4 +- archiva-docs/pom.xml | 2 +- archiva-jetty/pom.xml | 2 +- .../archiva-artifact-converter/pom.xml | 2 +- .../archiva-base/archiva-checksum/pom.xml | 2 +- .../archiva-base/archiva-common/pom.xml | 2 +- .../archiva-base/archiva-configuration/pom.xml | 2 +- .../archiva-consumers/archiva-consumer-api/pom.xml | 2 +- .../archiva-core-consumers/pom.xml | 2 +- .../archiva-database-consumers/pom.xml | 2 +- .../archiva-dependency-tree-consumer/pom.xml | 2 +- .../archiva-lucene-consumers/pom.xml | 2 +- .../archiva-signature-consumers/pom.xml | 2 +- .../archiva-base/archiva-consumers/pom.xml | 2 +- .../archiva-base/archiva-converter/pom.xml | 2 +- .../archiva-base/archiva-dependency-graph/pom.xml | 2 +- .../archiva-base/archiva-indexer/pom.xml | 2 +- archiva-modules/archiva-base/archiva-model/pom.xml | 2 +- .../archiva-base/archiva-policies/pom.xml | 2 +- archiva-modules/archiva-base/archiva-proxy/pom.xml | 2 +- .../archiva-base/archiva-repository-layer/pom.xml | 2 +- .../archiva-base/archiva-transaction/pom.xml | 2 +- .../archiva-base/archiva-xml-tools/pom.xml | 2 +- archiva-modules/archiva-base/pom.xml | 2 +- archiva-modules/archiva-database/pom.xml | 2 +- .../archiva-artifact-reports/pom.xml | 2 +- .../archiva-metadata-reports/pom.xml | 2 +- .../archiva-project-reports/pom.xml | 2 +- .../archiva-report-manager/pom.xml | 2 +- archiva-modules/archiva-reporting/pom.xml | 2 +- archiva-modules/archiva-scheduled/pom.xml | 2 +- archiva-modules/archiva-web/archiva-applet/pom.xml | 2 +- archiva-modules/archiva-web/archiva-rss/pom.xml | 2 +- .../archiva-web/archiva-security/pom.xml | 2 +- archiva-modules/archiva-web/archiva-webapp/pom.xml | 2 +- archiva-modules/archiva-web/archiva-webdav/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-api/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-client/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-security/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-services/pom.xml | 2 +- archiva-modules/archiva-web/archiva-xmlrpc/pom.xml | 2 +- archiva-modules/archiva-web/pom.xml | 2 +- archiva-modules/pom.xml | 2 +- pom.xml | 70 +++++++++++----------- 44 files changed, 79 insertions(+), 79 deletions(-) (limited to 'archiva-cli') diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index af8a0cf59..40060bc93 100644 --- a/archiva-cli/pom.xml +++ b/archiva-cli/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva - 1.2 + 1.2.1-SNAPSHOT 4.0.0 archiva-cli @@ -35,7 +35,7 @@ org.apache.archiva archiva-dependency-tree-consumer - 1.2 + 1.2.1-SNAPSHOT runtime diff --git a/archiva-docs/pom.xml b/archiva-docs/pom.xml index 73076e915..13117e3bd 100644 --- a/archiva-docs/pom.xml +++ b/archiva-docs/pom.xml @@ -21,7 +21,7 @@ org.apache.archiva archiva - 1.2 + 1.2.1-SNAPSHOT 4.0.0 archiva-docs diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml index bd1d5ef14..b752f1243 100644 --- a/archiva-jetty/pom.xml +++ b/archiva-jetty/pom.xml @@ -3,7 +3,7 @@ org.apache.archiva archiva - 1.2 + 1.2.1-SNAPSHOT archiva-jetty pom diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml index 8aac71e7c..83e1b0012 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2 + 1.2.1-SNAPSHOT archiva-artifact-converter Archiva Artifact Converter diff --git a/archiva-modules/archiva-base/archiva-checksum/pom.xml b/archiva-modules/archiva-base/archiva-checksum/pom.xml index 2c69cc855..8c47aa41f 100644 --- a/archiva-modules/archiva-base/archiva-checksum/pom.xml +++ b/archiva-modules/archiva-base/archiva-checksum/pom.xml @@ -19,7 +19,7 @@ org.apache.archiva archiva-base - 1.2 + 1.2.1-SNAPSHOT archiva-checksum Archiva Checksum diff --git a/archiva-modules/archiva-base/archiva-common/pom.xml b/archiva-modules/archiva-base/archiva-common/pom.xml index 74519db89..fc2f82c31 100644 --- a/archiva-modules/archiva-base/archiva-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-common/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2 + 1.2.1-SNAPSHOT 4.0.0 archiva-common diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index a6a8c5e84..7609471aa 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2 + 1.2.1-SNAPSHOT 4.0.0 archiva-configuration diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml index 43dfb44b9..998b876ac 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-consumers - 1.2 + 1.2.1-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index 15f4aac13..f37d3ad5d 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2 + 1.2.1-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml index e02252d0e..2d53d0f86 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2 + 1.2.1-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml index 8ddad8c16..164225e5e 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml @@ -3,7 +3,7 @@ org.apache.archiva archiva-consumers - 1.2 + 1.2.1-SNAPSHOT archiva-dependency-tree-consumer Archiva Consumers :: Dependency Tree Consumer diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml index 98eb2e456..7c3b52ea0 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2 + 1.2.1-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml index 3ffc3bc48..8211e9ab5 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2 + 1.2.1-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/pom.xml index 5773ffe6b..c35aaa430 100644 --- a/archiva-modules/archiva-base/archiva-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-base - 1.2 + 1.2.1-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml index ef599a5be..579593002 100644 --- a/archiva-modules/archiva-base/archiva-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-converter/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2 + 1.2.1-SNAPSHOT 4.0.0 archiva-converter diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml index 5f051ac4b..eb460aa2f 100644 --- a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml +++ b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2 + 1.2.1-SNAPSHOT 4.0.0 archiva-dependency-graph diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml index 3aec08864..4591915e3 100644 --- a/archiva-modules/archiva-base/archiva-indexer/pom.xml +++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2 + 1.2.1-SNAPSHOT 4.0.0 archiva-indexer diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml index 983db8970..aa2d2a90c 100755 --- a/archiva-modules/archiva-base/archiva-model/pom.xml +++ b/archiva-modules/archiva-base/archiva-model/pom.xml @@ -2,7 +2,7 @@ org.apache.archiva archiva-base - 1.2 + 1.2.1-SNAPSHOT 4.0.0 archiva-model diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index a4eeffc5c..f85786f1f 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2 + 1.2.1-SNAPSHOT 4.0.0 archiva-policies diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index 511548454..94df3c8d3 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2 + 1.2.1-SNAPSHOT 4.0.0 archiva-proxy diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index b57e804fc..75945ba36 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2 + 1.2.1-SNAPSHOT 4.0.0 archiva-repository-layer diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml index f2655699b..1ad239254 100644 --- a/archiva-modules/archiva-base/archiva-transaction/pom.xml +++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2 + 1.2.1-SNAPSHOT archiva-transaction Archiva Transactions diff --git a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml index 1d6c68877..16b829c5e 100644 --- a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml +++ b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2 + 1.2.1-SNAPSHOT 4.0.0 archiva-xml-tools diff --git a/archiva-modules/archiva-base/pom.xml b/archiva-modules/archiva-base/pom.xml index 1b5336779..f38d15e66 100644 --- a/archiva-modules/archiva-base/pom.xml +++ b/archiva-modules/archiva-base/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2 + 1.2.1-SNAPSHOT archiva-base diff --git a/archiva-modules/archiva-database/pom.xml b/archiva-modules/archiva-database/pom.xml index 453da0735..8fb7185f2 100755 --- a/archiva-modules/archiva-database/pom.xml +++ b/archiva-modules/archiva-database/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-modules - 1.2 + 1.2.1-SNAPSHOT 4.0.0 archiva-database diff --git a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml index 6c153ca9e..7e2564e1c 100755 --- a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2 + 1.2.1-SNAPSHOT 4.0.0 archiva-artifact-reports diff --git a/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml index 1a178243b..16d3a7c91 100755 --- a/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2 + 1.2.1-SNAPSHOT 4.0.0 archiva-metadata-reports diff --git a/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml index 12dc1b534..dafbb68c0 100755 --- a/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2 + 1.2.1-SNAPSHOT 4.0.0 archiva-project-reports diff --git a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml index 58d31569e..58785dcb5 100755 --- a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2 + 1.2.1-SNAPSHOT 4.0.0 archiva-report-manager diff --git a/archiva-modules/archiva-reporting/pom.xml b/archiva-modules/archiva-reporting/pom.xml index 534c849b3..b1fda360f 100644 --- a/archiva-modules/archiva-reporting/pom.xml +++ b/archiva-modules/archiva-reporting/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2 + 1.2.1-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-scheduled/pom.xml b/archiva-modules/archiva-scheduled/pom.xml index 3916b0054..664ff1d24 100644 --- a/archiva-modules/archiva-scheduled/pom.xml +++ b/archiva-modules/archiva-scheduled/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-modules - 1.2 + 1.2.1-SNAPSHOT 4.0.0 archiva-scheduled diff --git a/archiva-modules/archiva-web/archiva-applet/pom.xml b/archiva-modules/archiva-web/archiva-applet/pom.xml index 4e152a70c..021d2c44b 100644 --- a/archiva-modules/archiva-web/archiva-applet/pom.xml +++ b/archiva-modules/archiva-web/archiva-applet/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2 + 1.2.1-SNAPSHOT archiva-applet Archiva Web :: Applet diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml index 3e040eab5..b66842524 100644 --- a/archiva-modules/archiva-web/archiva-rss/pom.xml +++ b/archiva-modules/archiva-web/archiva-rss/pom.xml @@ -2,7 +2,7 @@ archiva-web org.apache.archiva - 1.2 + 1.2.1-SNAPSHOT 4.0.0 archiva-rss diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml index 33e86fa56..26a5c7237 100644 --- a/archiva-modules/archiva-web/archiva-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-security/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-web - 1.2 + 1.2.1-SNAPSHOT 4.0.0 archiva-security diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index b467e5293..8a6afbdfa 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2 + 1.2.1-SNAPSHOT ../pom.xml archiva-webapp diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index 364654cba..4d87a35d5 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2 + 1.2.1-SNAPSHOT archiva-webdav diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml index 6dc91ed3d..48814a123 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2 + 1.2.1-SNAPSHOT ../pom.xml archiva-xmlrpc-api diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml index 8f12cae97..7c14c38fc 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml @@ -19,7 +19,7 @@ archiva-xmlrpc org.apache.archiva - 1.2 + 1.2.1-SNAPSHOT 4.0.0 archiva-xmlrpc-client diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml index ac2d212b2..1a5c4838b 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2 + 1.2.1-SNAPSHOT ../pom.xml archiva-xmlrpc-security diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml index 9905b5c6d..d641cb0bd 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2 + 1.2.1-SNAPSHOT ../pom.xml archiva-xmlrpc-services diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml index dea4b2224..b503abce8 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-web - 1.2 + 1.2.1-SNAPSHOT ../pom.xml archiva-xmlrpc diff --git a/archiva-modules/archiva-web/pom.xml b/archiva-modules/archiva-web/pom.xml index 1acde2f3d..1ca576509 100644 --- a/archiva-modules/archiva-web/pom.xml +++ b/archiva-modules/archiva-web/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2 + 1.2.1-SNAPSHOT ../pom.xml diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml index e4517729f..da6ff98f0 100644 --- a/archiva-modules/pom.xml +++ b/archiva-modules/pom.xml @@ -23,7 +23,7 @@ archiva org.apache.archiva - 1.2 + 1.2.1-SNAPSHOT 4.0.0 archiva-modules diff --git a/pom.xml b/pom.xml index c3ec09573..9b120d53d 100644 --- a/pom.xml +++ b/pom.xml @@ -34,12 +34,12 @@ Archiva archiva pom - 1.2 + 1.2.1-SNAPSHOT http://archiva.apache.org - scm:svn:http://svn.apache.org/repos/asf/archiva/tags/archiva-1.2 - scm:svn:https://svn.apache.org/repos/asf/archiva/tags/archiva-1.2 - http://svn.apache.org/viewvc/archiva/tags/archiva-1.2 + scm:svn:http://svn.apache.org/repos/asf/archiva/trunk + scm:svn:https://svn.apache.org/repos/asf/archiva/trunk + http://svn.apache.org/viewvc/archiva/trunk @@ -289,47 +289,47 @@ org.apache.archiva archiva-applet - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-artifact-converter - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-artifact-reports - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-checksum - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-common - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-configuration - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-consumer-api - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-converter - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-dependency-graph - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva @@ -339,115 +339,115 @@ org.apache.archiva archiva-core-consumers - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-database - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-database-consumers - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-indexer - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-lucene-consumers - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-model - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-policies - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-proxy - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-report-manager - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-repository-layer - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-scheduled - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-security - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-signature-consumers - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-transaction - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-docs - 1.2 + 1.2.1-SNAPSHOT zip docs org.apache.archiva archiva-webapp - 1.2 + 1.2.1-SNAPSHOT war org.apache.archiva archiva-xml-tools - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-webdav - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-rss - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-xmlrpc-api - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-xmlrpc-services - 1.2 + 1.2.1-SNAPSHOT org.apache.archiva archiva-xmlrpc-security - 1.2 + 1.2.1-SNAPSHOT org.codehaus.plexus -- cgit v1.2.3 From f2a299be93a28e861c310b82edc39b8876b39e52 Mon Sep 17 00:00:00 2001 From: "Maria Odea B. Ching" Date: Sun, 24 May 2009 13:58:14 +0000 Subject: [maven-release-plugin] prepare release archiva-1.2.1 git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@778151 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-cli/pom.xml | 4 +- archiva-docs/pom.xml | 2 +- archiva-jetty/pom.xml | 2 +- .../archiva-artifact-converter/pom.xml | 2 +- .../archiva-base/archiva-checksum/pom.xml | 2 +- .../archiva-base/archiva-common/pom.xml | 2 +- .../archiva-base/archiva-configuration/pom.xml | 2 +- .../archiva-consumers/archiva-consumer-api/pom.xml | 2 +- .../archiva-core-consumers/pom.xml | 2 +- .../archiva-database-consumers/pom.xml | 2 +- .../archiva-dependency-tree-consumer/pom.xml | 2 +- .../archiva-lucene-consumers/pom.xml | 2 +- .../archiva-signature-consumers/pom.xml | 2 +- .../archiva-base/archiva-consumers/pom.xml | 2 +- .../archiva-base/archiva-converter/pom.xml | 2 +- .../archiva-base/archiva-dependency-graph/pom.xml | 2 +- .../archiva-base/archiva-indexer/pom.xml | 2 +- archiva-modules/archiva-base/archiva-model/pom.xml | 2 +- .../archiva-base/archiva-policies/pom.xml | 2 +- archiva-modules/archiva-base/archiva-proxy/pom.xml | 2 +- .../archiva-base/archiva-repository-layer/pom.xml | 2 +- .../archiva-base/archiva-transaction/pom.xml | 2 +- .../archiva-base/archiva-xml-tools/pom.xml | 2 +- archiva-modules/archiva-base/pom.xml | 2 +- archiva-modules/archiva-database/pom.xml | 2 +- .../archiva-artifact-reports/pom.xml | 2 +- .../archiva-metadata-reports/pom.xml | 2 +- .../archiva-project-reports/pom.xml | 2 +- .../archiva-report-manager/pom.xml | 2 +- archiva-modules/archiva-reporting/pom.xml | 2 +- archiva-modules/archiva-scheduled/pom.xml | 2 +- archiva-modules/archiva-web/archiva-applet/pom.xml | 2 +- archiva-modules/archiva-web/archiva-rss/pom.xml | 2 +- .../archiva-web/archiva-security/pom.xml | 2 +- archiva-modules/archiva-web/archiva-webapp/pom.xml | 2 +- archiva-modules/archiva-web/archiva-webdav/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-api/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-client/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-security/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-services/pom.xml | 2 +- archiva-modules/archiva-web/archiva-xmlrpc/pom.xml | 2 +- archiva-modules/archiva-web/pom.xml | 2 +- archiva-modules/pom.xml | 2 +- pom.xml | 70 +++++++++++----------- 44 files changed, 79 insertions(+), 79 deletions(-) (limited to 'archiva-cli') diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index 40060bc93..089c61e8c 100644 --- a/archiva-cli/pom.xml +++ b/archiva-cli/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-cli @@ -35,7 +35,7 @@ org.apache.archiva archiva-dependency-tree-consumer - 1.2.1-SNAPSHOT + 1.2.1 runtime diff --git a/archiva-docs/pom.xml b/archiva-docs/pom.xml index 13117e3bd..81b20c9b3 100644 --- a/archiva-docs/pom.xml +++ b/archiva-docs/pom.xml @@ -21,7 +21,7 @@ org.apache.archiva archiva - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-docs diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml index b752f1243..0f8f5dcc5 100644 --- a/archiva-jetty/pom.xml +++ b/archiva-jetty/pom.xml @@ -3,7 +3,7 @@ org.apache.archiva archiva - 1.2.1-SNAPSHOT + 1.2.1 archiva-jetty pom diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml index 83e1b0012..5615de25d 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 archiva-artifact-converter Archiva Artifact Converter diff --git a/archiva-modules/archiva-base/archiva-checksum/pom.xml b/archiva-modules/archiva-base/archiva-checksum/pom.xml index 8c47aa41f..3cbb03448 100644 --- a/archiva-modules/archiva-base/archiva-checksum/pom.xml +++ b/archiva-modules/archiva-base/archiva-checksum/pom.xml @@ -19,7 +19,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 archiva-checksum Archiva Checksum diff --git a/archiva-modules/archiva-base/archiva-common/pom.xml b/archiva-modules/archiva-base/archiva-common/pom.xml index fc2f82c31..bddde3bb7 100644 --- a/archiva-modules/archiva-base/archiva-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-common/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-common diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index 7609471aa..89a3c5c8b 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-configuration diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml index 998b876ac..29414f52a 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-consumers - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index f37d3ad5d..912627ba6 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml index 2d53d0f86..3f0a2bd31 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml index 164225e5e..f4b50b762 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml @@ -3,7 +3,7 @@ org.apache.archiva archiva-consumers - 1.2.1-SNAPSHOT + 1.2.1 archiva-dependency-tree-consumer Archiva Consumers :: Dependency Tree Consumer diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml index 4ead51724..297b80017 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml index 8211e9ab5..ffe158465 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/pom.xml index c35aaa430..f8d74aa43 100644 --- a/archiva-modules/archiva-base/archiva-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml index 579593002..01e4349f3 100644 --- a/archiva-modules/archiva-base/archiva-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-converter/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-converter diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml index eb460aa2f..c574d6175 100644 --- a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml +++ b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-dependency-graph diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml index 4591915e3..89e5ed5da 100644 --- a/archiva-modules/archiva-base/archiva-indexer/pom.xml +++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-indexer diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml index 9fd40f050..22e922622 100755 --- a/archiva-modules/archiva-base/archiva-model/pom.xml +++ b/archiva-modules/archiva-base/archiva-model/pom.xml @@ -2,7 +2,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-model diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index f85786f1f..5eb8b533e 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-policies diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index 4ed8e4ac5..01e3361d8 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-proxy diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index 75945ba36..2f12ed19b 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-repository-layer diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml index 1ad239254..e0bd41e7a 100644 --- a/archiva-modules/archiva-base/archiva-transaction/pom.xml +++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 archiva-transaction Archiva Transactions diff --git a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml index 16b829c5e..ffff854f1 100644 --- a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml +++ b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-xml-tools diff --git a/archiva-modules/archiva-base/pom.xml b/archiva-modules/archiva-base/pom.xml index f38d15e66..326f6ff95 100644 --- a/archiva-modules/archiva-base/pom.xml +++ b/archiva-modules/archiva-base/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2.1-SNAPSHOT + 1.2.1 archiva-base diff --git a/archiva-modules/archiva-database/pom.xml b/archiva-modules/archiva-database/pom.xml index 8fb7185f2..576f043cd 100755 --- a/archiva-modules/archiva-database/pom.xml +++ b/archiva-modules/archiva-database/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-modules - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-database diff --git a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml index 7e2564e1c..d5221d0ed 100755 --- a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-artifact-reports diff --git a/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml index 16d3a7c91..f8d310104 100755 --- a/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-metadata-reports diff --git a/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml index dafbb68c0..e0f07a358 100755 --- a/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-project-reports diff --git a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml index 58785dcb5..3e0f4a91b 100755 --- a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-report-manager diff --git a/archiva-modules/archiva-reporting/pom.xml b/archiva-modules/archiva-reporting/pom.xml index b1fda360f..d51eb2e76 100644 --- a/archiva-modules/archiva-reporting/pom.xml +++ b/archiva-modules/archiva-reporting/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml diff --git a/archiva-modules/archiva-scheduled/pom.xml b/archiva-modules/archiva-scheduled/pom.xml index 445d70962..f25854924 100644 --- a/archiva-modules/archiva-scheduled/pom.xml +++ b/archiva-modules/archiva-scheduled/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-modules - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-scheduled diff --git a/archiva-modules/archiva-web/archiva-applet/pom.xml b/archiva-modules/archiva-web/archiva-applet/pom.xml index 021d2c44b..0b29573ed 100644 --- a/archiva-modules/archiva-web/archiva-applet/pom.xml +++ b/archiva-modules/archiva-web/archiva-applet/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2.1-SNAPSHOT + 1.2.1 archiva-applet Archiva Web :: Applet diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml index b66842524..afb855d2d 100644 --- a/archiva-modules/archiva-web/archiva-rss/pom.xml +++ b/archiva-modules/archiva-web/archiva-rss/pom.xml @@ -2,7 +2,7 @@ archiva-web org.apache.archiva - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-rss diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml index 26a5c7237..34fcaf191 100644 --- a/archiva-modules/archiva-web/archiva-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-security/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-web - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-security diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 8a6afbdfa..261c5dfa3 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml archiva-webapp diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index 4d87a35d5..34ad1fe6a 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2.1-SNAPSHOT + 1.2.1 archiva-webdav diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml index 48814a123..92ffb1fd7 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml archiva-xmlrpc-api diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml index eb8aa0519..df3da5fba 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml @@ -19,7 +19,7 @@ archiva-xmlrpc org.apache.archiva - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-xmlrpc-client diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml index 1a5c4838b..334152429 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml archiva-xmlrpc-security diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml index d641cb0bd..0f6eeb31e 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml archiva-xmlrpc-services diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml index b503abce8..6446d16c4 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-web - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml archiva-xmlrpc diff --git a/archiva-modules/archiva-web/pom.xml b/archiva-modules/archiva-web/pom.xml index 7a2e5d7d6..20dfe604b 100644 --- a/archiva-modules/archiva-web/pom.xml +++ b/archiva-modules/archiva-web/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml index da6ff98f0..48dafcd3f 100644 --- a/archiva-modules/pom.xml +++ b/archiva-modules/pom.xml @@ -23,7 +23,7 @@ archiva org.apache.archiva - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-modules diff --git a/pom.xml b/pom.xml index ea823066e..cccf51781 100644 --- a/pom.xml +++ b/pom.xml @@ -34,12 +34,12 @@ Archiva archiva pom - 1.2.1-SNAPSHOT + 1.2.1 http://archiva.apache.org - scm:svn:http://svn.apache.org/repos/asf/archiva/trunk - scm:svn:https://svn.apache.org/repos/asf/archiva/trunk - http://svn.apache.org/viewvc/archiva/trunk + scm:svn:http://svn.apache.org/repos/asf/archiva/tags/archiva-1.2.1 + scm:svn:https://svn.apache.org/repos/asf/archiva/tags/archiva-1.2.1 + http://svn.apache.org/viewvc/archiva/tags/archiva-1.2.1 @@ -289,47 +289,47 @@ org.apache.archiva archiva-applet - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-artifact-converter - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-artifact-reports - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-checksum - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-common - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-configuration - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-consumer-api - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-converter - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-dependency-graph - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva @@ -339,115 +339,115 @@ org.apache.archiva archiva-core-consumers - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-database - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-database-consumers - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-indexer - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-lucene-consumers - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-model - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-policies - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-proxy - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-report-manager - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-repository-layer - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-scheduled - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-security - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-signature-consumers - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-transaction - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-docs - 1.2.1-SNAPSHOT + 1.2.1 zip docs org.apache.archiva archiva-webapp - 1.2.1-SNAPSHOT + 1.2.1 war org.apache.archiva archiva-xml-tools - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-webdav - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-rss - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-xmlrpc-api - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-xmlrpc-services - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-xmlrpc-security - 1.2.1-SNAPSHOT + 1.2.1 org.codehaus.plexus -- cgit v1.2.3 From 4f50f5722eb1b194d69f018a8053fd92330410b9 Mon Sep 17 00:00:00 2001 From: "Maria Odea B. Ching" Date: Sun, 24 May 2009 14:17:53 +0000 Subject: revert to 1.2.1-SNAPSHOT git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@778156 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-cli/pom.xml | 4 +- archiva-docs/pom.xml | 2 +- archiva-jetty/pom.xml | 2 +- .../archiva-artifact-converter/pom.xml | 2 +- .../archiva-base/archiva-checksum/pom.xml | 2 +- .../archiva-base/archiva-common/pom.xml | 2 +- .../archiva-base/archiva-configuration/pom.xml | 2 +- .../archiva-consumers/archiva-consumer-api/pom.xml | 2 +- .../archiva-core-consumers/pom.xml | 2 +- .../archiva-database-consumers/pom.xml | 2 +- .../archiva-dependency-tree-consumer/pom.xml | 2 +- .../archiva-lucene-consumers/pom.xml | 2 +- .../archiva-signature-consumers/pom.xml | 2 +- .../archiva-base/archiva-consumers/pom.xml | 2 +- .../archiva-base/archiva-converter/pom.xml | 2 +- .../archiva-base/archiva-dependency-graph/pom.xml | 2 +- .../archiva-base/archiva-indexer/pom.xml | 2 +- archiva-modules/archiva-base/archiva-model/pom.xml | 2 +- .../archiva-base/archiva-policies/pom.xml | 2 +- archiva-modules/archiva-base/archiva-proxy/pom.xml | 2 +- .../archiva-base/archiva-repository-layer/pom.xml | 2 +- .../archiva-base/archiva-transaction/pom.xml | 2 +- .../archiva-base/archiva-xml-tools/pom.xml | 2 +- archiva-modules/archiva-base/pom.xml | 2 +- archiva-modules/archiva-database/pom.xml | 2 +- .../archiva-artifact-reports/pom.xml | 2 +- .../archiva-metadata-reports/pom.xml | 2 +- .../archiva-project-reports/pom.xml | 2 +- .../archiva-report-manager/pom.xml | 2 +- archiva-modules/archiva-reporting/pom.xml | 2 +- archiva-modules/archiva-scheduled/pom.xml | 2 +- archiva-modules/archiva-web/archiva-applet/pom.xml | 2 +- archiva-modules/archiva-web/archiva-rss/pom.xml | 2 +- .../archiva-web/archiva-security/pom.xml | 2 +- archiva-modules/archiva-web/archiva-webapp/pom.xml | 2 +- archiva-modules/archiva-web/archiva-webdav/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-api/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-client/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-security/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-services/pom.xml | 2 +- archiva-modules/archiva-web/archiva-xmlrpc/pom.xml | 2 +- archiva-modules/archiva-web/pom.xml | 2 +- archiva-modules/pom.xml | 2 +- pom.xml | 70 +++++++++++----------- 44 files changed, 79 insertions(+), 79 deletions(-) (limited to 'archiva-cli') diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index 089c61e8c..40060bc93 100644 --- a/archiva-cli/pom.xml +++ b/archiva-cli/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva - 1.2.1 + 1.2.1-SNAPSHOT 4.0.0 archiva-cli @@ -35,7 +35,7 @@ org.apache.archiva archiva-dependency-tree-consumer - 1.2.1 + 1.2.1-SNAPSHOT runtime diff --git a/archiva-docs/pom.xml b/archiva-docs/pom.xml index 81b20c9b3..13117e3bd 100644 --- a/archiva-docs/pom.xml +++ b/archiva-docs/pom.xml @@ -21,7 +21,7 @@ org.apache.archiva archiva - 1.2.1 + 1.2.1-SNAPSHOT 4.0.0 archiva-docs diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml index 0f8f5dcc5..b752f1243 100644 --- a/archiva-jetty/pom.xml +++ b/archiva-jetty/pom.xml @@ -3,7 +3,7 @@ org.apache.archiva archiva - 1.2.1 + 1.2.1-SNAPSHOT archiva-jetty pom diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml index 5615de25d..83e1b0012 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.1-SNAPSHOT archiva-artifact-converter Archiva Artifact Converter diff --git a/archiva-modules/archiva-base/archiva-checksum/pom.xml b/archiva-modules/archiva-base/archiva-checksum/pom.xml index 3cbb03448..8c47aa41f 100644 --- a/archiva-modules/archiva-base/archiva-checksum/pom.xml +++ b/archiva-modules/archiva-base/archiva-checksum/pom.xml @@ -19,7 +19,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.1-SNAPSHOT archiva-checksum Archiva Checksum diff --git a/archiva-modules/archiva-base/archiva-common/pom.xml b/archiva-modules/archiva-base/archiva-common/pom.xml index bddde3bb7..fc2f82c31 100644 --- a/archiva-modules/archiva-base/archiva-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-common/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.1-SNAPSHOT 4.0.0 archiva-common diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index 89a3c5c8b..7609471aa 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.1-SNAPSHOT 4.0.0 archiva-configuration diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml index 29414f52a..998b876ac 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-consumers - 1.2.1 + 1.2.1-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index 912627ba6..f37d3ad5d 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.1 + 1.2.1-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml index 3f0a2bd31..2d53d0f86 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.1 + 1.2.1-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml index f4b50b762..164225e5e 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml @@ -3,7 +3,7 @@ org.apache.archiva archiva-consumers - 1.2.1 + 1.2.1-SNAPSHOT archiva-dependency-tree-consumer Archiva Consumers :: Dependency Tree Consumer diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml index 297b80017..4ead51724 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.1 + 1.2.1-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml index ffe158465..8211e9ab5 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.1 + 1.2.1-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/pom.xml index f8d74aa43..c35aaa430 100644 --- a/archiva-modules/archiva-base/archiva-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.1-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml index 01e4349f3..579593002 100644 --- a/archiva-modules/archiva-base/archiva-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-converter/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.1-SNAPSHOT 4.0.0 archiva-converter diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml index c574d6175..eb460aa2f 100644 --- a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml +++ b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.1-SNAPSHOT 4.0.0 archiva-dependency-graph diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml index 89e5ed5da..4591915e3 100644 --- a/archiva-modules/archiva-base/archiva-indexer/pom.xml +++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.1-SNAPSHOT 4.0.0 archiva-indexer diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml index 22e922622..9fd40f050 100755 --- a/archiva-modules/archiva-base/archiva-model/pom.xml +++ b/archiva-modules/archiva-base/archiva-model/pom.xml @@ -2,7 +2,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.1-SNAPSHOT 4.0.0 archiva-model diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index 5eb8b533e..f85786f1f 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.1-SNAPSHOT 4.0.0 archiva-policies diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index 01e3361d8..4ed8e4ac5 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.1-SNAPSHOT 4.0.0 archiva-proxy diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index 2f12ed19b..75945ba36 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.1-SNAPSHOT 4.0.0 archiva-repository-layer diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml index e0bd41e7a..1ad239254 100644 --- a/archiva-modules/archiva-base/archiva-transaction/pom.xml +++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.1-SNAPSHOT archiva-transaction Archiva Transactions diff --git a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml index ffff854f1..16b829c5e 100644 --- a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml +++ b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.1-SNAPSHOT 4.0.0 archiva-xml-tools diff --git a/archiva-modules/archiva-base/pom.xml b/archiva-modules/archiva-base/pom.xml index 326f6ff95..f38d15e66 100644 --- a/archiva-modules/archiva-base/pom.xml +++ b/archiva-modules/archiva-base/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2.1 + 1.2.1-SNAPSHOT archiva-base diff --git a/archiva-modules/archiva-database/pom.xml b/archiva-modules/archiva-database/pom.xml index 576f043cd..8fb7185f2 100755 --- a/archiva-modules/archiva-database/pom.xml +++ b/archiva-modules/archiva-database/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-modules - 1.2.1 + 1.2.1-SNAPSHOT 4.0.0 archiva-database diff --git a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml index d5221d0ed..7e2564e1c 100755 --- a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.1 + 1.2.1-SNAPSHOT 4.0.0 archiva-artifact-reports diff --git a/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml index f8d310104..16d3a7c91 100755 --- a/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.1 + 1.2.1-SNAPSHOT 4.0.0 archiva-metadata-reports diff --git a/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml index e0f07a358..dafbb68c0 100755 --- a/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.1 + 1.2.1-SNAPSHOT 4.0.0 archiva-project-reports diff --git a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml index 3e0f4a91b..58785dcb5 100755 --- a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.1 + 1.2.1-SNAPSHOT 4.0.0 archiva-report-manager diff --git a/archiva-modules/archiva-reporting/pom.xml b/archiva-modules/archiva-reporting/pom.xml index d51eb2e76..b1fda360f 100644 --- a/archiva-modules/archiva-reporting/pom.xml +++ b/archiva-modules/archiva-reporting/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2.1 + 1.2.1-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-scheduled/pom.xml b/archiva-modules/archiva-scheduled/pom.xml index f25854924..445d70962 100644 --- a/archiva-modules/archiva-scheduled/pom.xml +++ b/archiva-modules/archiva-scheduled/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-modules - 1.2.1 + 1.2.1-SNAPSHOT 4.0.0 archiva-scheduled diff --git a/archiva-modules/archiva-web/archiva-applet/pom.xml b/archiva-modules/archiva-web/archiva-applet/pom.xml index 0b29573ed..021d2c44b 100644 --- a/archiva-modules/archiva-web/archiva-applet/pom.xml +++ b/archiva-modules/archiva-web/archiva-applet/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2.1 + 1.2.1-SNAPSHOT archiva-applet Archiva Web :: Applet diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml index afb855d2d..b66842524 100644 --- a/archiva-modules/archiva-web/archiva-rss/pom.xml +++ b/archiva-modules/archiva-web/archiva-rss/pom.xml @@ -2,7 +2,7 @@ archiva-web org.apache.archiva - 1.2.1 + 1.2.1-SNAPSHOT 4.0.0 archiva-rss diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml index 34fcaf191..26a5c7237 100644 --- a/archiva-modules/archiva-web/archiva-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-security/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-web - 1.2.1 + 1.2.1-SNAPSHOT 4.0.0 archiva-security diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 261c5dfa3..8a6afbdfa 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2.1 + 1.2.1-SNAPSHOT ../pom.xml archiva-webapp diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index 34ad1fe6a..4d87a35d5 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2.1 + 1.2.1-SNAPSHOT archiva-webdav diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml index 92ffb1fd7..48814a123 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2.1 + 1.2.1-SNAPSHOT ../pom.xml archiva-xmlrpc-api diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml index df3da5fba..eb8aa0519 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml @@ -19,7 +19,7 @@ archiva-xmlrpc org.apache.archiva - 1.2.1 + 1.2.1-SNAPSHOT 4.0.0 archiva-xmlrpc-client diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml index 334152429..1a5c4838b 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2.1 + 1.2.1-SNAPSHOT ../pom.xml archiva-xmlrpc-security diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml index 0f6eeb31e..d641cb0bd 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2.1 + 1.2.1-SNAPSHOT ../pom.xml archiva-xmlrpc-services diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml index 6446d16c4..b503abce8 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-web - 1.2.1 + 1.2.1-SNAPSHOT ../pom.xml archiva-xmlrpc diff --git a/archiva-modules/archiva-web/pom.xml b/archiva-modules/archiva-web/pom.xml index 20dfe604b..7a2e5d7d6 100644 --- a/archiva-modules/archiva-web/pom.xml +++ b/archiva-modules/archiva-web/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2.1 + 1.2.1-SNAPSHOT ../pom.xml diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml index 48dafcd3f..da6ff98f0 100644 --- a/archiva-modules/pom.xml +++ b/archiva-modules/pom.xml @@ -23,7 +23,7 @@ archiva org.apache.archiva - 1.2.1 + 1.2.1-SNAPSHOT 4.0.0 archiva-modules diff --git a/pom.xml b/pom.xml index cccf51781..ea823066e 100644 --- a/pom.xml +++ b/pom.xml @@ -34,12 +34,12 @@ Archiva archiva pom - 1.2.1 + 1.2.1-SNAPSHOT http://archiva.apache.org - scm:svn:http://svn.apache.org/repos/asf/archiva/tags/archiva-1.2.1 - scm:svn:https://svn.apache.org/repos/asf/archiva/tags/archiva-1.2.1 - http://svn.apache.org/viewvc/archiva/tags/archiva-1.2.1 + scm:svn:http://svn.apache.org/repos/asf/archiva/trunk + scm:svn:https://svn.apache.org/repos/asf/archiva/trunk + http://svn.apache.org/viewvc/archiva/trunk @@ -289,47 +289,47 @@ org.apache.archiva archiva-applet - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-artifact-converter - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-artifact-reports - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-checksum - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-common - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-configuration - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-consumer-api - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-converter - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-dependency-graph - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva @@ -339,115 +339,115 @@ org.apache.archiva archiva-core-consumers - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-database - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-database-consumers - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-indexer - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-lucene-consumers - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-model - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-policies - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-proxy - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-report-manager - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-repository-layer - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-scheduled - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-security - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-signature-consumers - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-transaction - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-docs - 1.2.1 + 1.2.1-SNAPSHOT zip docs org.apache.archiva archiva-webapp - 1.2.1 + 1.2.1-SNAPSHOT war org.apache.archiva archiva-xml-tools - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-webdav - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-rss - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-xmlrpc-api - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-xmlrpc-services - 1.2.1 + 1.2.1-SNAPSHOT org.apache.archiva archiva-xmlrpc-security - 1.2.1 + 1.2.1-SNAPSHOT org.codehaus.plexus -- cgit v1.2.3 From 2d00ba7504e2de98604201758fe46154cca5c4ec Mon Sep 17 00:00:00 2001 From: "Maria Odea B. Ching" Date: Sun, 24 May 2009 14:46:45 +0000 Subject: [maven-release-plugin] prepare release archiva-1.2.1 git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@778164 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-cli/pom.xml | 4 +- archiva-docs/pom.xml | 2 +- archiva-jetty/pom.xml | 2 +- .../archiva-artifact-converter/pom.xml | 2 +- .../archiva-base/archiva-checksum/pom.xml | 2 +- .../archiva-base/archiva-common/pom.xml | 2 +- .../archiva-base/archiva-configuration/pom.xml | 2 +- .../archiva-consumers/archiva-consumer-api/pom.xml | 2 +- .../archiva-core-consumers/pom.xml | 2 +- .../archiva-database-consumers/pom.xml | 2 +- .../archiva-dependency-tree-consumer/pom.xml | 2 +- .../archiva-lucene-consumers/pom.xml | 2 +- .../archiva-signature-consumers/pom.xml | 2 +- .../archiva-base/archiva-consumers/pom.xml | 2 +- .../archiva-base/archiva-converter/pom.xml | 2 +- .../archiva-base/archiva-dependency-graph/pom.xml | 2 +- .../archiva-base/archiva-indexer/pom.xml | 2 +- archiva-modules/archiva-base/archiva-model/pom.xml | 2 +- .../archiva-base/archiva-policies/pom.xml | 2 +- archiva-modules/archiva-base/archiva-proxy/pom.xml | 2 +- .../archiva-base/archiva-repository-layer/pom.xml | 2 +- .../archiva-base/archiva-transaction/pom.xml | 2 +- .../archiva-base/archiva-xml-tools/pom.xml | 2 +- archiva-modules/archiva-base/pom.xml | 2 +- archiva-modules/archiva-database/pom.xml | 2 +- .../archiva-artifact-reports/pom.xml | 2 +- .../archiva-metadata-reports/pom.xml | 2 +- .../archiva-project-reports/pom.xml | 2 +- .../archiva-report-manager/pom.xml | 2 +- archiva-modules/archiva-reporting/pom.xml | 2 +- archiva-modules/archiva-scheduled/pom.xml | 2 +- archiva-modules/archiva-web/archiva-applet/pom.xml | 2 +- archiva-modules/archiva-web/archiva-rss/pom.xml | 2 +- .../archiva-web/archiva-security/pom.xml | 2 +- archiva-modules/archiva-web/archiva-webapp/pom.xml | 2 +- archiva-modules/archiva-web/archiva-webdav/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-api/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-client/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-security/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-services/pom.xml | 2 +- archiva-modules/archiva-web/archiva-xmlrpc/pom.xml | 2 +- archiva-modules/archiva-web/pom.xml | 2 +- archiva-modules/pom.xml | 2 +- pom.xml | 70 +++++++++++----------- 44 files changed, 79 insertions(+), 79 deletions(-) (limited to 'archiva-cli') diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index 40060bc93..089c61e8c 100644 --- a/archiva-cli/pom.xml +++ b/archiva-cli/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-cli @@ -35,7 +35,7 @@ org.apache.archiva archiva-dependency-tree-consumer - 1.2.1-SNAPSHOT + 1.2.1 runtime diff --git a/archiva-docs/pom.xml b/archiva-docs/pom.xml index 13117e3bd..81b20c9b3 100644 --- a/archiva-docs/pom.xml +++ b/archiva-docs/pom.xml @@ -21,7 +21,7 @@ org.apache.archiva archiva - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-docs diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml index b752f1243..0f8f5dcc5 100644 --- a/archiva-jetty/pom.xml +++ b/archiva-jetty/pom.xml @@ -3,7 +3,7 @@ org.apache.archiva archiva - 1.2.1-SNAPSHOT + 1.2.1 archiva-jetty pom diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml index 83e1b0012..5615de25d 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 archiva-artifact-converter Archiva Artifact Converter diff --git a/archiva-modules/archiva-base/archiva-checksum/pom.xml b/archiva-modules/archiva-base/archiva-checksum/pom.xml index 8c47aa41f..3cbb03448 100644 --- a/archiva-modules/archiva-base/archiva-checksum/pom.xml +++ b/archiva-modules/archiva-base/archiva-checksum/pom.xml @@ -19,7 +19,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 archiva-checksum Archiva Checksum diff --git a/archiva-modules/archiva-base/archiva-common/pom.xml b/archiva-modules/archiva-base/archiva-common/pom.xml index fc2f82c31..bddde3bb7 100644 --- a/archiva-modules/archiva-base/archiva-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-common/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-common diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index 7609471aa..89a3c5c8b 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-configuration diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml index 998b876ac..29414f52a 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-consumers - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index f37d3ad5d..912627ba6 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml index 2d53d0f86..3f0a2bd31 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml index 164225e5e..f4b50b762 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml @@ -3,7 +3,7 @@ org.apache.archiva archiva-consumers - 1.2.1-SNAPSHOT + 1.2.1 archiva-dependency-tree-consumer Archiva Consumers :: Dependency Tree Consumer diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml index 4ead51724..297b80017 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml index 8211e9ab5..ffe158465 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/pom.xml index c35aaa430..f8d74aa43 100644 --- a/archiva-modules/archiva-base/archiva-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml index 579593002..01e4349f3 100644 --- a/archiva-modules/archiva-base/archiva-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-converter/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-converter diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml index eb460aa2f..c574d6175 100644 --- a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml +++ b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-dependency-graph diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml index 4591915e3..89e5ed5da 100644 --- a/archiva-modules/archiva-base/archiva-indexer/pom.xml +++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-indexer diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml index 9fd40f050..22e922622 100755 --- a/archiva-modules/archiva-base/archiva-model/pom.xml +++ b/archiva-modules/archiva-base/archiva-model/pom.xml @@ -2,7 +2,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-model diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index f85786f1f..5eb8b533e 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-policies diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index 4ed8e4ac5..01e3361d8 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-proxy diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index 75945ba36..2f12ed19b 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-repository-layer diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml index 1ad239254..e0bd41e7a 100644 --- a/archiva-modules/archiva-base/archiva-transaction/pom.xml +++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 archiva-transaction Archiva Transactions diff --git a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml index 16b829c5e..ffff854f1 100644 --- a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml +++ b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-xml-tools diff --git a/archiva-modules/archiva-base/pom.xml b/archiva-modules/archiva-base/pom.xml index f38d15e66..326f6ff95 100644 --- a/archiva-modules/archiva-base/pom.xml +++ b/archiva-modules/archiva-base/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2.1-SNAPSHOT + 1.2.1 archiva-base diff --git a/archiva-modules/archiva-database/pom.xml b/archiva-modules/archiva-database/pom.xml index 8fb7185f2..576f043cd 100755 --- a/archiva-modules/archiva-database/pom.xml +++ b/archiva-modules/archiva-database/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-modules - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-database diff --git a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml index 7e2564e1c..d5221d0ed 100755 --- a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-artifact-reports diff --git a/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml index 16d3a7c91..f8d310104 100755 --- a/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-metadata-reports diff --git a/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml index dafbb68c0..e0f07a358 100755 --- a/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-project-reports diff --git a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml index 58785dcb5..3e0f4a91b 100755 --- a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-report-manager diff --git a/archiva-modules/archiva-reporting/pom.xml b/archiva-modules/archiva-reporting/pom.xml index b1fda360f..d51eb2e76 100644 --- a/archiva-modules/archiva-reporting/pom.xml +++ b/archiva-modules/archiva-reporting/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml diff --git a/archiva-modules/archiva-scheduled/pom.xml b/archiva-modules/archiva-scheduled/pom.xml index 445d70962..f25854924 100644 --- a/archiva-modules/archiva-scheduled/pom.xml +++ b/archiva-modules/archiva-scheduled/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-modules - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-scheduled diff --git a/archiva-modules/archiva-web/archiva-applet/pom.xml b/archiva-modules/archiva-web/archiva-applet/pom.xml index 021d2c44b..0b29573ed 100644 --- a/archiva-modules/archiva-web/archiva-applet/pom.xml +++ b/archiva-modules/archiva-web/archiva-applet/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2.1-SNAPSHOT + 1.2.1 archiva-applet Archiva Web :: Applet diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml index b66842524..afb855d2d 100644 --- a/archiva-modules/archiva-web/archiva-rss/pom.xml +++ b/archiva-modules/archiva-web/archiva-rss/pom.xml @@ -2,7 +2,7 @@ archiva-web org.apache.archiva - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-rss diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml index 26a5c7237..34fcaf191 100644 --- a/archiva-modules/archiva-web/archiva-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-security/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-web - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-security diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 8a6afbdfa..261c5dfa3 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml archiva-webapp diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index 4d87a35d5..34ad1fe6a 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2.1-SNAPSHOT + 1.2.1 archiva-webdav diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml index 48814a123..92ffb1fd7 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml archiva-xmlrpc-api diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml index eb8aa0519..df3da5fba 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml @@ -19,7 +19,7 @@ archiva-xmlrpc org.apache.archiva - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-xmlrpc-client diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml index 1a5c4838b..334152429 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml archiva-xmlrpc-security diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml index d641cb0bd..0f6eeb31e 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml archiva-xmlrpc-services diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml index b503abce8..6446d16c4 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-web - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml archiva-xmlrpc diff --git a/archiva-modules/archiva-web/pom.xml b/archiva-modules/archiva-web/pom.xml index 7a2e5d7d6..20dfe604b 100644 --- a/archiva-modules/archiva-web/pom.xml +++ b/archiva-modules/archiva-web/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml index da6ff98f0..48dafcd3f 100644 --- a/archiva-modules/pom.xml +++ b/archiva-modules/pom.xml @@ -23,7 +23,7 @@ archiva org.apache.archiva - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 archiva-modules diff --git a/pom.xml b/pom.xml index ea823066e..cccf51781 100644 --- a/pom.xml +++ b/pom.xml @@ -34,12 +34,12 @@ Archiva archiva pom - 1.2.1-SNAPSHOT + 1.2.1 http://archiva.apache.org - scm:svn:http://svn.apache.org/repos/asf/archiva/trunk - scm:svn:https://svn.apache.org/repos/asf/archiva/trunk - http://svn.apache.org/viewvc/archiva/trunk + scm:svn:http://svn.apache.org/repos/asf/archiva/tags/archiva-1.2.1 + scm:svn:https://svn.apache.org/repos/asf/archiva/tags/archiva-1.2.1 + http://svn.apache.org/viewvc/archiva/tags/archiva-1.2.1 @@ -289,47 +289,47 @@ org.apache.archiva archiva-applet - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-artifact-converter - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-artifact-reports - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-checksum - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-common - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-configuration - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-consumer-api - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-converter - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-dependency-graph - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva @@ -339,115 +339,115 @@ org.apache.archiva archiva-core-consumers - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-database - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-database-consumers - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-indexer - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-lucene-consumers - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-model - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-policies - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-proxy - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-report-manager - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-repository-layer - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-scheduled - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-security - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-signature-consumers - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-transaction - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-docs - 1.2.1-SNAPSHOT + 1.2.1 zip docs org.apache.archiva archiva-webapp - 1.2.1-SNAPSHOT + 1.2.1 war org.apache.archiva archiva-xml-tools - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-webdav - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-rss - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-xmlrpc-api - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-xmlrpc-services - 1.2.1-SNAPSHOT + 1.2.1 org.apache.archiva archiva-xmlrpc-security - 1.2.1-SNAPSHOT + 1.2.1 org.codehaus.plexus -- cgit v1.2.3 From 3fea67fafd60c7bed16e9a0cdc3a2af99d31585b Mon Sep 17 00:00:00 2001 From: "Maria Odea B. Ching" Date: Sun, 24 May 2009 14:50:05 +0000 Subject: [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@778166 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-cli/pom.xml | 4 +- archiva-docs/pom.xml | 2 +- archiva-jetty/pom.xml | 2 +- .../archiva-artifact-converter/pom.xml | 2 +- .../archiva-base/archiva-checksum/pom.xml | 2 +- .../archiva-base/archiva-common/pom.xml | 2 +- .../archiva-base/archiva-configuration/pom.xml | 2 +- .../archiva-consumers/archiva-consumer-api/pom.xml | 2 +- .../archiva-core-consumers/pom.xml | 2 +- .../archiva-database-consumers/pom.xml | 2 +- .../archiva-dependency-tree-consumer/pom.xml | 2 +- .../archiva-lucene-consumers/pom.xml | 2 +- .../archiva-signature-consumers/pom.xml | 2 +- .../archiva-base/archiva-consumers/pom.xml | 2 +- .../archiva-base/archiva-converter/pom.xml | 2 +- .../archiva-base/archiva-dependency-graph/pom.xml | 2 +- .../archiva-base/archiva-indexer/pom.xml | 2 +- archiva-modules/archiva-base/archiva-model/pom.xml | 2 +- .../archiva-base/archiva-policies/pom.xml | 2 +- archiva-modules/archiva-base/archiva-proxy/pom.xml | 2 +- .../archiva-base/archiva-repository-layer/pom.xml | 2 +- .../archiva-base/archiva-transaction/pom.xml | 2 +- .../archiva-base/archiva-xml-tools/pom.xml | 2 +- archiva-modules/archiva-base/pom.xml | 2 +- archiva-modules/archiva-database/pom.xml | 2 +- .../archiva-artifact-reports/pom.xml | 2 +- .../archiva-metadata-reports/pom.xml | 2 +- .../archiva-project-reports/pom.xml | 2 +- .../archiva-report-manager/pom.xml | 2 +- archiva-modules/archiva-reporting/pom.xml | 2 +- archiva-modules/archiva-scheduled/pom.xml | 2 +- archiva-modules/archiva-web/archiva-applet/pom.xml | 2 +- archiva-modules/archiva-web/archiva-rss/pom.xml | 2 +- .../archiva-web/archiva-security/pom.xml | 2 +- archiva-modules/archiva-web/archiva-webapp/pom.xml | 2 +- archiva-modules/archiva-web/archiva-webdav/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-api/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-client/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-security/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-services/pom.xml | 2 +- archiva-modules/archiva-web/archiva-xmlrpc/pom.xml | 2 +- archiva-modules/archiva-web/pom.xml | 2 +- archiva-modules/pom.xml | 2 +- pom.xml | 70 +++++++++++----------- 44 files changed, 79 insertions(+), 79 deletions(-) (limited to 'archiva-cli') diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index 089c61e8c..52aabde3a 100644 --- a/archiva-cli/pom.xml +++ b/archiva-cli/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva - 1.2.1 + 1.2.2-SNAPSHOT 4.0.0 archiva-cli @@ -35,7 +35,7 @@ org.apache.archiva archiva-dependency-tree-consumer - 1.2.1 + 1.2.2-SNAPSHOT runtime diff --git a/archiva-docs/pom.xml b/archiva-docs/pom.xml index 81b20c9b3..80f293284 100644 --- a/archiva-docs/pom.xml +++ b/archiva-docs/pom.xml @@ -21,7 +21,7 @@ org.apache.archiva archiva - 1.2.1 + 1.2.2-SNAPSHOT 4.0.0 archiva-docs diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml index 0f8f5dcc5..799a3d7c1 100644 --- a/archiva-jetty/pom.xml +++ b/archiva-jetty/pom.xml @@ -3,7 +3,7 @@ org.apache.archiva archiva - 1.2.1 + 1.2.2-SNAPSHOT archiva-jetty pom diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml index 5615de25d..442a65e7e 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.2-SNAPSHOT archiva-artifact-converter Archiva Artifact Converter diff --git a/archiva-modules/archiva-base/archiva-checksum/pom.xml b/archiva-modules/archiva-base/archiva-checksum/pom.xml index 3cbb03448..642c2f35b 100644 --- a/archiva-modules/archiva-base/archiva-checksum/pom.xml +++ b/archiva-modules/archiva-base/archiva-checksum/pom.xml @@ -19,7 +19,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.2-SNAPSHOT archiva-checksum Archiva Checksum diff --git a/archiva-modules/archiva-base/archiva-common/pom.xml b/archiva-modules/archiva-base/archiva-common/pom.xml index bddde3bb7..e570d7ae7 100644 --- a/archiva-modules/archiva-base/archiva-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-common/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.2-SNAPSHOT 4.0.0 archiva-common diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index 89a3c5c8b..39d964b6b 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.2-SNAPSHOT 4.0.0 archiva-configuration diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml index 29414f52a..c49eff441 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-consumers - 1.2.1 + 1.2.2-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index 912627ba6..31228cfa5 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.1 + 1.2.2-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml index 3f0a2bd31..dc2563f5c 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.1 + 1.2.2-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml index f4b50b762..ae17b96b7 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml @@ -3,7 +3,7 @@ org.apache.archiva archiva-consumers - 1.2.1 + 1.2.2-SNAPSHOT archiva-dependency-tree-consumer Archiva Consumers :: Dependency Tree Consumer diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml index 297b80017..6c01328b1 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.1 + 1.2.2-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml index ffe158465..820ae8510 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.1 + 1.2.2-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/pom.xml index f8d74aa43..17c538dec 100644 --- a/archiva-modules/archiva-base/archiva-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.2-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml index 01e4349f3..cdac688cb 100644 --- a/archiva-modules/archiva-base/archiva-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-converter/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.2-SNAPSHOT 4.0.0 archiva-converter diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml index c574d6175..96e3aa1fd 100644 --- a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml +++ b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.2-SNAPSHOT 4.0.0 archiva-dependency-graph diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml index 89e5ed5da..a51dcc314 100644 --- a/archiva-modules/archiva-base/archiva-indexer/pom.xml +++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.2-SNAPSHOT 4.0.0 archiva-indexer diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml index 22e922622..c59fcf4a9 100755 --- a/archiva-modules/archiva-base/archiva-model/pom.xml +++ b/archiva-modules/archiva-base/archiva-model/pom.xml @@ -2,7 +2,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.2-SNAPSHOT 4.0.0 archiva-model diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index 5eb8b533e..d015e9788 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.2-SNAPSHOT 4.0.0 archiva-policies diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index 01e3361d8..373e208b2 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.2-SNAPSHOT 4.0.0 archiva-proxy diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index 2f12ed19b..22592f1a3 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.2-SNAPSHOT 4.0.0 archiva-repository-layer diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml index e0bd41e7a..fa8bb9e1c 100644 --- a/archiva-modules/archiva-base/archiva-transaction/pom.xml +++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.2-SNAPSHOT archiva-transaction Archiva Transactions diff --git a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml index ffff854f1..40d630ab4 100644 --- a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml +++ b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.1 + 1.2.2-SNAPSHOT 4.0.0 archiva-xml-tools diff --git a/archiva-modules/archiva-base/pom.xml b/archiva-modules/archiva-base/pom.xml index 326f6ff95..2ecfe884a 100644 --- a/archiva-modules/archiva-base/pom.xml +++ b/archiva-modules/archiva-base/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2.1 + 1.2.2-SNAPSHOT archiva-base diff --git a/archiva-modules/archiva-database/pom.xml b/archiva-modules/archiva-database/pom.xml index 576f043cd..9b02179b5 100755 --- a/archiva-modules/archiva-database/pom.xml +++ b/archiva-modules/archiva-database/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-modules - 1.2.1 + 1.2.2-SNAPSHOT 4.0.0 archiva-database diff --git a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml index d5221d0ed..f0d5f3456 100755 --- a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.1 + 1.2.2-SNAPSHOT 4.0.0 archiva-artifact-reports diff --git a/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml index f8d310104..5c5719574 100755 --- a/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.1 + 1.2.2-SNAPSHOT 4.0.0 archiva-metadata-reports diff --git a/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml index e0f07a358..100ebdbde 100755 --- a/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.1 + 1.2.2-SNAPSHOT 4.0.0 archiva-project-reports diff --git a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml index 3e0f4a91b..111ebfaa1 100755 --- a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.1 + 1.2.2-SNAPSHOT 4.0.0 archiva-report-manager diff --git a/archiva-modules/archiva-reporting/pom.xml b/archiva-modules/archiva-reporting/pom.xml index d51eb2e76..1f5d6cbe6 100644 --- a/archiva-modules/archiva-reporting/pom.xml +++ b/archiva-modules/archiva-reporting/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2.1 + 1.2.2-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-scheduled/pom.xml b/archiva-modules/archiva-scheduled/pom.xml index f25854924..59afcb092 100644 --- a/archiva-modules/archiva-scheduled/pom.xml +++ b/archiva-modules/archiva-scheduled/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-modules - 1.2.1 + 1.2.2-SNAPSHOT 4.0.0 archiva-scheduled diff --git a/archiva-modules/archiva-web/archiva-applet/pom.xml b/archiva-modules/archiva-web/archiva-applet/pom.xml index 0b29573ed..177fc3f41 100644 --- a/archiva-modules/archiva-web/archiva-applet/pom.xml +++ b/archiva-modules/archiva-web/archiva-applet/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2.1 + 1.2.2-SNAPSHOT archiva-applet Archiva Web :: Applet diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml index afb855d2d..a7d1f8ad1 100644 --- a/archiva-modules/archiva-web/archiva-rss/pom.xml +++ b/archiva-modules/archiva-web/archiva-rss/pom.xml @@ -2,7 +2,7 @@ archiva-web org.apache.archiva - 1.2.1 + 1.2.2-SNAPSHOT 4.0.0 archiva-rss diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml index 34fcaf191..c116e84d3 100644 --- a/archiva-modules/archiva-web/archiva-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-security/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-web - 1.2.1 + 1.2.2-SNAPSHOT 4.0.0 archiva-security diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 261c5dfa3..af049d723 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2.1 + 1.2.2-SNAPSHOT ../pom.xml archiva-webapp diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index 34ad1fe6a..d3766d121 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2.1 + 1.2.2-SNAPSHOT archiva-webdav diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml index 92ffb1fd7..85af95d76 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2.1 + 1.2.2-SNAPSHOT ../pom.xml archiva-xmlrpc-api diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml index df3da5fba..f13174675 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml @@ -19,7 +19,7 @@ archiva-xmlrpc org.apache.archiva - 1.2.1 + 1.2.2-SNAPSHOT 4.0.0 archiva-xmlrpc-client diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml index 334152429..0afa4c9a6 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2.1 + 1.2.2-SNAPSHOT ../pom.xml archiva-xmlrpc-security diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml index 0f6eeb31e..21593fda9 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2.1 + 1.2.2-SNAPSHOT ../pom.xml archiva-xmlrpc-services diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml index 6446d16c4..958940114 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-web - 1.2.1 + 1.2.2-SNAPSHOT ../pom.xml archiva-xmlrpc diff --git a/archiva-modules/archiva-web/pom.xml b/archiva-modules/archiva-web/pom.xml index 20dfe604b..fbd9eb695 100644 --- a/archiva-modules/archiva-web/pom.xml +++ b/archiva-modules/archiva-web/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2.1 + 1.2.2-SNAPSHOT ../pom.xml diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml index 48dafcd3f..8f8c6352a 100644 --- a/archiva-modules/pom.xml +++ b/archiva-modules/pom.xml @@ -23,7 +23,7 @@ archiva org.apache.archiva - 1.2.1 + 1.2.2-SNAPSHOT 4.0.0 archiva-modules diff --git a/pom.xml b/pom.xml index cccf51781..f07ed46d0 100644 --- a/pom.xml +++ b/pom.xml @@ -34,12 +34,12 @@ Archiva archiva pom - 1.2.1 + 1.2.2-SNAPSHOT http://archiva.apache.org - scm:svn:http://svn.apache.org/repos/asf/archiva/tags/archiva-1.2.1 - scm:svn:https://svn.apache.org/repos/asf/archiva/tags/archiva-1.2.1 - http://svn.apache.org/viewvc/archiva/tags/archiva-1.2.1 + scm:svn:http://svn.apache.org/repos/asf/archiva/trunk + scm:svn:https://svn.apache.org/repos/asf/archiva/trunk + http://svn.apache.org/viewvc/archiva/trunk @@ -289,47 +289,47 @@ org.apache.archiva archiva-applet - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-artifact-converter - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-artifact-reports - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-checksum - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-common - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-configuration - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-consumer-api - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-converter - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-dependency-graph - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva @@ -339,115 +339,115 @@ org.apache.archiva archiva-core-consumers - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-database - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-database-consumers - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-indexer - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-lucene-consumers - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-model - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-policies - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-proxy - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-report-manager - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-repository-layer - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-scheduled - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-security - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-signature-consumers - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-transaction - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-docs - 1.2.1 + 1.2.2-SNAPSHOT zip docs org.apache.archiva archiva-webapp - 1.2.1 + 1.2.2-SNAPSHOT war org.apache.archiva archiva-xml-tools - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-webdav - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-rss - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-xmlrpc-api - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-xmlrpc-services - 1.2.1 + 1.2.2-SNAPSHOT org.apache.archiva archiva-xmlrpc-security - 1.2.1 + 1.2.2-SNAPSHOT org.codehaus.plexus -- cgit v1.2.3 From b8578cfac9a3e2352cb705868078efd27507e4e3 Mon Sep 17 00:00:00 2001 From: Emmanuel Venisse Date: Fri, 29 May 2009 05:02:22 +0000 Subject: [MRM-1097] close some open streams git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@779841 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/archiva/cli/ArchivaCli.java | 66 +++++++++------- .../maven/archiva/web/action/UploadAction.java | 90 +++++++++++----------- .../maven/archiva/web/startup/BannerTest.java | 40 +++++----- 3 files changed, 106 insertions(+), 90 deletions(-) (limited to 'archiva-cli') diff --git a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java index a9bae8f48..5e023f08d 100644 --- a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java +++ b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java @@ -19,6 +19,9 @@ package org.apache.maven.archiva.cli; * under the License. */ +import com.sampullara.cli.Args; +import com.sampullara.cli.Argument; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -31,6 +34,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.consumers.ConsumerException; @@ -46,14 +50,11 @@ import org.apache.maven.artifact.manager.WagonManager; import org.codehaus.plexus.spring.PlexusClassPathXmlApplicationContext; import org.codehaus.plexus.spring.PlexusToSpringUtils; -import com.sampullara.cli.Args; -import com.sampullara.cli.Argument; - /** * ArchivaCli - * - * @todo add back reading of archiva.xml from a given location + * * @version $Id$ + * @todo add back reading of archiva.xml from a given location */ public class ArchivaCli { @@ -71,7 +72,8 @@ public class ArchivaCli throws IOException { Properties properties = new Properties(); - properties.load( ArchivaCli.class.getResourceAsStream( "/META-INF/maven/org.apache.archiva/archiva-cli/pom.properties" ) ); + properties.load( + ArchivaCli.class.getResourceAsStream( "/META-INF/maven/org.apache.archiva/archiva-cli/pom.properties" ) ); return properties.getProperty( "version" ); } @@ -79,9 +81,8 @@ public class ArchivaCli public ArchivaCli() { - applicationContext = - new PlexusClassPathXmlApplicationContext( new String[] { "classpath*:/META-INF/spring-context.xml", - "classpath*:/META-INF/plexus/components.xml" } ); + applicationContext = new PlexusClassPathXmlApplicationContext( + new String[]{"classpath*:/META-INF/spring-context.xml", "classpath*:/META-INF/plexus/components.xml"} ); } public static void main( String[] args ) @@ -144,8 +145,8 @@ public class ArchivaCli { // hack around poorly configurable project builder by pointing all repositories back at this location to be self // contained - WagonManager wagonManager = - (WagonManager) applicationContext.getBean( PlexusToSpringUtils.buildSpringId( WagonManager.class.getName() ) ); + WagonManager wagonManager = (WagonManager) applicationContext.getBean( + PlexusToSpringUtils.buildSpringId( WagonManager.class.getName() ) ); wagonManager.addMirror( "internal", "*", new File( path ).toURL().toExternalForm() ); ManagedRepositoryConfiguration repo = new ManagedRepositoryConfiguration(); @@ -166,9 +167,8 @@ public class ArchivaCli try { - RepositoryScanStatistics stats = - scanner.scan( repo, knownConsumerList, invalidConsumerList, ignoredContent, - RepositoryScanner.FRESH_SCAN ); + RepositoryScanStatistics stats = scanner.scan( repo, knownConsumerList, invalidConsumerList, ignoredContent, + RepositoryScanner.FRESH_SCAN ); System.out.println( "\n" + stats.toDump( repo ) ); } @@ -215,12 +215,12 @@ public class ArchivaCli { String consumerHint = (String) entry.getKey(); RepositoryContentConsumer consumer = (RepositoryContentConsumer) entry.getValue(); - System.out.println( " " + consumerHint + ": " + consumer.getDescription() + " (" - + consumer.getClass().getName() + ")" ); + System.out.println( + " " + consumerHint + ": " + consumer.getDescription() + " (" + consumer.getClass().getName() + ")" ); } } - @SuppressWarnings( "unchecked" ) + @SuppressWarnings("unchecked") private Map getConsumers() { return PlexusToSpringUtils.lookupMap( "knownRepositoryContentConsumer", applicationContext ); @@ -234,7 +234,16 @@ public class ArchivaCli Properties p = new Properties(); - p.load( new FileInputStream( properties ) ); + FileInputStream fis = new FileInputStream( properties ); + + try + { + p.load( fis ); + } + finally + { + IOUtils.closeQuietly( fis ); + } File oldRepositoryPath = new File( p.getProperty( SOURCE_REPO_PATH ) ); @@ -251,33 +260,36 @@ public class ArchivaCli fileExclusionPatterns = Arrays.asList( StringUtils.split( s, "," ) ); } - legacyRepositoryConverter.convertLegacyRepository( oldRepositoryPath, newRepositoryPath, fileExclusionPatterns ); + legacyRepositoryConverter.convertLegacyRepository( oldRepositoryPath, newRepositoryPath, + fileExclusionPatterns ); } private static class Commands { - @Argument( description = "Display help information", value = "help", alias = "h" ) + @Argument(description = "Display help information", value = "help", alias = "h") private boolean help; - @Argument( description = "Display version information", value = "version", alias = "v" ) + @Argument(description = "Display version information", value = "version", alias = "v") private boolean version; - @Argument( description = "List available consumers", value = "listconsumers", alias = "l" ) + @Argument(description = "List available consumers", value = "listconsumers", alias = "l") private boolean listConsumers; - @Argument( description = "The consumers to use (comma delimited)", value = "consumers", alias = "u" ) + @Argument(description = "The consumers to use (comma delimited)", value = "consumers", alias = "u") private String consumers = "count-artifacts"; - @Argument( description = "Scan the specified repository", value = "scan", alias = "s" ) + @Argument(description = "Scan the specified repository", value = "scan", alias = "s") private boolean scan; - @Argument( description = "Convert a legacy Maven 1.x repository to a Maven 2.x repository using a properties file to describe the conversion", value = "convert", alias = "c" ) + @Argument( + description = "Convert a legacy Maven 1.x repository to a Maven 2.x repository using a properties file to describe the conversion", + value = "convert", alias = "c") private boolean convert; - @Argument( description = "The properties file for the converstion", value = "properties" ) + @Argument(description = "The properties file for the converstion", value = "properties") private String properties = "conversion.properties"; - @Argument( description = "The repository to scan", value = "repository" ) + @Argument(description = "The repository to scan", value = "repository") private String repository; } } diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java index 0071d1153..4454f0445 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java @@ -19,6 +19,9 @@ package org.apache.maven.archiva.web.action; * under the License. */ +import com.opensymphony.xwork2.Preparable; +import com.opensymphony.xwork2.Validateable; + import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -27,13 +30,15 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; -import java.util.Date; import java.util.Collections; +import java.util.Date; import java.util.List; import java.util.TimeZone; import org.apache.archiva.checksum.ChecksumAlgorithm; import org.apache.archiva.checksum.ChecksummedFile; +import org.apache.commons.io.FilenameUtils; +import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.common.utils.VersionComparator; import org.apache.maven.archiva.common.utils.VersionUtil; import org.apache.maven.archiva.configuration.ArchivaConfiguration; @@ -46,7 +51,6 @@ import org.apache.maven.archiva.repository.ManagedRepositoryContent; import org.apache.maven.archiva.repository.RepositoryContentFactory; import org.apache.maven.archiva.repository.RepositoryException; import org.apache.maven.archiva.repository.RepositoryNotFoundException; -import org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers; import org.apache.maven.archiva.repository.audit.AuditEvent; import org.apache.maven.archiva.repository.audit.Auditable; import org.apache.maven.archiva.repository.metadata.MetadataTools; @@ -56,6 +60,7 @@ import org.apache.maven.archiva.repository.metadata.RepositoryMetadataWriter; import org.apache.maven.archiva.repository.project.ProjectModelException; import org.apache.maven.archiva.repository.project.ProjectModelWriter; import org.apache.maven.archiva.repository.project.writers.ProjectModel400Writer; +import org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers; import org.apache.maven.archiva.scheduled.ArchivaTaskScheduler; import org.apache.maven.archiva.scheduled.tasks.RepositoryTask; import org.apache.maven.archiva.scheduled.tasks.TaskCreator; @@ -63,17 +68,12 @@ import org.apache.maven.archiva.security.AccessDeniedException; import org.apache.maven.archiva.security.ArchivaSecurityException; import org.apache.maven.archiva.security.PrincipalNotFoundException; import org.apache.maven.archiva.security.UserRepositories; - -import com.opensymphony.xwork2.Preparable; -import com.opensymphony.xwork2.Validateable; -import org.apache.commons.io.FilenameUtils; -import org.apache.commons.lang.StringUtils; import org.codehaus.plexus.taskqueue.TaskQueueException; /** * Upload an artifact using Jakarta file upload in webwork. If set by the user a pom will also be generated. Metadata * will also be updated if one exists, otherwise it would be created. - * + * * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="uploadAction" instantiation-strategy="per-lookup" */ public class UploadAction @@ -81,11 +81,11 @@ public class UploadAction implements Validateable, Preparable, Auditable { /** - * @plexus.requirement - */ - private RepositoryContentConsumers consumers; - - /** + * @plexus.requirement + */ + private RepositoryContentConsumers consumers; + + /** * The groupId of the artifact to be deployed. */ private String groupId; @@ -149,16 +149,16 @@ public class UploadAction * @plexus.requirement */ private RepositoryContentFactory repositoryFactory; - + /** * @plexus.requirement */ private ArchivaTaskScheduler scheduler; - - private ChecksumAlgorithm[] algorithms = new ChecksumAlgorithm[] { ChecksumAlgorithm.SHA1, ChecksumAlgorithm.MD5 }; + + private ChecksumAlgorithm[] algorithms = new ChecksumAlgorithm[]{ChecksumAlgorithm.SHA1, ChecksumAlgorithm.MD5}; private ProjectModelWriter pomWriter = new ProjectModel400Writer(); - + public void setArtifact( File file ) { this.artifactFile = file; @@ -293,7 +293,7 @@ public class UploadAction repositoryId = ""; generatePom = false; } - + public String doUpload() { try @@ -319,11 +319,11 @@ public class UploadAction Date lastUpdatedTimestamp = Calendar.getInstance().getTime(); int newBuildNumber = -1; String timestamp = null; - + File metadataFile = getMetadata( targetPath.getAbsolutePath() ); ArchivaRepositoryMetadata metadata = getMetadata( metadataFile ); - if (VersionUtil.isSnapshot(version)) + if ( VersionUtil.isSnapshot( version ) ) { TimeZone timezone = TimeZone.getTimeZone( "UTC" ); DateFormat fmt = new SimpleDateFormat( "yyyyMMdd.HHmmss" ); @@ -335,8 +335,8 @@ public class UploadAction } else { - metadata.setSnapshotVersion( new SnapshotVersion() ); - newBuildNumber = 1; + metadata.setSnapshotVersion( new SnapshotVersion() ); + newBuildNumber = 1; } } @@ -364,12 +364,12 @@ public class UploadAction } String pomFilename = filename; - if( classifier != null && !"".equals( classifier ) ) + if ( classifier != null && !"".equals( classifier ) ) { pomFilename = StringUtils.remove( pomFilename, "-" + classifier ); } pomFilename = FilenameUtils.removeExtension( pomFilename ) + ".pom"; - + if ( generatePom ) { try @@ -389,11 +389,11 @@ public class UploadAction return ERROR; } } - - if ( pomFile != null && pomFile.length() > 0 ) + + if ( pomFile != null && pomFile.length() > 0 ) { try - { + { copyFile( pomFile, targetPath, pomFilename ); queueRepositoryTask( repoConfig.getId(), new File( targetPath, pomFilename ) ); //consumers.executeConsumers( repoConfig, new File( targetPath, pomFilename ) ); @@ -403,16 +403,16 @@ public class UploadAction addActionError( "Error encountered while uploading pom file: " + ie.getMessage() ); return ERROR; } - + } updateMetadata( metadata, metadataFile, lastUpdatedTimestamp, timestamp, newBuildNumber ); String msg = "Artifact \'" + groupId + ":" + artifactId + ":" + version + "\' was successfully deployed to repository \'" + repositoryId + "\'"; - + triggerAuditEvent( repositoryId, groupId + ":" + artifactId + ":" + version, AuditEvent.UPLOAD_FILE ); - + addActionMessage( msg ); reset(); @@ -434,11 +434,11 @@ public class UploadAction throws IOException { FileOutputStream out = new FileOutputStream( new File( targetPath, targetFilename ) ); + FileInputStream input = new FileInputStream( sourceFile ); try { - FileInputStream input = new FileInputStream( sourceFile ); - int i = 0; + int i; while ( ( i = input.read() ) != -1 ) { out.write( i ); @@ -448,6 +448,7 @@ public class UploadAction finally { out.close(); + input.close(); } } @@ -459,8 +460,8 @@ public class UploadAction projectModel.setArtifactId( artifactId ); projectModel.setVersion( version ); projectModel.setPackaging( packaging ); - - File pomFile = new File( targetPath, filename); + + File pomFile = new File( targetPath, filename ); pomWriter.write( projectModel, pomFile ); return pomFile; @@ -486,7 +487,7 @@ public class UploadAction /** * Update artifact level metadata. If it does not exist, create the metadata. - * + * * @param metadata */ private void updateMetadata( ArchivaRepositoryMetadata metadata, File metadataFile, Date lastUpdatedTimestamp, @@ -519,11 +520,11 @@ public class UploadAction if ( metadata.getGroupId() == null ) { - metadata.setGroupId( groupId ); + metadata.setGroupId( groupId ); } if ( metadata.getArtifactId() == null ) { - metadata.setArtifactId( artifactId ); + metadata.setArtifactId( artifactId ); } metadata.setLatestVersion( latestVersion ); @@ -560,11 +561,11 @@ public class UploadAction { addActionError( "Please add a file to upload." ); } - + if ( version == null || !VersionUtil.isVersion( version ) ) { addActionError( "Invalid version." ); - } + } } catch ( PrincipalNotFoundException pe ) { @@ -575,7 +576,7 @@ public class UploadAction addActionError( ae.getMessage() ); } } - + private List getManagableRepos() { try @@ -597,19 +598,20 @@ public class UploadAction } return Collections.emptyList(); } - + private void queueRepositoryTask( String repositoryId, File localFile ) { RepositoryTask task = TaskCreator.createRepositoryTask( repositoryId, localFile.getName(), localFile ); - + try { scheduler.queueRepositoryTask( task ); } catch ( TaskQueueException e ) { - log.error( "Unable to queue repository task to execute consumers on resource file ['" + - localFile.getName() + "']." ); + log.error( + "Unable to queue repository task to execute consumers on resource file ['" + localFile.getName() + + "']." ); } } } diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/startup/BannerTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/startup/BannerTest.java index 8db84ea35..c162277be 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/startup/BannerTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/startup/BannerTest.java @@ -19,24 +19,24 @@ package org.apache.maven.archiva.web.startup; * under the License. */ -import org.apache.commons.io.IOUtils; - import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.util.zip.GZIPInputStream; +import org.apache.commons.io.IOUtils; + import junit.framework.TestCase; /** - * BannerTest + * BannerTest * * @version $Id$ */ public class BannerTest extends TestCase { - private static final String eol = System.getProperty("line.separator"); + private static final String eol = System.getProperty( "line.separator" ); private void assertEncodeDecode( String encoded, String decoded ) { @@ -47,17 +47,17 @@ public class BannerTest public void testEncodeDecode() { assertEncodeDecode( "[$10 ]", "[ ]" ); - assertEncodeDecode( "$$$5_$n$5_", "$_____"+eol+"_____" ); + assertEncodeDecode( "$$$5_$n$5_", "$_____" + eol + "_____" ); assertEncodeDecode( "$${Refgjuvyr}", "${Erstwhile}" ); } public void testInjectVersion() { assertEquals( "[ 1.0 ]", Banner.injectVersion( "[#####]", "1.0" ) ); - assertEquals( ".\\ 1.0-SNAPSHOT \\._____", Banner.injectVersion( ".\\################\\._____", - "1.0-SNAPSHOT" ) ); - assertEquals( "Archiva:\"+eol+\" ( 1.0-alpha-1 )", Banner - .injectVersion( "Archiva:\"+eol+\" (##############)", "1.0-alpha-1" ) ); + assertEquals( ".\\ 1.0-SNAPSHOT \\._____", + Banner.injectVersion( ".\\################\\._____", "1.0-SNAPSHOT" ) ); + assertEquals( "Archiva:\"+eol+\" ( 1.0-alpha-1 )", + Banner.injectVersion( "Archiva:\"+eol+\" (##############)", "1.0-alpha-1" ) ); } public void testGetBanner() @@ -67,16 +67,16 @@ public class BannerTest String banner = Banner.getBanner( version ); assertNotNull( "Banner should not be null.", banner ); assertTrue( "Banner contains version.", banner.indexOf( version ) > 0 ); - + /* Want to make a new banner? - * Steps to do it. - * 1) Edit the src/test/resources/banner.gz file. - * 2) Save it compressed. - * 3) Add (to this test method) ... - * System.out.println( "\"" + Banner.encode( getRawBanner() ) + "\"" ); - * 4) Run the test - * 5) Copy / Paste the encoded form into the Banner.getBanner() method. - */ + * Steps to do it. + * 1) Edit the src/test/resources/banner.gz file. + * 2) Save it compressed. + * 3) Add (to this test method) ... + * System.out.println( "\"" + Banner.encode( getRawBanner() ) + "\"" ); + * 4) Run the test + * 5) Copy / Paste the encoded form into the Banner.getBanner() method. + */ } public String getRawBanner() @@ -86,6 +86,8 @@ public class BannerTest assertTrue( "File [" + gzBanner.getPath() + "] not found.", gzBanner.exists() ); FileInputStream fis = new FileInputStream( gzBanner ); GZIPInputStream gzis = new GZIPInputStream( fis ); - return IOUtils.toString( gzis ); + String str = IOUtils.toString( gzis ); + IOUtils.closeQuietly( gzis ); + return str; } } -- cgit v1.2.3 From a73f0ccf31fcf1d0cf0b79cbd873c446325bcf58 Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Thu, 16 Jul 2009 07:45:17 +0000 Subject: [MRM-1219] correct log4j configuration, consolidate logging APIs git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@794572 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-cli/pom.xml | 2 +- archiva-modules/archiva-base/archiva-model/pom.xml | 4 +- .../archiva-base/archiva-policies/pom.xml | 2 +- .../archiva-base/archiva-transaction/pom.xml | 2 +- archiva-modules/archiva-web/archiva-webapp/pom.xml | 4 +- .../archiva-webapp/src/main/resources/log4j.xml | 59 ++++++++-------------- .../archiva-xmlrpc/archiva-xmlrpc-client/pom.xml | 2 +- pom.xml | 30 ++++++++--- 8 files changed, 54 insertions(+), 51 deletions(-) (limited to 'archiva-cli') diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index 52aabde3a..78721811c 100644 --- a/archiva-cli/pom.xml +++ b/archiva-cli/pom.xml @@ -61,7 +61,7 @@ org.slf4j - jcl104-over-slf4j + jcl-over-slf4j compile diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml index c59fcf4a9..d3e59efb5 100755 --- a/archiva-modules/archiva-base/archiva-model/pom.xml +++ b/archiva-modules/archiva-base/archiva-model/pom.xml @@ -36,7 +36,7 @@ org.slf4j - jcl104-over-slf4j + jcl-over-slf4j runtime @@ -175,4 +175,4 @@ - \ No newline at end of file + diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index d015e9788..da6a18c2a 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -56,7 +56,7 @@ org.slf4j - jcl104-over-slf4j + jcl-over-slf4j runtime diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml index fa8bb9e1c..96722daac 100644 --- a/archiva-modules/archiva-base/archiva-transaction/pom.xml +++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml @@ -56,7 +56,7 @@ org.slf4j - jcl104-over-slf4j + jcl-over-slf4j runtime diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index af049d723..71a0bff85 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -242,6 +242,8 @@ commons-logging commons-logging-api 1.1 + + provided com.atlassian.xmlrpc @@ -325,7 +327,7 @@ Specifically setting this to false to avoid accidental jar file creation. --> false META-INF/**,WEB-INF/web.xml,WEB-INF/classes/xwork.xml,WEB-INF/lib/** - WEB-INF/lib/xalan-*.jar,WEB-INF/lib/velocity-dep-*.jar,WEB-INF/lib/xml-apis-*.jar,WEB-INF/lib/wstx-asl-*.jar,WEB-INF/lib/stax-utils-*.jar,WEB-INF/lib/xercesImpl-*.jar,WEB-INF/lib/slf4j-api-1.5.6.jar,WEB-INF/lib/slf4j-log4j12-1.5.6.jar + WEB-INF/lib/xalan-*.jar,WEB-INF/lib/velocity-dep-*.jar,WEB-INF/lib/xml-apis-*.jar,WEB-INF/lib/wstx-asl-*.jar,WEB-INF/lib/stax-utils-*.jar,WEB-INF/lib/xercesImpl-*.jar diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml index b759c40bf..cc0aa6a40 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml @@ -35,114 +35,97 @@ + + + + + + - - - - - - - - - - - - - - - - - - - + +--> + + + + + + + + + + + + - - - - - - + diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml index 1a0b4c48d..b7c33027e 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml @@ -42,7 +42,7 @@ org.slf4j - jcl104-over-slf4j + jcl-over-slf4j compile diff --git a/pom.xml b/pom.xml index 52ab923d1..b17e49896 100644 --- a/pom.xml +++ b/pom.xml @@ -77,6 +77,7 @@ org.codehaus.plexus:plexus-container-default org.codehaus.plexus:plexus-log4j-logging commons-logging:commons-logging + org.slf4j:jcl104-over-slf4j velocity:velocity-dep classworlds:classworlds javax.transaction:jta @@ -84,6 +85,7 @@ ant:ant-optional xom:xom org.codehaus.plexus:plexus-xwork-integration + plexus:plexus-utils @@ -814,6 +816,10 @@ classworlds classworlds + + plexus + plexus-utils + velocity velocity-dep @@ -861,6 +867,11 @@ + + commons-logging + commons-logging-api + 1.1 + javax.servlet servlet-api @@ -873,25 +884,31 @@ org.slf4j - jcl104-over-slf4j - 1.5.0 + slf4j-api + ${slf4j.version} + + + org.slf4j + jcl-over-slf4j + ${slf4j.version} runtime org.slf4j - slf4j-api - 1.5.0 + slf4j-jdk14 + ${slf4j.version} + runtime org.slf4j slf4j-simple - 1.5.0 + ${slf4j.version} test org.slf4j slf4j-log4j12 - 1.5.0 + ${slf4j.version} runtime @@ -1084,6 +1101,7 @@ 1.0-beta-5 1.2.1 6.1.19 + 1.5.8 0.9 2.5.6 -- cgit v1.2.3 From 57a95feef7e415bcfb5695a982ddaa3924ea7212 Mon Sep 17 00:00:00 2001 From: "Maria Odea B. Ching" Date: Wed, 29 Jul 2009 08:41:34 +0000 Subject: [MRM-1141] archiva-cli no longer works o merge spring.handlers of spring-context and plexus-spring git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@798809 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-cli/pom.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'archiva-cli') diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index 78721811c..95ac68b44 100644 --- a/archiva-cli/pom.xml +++ b/archiva-cli/pom.xml @@ -75,7 +75,7 @@ org.apache.maven.plugins maven-shade-plugin - 1.0.1 + 1.2.1 package @@ -85,6 +85,9 @@ apache-archiva-cli-${project.version} + + META-INF/spring.handlers + -- cgit v1.2.3 From 06ac3284ec3f86a9cd160c5bc7e2a80c80f2c51c Mon Sep 17 00:00:00 2001 From: "Maria Odea B. Ching" Date: Thu, 30 Jul 2009 06:15:04 +0000 Subject: [MRM-1141] archiva-cli no longer works o merge content of all spring-context.xml files o include commons-io in shaded jar, this is needed for repository scan git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@799177 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-cli/pom.xml | 4 +++- .../src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'archiva-cli') diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index 95ac68b44..10d617ead 100644 --- a/archiva-cli/pom.xml +++ b/archiva-cli/pom.xml @@ -87,6 +87,9 @@ META-INF/spring.handlers + + + META-INF/spring-context.xml @@ -96,7 +99,6 @@ xml-apis:xml-apis xalan:xalan commons-beanutils:commons-beanutils - commons-io:commons-io diff --git a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java index 5e023f08d..43cb75350 100644 --- a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java +++ b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java @@ -286,7 +286,7 @@ public class ArchivaCli value = "convert", alias = "c") private boolean convert; - @Argument(description = "The properties file for the converstion", value = "properties") + @Argument(description = "The properties file for the conversion", value = "properties") private String properties = "conversion.properties"; @Argument(description = "The repository to scan", value = "repository") -- cgit v1.2.3 From 03aae7ee6af0f15d6cb575153406a2dd5b915770 Mon Sep 17 00:00:00 2001 From: "Maria Odea B. Ching" Date: Mon, 24 Aug 2009 06:12:10 +0000 Subject: [maven-release-plugin] prepare release archiva-1.2.2 git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@807087 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-cli/pom.xml | 4 +- archiva-docs/pom.xml | 2 +- archiva-jetty/pom.xml | 2 +- .../archiva-artifact-converter/pom.xml | 2 +- .../archiva-base/archiva-checksum/pom.xml | 2 +- .../archiva-base/archiva-common/pom.xml | 2 +- .../archiva-base/archiva-configuration/pom.xml | 2 +- .../archiva-consumers/archiva-consumer-api/pom.xml | 2 +- .../archiva-core-consumers/pom.xml | 2 +- .../archiva-database-consumers/pom.xml | 2 +- .../archiva-dependency-tree-consumer/pom.xml | 2 +- .../archiva-lucene-consumers/pom.xml | 2 +- .../archiva-signature-consumers/pom.xml | 2 +- .../archiva-base/archiva-consumers/pom.xml | 2 +- .../archiva-base/archiva-converter/pom.xml | 2 +- .../archiva-base/archiva-dependency-graph/pom.xml | 2 +- .../archiva-base/archiva-indexer/pom.xml | 2 +- archiva-modules/archiva-base/archiva-model/pom.xml | 2 +- .../archiva-base/archiva-policies/pom.xml | 2 +- archiva-modules/archiva-base/archiva-proxy/pom.xml | 2 +- .../archiva-base/archiva-repository-layer/pom.xml | 2 +- .../archiva-base/archiva-transaction/pom.xml | 2 +- .../archiva-base/archiva-xml-tools/pom.xml | 2 +- archiva-modules/archiva-base/pom.xml | 2 +- archiva-modules/archiva-database/pom.xml | 2 +- .../archiva-artifact-reports/pom.xml | 2 +- .../archiva-metadata-reports/pom.xml | 2 +- .../archiva-project-reports/pom.xml | 2 +- .../archiva-report-manager/pom.xml | 2 +- archiva-modules/archiva-reporting/pom.xml | 2 +- archiva-modules/archiva-scheduled/pom.xml | 2 +- archiva-modules/archiva-web/archiva-applet/pom.xml | 2 +- archiva-modules/archiva-web/archiva-rss/pom.xml | 2 +- .../archiva-web/archiva-security/pom.xml | 2 +- archiva-modules/archiva-web/archiva-webapp/pom.xml | 2 +- archiva-modules/archiva-web/archiva-webdav/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-api/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-client/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-security/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-services/pom.xml | 2 +- archiva-modules/archiva-web/archiva-xmlrpc/pom.xml | 2 +- archiva-modules/archiva-web/pom.xml | 2 +- archiva-modules/pom.xml | 2 +- pom.xml | 70 +++++++++++----------- 44 files changed, 79 insertions(+), 79 deletions(-) (limited to 'archiva-cli') diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index 10d617ead..66dde7a24 100644 --- a/archiva-cli/pom.xml +++ b/archiva-cli/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva - 1.2.2-SNAPSHOT + 1.2.2 4.0.0 archiva-cli @@ -35,7 +35,7 @@ org.apache.archiva archiva-dependency-tree-consumer - 1.2.2-SNAPSHOT + 1.2.2 runtime diff --git a/archiva-docs/pom.xml b/archiva-docs/pom.xml index 63d81bf4b..a7e68702f 100644 --- a/archiva-docs/pom.xml +++ b/archiva-docs/pom.xml @@ -21,7 +21,7 @@ org.apache.archiva archiva - 1.2.2-SNAPSHOT + 1.2.2 4.0.0 archiva-docs diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml index 0e9ada6ed..bfb8e7c10 100644 --- a/archiva-jetty/pom.xml +++ b/archiva-jetty/pom.xml @@ -3,7 +3,7 @@ org.apache.archiva archiva - 1.2.2-SNAPSHOT + 1.2.2 archiva-jetty pom diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml index 442a65e7e..58743efd3 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2-SNAPSHOT + 1.2.2 archiva-artifact-converter Archiva Artifact Converter diff --git a/archiva-modules/archiva-base/archiva-checksum/pom.xml b/archiva-modules/archiva-base/archiva-checksum/pom.xml index 642c2f35b..51a1f9251 100644 --- a/archiva-modules/archiva-base/archiva-checksum/pom.xml +++ b/archiva-modules/archiva-base/archiva-checksum/pom.xml @@ -19,7 +19,7 @@ org.apache.archiva archiva-base - 1.2.2-SNAPSHOT + 1.2.2 archiva-checksum Archiva Checksum diff --git a/archiva-modules/archiva-base/archiva-common/pom.xml b/archiva-modules/archiva-base/archiva-common/pom.xml index e570d7ae7..9f8867704 100644 --- a/archiva-modules/archiva-base/archiva-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-common/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2-SNAPSHOT + 1.2.2 4.0.0 archiva-common diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index 39d964b6b..08d4139bd 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2-SNAPSHOT + 1.2.2 4.0.0 archiva-configuration diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml index c49eff441..e23d4f8de 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-consumers - 1.2.2-SNAPSHOT + 1.2.2 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index 31228cfa5..b6ca481d7 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.2-SNAPSHOT + 1.2.2 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml index dc2563f5c..1af8996ee 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.2-SNAPSHOT + 1.2.2 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml index ae17b96b7..ffa98567f 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml @@ -3,7 +3,7 @@ org.apache.archiva archiva-consumers - 1.2.2-SNAPSHOT + 1.2.2 archiva-dependency-tree-consumer Archiva Consumers :: Dependency Tree Consumer diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml index 6c01328b1..4a4a140bf 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.2-SNAPSHOT + 1.2.2 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml index 820ae8510..0b5861e64 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.2-SNAPSHOT + 1.2.2 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/pom.xml index 17c538dec..1c4c281f6 100644 --- a/archiva-modules/archiva-base/archiva-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-base - 1.2.2-SNAPSHOT + 1.2.2 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml index cdac688cb..ee4d1eaf1 100644 --- a/archiva-modules/archiva-base/archiva-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-converter/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2-SNAPSHOT + 1.2.2 4.0.0 archiva-converter diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml index 96e3aa1fd..72c3122c7 100644 --- a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml +++ b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2-SNAPSHOT + 1.2.2 4.0.0 archiva-dependency-graph diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml index a51dcc314..e6b3fb564 100644 --- a/archiva-modules/archiva-base/archiva-indexer/pom.xml +++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2-SNAPSHOT + 1.2.2 4.0.0 archiva-indexer diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml index d3e59efb5..314d900ad 100755 --- a/archiva-modules/archiva-base/archiva-model/pom.xml +++ b/archiva-modules/archiva-base/archiva-model/pom.xml @@ -2,7 +2,7 @@ org.apache.archiva archiva-base - 1.2.2-SNAPSHOT + 1.2.2 4.0.0 archiva-model diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index da6a18c2a..a048c0850 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2-SNAPSHOT + 1.2.2 4.0.0 archiva-policies diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index 373e208b2..8bbbcae8b 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2-SNAPSHOT + 1.2.2 4.0.0 archiva-proxy diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index 22592f1a3..c598b8d9f 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2-SNAPSHOT + 1.2.2 4.0.0 archiva-repository-layer diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml index 96722daac..a6898727a 100644 --- a/archiva-modules/archiva-base/archiva-transaction/pom.xml +++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2-SNAPSHOT + 1.2.2 archiva-transaction Archiva Transactions diff --git a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml index 40d630ab4..e1742ac63 100644 --- a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml +++ b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2-SNAPSHOT + 1.2.2 4.0.0 archiva-xml-tools diff --git a/archiva-modules/archiva-base/pom.xml b/archiva-modules/archiva-base/pom.xml index 2ecfe884a..b1ccb3f95 100644 --- a/archiva-modules/archiva-base/pom.xml +++ b/archiva-modules/archiva-base/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2.2-SNAPSHOT + 1.2.2 archiva-base diff --git a/archiva-modules/archiva-database/pom.xml b/archiva-modules/archiva-database/pom.xml index 9b02179b5..041e50da8 100755 --- a/archiva-modules/archiva-database/pom.xml +++ b/archiva-modules/archiva-database/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-modules - 1.2.2-SNAPSHOT + 1.2.2 4.0.0 archiva-database diff --git a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml index f0d5f3456..08a157e8c 100755 --- a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.2-SNAPSHOT + 1.2.2 4.0.0 archiva-artifact-reports diff --git a/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml index 5c5719574..21912e966 100755 --- a/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.2-SNAPSHOT + 1.2.2 4.0.0 archiva-metadata-reports diff --git a/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml index 100ebdbde..81603d395 100755 --- a/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.2-SNAPSHOT + 1.2.2 4.0.0 archiva-project-reports diff --git a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml index 111ebfaa1..cbd8cf64a 100755 --- a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.2-SNAPSHOT + 1.2.2 4.0.0 archiva-report-manager diff --git a/archiva-modules/archiva-reporting/pom.xml b/archiva-modules/archiva-reporting/pom.xml index 1f5d6cbe6..abb74c27e 100644 --- a/archiva-modules/archiva-reporting/pom.xml +++ b/archiva-modules/archiva-reporting/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2.2-SNAPSHOT + 1.2.2 ../pom.xml diff --git a/archiva-modules/archiva-scheduled/pom.xml b/archiva-modules/archiva-scheduled/pom.xml index 59afcb092..572107a95 100644 --- a/archiva-modules/archiva-scheduled/pom.xml +++ b/archiva-modules/archiva-scheduled/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-modules - 1.2.2-SNAPSHOT + 1.2.2 4.0.0 archiva-scheduled diff --git a/archiva-modules/archiva-web/archiva-applet/pom.xml b/archiva-modules/archiva-web/archiva-applet/pom.xml index 177fc3f41..23428a235 100644 --- a/archiva-modules/archiva-web/archiva-applet/pom.xml +++ b/archiva-modules/archiva-web/archiva-applet/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2.2-SNAPSHOT + 1.2.2 archiva-applet Archiva Web :: Applet diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml index a7d1f8ad1..441d137b5 100644 --- a/archiva-modules/archiva-web/archiva-rss/pom.xml +++ b/archiva-modules/archiva-web/archiva-rss/pom.xml @@ -2,7 +2,7 @@ archiva-web org.apache.archiva - 1.2.2-SNAPSHOT + 1.2.2 4.0.0 archiva-rss diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml index c116e84d3..6efab4c4c 100644 --- a/archiva-modules/archiva-web/archiva-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-security/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-web - 1.2.2-SNAPSHOT + 1.2.2 4.0.0 archiva-security diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 71a0bff85..a4a59ae03 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2.2-SNAPSHOT + 1.2.2 ../pom.xml archiva-webapp diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index d3766d121..4a3104fbb 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2.2-SNAPSHOT + 1.2.2 archiva-webdav diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml index 85af95d76..e92ca45d9 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2.2-SNAPSHOT + 1.2.2 ../pom.xml archiva-xmlrpc-api diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml index b7c33027e..fecfaa7f4 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml @@ -19,7 +19,7 @@ archiva-xmlrpc org.apache.archiva - 1.2.2-SNAPSHOT + 1.2.2 4.0.0 archiva-xmlrpc-client diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml index 0afa4c9a6..38ad35ae5 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2.2-SNAPSHOT + 1.2.2 ../pom.xml archiva-xmlrpc-security diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml index 21593fda9..d4d93ac96 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2.2-SNAPSHOT + 1.2.2 ../pom.xml archiva-xmlrpc-services diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml index 958940114..664c49399 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-web - 1.2.2-SNAPSHOT + 1.2.2 ../pom.xml archiva-xmlrpc diff --git a/archiva-modules/archiva-web/pom.xml b/archiva-modules/archiva-web/pom.xml index fbd9eb695..17a57fea9 100644 --- a/archiva-modules/archiva-web/pom.xml +++ b/archiva-modules/archiva-web/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2.2-SNAPSHOT + 1.2.2 ../pom.xml diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml index 8f8c6352a..0dc0f0388 100644 --- a/archiva-modules/pom.xml +++ b/archiva-modules/pom.xml @@ -23,7 +23,7 @@ archiva org.apache.archiva - 1.2.2-SNAPSHOT + 1.2.2 4.0.0 archiva-modules diff --git a/pom.xml b/pom.xml index ff83b2187..4d365adb8 100644 --- a/pom.xml +++ b/pom.xml @@ -34,12 +34,12 @@ Archiva archiva pom - 1.2.2-SNAPSHOT + 1.2.2 http://archiva.apache.org - scm:svn:http://svn.apache.org/repos/asf/archiva/trunk - scm:svn:https://svn.apache.org/repos/asf/archiva/trunk - http://svn.apache.org/viewvc/archiva/trunk + scm:svn:http://svn.apache.org/repos/asf/archiva/tags/archiva-1.2.2 + scm:svn:https://svn.apache.org/repos/asf/archiva/tags/archiva-1.2.2 + http://svn.apache.org/viewvc/archiva/tags/archiva-1.2.2 @@ -291,160 +291,160 @@ org.apache.archiva archiva-applet - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-artifact-converter - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-artifact-reports - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-checksum - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-common - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-configuration - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-consumer-api - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-converter - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-dependency-graph - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-core-consumers - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-database - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-database-consumers - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-indexer - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-lucene-consumers - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-model - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-policies - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-proxy - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-report-manager - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-repository-layer - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-scheduled - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-security - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-signature-consumers - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-transaction - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-docs - 1.2.2-SNAPSHOT + 1.2.2 zip docs org.apache.archiva archiva-webapp - 1.2.2-SNAPSHOT + 1.2.2 war org.apache.archiva archiva-xml-tools - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-webdav - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-rss - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-xmlrpc-api - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-xmlrpc-services - 1.2.2-SNAPSHOT + 1.2.2 org.apache.archiva archiva-xmlrpc-security - 1.2.2-SNAPSHOT + 1.2.2 org.codehaus.plexus -- cgit v1.2.3 From 81aa36aa0911188c54afc4bf07cf1b2dc4ca80bb Mon Sep 17 00:00:00 2001 From: "Maria Odea B. Ching" Date: Mon, 24 Aug 2009 06:14:31 +0000 Subject: [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@807091 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-cli/pom.xml | 4 +- archiva-docs/pom.xml | 2 +- archiva-jetty/pom.xml | 2 +- .../archiva-artifact-converter/pom.xml | 2 +- .../archiva-base/archiva-checksum/pom.xml | 2 +- .../archiva-base/archiva-common/pom.xml | 2 +- .../archiva-base/archiva-configuration/pom.xml | 2 +- .../archiva-consumers/archiva-consumer-api/pom.xml | 2 +- .../archiva-core-consumers/pom.xml | 2 +- .../archiva-database-consumers/pom.xml | 2 +- .../archiva-dependency-tree-consumer/pom.xml | 2 +- .../archiva-lucene-consumers/pom.xml | 2 +- .../archiva-signature-consumers/pom.xml | 2 +- .../archiva-base/archiva-consumers/pom.xml | 2 +- .../archiva-base/archiva-converter/pom.xml | 2 +- .../archiva-base/archiva-dependency-graph/pom.xml | 2 +- .../archiva-base/archiva-indexer/pom.xml | 2 +- archiva-modules/archiva-base/archiva-model/pom.xml | 2 +- .../archiva-base/archiva-policies/pom.xml | 2 +- archiva-modules/archiva-base/archiva-proxy/pom.xml | 2 +- .../archiva-base/archiva-repository-layer/pom.xml | 2 +- .../archiva-base/archiva-transaction/pom.xml | 2 +- .../archiva-base/archiva-xml-tools/pom.xml | 2 +- archiva-modules/archiva-base/pom.xml | 2 +- archiva-modules/archiva-database/pom.xml | 2 +- .../archiva-artifact-reports/pom.xml | 2 +- .../archiva-metadata-reports/pom.xml | 2 +- .../archiva-project-reports/pom.xml | 2 +- .../archiva-report-manager/pom.xml | 2 +- archiva-modules/archiva-reporting/pom.xml | 2 +- archiva-modules/archiva-scheduled/pom.xml | 2 +- archiva-modules/archiva-web/archiva-applet/pom.xml | 2 +- archiva-modules/archiva-web/archiva-rss/pom.xml | 2 +- .../archiva-web/archiva-security/pom.xml | 2 +- archiva-modules/archiva-web/archiva-webapp/pom.xml | 2 +- archiva-modules/archiva-web/archiva-webdav/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-api/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-client/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-security/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-services/pom.xml | 2 +- archiva-modules/archiva-web/archiva-xmlrpc/pom.xml | 2 +- archiva-modules/archiva-web/pom.xml | 2 +- archiva-modules/pom.xml | 2 +- pom.xml | 70 +++++++++++----------- 44 files changed, 79 insertions(+), 79 deletions(-) (limited to 'archiva-cli') diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index 66dde7a24..4039c4575 100644 --- a/archiva-cli/pom.xml +++ b/archiva-cli/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-cli @@ -35,7 +35,7 @@ org.apache.archiva archiva-dependency-tree-consumer - 1.2.2 + 1.2.3-SNAPSHOT runtime diff --git a/archiva-docs/pom.xml b/archiva-docs/pom.xml index a7e68702f..060edc504 100644 --- a/archiva-docs/pom.xml +++ b/archiva-docs/pom.xml @@ -21,7 +21,7 @@ org.apache.archiva archiva - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-docs diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml index bfb8e7c10..74e31535d 100644 --- a/archiva-jetty/pom.xml +++ b/archiva-jetty/pom.xml @@ -3,7 +3,7 @@ org.apache.archiva archiva - 1.2.2 + 1.2.3-SNAPSHOT archiva-jetty pom diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml index 58743efd3..765a09d49 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT archiva-artifact-converter Archiva Artifact Converter diff --git a/archiva-modules/archiva-base/archiva-checksum/pom.xml b/archiva-modules/archiva-base/archiva-checksum/pom.xml index 51a1f9251..456f91f55 100644 --- a/archiva-modules/archiva-base/archiva-checksum/pom.xml +++ b/archiva-modules/archiva-base/archiva-checksum/pom.xml @@ -19,7 +19,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT archiva-checksum Archiva Checksum diff --git a/archiva-modules/archiva-base/archiva-common/pom.xml b/archiva-modules/archiva-base/archiva-common/pom.xml index 9f8867704..233964823 100644 --- a/archiva-modules/archiva-base/archiva-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-common/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-common diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index 08d4139bd..cf1d13cac 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-configuration diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml index e23d4f8de..423179df1 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-consumers - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index b6ca481d7..c31829f25 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml index 1af8996ee..d243752ee 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml index ffa98567f..fb0d2f54b 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml @@ -3,7 +3,7 @@ org.apache.archiva archiva-consumers - 1.2.2 + 1.2.3-SNAPSHOT archiva-dependency-tree-consumer Archiva Consumers :: Dependency Tree Consumer diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml index 4a4a140bf..1f9622080 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml index 0b5861e64..20a782773 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/pom.xml index 1c4c281f6..96f73335e 100644 --- a/archiva-modules/archiva-base/archiva-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml index ee4d1eaf1..75735a78d 100644 --- a/archiva-modules/archiva-base/archiva-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-converter/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-converter diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml index 72c3122c7..bf6716d88 100644 --- a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml +++ b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-dependency-graph diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml index e6b3fb564..adcfdab5b 100644 --- a/archiva-modules/archiva-base/archiva-indexer/pom.xml +++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-indexer diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml index 314d900ad..c21e4185a 100755 --- a/archiva-modules/archiva-base/archiva-model/pom.xml +++ b/archiva-modules/archiva-base/archiva-model/pom.xml @@ -2,7 +2,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-model diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index a048c0850..cbbe88d5d 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-policies diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index 8bbbcae8b..90a1167ef 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-proxy diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index c598b8d9f..fb9fd1e0b 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-repository-layer diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml index a6898727a..bdac3e8f4 100644 --- a/archiva-modules/archiva-base/archiva-transaction/pom.xml +++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT archiva-transaction Archiva Transactions diff --git a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml index e1742ac63..cdd157ef3 100644 --- a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml +++ b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-xml-tools diff --git a/archiva-modules/archiva-base/pom.xml b/archiva-modules/archiva-base/pom.xml index b1ccb3f95..7118b34ea 100644 --- a/archiva-modules/archiva-base/pom.xml +++ b/archiva-modules/archiva-base/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2.2 + 1.2.3-SNAPSHOT archiva-base diff --git a/archiva-modules/archiva-database/pom.xml b/archiva-modules/archiva-database/pom.xml index 041e50da8..9a75add1c 100755 --- a/archiva-modules/archiva-database/pom.xml +++ b/archiva-modules/archiva-database/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-modules - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-database diff --git a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml index 08a157e8c..074c748c6 100755 --- a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-artifact-reports diff --git a/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml index 21912e966..9d064785d 100755 --- a/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-metadata-reports diff --git a/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml index 81603d395..e0a814110 100755 --- a/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-project-reports diff --git a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml index cbd8cf64a..839097f12 100755 --- a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-report-manager diff --git a/archiva-modules/archiva-reporting/pom.xml b/archiva-modules/archiva-reporting/pom.xml index abb74c27e..17571190e 100644 --- a/archiva-modules/archiva-reporting/pom.xml +++ b/archiva-modules/archiva-reporting/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-scheduled/pom.xml b/archiva-modules/archiva-scheduled/pom.xml index 572107a95..0c947db53 100644 --- a/archiva-modules/archiva-scheduled/pom.xml +++ b/archiva-modules/archiva-scheduled/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-modules - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-scheduled diff --git a/archiva-modules/archiva-web/archiva-applet/pom.xml b/archiva-modules/archiva-web/archiva-applet/pom.xml index 23428a235..402ae2208 100644 --- a/archiva-modules/archiva-web/archiva-applet/pom.xml +++ b/archiva-modules/archiva-web/archiva-applet/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2.2 + 1.2.3-SNAPSHOT archiva-applet Archiva Web :: Applet diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml index 441d137b5..35bc0b307 100644 --- a/archiva-modules/archiva-web/archiva-rss/pom.xml +++ b/archiva-modules/archiva-web/archiva-rss/pom.xml @@ -2,7 +2,7 @@ archiva-web org.apache.archiva - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-rss diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml index 6efab4c4c..109016582 100644 --- a/archiva-modules/archiva-web/archiva-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-security/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-web - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-security diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index a4a59ae03..54386d082 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml archiva-webapp diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index 4a3104fbb..743f14045 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2.2 + 1.2.3-SNAPSHOT archiva-webdav diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml index e92ca45d9..1528bd3b0 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml archiva-xmlrpc-api diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml index fecfaa7f4..98723d9ed 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml @@ -19,7 +19,7 @@ archiva-xmlrpc org.apache.archiva - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-xmlrpc-client diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml index 38ad35ae5..33105de08 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml archiva-xmlrpc-security diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml index d4d93ac96..a317df6e5 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml archiva-xmlrpc-services diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml index 664c49399..3ec95265e 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-web - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml archiva-xmlrpc diff --git a/archiva-modules/archiva-web/pom.xml b/archiva-modules/archiva-web/pom.xml index 17a57fea9..5f46099d6 100644 --- a/archiva-modules/archiva-web/pom.xml +++ b/archiva-modules/archiva-web/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml index 0dc0f0388..76fb71efa 100644 --- a/archiva-modules/pom.xml +++ b/archiva-modules/pom.xml @@ -23,7 +23,7 @@ archiva org.apache.archiva - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-modules diff --git a/pom.xml b/pom.xml index 4d365adb8..397611ea1 100644 --- a/pom.xml +++ b/pom.xml @@ -34,12 +34,12 @@ Archiva archiva pom - 1.2.2 + 1.2.3-SNAPSHOT http://archiva.apache.org - scm:svn:http://svn.apache.org/repos/asf/archiva/tags/archiva-1.2.2 - scm:svn:https://svn.apache.org/repos/asf/archiva/tags/archiva-1.2.2 - http://svn.apache.org/viewvc/archiva/tags/archiva-1.2.2 + scm:svn:http://svn.apache.org/repos/asf/archiva/trunk + scm:svn:https://svn.apache.org/repos/asf/archiva/trunk + http://svn.apache.org/viewvc/archiva/trunk @@ -291,160 +291,160 @@ org.apache.archiva archiva-applet - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-artifact-converter - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-artifact-reports - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-checksum - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-common - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-configuration - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-consumer-api - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-converter - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-dependency-graph - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-core-consumers - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-database - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-database-consumers - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-indexer - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-lucene-consumers - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-model - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-policies - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-proxy - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-report-manager - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-repository-layer - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-scheduled - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-security - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-signature-consumers - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-transaction - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-docs - 1.2.2 + 1.2.3-SNAPSHOT zip docs org.apache.archiva archiva-webapp - 1.2.2 + 1.2.3-SNAPSHOT war org.apache.archiva archiva-xml-tools - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-webdav - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-rss - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-xmlrpc-api - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-xmlrpc-services - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-xmlrpc-security - 1.2.2 + 1.2.3-SNAPSHOT org.codehaus.plexus -- cgit v1.2.3 From 924e33b5625b43f37078445e2e4a7d652686e3a0 Mon Sep 17 00:00:00 2001 From: "Maria Odea B. Ching" Date: Thu, 27 Aug 2009 09:30:51 +0000 Subject: [maven-release-plugin] prepare release archiva-1.2.2 git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@808336 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-cli/pom.xml | 4 +- archiva-docs/pom.xml | 2 +- archiva-jetty/pom.xml | 2 +- .../archiva-artifact-converter/pom.xml | 2 +- .../archiva-base/archiva-checksum/pom.xml | 2 +- .../archiva-base/archiva-common/pom.xml | 2 +- .../archiva-base/archiva-configuration/pom.xml | 2 +- .../archiva-consumers/archiva-consumer-api/pom.xml | 2 +- .../archiva-core-consumers/pom.xml | 2 +- .../archiva-database-consumers/pom.xml | 2 +- .../archiva-dependency-tree-consumer/pom.xml | 2 +- .../archiva-lucene-consumers/pom.xml | 2 +- .../archiva-signature-consumers/pom.xml | 2 +- .../archiva-base/archiva-consumers/pom.xml | 2 +- .../archiva-base/archiva-converter/pom.xml | 2 +- .../archiva-base/archiva-dependency-graph/pom.xml | 2 +- .../archiva-base/archiva-indexer/pom.xml | 2 +- archiva-modules/archiva-base/archiva-model/pom.xml | 2 +- .../archiva-base/archiva-policies/pom.xml | 2 +- archiva-modules/archiva-base/archiva-proxy/pom.xml | 2 +- .../archiva-base/archiva-repository-layer/pom.xml | 2 +- .../archiva-base/archiva-transaction/pom.xml | 2 +- .../archiva-base/archiva-xml-tools/pom.xml | 2 +- archiva-modules/archiva-base/pom.xml | 2 +- archiva-modules/archiva-database/pom.xml | 2 +- .../archiva-artifact-reports/pom.xml | 2 +- .../archiva-metadata-reports/pom.xml | 2 +- .../archiva-project-reports/pom.xml | 2 +- .../archiva-report-manager/pom.xml | 2 +- archiva-modules/archiva-reporting/pom.xml | 2 +- archiva-modules/archiva-scheduled/pom.xml | 2 +- archiva-modules/archiva-web/archiva-applet/pom.xml | 2 +- archiva-modules/archiva-web/archiva-rss/pom.xml | 2 +- .../archiva-web/archiva-security/pom.xml | 2 +- archiva-modules/archiva-web/archiva-webapp/pom.xml | 2 +- archiva-modules/archiva-web/archiva-webdav/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-api/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-client/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-security/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-services/pom.xml | 2 +- archiva-modules/archiva-web/archiva-xmlrpc/pom.xml | 2 +- archiva-modules/archiva-web/pom.xml | 2 +- archiva-modules/pom.xml | 2 +- pom.xml | 70 +++++++++++----------- 44 files changed, 79 insertions(+), 79 deletions(-) (limited to 'archiva-cli') diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index 4039c4575..66dde7a24 100644 --- a/archiva-cli/pom.xml +++ b/archiva-cli/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva - 1.2.3-SNAPSHOT + 1.2.2 4.0.0 archiva-cli @@ -35,7 +35,7 @@ org.apache.archiva archiva-dependency-tree-consumer - 1.2.3-SNAPSHOT + 1.2.2 runtime diff --git a/archiva-docs/pom.xml b/archiva-docs/pom.xml index 060edc504..a7e68702f 100644 --- a/archiva-docs/pom.xml +++ b/archiva-docs/pom.xml @@ -21,7 +21,7 @@ org.apache.archiva archiva - 1.2.3-SNAPSHOT + 1.2.2 4.0.0 archiva-docs diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml index 74e31535d..bfb8e7c10 100644 --- a/archiva-jetty/pom.xml +++ b/archiva-jetty/pom.xml @@ -3,7 +3,7 @@ org.apache.archiva archiva - 1.2.3-SNAPSHOT + 1.2.2 archiva-jetty pom diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml index 765a09d49..58743efd3 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.3-SNAPSHOT + 1.2.2 archiva-artifact-converter Archiva Artifact Converter diff --git a/archiva-modules/archiva-base/archiva-checksum/pom.xml b/archiva-modules/archiva-base/archiva-checksum/pom.xml index 456f91f55..51a1f9251 100644 --- a/archiva-modules/archiva-base/archiva-checksum/pom.xml +++ b/archiva-modules/archiva-base/archiva-checksum/pom.xml @@ -19,7 +19,7 @@ org.apache.archiva archiva-base - 1.2.3-SNAPSHOT + 1.2.2 archiva-checksum Archiva Checksum diff --git a/archiva-modules/archiva-base/archiva-common/pom.xml b/archiva-modules/archiva-base/archiva-common/pom.xml index 233964823..9f8867704 100644 --- a/archiva-modules/archiva-base/archiva-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-common/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.3-SNAPSHOT + 1.2.2 4.0.0 archiva-common diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index cf1d13cac..08d4139bd 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.3-SNAPSHOT + 1.2.2 4.0.0 archiva-configuration diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml index 423179df1..e23d4f8de 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-consumers - 1.2.3-SNAPSHOT + 1.2.2 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index c31829f25..b6ca481d7 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.3-SNAPSHOT + 1.2.2 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml index d243752ee..1af8996ee 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.3-SNAPSHOT + 1.2.2 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml index fb0d2f54b..ffa98567f 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml @@ -3,7 +3,7 @@ org.apache.archiva archiva-consumers - 1.2.3-SNAPSHOT + 1.2.2 archiva-dependency-tree-consumer Archiva Consumers :: Dependency Tree Consumer diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml index 1f9622080..4a4a140bf 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.3-SNAPSHOT + 1.2.2 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml index 20a782773..0b5861e64 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.3-SNAPSHOT + 1.2.2 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/pom.xml index 96f73335e..1c4c281f6 100644 --- a/archiva-modules/archiva-base/archiva-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-base - 1.2.3-SNAPSHOT + 1.2.2 ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml index 75735a78d..ee4d1eaf1 100644 --- a/archiva-modules/archiva-base/archiva-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-converter/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.3-SNAPSHOT + 1.2.2 4.0.0 archiva-converter diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml index bf6716d88..72c3122c7 100644 --- a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml +++ b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.3-SNAPSHOT + 1.2.2 4.0.0 archiva-dependency-graph diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml index adcfdab5b..e6b3fb564 100644 --- a/archiva-modules/archiva-base/archiva-indexer/pom.xml +++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.3-SNAPSHOT + 1.2.2 4.0.0 archiva-indexer diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml index c21e4185a..314d900ad 100755 --- a/archiva-modules/archiva-base/archiva-model/pom.xml +++ b/archiva-modules/archiva-base/archiva-model/pom.xml @@ -2,7 +2,7 @@ org.apache.archiva archiva-base - 1.2.3-SNAPSHOT + 1.2.2 4.0.0 archiva-model diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index cbbe88d5d..a048c0850 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.3-SNAPSHOT + 1.2.2 4.0.0 archiva-policies diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index 90a1167ef..8bbbcae8b 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.3-SNAPSHOT + 1.2.2 4.0.0 archiva-proxy diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index fb9fd1e0b..c598b8d9f 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.3-SNAPSHOT + 1.2.2 4.0.0 archiva-repository-layer diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml index bdac3e8f4..a6898727a 100644 --- a/archiva-modules/archiva-base/archiva-transaction/pom.xml +++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.3-SNAPSHOT + 1.2.2 archiva-transaction Archiva Transactions diff --git a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml index cdd157ef3..e1742ac63 100644 --- a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml +++ b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.3-SNAPSHOT + 1.2.2 4.0.0 archiva-xml-tools diff --git a/archiva-modules/archiva-base/pom.xml b/archiva-modules/archiva-base/pom.xml index 7118b34ea..b1ccb3f95 100644 --- a/archiva-modules/archiva-base/pom.xml +++ b/archiva-modules/archiva-base/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2.3-SNAPSHOT + 1.2.2 archiva-base diff --git a/archiva-modules/archiva-database/pom.xml b/archiva-modules/archiva-database/pom.xml index 9a75add1c..041e50da8 100755 --- a/archiva-modules/archiva-database/pom.xml +++ b/archiva-modules/archiva-database/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-modules - 1.2.3-SNAPSHOT + 1.2.2 4.0.0 archiva-database diff --git a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml index 074c748c6..08a157e8c 100755 --- a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.3-SNAPSHOT + 1.2.2 4.0.0 archiva-artifact-reports diff --git a/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml index 9d064785d..21912e966 100755 --- a/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.3-SNAPSHOT + 1.2.2 4.0.0 archiva-metadata-reports diff --git a/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml index e0a814110..81603d395 100755 --- a/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.3-SNAPSHOT + 1.2.2 4.0.0 archiva-project-reports diff --git a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml index 839097f12..cbd8cf64a 100755 --- a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.3-SNAPSHOT + 1.2.2 4.0.0 archiva-report-manager diff --git a/archiva-modules/archiva-reporting/pom.xml b/archiva-modules/archiva-reporting/pom.xml index 17571190e..abb74c27e 100644 --- a/archiva-modules/archiva-reporting/pom.xml +++ b/archiva-modules/archiva-reporting/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2.3-SNAPSHOT + 1.2.2 ../pom.xml diff --git a/archiva-modules/archiva-scheduled/pom.xml b/archiva-modules/archiva-scheduled/pom.xml index 0c947db53..572107a95 100644 --- a/archiva-modules/archiva-scheduled/pom.xml +++ b/archiva-modules/archiva-scheduled/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-modules - 1.2.3-SNAPSHOT + 1.2.2 4.0.0 archiva-scheduled diff --git a/archiva-modules/archiva-web/archiva-applet/pom.xml b/archiva-modules/archiva-web/archiva-applet/pom.xml index 402ae2208..23428a235 100644 --- a/archiva-modules/archiva-web/archiva-applet/pom.xml +++ b/archiva-modules/archiva-web/archiva-applet/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2.3-SNAPSHOT + 1.2.2 archiva-applet Archiva Web :: Applet diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml index 35bc0b307..441d137b5 100644 --- a/archiva-modules/archiva-web/archiva-rss/pom.xml +++ b/archiva-modules/archiva-web/archiva-rss/pom.xml @@ -2,7 +2,7 @@ archiva-web org.apache.archiva - 1.2.3-SNAPSHOT + 1.2.2 4.0.0 archiva-rss diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml index 109016582..6efab4c4c 100644 --- a/archiva-modules/archiva-web/archiva-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-security/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-web - 1.2.3-SNAPSHOT + 1.2.2 4.0.0 archiva-security diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 54386d082..a4a59ae03 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2.3-SNAPSHOT + 1.2.2 ../pom.xml archiva-webapp diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index 743f14045..4a3104fbb 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2.3-SNAPSHOT + 1.2.2 archiva-webdav diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml index 1528bd3b0..e92ca45d9 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2.3-SNAPSHOT + 1.2.2 ../pom.xml archiva-xmlrpc-api diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml index 98723d9ed..fecfaa7f4 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml @@ -19,7 +19,7 @@ archiva-xmlrpc org.apache.archiva - 1.2.3-SNAPSHOT + 1.2.2 4.0.0 archiva-xmlrpc-client diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml index 33105de08..38ad35ae5 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2.3-SNAPSHOT + 1.2.2 ../pom.xml archiva-xmlrpc-security diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml index a317df6e5..d4d93ac96 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2.3-SNAPSHOT + 1.2.2 ../pom.xml archiva-xmlrpc-services diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml index 3ec95265e..664c49399 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-web - 1.2.3-SNAPSHOT + 1.2.2 ../pom.xml archiva-xmlrpc diff --git a/archiva-modules/archiva-web/pom.xml b/archiva-modules/archiva-web/pom.xml index 5f46099d6..17a57fea9 100644 --- a/archiva-modules/archiva-web/pom.xml +++ b/archiva-modules/archiva-web/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2.3-SNAPSHOT + 1.2.2 ../pom.xml diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml index 76fb71efa..0dc0f0388 100644 --- a/archiva-modules/pom.xml +++ b/archiva-modules/pom.xml @@ -23,7 +23,7 @@ archiva org.apache.archiva - 1.2.3-SNAPSHOT + 1.2.2 4.0.0 archiva-modules diff --git a/pom.xml b/pom.xml index 397611ea1..4d365adb8 100644 --- a/pom.xml +++ b/pom.xml @@ -34,12 +34,12 @@ Archiva archiva pom - 1.2.3-SNAPSHOT + 1.2.2 http://archiva.apache.org - scm:svn:http://svn.apache.org/repos/asf/archiva/trunk - scm:svn:https://svn.apache.org/repos/asf/archiva/trunk - http://svn.apache.org/viewvc/archiva/trunk + scm:svn:http://svn.apache.org/repos/asf/archiva/tags/archiva-1.2.2 + scm:svn:https://svn.apache.org/repos/asf/archiva/tags/archiva-1.2.2 + http://svn.apache.org/viewvc/archiva/tags/archiva-1.2.2 @@ -291,160 +291,160 @@ org.apache.archiva archiva-applet - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-artifact-converter - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-artifact-reports - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-checksum - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-common - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-configuration - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-consumer-api - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-converter - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-dependency-graph - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-core-consumers - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-database - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-database-consumers - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-indexer - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-lucene-consumers - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-model - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-policies - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-proxy - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-report-manager - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-repository-layer - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-scheduled - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-security - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-signature-consumers - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-transaction - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-docs - 1.2.3-SNAPSHOT + 1.2.2 zip docs org.apache.archiva archiva-webapp - 1.2.3-SNAPSHOT + 1.2.2 war org.apache.archiva archiva-xml-tools - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-webdav - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-rss - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-xmlrpc-api - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-xmlrpc-services - 1.2.3-SNAPSHOT + 1.2.2 org.apache.archiva archiva-xmlrpc-security - 1.2.3-SNAPSHOT + 1.2.2 org.codehaus.plexus -- cgit v1.2.3 From 6ad5da6f8d8f41c723d2bd9a522661a053e370a8 Mon Sep 17 00:00:00 2001 From: "Maria Odea B. Ching" Date: Thu, 27 Aug 2009 09:34:26 +0000 Subject: [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@808338 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-cli/pom.xml | 4 +- archiva-docs/pom.xml | 2 +- archiva-jetty/pom.xml | 2 +- .../archiva-artifact-converter/pom.xml | 2 +- .../archiva-base/archiva-checksum/pom.xml | 2 +- .../archiva-base/archiva-common/pom.xml | 2 +- .../archiva-base/archiva-configuration/pom.xml | 2 +- .../archiva-consumers/archiva-consumer-api/pom.xml | 2 +- .../archiva-core-consumers/pom.xml | 2 +- .../archiva-database-consumers/pom.xml | 2 +- .../archiva-dependency-tree-consumer/pom.xml | 2 +- .../archiva-lucene-consumers/pom.xml | 2 +- .../archiva-signature-consumers/pom.xml | 2 +- .../archiva-base/archiva-consumers/pom.xml | 2 +- .../archiva-base/archiva-converter/pom.xml | 2 +- .../archiva-base/archiva-dependency-graph/pom.xml | 2 +- .../archiva-base/archiva-indexer/pom.xml | 2 +- archiva-modules/archiva-base/archiva-model/pom.xml | 2 +- .../archiva-base/archiva-policies/pom.xml | 2 +- archiva-modules/archiva-base/archiva-proxy/pom.xml | 2 +- .../archiva-base/archiva-repository-layer/pom.xml | 2 +- .../archiva-base/archiva-transaction/pom.xml | 2 +- .../archiva-base/archiva-xml-tools/pom.xml | 2 +- archiva-modules/archiva-base/pom.xml | 2 +- archiva-modules/archiva-database/pom.xml | 2 +- .../archiva-artifact-reports/pom.xml | 2 +- .../archiva-metadata-reports/pom.xml | 2 +- .../archiva-project-reports/pom.xml | 2 +- .../archiva-report-manager/pom.xml | 2 +- archiva-modules/archiva-reporting/pom.xml | 2 +- archiva-modules/archiva-scheduled/pom.xml | 2 +- archiva-modules/archiva-web/archiva-applet/pom.xml | 2 +- archiva-modules/archiva-web/archiva-rss/pom.xml | 2 +- .../archiva-web/archiva-security/pom.xml | 2 +- archiva-modules/archiva-web/archiva-webapp/pom.xml | 2 +- archiva-modules/archiva-web/archiva-webdav/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-api/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-client/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-security/pom.xml | 2 +- .../archiva-xmlrpc/archiva-xmlrpc-services/pom.xml | 2 +- archiva-modules/archiva-web/archiva-xmlrpc/pom.xml | 2 +- archiva-modules/archiva-web/pom.xml | 2 +- archiva-modules/pom.xml | 2 +- pom.xml | 70 +++++++++++----------- 44 files changed, 79 insertions(+), 79 deletions(-) (limited to 'archiva-cli') diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml index 66dde7a24..4039c4575 100644 --- a/archiva-cli/pom.xml +++ b/archiva-cli/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-cli @@ -35,7 +35,7 @@ org.apache.archiva archiva-dependency-tree-consumer - 1.2.2 + 1.2.3-SNAPSHOT runtime diff --git a/archiva-docs/pom.xml b/archiva-docs/pom.xml index a7e68702f..060edc504 100644 --- a/archiva-docs/pom.xml +++ b/archiva-docs/pom.xml @@ -21,7 +21,7 @@ org.apache.archiva archiva - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-docs diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml index bfb8e7c10..74e31535d 100644 --- a/archiva-jetty/pom.xml +++ b/archiva-jetty/pom.xml @@ -3,7 +3,7 @@ org.apache.archiva archiva - 1.2.2 + 1.2.3-SNAPSHOT archiva-jetty pom diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml index 58743efd3..765a09d49 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT archiva-artifact-converter Archiva Artifact Converter diff --git a/archiva-modules/archiva-base/archiva-checksum/pom.xml b/archiva-modules/archiva-base/archiva-checksum/pom.xml index 51a1f9251..456f91f55 100644 --- a/archiva-modules/archiva-base/archiva-checksum/pom.xml +++ b/archiva-modules/archiva-base/archiva-checksum/pom.xml @@ -19,7 +19,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT archiva-checksum Archiva Checksum diff --git a/archiva-modules/archiva-base/archiva-common/pom.xml b/archiva-modules/archiva-base/archiva-common/pom.xml index 9f8867704..233964823 100644 --- a/archiva-modules/archiva-base/archiva-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-common/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-common diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index 08d4139bd..cf1d13cac 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-configuration diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml index e23d4f8de..423179df1 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-consumers - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index b6ca481d7..c31829f25 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml index 1af8996ee..d243752ee 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml index ffa98567f..fb0d2f54b 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml @@ -3,7 +3,7 @@ org.apache.archiva archiva-consumers - 1.2.2 + 1.2.3-SNAPSHOT archiva-dependency-tree-consumer Archiva Consumers :: Dependency Tree Consumer diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml index 4a4a140bf..1f9622080 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml index 0b5861e64..20a782773 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-consumers - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/pom.xml index 1c4c281f6..96f73335e 100644 --- a/archiva-modules/archiva-base/archiva-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml index ee4d1eaf1..75735a78d 100644 --- a/archiva-modules/archiva-base/archiva-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-converter/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-converter diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml index 72c3122c7..bf6716d88 100644 --- a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml +++ b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-dependency-graph diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml index e6b3fb564..adcfdab5b 100644 --- a/archiva-modules/archiva-base/archiva-indexer/pom.xml +++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-indexer diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml index 314d900ad..c21e4185a 100755 --- a/archiva-modules/archiva-base/archiva-model/pom.xml +++ b/archiva-modules/archiva-base/archiva-model/pom.xml @@ -2,7 +2,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-model diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index a048c0850..cbbe88d5d 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-policies diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index 8bbbcae8b..90a1167ef 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-proxy diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index c598b8d9f..fb9fd1e0b 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-repository-layer diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml index a6898727a..bdac3e8f4 100644 --- a/archiva-modules/archiva-base/archiva-transaction/pom.xml +++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT archiva-transaction Archiva Transactions diff --git a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml index e1742ac63..cdd157ef3 100644 --- a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml +++ b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-base - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-xml-tools diff --git a/archiva-modules/archiva-base/pom.xml b/archiva-modules/archiva-base/pom.xml index b1ccb3f95..7118b34ea 100644 --- a/archiva-modules/archiva-base/pom.xml +++ b/archiva-modules/archiva-base/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2.2 + 1.2.3-SNAPSHOT archiva-base diff --git a/archiva-modules/archiva-database/pom.xml b/archiva-modules/archiva-database/pom.xml index 041e50da8..9a75add1c 100755 --- a/archiva-modules/archiva-database/pom.xml +++ b/archiva-modules/archiva-database/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-modules - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-database diff --git a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml index 08a157e8c..074c748c6 100755 --- a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-artifact-reports diff --git a/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml index 21912e966..9d064785d 100755 --- a/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-metadata-reports diff --git a/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml index 81603d395..e0a814110 100755 --- a/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-project-reports diff --git a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml index cbd8cf64a..839097f12 100755 --- a/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-reporting - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-report-manager diff --git a/archiva-modules/archiva-reporting/pom.xml b/archiva-modules/archiva-reporting/pom.xml index abb74c27e..17571190e 100644 --- a/archiva-modules/archiva-reporting/pom.xml +++ b/archiva-modules/archiva-reporting/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml diff --git a/archiva-modules/archiva-scheduled/pom.xml b/archiva-modules/archiva-scheduled/pom.xml index 572107a95..0c947db53 100644 --- a/archiva-modules/archiva-scheduled/pom.xml +++ b/archiva-modules/archiva-scheduled/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-modules - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-scheduled diff --git a/archiva-modules/archiva-web/archiva-applet/pom.xml b/archiva-modules/archiva-web/archiva-applet/pom.xml index 23428a235..402ae2208 100644 --- a/archiva-modules/archiva-web/archiva-applet/pom.xml +++ b/archiva-modules/archiva-web/archiva-applet/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2.2 + 1.2.3-SNAPSHOT archiva-applet Archiva Web :: Applet diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml index 441d137b5..35bc0b307 100644 --- a/archiva-modules/archiva-web/archiva-rss/pom.xml +++ b/archiva-modules/archiva-web/archiva-rss/pom.xml @@ -2,7 +2,7 @@ archiva-web org.apache.archiva - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-rss diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml index 6efab4c4c..109016582 100644 --- a/archiva-modules/archiva-web/archiva-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-security/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-web - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-security diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index a4a59ae03..54386d082 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml archiva-webapp diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index 4a3104fbb..743f14045 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -23,7 +23,7 @@ org.apache.archiva archiva-web - 1.2.2 + 1.2.3-SNAPSHOT archiva-webdav diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml index e92ca45d9..1528bd3b0 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml archiva-xmlrpc-api diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml index fecfaa7f4..98723d9ed 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml @@ -19,7 +19,7 @@ archiva-xmlrpc org.apache.archiva - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-xmlrpc-client diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml index 38ad35ae5..33105de08 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml archiva-xmlrpc-security diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml index d4d93ac96..a317df6e5 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml @@ -4,7 +4,7 @@ org.apache.archiva archiva-xmlrpc - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml archiva-xmlrpc-services diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml index 664c49399..3ec95265e 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml @@ -22,7 +22,7 @@ org.apache.archiva archiva-web - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml archiva-xmlrpc diff --git a/archiva-modules/archiva-web/pom.xml b/archiva-modules/archiva-web/pom.xml index 17a57fea9..5f46099d6 100644 --- a/archiva-modules/archiva-web/pom.xml +++ b/archiva-modules/archiva-web/pom.xml @@ -20,7 +20,7 @@ org.apache.archiva archiva-modules - 1.2.2 + 1.2.3-SNAPSHOT ../pom.xml diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml index 0dc0f0388..76fb71efa 100644 --- a/archiva-modules/pom.xml +++ b/archiva-modules/pom.xml @@ -23,7 +23,7 @@ archiva org.apache.archiva - 1.2.2 + 1.2.3-SNAPSHOT 4.0.0 archiva-modules diff --git a/pom.xml b/pom.xml index 4d365adb8..397611ea1 100644 --- a/pom.xml +++ b/pom.xml @@ -34,12 +34,12 @@ Archiva archiva pom - 1.2.2 + 1.2.3-SNAPSHOT http://archiva.apache.org - scm:svn:http://svn.apache.org/repos/asf/archiva/tags/archiva-1.2.2 - scm:svn:https://svn.apache.org/repos/asf/archiva/tags/archiva-1.2.2 - http://svn.apache.org/viewvc/archiva/tags/archiva-1.2.2 + scm:svn:http://svn.apache.org/repos/asf/archiva/trunk + scm:svn:https://svn.apache.org/repos/asf/archiva/trunk + http://svn.apache.org/viewvc/archiva/trunk @@ -291,160 +291,160 @@ org.apache.archiva archiva-applet - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-artifact-converter - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-artifact-reports - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-checksum - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-common - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-configuration - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-consumer-api - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-converter - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-dependency-graph - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-core-consumers - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-database - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-database-consumers - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-indexer - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-lucene-consumers - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-model - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-policies - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-proxy - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-report-manager - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-repository-layer - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-scheduled - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-security - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-signature-consumers - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-transaction - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-docs - 1.2.2 + 1.2.3-SNAPSHOT zip docs org.apache.archiva archiva-webapp - 1.2.2 + 1.2.3-SNAPSHOT war org.apache.archiva archiva-xml-tools - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-webdav - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-rss - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-xmlrpc-api - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-xmlrpc-services - 1.2.2 + 1.2.3-SNAPSHOT org.apache.archiva archiva-xmlrpc-security - 1.2.2 + 1.2.3-SNAPSHOT org.codehaus.plexus -- cgit v1.2.3