Repository: incubator-nifi Updated Branches: refs/heads/develop d85076876 -> 21182ac26
NIFI-150 updated to ensure docs get built and end up in the assembly under docs. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/21182ac2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/21182ac2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/21182ac2 Branch: refs/heads/develop Commit: 21182ac260f6f40e65d53750804924cf5096370c Parents: d850768 Author: joewitt <[email protected]> Authored: Fri Dec 19 16:34:25 2014 -0500 Committer: joewitt <[email protected]> Committed: Fri Dec 19 16:34:25 2014 -0500 ---------------------------------------------------------------------- assembly/pom.xml | 20 ++++++++++++++++ assembly/src/main/assembly/dependencies.xml | 7 ++++++ nifi-docs/pom.xml | 23 ++++++++++++++++--- nifi-docs/src/main/assembly/dependencies.xml | 28 +++++++++++++++++++++++ pom.xml | 8 +++++++ 5 files changed, 83 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/21182ac2/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index 17cf29b..887086c 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -43,6 +43,19 @@ <excludeTransitive>false</excludeTransitive> </configuration> </execution> + <execution> + <id>unpack-docs</id> + <goals> + <goal>unpack-dependencies</goal> + </goals> + <phase>generate-resources</phase> + <configuration> + <outputDirectory>${project.build.directory}/generated-docs</outputDirectory> + <includeArtifactIds>nifi-docs</includeArtifactIds> + <includeGroupIds>org.apache.nifi</includeGroupIds> + <excludeTransitive>false</excludeTransitive> + </configuration> + </execution> </executions> </plugin> <plugin> @@ -125,6 +138,13 @@ </dependency> <dependency> <groupId>org.apache.nifi</groupId> + <artifactId>nifi-docs</artifactId> + <classifier>resources</classifier> + <scope>provided</scope> <!-- Provided - we don't want the zip in the libs --> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> <artifactId>nifi-framework-nar</artifactId> <type>nar</type> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/21182ac2/assembly/src/main/assembly/dependencies.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/assembly/dependencies.xml b/assembly/src/main/assembly/dependencies.xml index f90127a..13e5b83 100644 --- a/assembly/src/main/assembly/dependencies.xml +++ b/assembly/src/main/assembly/dependencies.xml @@ -81,6 +81,13 @@ <fileMode>0640</fileMode> <filtered>false</filtered> </fileSet> + <fileSet> + <directory>${project.build.directory}/generated-docs/</directory> + <outputDirectory>docs</outputDirectory> + <directoryMode>0750</directoryMode> + <fileMode>0640</fileMode> + <filtered>false</filtered> + </fileSet> </fileSets> <files> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/21182ac2/nifi-docs/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-docs/pom.xml b/nifi-docs/pom.xml index 979f1f8..1979b66 100644 --- a/nifi-docs/pom.xml +++ b/nifi-docs/pom.xml @@ -99,9 +99,26 @@ $1 </value> </configuration> </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <attach>true</attach> + </configuration> + <executions> + <execution> + <id>make shared resource</id> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + <configuration> + <descriptors> + <descriptor>src/main/assembly/dependencies.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> - - <dependencies> - </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/21182ac2/nifi-docs/src/main/assembly/dependencies.xml ---------------------------------------------------------------------- diff --git a/nifi-docs/src/main/assembly/dependencies.xml b/nifi-docs/src/main/assembly/dependencies.xml new file mode 100644 index 0000000..8c41ead --- /dev/null +++ b/nifi-docs/src/main/assembly/dependencies.xml @@ -0,0 +1,28 @@ +<?xml version="1.0"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<assembly> + <id>resources</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>${project.build.directory}/generated-docs</directory> + <outputDirectory>/user-guide/</outputDirectory> + </fileSet> + </fileSets> +</assembly> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/21182ac2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9cccbf4..2ccdaa9 100644 --- a/pom.xml +++ b/pom.xml @@ -710,6 +710,14 @@ </dependency> <dependency> <groupId>org.apache.nifi</groupId> + <artifactId>nifi-docs</artifactId> + <version>${project.version}</version> + <classifier>resources</classifier> + <scope>provided</scope> <!-- Provided - we don't want the zip in the libs --> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> <artifactId>nifi-framework-nar</artifactId> <version>${project.version}</version> <type>nar</type>
