lining up to a common parent called "archiva" instead, incorparating site, preparing...

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

diff --git a/archiva-base/pom.xml b/archiva-base/pom.xml
index 66890bacae4082857009df0ee2db7faf0ef53c3d..685a52d9531f2bcee35f9de6e20e09742d7efb55 100644 (file)
--- a/archiva-base/pom.xml
+++ b/archiva-base/pom.xml
@@ -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>

diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml
index 99e6da5cf61f4d52796312dbb2ce2c2364ecb532..c4a9ce6053e3d594277f7460ac57bdf4fb6c650c 100644 (file)
--- a/archiva-cli/pom.xml
+++ b/archiva-cli/pom.xml
@@ -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>

diff --git a/archiva-database/pom.xml b/archiva-database/pom.xml
index 45d355bc0e12b3ff1b5622c8645cf5eef435f5e8..3bbd671a16ca67cbd44881516889dcdfe1b971c2 100755 (executable)
--- a/archiva-database/pom.xml
+++ b/archiva-database/pom.xml
@@ -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>

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

diff --git a/archiva-scheduled/pom.xml b/archiva-scheduled/pom.xml
index c915ca85f9d601c6b53f8a07e3eb591fd845d70a..9b0c5b4167514aff2fe627bf14ac1833e0929deb 100644 (file)
--- a/archiva-scheduled/pom.xml
+++ b/archiva-scheduled/pom.xml
@@ -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>

diff --git a/archiva-site/pom.xml b/archiva-site/pom.xml
index 82a3c1e7283003939ead30569458b15051186579..0e0bb1e0fd9840eccdc9b6199cd4baa09a860aa3 100644 (file)
--- a/archiva-site/pom.xml
+++ b/archiva-site/pom.xml
@@ -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>

diff --git a/archiva-web/pom.xml b/archiva-web/pom.xml
index ac3d16a14483ac7f676b83b619b51098881bd812..3d35db5e68cba53a105bf9487a01b7dfa9812554 100644 (file)
--- a/archiva-web/pom.xml
+++ b/archiva-web/pom.xml
@@ -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>

diff --git a/maven-meeper/pom.xml b/maven-meeper/pom.xml
index c8a42678225e6d3d71836ab61629a760431d9a6b..1657faaa29a61e5e6edd6dc074670cd8a7dd858b 100644 (file)
--- a/maven-meeper/pom.xml
+++ b/maven-meeper/pom.xml
@@ -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>

diff --git a/pom.xml b/pom.xml
index 1301316a5026765d6bdd6c72c20f7590370346c7..3029e1ecae9691e4a5355debf7505642501f94fb 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -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>

diff --git a/tools/pom.xml b/tools/pom.xml
index 3896ba82bf6f967a79aa6aad365b606561e1e7eb..e2f4ee2d42877f730c18bb5dc93e1c31f217977f 100644 (file)
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -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>