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

diff --git a/archiva-base/archiva-common/pom.xml b/archiva-base/archiva-common/pom.xml
index 1dfc08037beb51a55b48750312947ddc6b09b57e..9093b12dfb33b74510f6e497dc7ac022fc0a9308 100644 (file)
--- a/archiva-base/archiva-common/pom.xml
+++ b/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>

diff --git a/archiva-base/archiva-configuration/pom.xml b/archiva-base/archiva-configuration/pom.xml
index 13e5d4d836bb8766fc5abdba5fd86d56c0a9bed5..db1c88f3afb9dbded538ebf4b5ae3a071662be96 100644 (file)
--- a/archiva-base/archiva-configuration/pom.xml
+++ b/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>

diff --git a/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml b/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
index f331ed0744f7610bf363c3ef16ae1e6b6eb94e1a..419139f2c509150630f9d9bf8778b07a61cfd1e0 100644 (file)
--- a/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
+++ b/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>
 

diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
index 182578f573802cbfc9e81f252632f02487d59e63..68f11afe07be0d1b742c41d606bb74d49d8e2bc5 100644 (file)
--- a/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
+++ b/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>
 

diff --git a/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml b/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml
index 2461e26715eee384d2b6861c792a1aceba674f29..a1469871b02d3286abee24655411b8f852d5e448 100644 (file)
--- a/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml
+++ b/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>

diff --git a/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
index ae5761b2ae20dcd3661b384f00462cb6b08e2956..c1cb365f1caa46388141de3557b558a313824cbe 100644 (file)
--- a/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
+++ b/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>
 

diff --git a/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml b/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml
index 8aef2546792454ccfabb76fef2d0214bda973479..9d6702d02a495ecdc22cff02a90f1890a7200ea9 100644 (file)
--- a/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml
+++ b/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>
 

diff --git a/archiva-base/archiva-consumers/pom.xml b/archiva-base/archiva-consumers/pom.xml
index 04ea498104c3279c3e16f0e8a80803eec416af11..beedf7d0b707543f5641df773bda22f7e4577c1a 100644 (file)
--- a/archiva-base/archiva-consumers/pom.xml
+++ b/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>
 

diff --git a/archiva-base/archiva-converter/pom.xml b/archiva-base/archiva-converter/pom.xml
index ec20ad3c0f5dd3ec3ad355e0476f3e51a4022f9b..dbfeca6cda089096f301ba8aa1987f2d22f293bb 100644 (file)
--- a/archiva-base/archiva-converter/pom.xml
+++ b/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>

diff --git a/archiva-base/archiva-indexer/pom.xml b/archiva-base/archiva-indexer/pom.xml
index dab7595b2ccc35ceca0d083b2e16441f3e6e3218..d763b19f913f07e6519dc9c81bb32b954f44bc66 100644 (file)
--- a/archiva-base/archiva-indexer/pom.xml
+++ b/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>

diff --git a/archiva-base/archiva-model/pom.xml b/archiva-base/archiva-model/pom.xml
index f8b378a61f81205d9cf0e89861e8283975f61a1c..b14ce4fb6f5a045a2aaa5211c2aa7d0833a49c3e 100755 (executable)
--- a/archiva-base/archiva-model/pom.xml
+++ b/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>

diff --git a/archiva-base/archiva-policies/pom.xml b/archiva-base/archiva-policies/pom.xml
index 36512515e5a3f0f5515ae644fef187b02dc00a16..2c3061a704451508255ead2c2620179724736c8c 100644 (file)
--- a/archiva-base/archiva-policies/pom.xml
+++ b/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>

diff --git a/archiva-base/archiva-proxy/pom.xml b/archiva-base/archiva-proxy/pom.xml
index e9d55f1b3cfbc578e9e1e54d0219c555d121f40e..7855eb1d76c427607117d6d7eadf754e86563817 100644 (file)
--- a/archiva-base/archiva-proxy/pom.xml
+++ b/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>

