Upgrading trunk to 1.0-alpha-1-SNAPSHOT

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@534183 13f79535-47bb-0310-9956-ffa450edef68

archiva-base/archiva-common/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-common</artifactId>

archiva-base/archiva-configuration/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-configuration</artifactId>
@@ -36,12 +36,12 @@
     <dependency>
       <groupId>org.apache.maven.archiva</groupId>
       <artifactId>archiva-xml-tools</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0-alpha-1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.archiva</groupId>
       <artifactId>archiva-policies</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0-alpha-1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

archiva-base/archiva-consumers/archiva-consumer-api/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

archiva-base/archiva-consumers/archiva-core-consumers/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

archiva-base/archiva-consumers/archiva-database-consumers/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -37,7 +37,6 @@
     <dependency>
       <groupId>org.apache.maven.archiva</groupId>
       <artifactId>archiva-artifact-reports</artifactId>
-      <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.archiva</groupId>

archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

archiva-base/archiva-consumers/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

archiva-base/archiva-converter/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-converter</artifactId>
@@ -32,12 +32,10 @@
     <dependency>
       <groupId>org.apache.maven.archiva</groupId>
       <artifactId>archiva-consumer-api</artifactId>
-      <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.archiva</groupId>
       <artifactId>archiva-repository-layer</artifactId>
-      <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>

archiva-base/archiva-indexer/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-indexer</artifactId>

archiva-base/archiva-model/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-model</artifactId>

archiva-base/archiva-policies/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-policies</artifactId>

archiva-base/archiva-proxy/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-proxy</artifactId>

archiva-base/archiva-repository-layer/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-repository-layer</artifactId>
@@ -44,7 +44,6 @@
     <dependency>
       <groupId>org.apache.maven.archiva</groupId>
       <artifactId>archiva-xml-tools</artifactId>
-      <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

archiva-base/archiva-xml-tools/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-xml-tools</artifactId>

archiva-base/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

archiva-cli/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-cli</artifactId>

archiva-database/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-database</artifactId>

archiva-reporting/archiva-artifact-reports/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-reporting</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-artifact-reports</artifactId>
@@ -32,7 +32,6 @@
     <dependency>
       <groupId>org.apache.maven.archiva</groupId>
       <artifactId>archiva-report-manager</artifactId>
-      <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.archiva</groupId>

archiva-reporting/archiva-metadata-reports/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-reporting</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-metadata-reports</artifactId>
@@ -32,7 +32,6 @@
     <dependency>
       <groupId>org.apache.maven.archiva</groupId>
       <artifactId>archiva-report-manager</artifactId>
-      <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.archiva</groupId>

archiva-reporting/archiva-project-reports/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-reporting</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-project-reports</artifactId>
@@ -32,7 +32,6 @@
     <dependency>
       <groupId>org.apache.maven.archiva</groupId>
       <artifactId>archiva-report-manager</artifactId>
-      <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.archiva</groupId>

archiva-reporting/archiva-report-manager/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-reporting</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-report-manager</artifactId>

archiva-reporting/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

archiva-scheduled/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-scheduled</artifactId>

archiva-site/pom.xml

@@ -20,9 +20,9 @@
 <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.maven.archiva</groupId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>archiva-parent</artifactId>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-site</artifactId>

archiva-site/src/site/apt/guides/getting-started/index.apt

