Author: ctubbsii
Date: Tue Jun 4 22:14:36 2013
New Revision: 1489654
URL: http://svn.apache.org/r1489654
Log:
ACCUMULO-935 fix missing pdf from assembly
Modified:
accumulo/trunk/assemble/pom.xml
accumulo/trunk/assemble/src/main/assemblies/component.xml
accumulo/trunk/docs/pom.xml
accumulo/trunk/pom.xml
Modified: accumulo/trunk/assemble/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1489654&r1=1489653&r2=1489654&view=diff
==============================================================================
--- accumulo/trunk/assemble/pom.xml (original)
+++ accumulo/trunk/assemble/pom.xml Tue Jun 4 22:14:36 2013
@@ -651,5 +651,16 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>docs</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-docs</artifactId>
+ <classifier>user-manual</classifier>
+ <type>pdf</type>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
Modified: accumulo/trunk/assemble/src/main/assemblies/component.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/assemble/src/main/assemblies/component.xml?rev=1489654&r1=1489653&r2=1489654&view=diff
==============================================================================
--- accumulo/trunk/assemble/src/main/assemblies/component.xml (original)
+++ accumulo/trunk/assemble/src/main/assemblies/component.xml Tue Jun 4
22:14:36 2013
@@ -24,7 +24,6 @@
<fileMode>0644</fileMode>
<useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
<useTransitiveDependencies>false</useTransitiveDependencies>
<includes>
<include>${groupId}:${artifactId}-*</include>
@@ -35,6 +34,20 @@
<include>jline:jline</include>
<include>org.apache.thrift:libthrift</include>
</includes>
+ <excludes>
+ <exclude>${groupId}:${artifactId}-docs</exclude>
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>docs</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ <useProjectArtifact>false</useProjectArtifact>
+
<outputFileNameMapping>${artifactId}_user_manual.${artifact.extension}</outputFileNameMapping>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <includes>
+ <include>${groupId}:${artifactId}-docs</include>
+ </includes>
</dependencySet>
</dependencySets>
<fileSets>
@@ -71,7 +84,7 @@
</excludes>
</fileSet>
<fileSet>
- <directory>../lib/ext</directory>
+ <directory>./</directory>
<outputDirectory>/lib/ext</outputDirectory>
<directoryMode>0755</directoryMode>
<excludes>
@@ -79,7 +92,7 @@
</excludes>
</fileSet>
<fileSet>
- <directory>../logs</directory>
+ <directory>./</directory>
<outputDirectory>/logs</outputDirectory>
<directoryMode>0700</directoryMode>
<excludes>
@@ -90,9 +103,10 @@
<directory>../docs</directory>
<directoryMode>0755</directoryMode>
<fileMode>0644</fileMode>
- <excludes>
- <exclude>src/**</exclude>
- </excludes>
+ <includes>
+ <include>*.html</include>
+ <include>examples/*</include>
+ </includes>
</fileSet>
<fileSet>
<directory>../conf</directory>
Modified: accumulo/trunk/docs/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/docs/pom.xml?rev=1489654&r1=1489653&r2=1489654&view=diff
==============================================================================
--- accumulo/trunk/docs/pom.xml (original)
+++ accumulo/trunk/docs/pom.xml Tue Jun 4 22:14:36 2013
@@ -85,6 +85,27 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-user-manual-pdf</id>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+
<file>${project.build.directory}/accumulo_user_manual.pdf</file>
+ <type>pdf</type>
+ <classifier>user-manual</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
Modified: accumulo/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1489654&r1=1489653&r2=1489654&view=diff
==============================================================================
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Tue Jun 4 22:14:36 2013
@@ -211,6 +211,13 @@
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-docs</artifactId>
+ <version>${project.version}</version>
+ <classifier>user-manual</classifier>
+ <type>pdf</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-examples-simple</artifactId>
<version>${project.version}</version>
</dependency>
