Copied: archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/pom.xml (from r723577, archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/pom.xml) URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/pom.xml?p2=archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/pom.xml&p1=archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/pom.xml&r1=723577&r2=825867&rev=825867&view=diff ============================================================================== --- archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/pom.xml (original) +++ archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/pom.xml Fri Oct 16 12:35:38 2009 @@ -21,7 +21,7 @@ <parent> <artifactId>metadata</artifactId> <groupId>org.apache.archiva</groupId> - <version>1.2-MRM1025-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </parent> <artifactId>metadata-model</artifactId> <name>Archiva Metadata Model</name>
Copied: archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ArtifactMetadata.java (from r723577, archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ArtifactMetadata.java) URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ArtifactMetadata.java?p2=archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ArtifactMetadata.java&p1=archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ArtifactMetadata.java&r1=723577&r2=825867&rev=825867&view=diff ============================================================================== --- archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ArtifactMetadata.java (original) +++ archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ArtifactMetadata.java Fri Oct 16 12:35:38 2009 @@ -1,7 +1,5 @@ package org.apache.archiva.metadata.model; -import java.util.Date; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -21,6 +19,8 @@ * under the License. */ +import java.util.Date; + public class ArtifactMetadata { private String id; Copied: archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectBuildMetadata.java (from r723577, archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectBuildMetadata.java) URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectBuildMetadata.java?p2=archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectBuildMetadata.java&p1=archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectBuildMetadata.java&r1=723577&r2=825867&rev=825867&view=diff ============================================================================== --- archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectBuildMetadata.java (original) +++ archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectBuildMetadata.java Fri Oct 16 12:35:38 2009 @@ -1,9 +1,5 @@ package org.apache.archiva.metadata.model; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.Map; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -23,6 +19,10 @@ * under the License. */ +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.Map; + public class ProjectBuildMetadata { private String id; Copied: archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectMetadata.java (from r723577, archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectMetadata.java) URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectMetadata.java?p2=archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectMetadata.java&p1=archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectMetadata.java&r1=723577&r2=825867&rev=825867&view=diff ============================================================================== --- archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectMetadata.java (original) +++ archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectMetadata.java Fri Oct 16 12:35:38 2009 @@ -1,9 +1,5 @@ package org.apache.archiva.metadata.model; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.Map; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -23,6 +19,10 @@ * under the License. */ +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.Map; + public class ProjectMetadata { private String id; Propchange: archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Oct 16 12:35:38 2009 @@ -0,0 +1,7 @@ +*.iml +*.ipr +*.iws +target +.classpath +.project +.settings Copied: archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/pom.xml (from r723577, archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/pom.xml) URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/pom.xml?p2=archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/pom.xml&p1=archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/pom.xml&r1=723577&r2=825867&rev=825867&view=diff ============================================================================== --- archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/pom.xml (original) +++ archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/pom.xml Fri Oct 16 12:35:38 2009 @@ -21,7 +21,7 @@ <parent> <artifactId>metadata</artifactId> <groupId>org.apache.archiva</groupId> - <version>1.2-MRM1025-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </parent> <artifactId>metadata-repository-api</artifactId> <name>Archiva Metadata Repository API</name> @@ -29,7 +29,6 @@ <dependency> <groupId>org.apache.archiva</groupId> <artifactId>metadata-model</artifactId> - <version>1.2-MRM1025-SNAPSHOT</version> <!-- TODO: dep mgmt --> </dependency> </dependencies> </project> Copied: archiva/branches/MRM-1025/archiva-modules/metadata/pom.xml (from r723577, archiva/branches/MRM-1025/archiva-modules/metadata/pom.xml) URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/metadata/pom.xml?p2=archiva/branches/MRM-1025/archiva-modules/metadata/pom.xml&p1=archiva/branches/MRM-1025/archiva-modules/metadata/pom.xml&r1=723577&r2=825867&rev=825867&view=diff ============================================================================== --- archiva/branches/MRM-1025/archiva-modules/metadata/pom.xml (original) +++ archiva/branches/MRM-1025/archiva-modules/metadata/pom.xml Fri Oct 16 12:35:38 2009 @@ -21,7 +21,7 @@ <parent> <artifactId>archiva-modules</artifactId> <groupId>org.apache.archiva</groupId> - <version>1.2-MRM1025-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </parent> <artifactId>metadata</artifactId> <name>Archiva Metadata</name> Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Oct 16 12:35:38 2009 @@ -0,0 +1,7 @@ +*.iml +*.ipr +*.iws +.classpath +.project +.settings +target Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Oct 16 12:35:38 2009 @@ -0,0 +1,7 @@ +*.iml +*.ipr +*.iws +target +.settings +.classpath +.project Copied: archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/pom.xml (from r723577, archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/pom.xml) URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/pom.xml?p2=archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/pom.xml&p1=archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/pom.xml&r1=723577&r2=825867&rev=825867&view=diff ============================================================================== --- archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/pom.xml (original) +++ archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/pom.xml Fri Oct 16 12:35:38 2009 @@ -23,7 +23,7 @@ <parent> <artifactId>plugins</artifactId> <groupId>org.apache.archiva</groupId> - <version>1.2-MRM1025-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </parent> <artifactId>metadata-repository-file</artifactId> <name>File System Backed Metadata Repository</name> @@ -31,7 +31,6 @@ <dependency> <groupId>org.apache.archiva</groupId> <artifactId>metadata-repository-api</artifactId> - <version>1.2-MRM1025-SNAPSHOT</version> </dependency> <dependency> <groupId>commons-io</groupId> Copied: archiva/branches/MRM-1025/archiva-modules/plugins/pom.xml (from r723577, archiva/branches/MRM-1025/archiva-modules/plugins/pom.xml) URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/pom.xml?p2=archiva/branches/MRM-1025/archiva-modules/plugins/pom.xml&p1=archiva/branches/MRM-1025/archiva-modules/plugins/pom.xml&r1=723577&r2=825867&rev=825867&view=diff ============================================================================== --- archiva/branches/MRM-1025/archiva-modules/plugins/pom.xml (original) +++ archiva/branches/MRM-1025/archiva-modules/plugins/pom.xml Fri Oct 16 12:35:38 2009 @@ -21,7 +21,7 @@ <parent> <artifactId>archiva-modules</artifactId> <groupId>org.apache.archiva</groupId> - <version>1.2-MRM1025-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </parent> <artifactId>plugins</artifactId> <name>Archiva Core Plugins</name> Modified: archiva/branches/MRM-1025/archiva-modules/pom.xml URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/pom.xml?rev=825867&r1=825866&r2=825867&view=diff ============================================================================== --- archiva/branches/MRM-1025/archiva-modules/pom.xml (original) +++ archiva/branches/MRM-1025/archiva-modules/pom.xml Fri Oct 16 12:35:38 2009 @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> - <!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more contributor license agreements. See the NOTICE file @@ -17,13 +16,11 @@ ~ KIND, either express or implied. See the License for the ~ specific language governing permissions and limitations ~ under the License. - --> - -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + --><project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <artifactId>archiva</artifactId> <groupId>org.apache.archiva</groupId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-modules</artifactId> @@ -36,6 +33,8 @@ <module>archiva-reporting</module> <module>archiva-scheduled</module> <module>archiva-web</module> + <module>metadata</module> + <module>plugins</module> </modules> <reporting> <plugins> Modified: archiva/branches/MRM-1025/pom.xml URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/pom.xml?rev=825867&r1=825866&r2=825867&view=diff ============================================================================== --- archiva/branches/MRM-1025/pom.xml (original) +++ archiva/branches/MRM-1025/pom.xml Fri Oct 16 12:35:38 2009 @@ -34,7 +34,7 @@ <name>Archiva</name> <artifactId>archiva</artifactId> <packaging>pom</packaging> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> <url>http://archiva.apache.org</url> <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/archiva/trunk</connection> @@ -290,161 +290,181 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> + <artifactId>metadata-model</artifactId> + <version>1.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>metadata-repository-api</artifactId> + <version>1.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>metadata-repository-file</artifactId> + <version>1.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> <artifactId>archiva-applet</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-artifact-converter</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-artifact-reports</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-checksum</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-common</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-configuration</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-consumer-api</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-converter</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-dependency-graph</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-core-consumers</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-database</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-database-consumers</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-indexer</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-lucene-consumers</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-model</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-policies</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-proxy</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-report-manager</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-repository-layer</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-repository-scanner</artifactId> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-scheduled</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-security</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-signature-consumers</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-transaction</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-docs</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> <type>zip</type> <classifier>docs</classifier> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-webapp</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> <type>war</type> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-xml-tools</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-webdav</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-rss</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-xmlrpc-api</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-xmlrpc-services</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-xmlrpc-security</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId>