@@ -30,11 +30,11 @@ To checkout the latest code
 
   Using Subversion, either checkout from {{http://svn.apache.org/repos/asf/maven/archiva/trunk/}} or to get all of Maven 2, checkout from {{http://svn.apache.org/repos/asf/maven/trunks/}}.
 
-To build 
+To build
 
   If this is the first time, and if you've not pulled this down for some other reason then it will save time to do the following first:
 
-    * Download the 1.0 connector zip from: http://java.sun.com/j2ee/connector/download.html
+    * Download the 1.0 connector zip from: {{http://java.sun.com/j2ee/connector/download.html}}
 
     * Unpack the zip to get the jar
 
@@ -42,7 +42,7 @@ To build
 
     * Download the 1.0.1B jta zip from: {{http://java.sun.com/products/jta/}}
 
-    * Install it: mvn install:install-file -DgroupId=javax.transaction -DartifactId=jta -Dversion=1.0.1B -Dpackaging=jar -Dfile=jta-1_0_1B-classes.zip 
+    * Install it: mvn install:install-file -DgroupId=javax.transaction -DartifactId=jta -Dversion=1.0.1B -Dpackaging=jar -Dfile=jta-1_0_1B-classes.zip
 
   Otherwise:
 
@@ -51,7 +51,7 @@ To build
 
 To test-deploy Archiva on the embedded Jetty
 
-    * cd archiva-webapp
+    * cd archiva-web/archiva-webapp
 
     * mvn jetty:run
 
@@ -74,13 +74,13 @@ To deploy Archiva to Tomcat 5.5
            password=""
            driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
            url="jdbc:derby:database/archiva;create=true" />
- 
+
  <Resource name="jdbc/archiva" auth="Container" type="javax.sql.DataSource"
            username="sa"
            password=""
            driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
            url="jdbc:derby:database/archiva;create=true" />
- 
+
  <Resource name="mail/Session" auth="Container"
             type="javax.mail.Session"
             mail.smtp.host="localhost"/>

archiva-web/archiva-applet/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-applet</artifactId>
   <name>Archiva Web :: Applet</name>

archiva-web/archiva-security/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-security</artifactId>

archiva-web/archiva-standalone/archiva-plexus-application/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-web-standalone</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-plexus-application</artifactId>

archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-web-standalone</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-plexus-runtime</artifactId>

archiva-web/archiva-standalone/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

archiva-web/archiva-webapp-test/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-webapp-test</artifactId>
   <packaging>pom</packaging>

archiva-web/archiva-webapp/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-webapp</artifactId>
   <packaging>war</packaging>
@@ -33,12 +33,10 @@
     <dependency>
       <groupId>org.apache.maven.archiva</groupId>
       <artifactId>archiva-report-manager</artifactId>
-      <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.archiva</groupId>
       <artifactId>archiva-scheduled</artifactId>
-      <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.archiva</groupId>

archiva-web/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

design/white-site/pom.xml

@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.archiva</groupId>
   <artifactId>archiva-white-site</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0-alpha-1-SNAPSHOT</version>
   <name>Archiva White Site</name>
   <inceptionYear>2005</inceptionYear>
   <reporting>

maven-meeper/pom.xml

@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-meeper</artifactId>

pom.xml

@@ -28,7 +28,7 @@
    <artifactId>archiva-parent</artifactId>
    <packaging>pom</packaging>
    <name>Archiva</name>
-   <version>1.0-SNAPSHOT</version>
+   <version>1.0-alpha-1-SNAPSHOT</version>
    <description>
       Archiva is an application for managing one or more remote
       repositories, including administration, artifact handling,
@@ -155,6 +155,7 @@
       <module>archiva-scheduled</module>
       <module>archiva-web</module>
       <module>archiva-cli</module>
+      <module>archiva-site</module>
       <module>maven-meeper</module>
    </modules>
    <dependencies>
@@ -279,7 +280,12 @@
          </dependency>
          <dependency>
             <groupId>org.apache.maven.archiva</groupId>
-            <artifactId>archiva-reports-standard</artifactId>
+            <artifactId>archiva-report-manager</artifactId>
+            <version>${archiva.version}</version>
+         </dependency>
+         <dependency>
+            <groupId>org.apache.maven.archiva</groupId>
+            <artifactId>archiva-artifact-reports</artifactId>
             <version>${archiva.version}</version>
          </dependency>
          <dependency>
@@ -324,7 +330,7 @@
          </dependency>
          <dependency>
             <groupId>org.apache.maven.archiva</groupId>
-            <artifactId>archiva-discoverer</artifactId>
+            <artifactId>archiva-xml-tools</artifactId>
             <version>${archiva.version}</version>
          </dependency>
          <dependency>
@@ -364,7 +370,7 @@
          </dependency>
          <dependency>
             <groupId>org.apache.maven.archiva</groupId>
-            <artifactId>archiva-utils</artifactId>
+            <artifactId>archiva-scheduled</artifactId>
             <version>${archiva.version}</version>
          </dependency>
          <dependency>
@@ -636,7 +642,7 @@
       </pluginRepository>
    </pluginRepositories>
    <properties>
-      <archiva.version>1.0-SNAPSHOT</archiva.version>
+      <archiva.version>1.0-alpha-1-SNAPSHOT</archiva.version>
       <maven.version>2.0.5</maven.version>
       <wagon.version>1.0-beta-2</wagon.version>
       <plexus-security.version>1.0-alpha-11</plexus-security.version>