You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2014/12/22 12:59:27 UTC
[15/31] incubator-nifi git commit: NIFI-150 fixed error with
inserting license header
NIFI-150 fixed error with inserting license header
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d8507687
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d8507687
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d8507687
Branch: refs/heads/NIFI-182
Commit: d850768765c5012d09134a042eed2d71beb28c45
Parents: 4031bd5
Author: joewitt <jo...@apache.org>
Authored: Fri Dec 19 15:32:55 2014 -0500
Committer: joewitt <jo...@apache.org>
Committed: Fri Dec 19 15:32:55 2014 -0500
----------------------------------------------------------------------
nifi-docs/pom.xml | 57 ++++++++++++++++++++++++++++++++++----------------
1 file changed, 39 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d8507687/nifi-docs/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-docs/pom.xml b/nifi-docs/pom.xml
index bfa9e44..979f1f8 100644
--- a/nifi-docs/pom.xml
+++ b/nifi-docs/pom.xml
@@ -13,6 +13,27 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-asciidoc</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+ <directory>src/main/asciidoc</directory>
+ </resource>
+ </resources>
+ <outputDirectory>${project.build.directory}/asciidoc</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
@@ -20,13 +41,14 @@
<executions>
<execution>
<id>output-html</id>
- <phase>generate-resources</phase>
+ <phase>prepare-package</phase>
<goals>
<goal>process-asciidoc</goal>
</goals>
</execution>
</executions>
<configuration>
+ <sourceDirectory>${project.build.directory}/asciidoc</sourceDirectory>
<backend>html</backend>
<attributes>
<skipFrontMatter>true</skipFrontMatter>
@@ -42,15 +64,14 @@
<version>1.5.3</version>
<executions>
<execution>
- <phase>prepare-package</phase>
+ <phase>package</phase>
<goals>
<goal>replace</goal>
</goals>
</execution>
</executions>
<configuration>
- <ignoreErrors>true</ignoreErrors>
- <file>target/generated-docs/nifi-user-guide.html</file>
+ <file>${project.build.directory}/generated-docs/nifi-user-guide.html</file>
<regex>true</regex>
<regexFlags>
<regexFlag>DOTALL</regexFlag>
@@ -59,22 +80,22 @@
<token>^(.*)$</token>
<value>
<!--
- 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
+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
+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.
- -->
- $1
+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.
+-->
+$1
</value>
</configuration>
</plugin>