diff --git a/archiva-base/archiva-repository-layer/pom.xml b/archiva-base/archiva-repository-layer/pom.xml
index b7cbcec17bc7f1fbe2e8aeec862c93848de69ca1..1a4ce33b2b69d100a53d6a763dc77b70c296b6ae 100644 (file)
--- a/archiva-base/archiva-repository-layer/pom.xml
+++ b/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>

diff --git a/archiva-base/archiva-xml-tools/pom.xml b/archiva-base/archiva-xml-tools/pom.xml
index 352f6891bb3bc249263ff081c7fbceb0087a46d6..5f3a92b911145f2787f1e2273157bd49f8ddccf6 100644 (file)
--- a/archiva-base/archiva-xml-tools/pom.xml
+++ b/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>

diff --git a/archiva-base/pom.xml b/archiva-base/pom.xml
index d13f97edab1e5b7fa5a741813e965ed093ad2a31..e4fc94f6f6be090faef028eaaf8a08ff57379297 100644 (file)
--- a/archiva-base/pom.xml
+++ b/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>
 

diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml
index 0fdf11f83e86e140447faf4ffc37101c08d2eb0b..976a8cebc13046b5520dda0485d71285480ec639 100644 (file)
--- a/archiva-cli/pom.xml
+++ b/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>

diff --git a/archiva-database/pom.xml b/archiva-database/pom.xml
index 25b1fbd3a4c88cfa8990327ee59d990732c7da9a..386c2968cb84195e7995e387e99ac6d8cb8cda7b 100755 (executable)
--- a/archiva-database/pom.xml
+++ b/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>

diff --git a/archiva-reporting/archiva-artifact-reports/pom.xml b/archiva-reporting/archiva-artifact-reports/pom.xml
index f2da3aa20cdc5a2249e607fbb96b10dcaeb7a5bb..c6b904efab91411b215515ca941c77d60e086561 100755 (executable)
--- a/archiva-reporting/archiva-artifact-reports/pom.xml
+++ b/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>

diff --git a/archiva-reporting/archiva-metadata-reports/pom.xml b/archiva-reporting/archiva-metadata-reports/pom.xml
index 6912b0ce3cd864acce933ca498233d324ddf52f5..4e878250aad9e2521cda714b20614bfd6f10a721 100755 (executable)
--- a/archiva-reporting/archiva-metadata-reports/pom.xml
+++ b/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>

diff --git a/archiva-reporting/archiva-project-reports/pom.xml b/archiva-reporting/archiva-project-reports/pom.xml
index 128236a967ab7b03b472f72bfe49183b1f3ab6d0..fe3d930433dbc417a1dfab268c2ae6d3301bacb2 100755 (executable)
--- a/archiva-reporting/archiva-project-reports/pom.xml
+++ b/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>

diff --git a/archiva-reporting/archiva-report-manager/pom.xml b/archiva-reporting/archiva-report-manager/pom.xml
index 17fe1236657a3c1f4b27bd1496606297af74b34e..8ea71d8363e4c76344ffd18592245a05138ed675 100755 (executable)
--- a/archiva-reporting/archiva-report-manager/pom.xml
+++ b/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>

diff --git a/archiva-reporting/pom.xml b/archiva-reporting/pom.xml
index f8f89a730eff1728e03431fbee1a70053c710a86..a2de6b76df774a852cf7e61879be03f976851317 100644 (file)
--- a/archiva-reporting/pom.xml
+++ b/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>
 

diff --git a/archiva-scheduled/pom.xml b/archiva-scheduled/pom.xml
index 50fa26016a8c3f63133ec589b4aced84a1962c96..04b01d202fdf7defbe94be8e66de85670a6ffaef 100644 (file)
--- a/archiva-scheduled/pom.xml
+++ b/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>

diff --git a/archiva-site/pom.xml b/archiva-site/pom.xml
index c01eb176a64d9f4e71ffa1302a2e04e1f73d0614..02832b49307ba4b81eec67eca983dcecc840a863 100644 (file)
--- a/archiva-site/pom.xml
+++ b/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>

