diff options
37 files changed, 55 insertions, 58 deletions
diff --git a/archiva-base/archiva-common/pom.xml b/archiva-base/archiva-common/pom.xml index 1dfc08037..9093b12df 100644 --- 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 13e5d4d83..db1c88f3a 100644 --- 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 f331ed074..419139f2c 100644 --- 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 182578f57..68f11afe0 100644 --- 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 2461e2671..a1469871b 100644 --- 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 ae5761b2a..c1cb365f1 100644 --- 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 8aef25467..9d6702d02 100644 --- 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 04ea49810..beedf7d0b 100644 --- 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 ec20ad3c0..dbfeca6cd 100644 --- 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 dab7595b2..d763b19f9 100644 --- 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 f8b378a61..b14ce4fb6 100755 --- 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 36512515e..2c3061a70 100644 --- 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 e9d55f1b3..7855eb1d7 100644 --- 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 b7cbcec17..1a4ce33b2 100644 --- 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 352f6891b..5f3a92b91 100644 --- 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 d13f97eda..e4fc94f6f 100644 --- 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 0fdf11f83..976a8cebc 100644 --- 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 25b1fbd3a..386c2968c 100755 --- 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 f2da3aa20..c6b904efa 100755 --- 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 6912b0ce3..4e878250a 100755 --- 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 128236a96..fe3d93043 100755 --- 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 17fe12366..8ea71d836 100755 --- 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 f8f89a730..a2de6b76d 100644 --- 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 50fa26016..04b01d202 100644 --- 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 c01eb176a..02832b493 100644 --- 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 21fa59727..d01cdbdc2 100644 --- 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 e16baaacd..343898e98 100644 --- 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 78e14a42d..6cc4661a4 100644 --- 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 cf44943fd..8ca96f7f0 100644 --- 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 bb0338b86..e8aa18017 100644 --- 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 412f55bc8..cf2a93347 100644 --- 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 36b3e505a..11997e407 100644 --- 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 e693ed9a1..33fa06e22 100644 --- 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 7d2e825d6..6fd907f15 100644 --- 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 fc8f299b6..e3365251d 100644 --- 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 e79f34b2f..8701fb038 100644 --- 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> @@ -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> |