Author: brett
Date: Wed Nov 21 02:45:25 2007
New Revision: 597028
URL: http://svn.apache.org/viewvc?rev=597028&view=rev
Log:
bundle documentation
Modified:
maven/archiva/trunk/archiva-docs/pom.xml
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/assembly/bin.xml
maven/archiva/trunk/pom.xml
Modified: maven/archiva/trunk/archiva-docs/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-docs/pom.xml?rev=597028&r1=597027&r2=597028&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-docs/pom.xml (original)
+++ maven/archiva/trunk/archiva-docs/pom.xml Wed Nov 21 02:45:25 2007
@@ -32,6 +32,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>
<configuration>
@@ -41,7 +52,7 @@
<execution>
<phase>package</phase>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
</execution>
</executions>
Modified:
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml?rev=597028&r1=597027&r2=597028&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
(original)
+++
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
Wed Nov 21 02:45:25 2007
@@ -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>
Modified:
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/assembly/bin.xml?rev=597028&r1=597027&r2=597028&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/assembly/bin.xml
(original)
+++
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/assembly/bin.xml
Wed Nov 21 02:45:25 2007
@@ -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>
Modified: maven/archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/pom.xml?rev=597028&r1=597027&r2=597028&view=diff
==============================================================================
--- maven/archiva/trunk/pom.xml (original)
+++ maven/archiva/trunk/pom.xml Wed Nov 21 02:45:25 2007
@@ -319,6 +319,13 @@
</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>
<version>${pom.version}</version>
<type>war</type>
