You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2007/11/11 14:14:21 UTC
svn commit: r593879 - in /maven/archiva/trunk: archiva-base/pom.xml
archiva-cli/pom.xml archiva-database/pom.xml archiva-reporting/pom.xml
archiva-scheduled/pom.xml archiva-site/pom.xml archiva-web/pom.xml
maven-meeper/pom.xml pom.xml tools/pom.xml
Author: brett
Date: Sun Nov 11 05:14:20 2007
New Revision: 593879
URL: http://svn.apache.org/viewvc?rev=593879&view=rev
Log:
lining up to a common parent called "archiva" instead, incorparating site, preparing for a shared product parent
Modified:
maven/archiva/trunk/archiva-base/pom.xml
maven/archiva/trunk/archiva-cli/pom.xml
maven/archiva/trunk/archiva-database/pom.xml
maven/archiva/trunk/archiva-reporting/pom.xml
maven/archiva/trunk/archiva-scheduled/pom.xml
maven/archiva/trunk/archiva-site/pom.xml
maven/archiva/trunk/archiva-web/pom.xml
maven/archiva/trunk/maven-meeper/pom.xml
maven/archiva/trunk/pom.xml
maven/archiva/trunk/tools/pom.xml
Modified: maven/archiva/trunk/archiva-base/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/pom.xml?rev=593879&r1=593878&r2=593879&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/pom.xml (original)
+++ maven/archiva/trunk/archiva-base/pom.xml Sun Nov 11 05:14:20 2007
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.archiva</groupId>
- <artifactId>archiva-parent</artifactId>
+ <artifactId>archiva</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: maven/archiva/trunk/archiva-cli/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-cli/pom.xml?rev=593879&r1=593878&r2=593879&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-cli/pom.xml (original)
+++ maven/archiva/trunk/archiva-cli/pom.xml Sun Nov 11 05:14:20 2007
@@ -21,7 +21,7 @@
<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>
<groupId>org.apache.maven.archiva</groupId>
- <artifactId>archiva-parent</artifactId>
+ <artifactId>archiva</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: maven/archiva/trunk/archiva-database/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-database/pom.xml?rev=593879&r1=593878&r2=593879&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-database/pom.xml (original)
+++ maven/archiva/trunk/archiva-database/pom.xml Sun Nov 11 05:14:20 2007
@@ -21,7 +21,7 @@
<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>
<groupId>org.apache.maven.archiva</groupId>
- <artifactId>archiva-parent</artifactId>
+ <artifactId>archiva</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: maven/archiva/trunk/archiva-reporting/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reporting/pom.xml?rev=593879&r1=593878&r2=593879&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-reporting/pom.xml (original)
+++ maven/archiva/trunk/archiva-reporting/pom.xml Sun Nov 11 05:14:20 2007
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.archiva</groupId>
- <artifactId>archiva-parent</artifactId>
+ <artifactId>archiva</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: maven/archiva/trunk/archiva-scheduled/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-scheduled/pom.xml?rev=593879&r1=593878&r2=593879&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-scheduled/pom.xml (original)
+++ maven/archiva/trunk/archiva-scheduled/pom.xml Sun Nov 11 05:14:20 2007
@@ -21,7 +21,7 @@
<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>
<groupId>org.apache.maven.archiva</groupId>
- <artifactId>archiva-parent</artifactId>
+ <artifactId>archiva</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: maven/archiva/trunk/archiva-site/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-site/pom.xml?rev=593879&r1=593878&r2=593879&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-site/pom.xml (original)
+++ maven/archiva/trunk/archiva-site/pom.xml Sun Nov 11 05:14:20 2007
@@ -20,13 +20,13 @@
<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>
<groupId>org.apache.maven.archiva</groupId>
- <artifactId>archiva-parent</artifactId>
- <version>1.0-beta-3-SNAPSHOT</version>
+ <artifactId>archiva</artifactId>
+ <version>1.0-beta-4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>archiva-site</artifactId>
<packaging>pom</packaging>
- <name>Archiva Site</name>
+ <name>Archiva Documentation</name>
<reporting>
<excludeDefaults>true</excludeDefaults>
@@ -34,12 +34,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1</version>
<reportSets>
<reportSet>
<reports>
- <report>cim</report>
- <report>issue-tracking</report>
- <report>mailing-list</report>
<report>license</report>
<report>project-team</report>
<report>scm</report>
@@ -49,7 +47,7 @@
</plugin>
</plugins>
</reporting>
- <!-- repeated here so that maven-site is not appended -->
+ <!-- prevent automatic artifactId appending -->
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/archiva/trunk/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/archiva/trunk/</developerConnection>
@@ -59,53 +57,8 @@
<distributionManagement>
<site>
<id>apache.website</id>
- <url>scp://people.apache.org/www/maven.apache.org/archiva</url>
+ <!-- prevent automatic artifactId appending -->
+ <url>scp://people.apache.org/www/maven.apache.org/archiva/docs/${project.version}</url>
</site>
</distributionManagement>
-
- <mailingLists>
- <mailingList>
- <name>Maven Archiva User List</name>
- <subscribe>archiva-users-subscribe@maven.apache.org</subscribe>
- <unsubscribe>archiva-users-unsubscribe@maven.apache.org</unsubscribe>
- <post>archiva-users@maven.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/maven-archiva-users</archive>
- </mailingList>
- <mailingList>
- <name>Maven Archiva Developer List</name>
- <subscribe>archiva-dev-subscribe@maven.apache.org</subscribe>
- <unsubscribe>archiva-dev-unsubscribe@maven.apache.org</unsubscribe>
- <post>archiva-dev@maven.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/maven-archiva-dev</archive>
- </mailingList>
- <mailingList>
- <name>Maven Archiva Commits List</name>
- <subscribe>archiva-commits-subscribe@maven.apache.org</subscribe>
- <unsubscribe>archiva-commits-unsubscribe@maven.apache.org</unsubscribe>
- <post>archiva-commits@maven.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/maven-archiva-commits</archive>
- </mailingList>
- <!-- duplication from parent pom - temporary until they inherit properly -->
- <mailingList>
- <name>Maven Announcements List</name>
- <post>announce@maven.apache.org</post>
- <subscribe>announce-subscribe@maven.apache.org</subscribe>
- <unsubscribe>announce-unsubscribe@maven.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/maven-announce/</archive>
- </mailingList>
- <mailingList>
- <name>Maven Issues List</name>
- <post>issues@maven.apache.org</post>
- <subscribe>issues-subscribe@maven.apache.org</subscribe>
- <unsubscribe>issues-unsubscribe@maven.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/maven-issues/</archive>
- </mailingList>
- <mailingList>
- <name>Maven Notifications List</name>
- <post>notifications@maven.apache.org</post>
- <subscribe>notifications-subscribe@maven.apache.org</subscribe>
- <unsubscribe>notifications-unsubscribe@maven.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/maven-notifications/</archive>
- </mailingList>
- </mailingLists>
</project>
Modified: maven/archiva/trunk/archiva-web/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/pom.xml?rev=593879&r1=593878&r2=593879&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/pom.xml (original)
+++ maven/archiva/trunk/archiva-web/pom.xml Sun Nov 11 05:14:20 2007
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.archiva</groupId>
- <artifactId>archiva-parent</artifactId>
+ <artifactId>archiva</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: maven/archiva/trunk/maven-meeper/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/pom.xml?rev=593879&r1=593878&r2=593879&view=diff
==============================================================================
--- maven/archiva/trunk/maven-meeper/pom.xml (original)
+++ maven/archiva/trunk/maven-meeper/pom.xml Sun Nov 11 05:14:20 2007
@@ -19,8 +19,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.archiva</groupId>
- <artifactId>archiva-parent</artifactId>
- <version>1.0-alpha-3-SNAPSHOT</version>
+ <artifactId>archiva</artifactId>
+ <version>1.0-alpha-4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-meeper</artifactId>
Modified: maven/archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/pom.xml?rev=593879&r1=593878&r2=593879&view=diff
==============================================================================
--- maven/archiva/trunk/pom.xml (original)
+++ maven/archiva/trunk/pom.xml Sun Nov 11 05:14:20 2007
@@ -21,17 +21,33 @@
<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">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
<version>5</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
- <groupId>org.apache.maven.archiva</groupId>
- <artifactId>archiva-parent</artifactId>
- <packaging>pom</packaging>
+ <!-- TODO: once agreed/released, put this in place
+ <parent>
+ <groupId>org.apache.maven.archiva</groupId>
+ <artifactId>archiva-parent</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath>../archiva-parent/pom.xml</relativePath>
+ </parent>
+-->
<name>Archiva</name>
+ <artifactId>archiva</artifactId>
+ <packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/archiva/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/archiva/trunk</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/maven/archiva/trunk</url>
+ </scm>
+
+ <!-- TODO: remove below when archiva parent in place -->
+ <groupId>org.apache.maven.archiva</groupId>
<description>
Archiva is an application for managing one or more remote
repositories, including administration, artifact handling,
@@ -65,21 +81,6 @@
<archive>http://mail-archives.apache.org/mod_mbox/maven-archiva-commits</archive>
</mailingList>
</mailingLists>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/archiva/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/archiva/trunk</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/maven/archiva/trunk</url>
- </scm>
- <distributionManagement>
- <repository>
- <id>apache.releases</id>
- <url>scpexe://people.apache.org/www/people.apache.org/builds/maven/archiva/${version}/m2-staging-repository</url>
- </repository>
- <site>
- <id>apache.website</id>
- <url>scpexe://people.apache.org/www/maven.apache.org/archiva/ref/${project.version}</url>
- </site>
- </distributionManagement>
<build>
<plugins>
<plugin>
@@ -180,8 +181,7 @@
<module>archiva-scheduled</module>
<module>archiva-web</module>
<module>archiva-cli</module>
- <!-- <module>archiva-site</module> -->
- <!-- <module>maven-meeper</module> -->
+ <module>archiva-site</module>
</modules>
<dependencies>
<dependency>
@@ -862,6 +862,12 @@
</plugin>
</plugins>
</build>
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>scpexe://people.apache.org/www/maven.apache.org/archiva/reports/</url>
+ </site>
+ </distributionManagement>
</profile>
<profile>
<id>release</id>
@@ -903,14 +909,14 @@
<wagon.version>1.0-beta-2</wagon.version>
<redback.version>1.0-alpha-4</redback.version>
</properties>
- <!-- for plexus webdav snapshot -->
- <repositories>
+ <distributionManagement>
<repository>
- <id>codehaus.snapshots</id>
- <url>http://snapshots.repository.codehaus.org/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
+ <id>apache.releases</id>
+ <url>scpexe://people.apache.org/www/people.apache.org/builds/maven/archiva/${version}/m2-staging-repository</url>
</repository>
- </repositories>
+ <site>
+ <id>apache.website</id>
+ <url>scpexe://people.apache.org/www/maven.apache.org/archiva/docs/${project.version}</url>
+ </site>
+ </distributionManagement>
</project>
Modified: maven/archiva/trunk/tools/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/tools/pom.xml?rev=593879&r1=593878&r2=593879&view=diff
==============================================================================
--- maven/archiva/trunk/tools/pom.xml (original)
+++ maven/archiva/trunk/tools/pom.xml Sun Nov 11 05:14:20 2007
@@ -20,8 +20,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.archiva</groupId>
- <artifactId>archiva-parent</artifactId>
- <version>1.0-alpha-1-SNAPSHOT</version>
+ <artifactId>archiva</artifactId>
+ <version>1.0-beta-4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>