From 3326da3972da61bcc644b33c20a07b1efd992b50 Mon Sep 17 00:00:00 2001
From: Brett Porter <brett@apache.org>
Date: Wed, 21 Nov 2007 10:45:25 +0000
Subject: [PATCH] bundle documentation

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@597028 13f79535-47bb-0310-9956-ffa450edef68
---
 archiva-docs/pom.xml                                | 13 ++++++++++++-
 .../archiva-plexus-runtime/pom.xml                  |  6 ++++++
 .../src/main/assembly/bin.xml                       |  9 ++++++++-
 pom.xml                                             |  7 +++++++
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/archiva-docs/pom.xml b/archiva-docs/pom.xml
index e504ddbb5..7e5bad706 100644
--- a/archiva-docs/pom.xml
+++ b/archiva-docs/pom.xml
@@ -31,6 +31,17 @@
 
   <build>
     <plugins>
+      <plugin>
+        <artifactId>maven-site-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>site</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <version>2.1</version>
@@ -41,7 +52,7 @@
           <execution>
             <phase>package</phase>
             <goals>
-              <goal>attached</goal>
+              <goal>single</goal>
             </goals>
           </execution>
         </executions>
diff --git a/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml b/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
index 89a23ac15..8643d8fb0 100644
--- a/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
+++ b/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
@@ -56,6 +56,12 @@
       <artifactId>archiva-plexus-application</artifactId>
       <type>plexus-application</type>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-docs</artifactId>
+      <type>zip</type>
+      <classifier>docs</classifier>
+    </dependency>
 
     <!-- Additional Core Artifacts -->
     <dependency>
diff --git a/archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/assembly/bin.xml b/archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/assembly/bin.xml
index 4cdde2d27..261f3447e 100644
--- a/archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/assembly/bin.xml
+++ b/archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/assembly/bin.xml
@@ -21,7 +21,6 @@
   <id>bin</id>
   <formats>
     <format>tar.gz</format>
-    <format>tar.bz2</format>
     <format>zip</format>
   </formats>
   <fileSets>
@@ -96,5 +95,13 @@
       </includes>
     </fileSet>
   </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <unpack>true</unpack>
+      <includes>
+        <include>org.apache.maven.archiva:archiva-docs:zip:docs</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
 </assembly>
 
diff --git a/pom.xml b/pom.xml
index 40bebca4a..86733f1ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -317,6 +317,13 @@
         <artifactId>archiva-transaction</artifactId>
         <version>${pom.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.maven.archiva</groupId>
+        <artifactId>archiva-docs</artifactId>
+        <version>${pom.version}</version>
+        <type>zip</type>
+        <classifier>docs</classifier>
+      </dependency>
       <dependency>
         <groupId>org.apache.maven.archiva</groupId>
         <artifactId>archiva-webapp</artifactId>
-- 
2.39.5