diff --git a/archiva-site/src/site/apt/guides/getting-started/index.apt b/archiva-site/src/site/apt/guides/getting-started/index.apt
index 21fa5972785a3576906d69e2610bc37071ff43b4..d01cdbdc2f42236d959bb54b3695f01ed1d294c4 100644 (file)
--- a/archiva-site/src/site/apt/guides/getting-started/index.apt
+++ b/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"/>

diff --git a/archiva-web/archiva-applet/pom.xml b/archiva-web/archiva-applet/pom.xml
index e16baaacd05b151d2eb6005af40af02e067ccfc5..343898e989ba606ca0f09f14db5cf58044278571 100644 (file)
--- a/archiva-web/archiva-applet/pom.xml
+++ b/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>

diff --git a/archiva-web/archiva-security/pom.xml b/archiva-web/archiva-security/pom.xml
index 78e14a42df5326df6e7dc584ce52b38151b57eb5..6cc4661a4f8c5d8bd94fdf138bf947c8bb376692 100644 (file)
--- a/archiva-web/archiva-security/pom.xml
+++ b/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>

diff --git a/archiva-web/archiva-standalone/archiva-plexus-application/pom.xml b/archiva-web/archiva-standalone/archiva-plexus-application/pom.xml
index cf44943fd6bf08e88857600a7aac39a78290c815..8ca96f7f0c3b50b48a9a4b33cb42376d923e150d 100644 (file)
--- a/archiva-web/archiva-standalone/archiva-plexus-application/pom.xml
+++ b/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>

diff --git a/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml b/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
index bb0338b86f9e73fd2f32dcc4d5691b6f5ab1aeeb..e8aa180173d0c23245040dbfb9eaa921ddde5b16 100644 (file)
--- a/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
+++ b/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>

diff --git a/archiva-web/archiva-standalone/pom.xml b/archiva-web/archiva-standalone/pom.xml
index 412f55bc889b18224e61f9f3fc495d793a687694..cf2a93347d3fc13e91faf8a414293a65861d1f29 100644 (file)
--- a/archiva-web/archiva-standalone/pom.xml
+++ b/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>
 

diff --git a/archiva-web/archiva-webapp-test/pom.xml b/archiva-web/archiva-webapp-test/pom.xml
index 36b3e505a9c5b3fbf2702db2c16d309bc9fbf61c..11997e407724b5ccbd941d8ae3d4d8efbaa1dff6 100644 (file)
--- a/archiva-web/archiva-webapp-test/pom.xml
+++ b/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>

diff --git a/archiva-web/archiva-webapp/pom.xml b/archiva-web/archiva-webapp/pom.xml
index e693ed9a1a2cd28ef1d1ebff2b02e046a5c2711f..33fa06e2299777d0e44f945cc3642f373bf6f6a1 100644 (file)
--- a/archiva-web/archiva-webapp/pom.xml
+++ b/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>

diff --git a/archiva-web/pom.xml b/archiva-web/pom.xml
index 7d2e825d65d6d4a258937846a565c3c238afccb8..6fd907f1577c3b43135938bf27f55b6dce5f03fd 100644 (file)
--- a/archiva-web/pom.xml
+++ b/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>
 

diff --git a/design/white-site/pom.xml b/design/white-site/pom.xml
index fc8f299b6a4293e2d52de36bcbed448673dfe6da..e3365251d2065a7bf2e72fdf8549cd9ce618e854 100644 (file)
--- a/design/white-site/pom.xml
+++ b/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>

diff --git a/maven-meeper/pom.xml b/maven-meeper/pom.xml
index e79f34b2fbaf3ed3741aa30a184a93613e406861..8701fb0381d43eabeae9e86888ef7e29926ded1a 100644 (file)
--- a/maven-meeper/pom.xml
+++ b/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>

diff --git a/pom.xml b/pom.xml
index d8d355c1334e526aa65e397824fe8504edb1c4c5..63fe7893ae2b5b4dfc15921379d31654926ef397 100644 (file)
--- a/pom.xml
+++ b/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>