diff options
| author | Brett Porter <brett@apache.org> | 2007-11-21 10:45:25 +0000 |
|---|---|---|
| committer | Brett Porter <brett@apache.org> | 2007-11-21 10:45:25 +0000 |
| commit | 3326da3972da61bcc644b33c20a07b1efd992b50 (patch) | |
| tree | cf35aecf54a01ea0fa27dbd0ce88ebbf895401b5 | |
| parent | cba73df07ed20fcd115203da94e5f84159790a42 (diff) | |
| download | archiva-3326da3972da61bcc644b33c20a07b1efd992b50.tar.gz archiva-3326da3972da61bcc644b33c20a07b1efd992b50.zip | |
bundle documentation
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@597028 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | archiva-docs/pom.xml | 13 | ||||
| -rw-r--r-- | archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml | 6 | ||||
| -rw-r--r-- | archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/assembly/bin.xml | 9 | ||||
| -rw-r--r-- | 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 @@ -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> 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> @@ -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> |