nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From joew...@apache.org
Subject incubator-nifi git commit: NIFI-150 updated replace text plugin to avoid double addition of license header
Date Fri, 19 Dec 2014 18:22:54 GMT
Repository: incubator-nifi
Updated Branches:
  refs/heads/NIFI-USER-GUIDE d8911e75e -> 782b2c188


NIFI-150 updated replace text plugin to avoid double addition of 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/782b2c18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/782b2c18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/782b2c18

Branch: refs/heads/NIFI-USER-GUIDE
Commit: 782b2c18820b34a7f9ed1bb8df41dacaa928425e
Parents: d8911e7
Author: joewitt <joewitt@apache.org>
Authored: Fri Dec 19 13:22:39 2014 -0500
Committer: joewitt <joewitt@apache.org>
Committed: Fri Dec 19 13:22:39 2014 -0500

----------------------------------------------------------------------
 nifi-docs/pom.xml | 121 +++++++++++++++++++++++++------------------------
 1 file changed, 62 insertions(+), 59 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/782b2c18/nifi-docs/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-docs/pom.xml b/nifi-docs/pom.xml
index a8a546a..79ae0ac 100644
--- a/nifi-docs/pom.xml
+++ b/nifi-docs/pom.xml
@@ -1,60 +1,63 @@
 <?xml version="1.0"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.nifi</groupId>
-    <artifactId>nifi-parent</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-  </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.nifi</groupId>
+        <artifactId>nifi-parent</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
 
-  <artifactId>nifi-docs</artifactId>
+    <artifactId>nifi-docs</artifactId>
 
-  <name>nifi-docs</name>
+    <name>nifi-docs</name>
   
-  <build>
-	<plugins>
-		<plugin>
-			<groupId>org.asciidoctor</groupId>
-			<artifactId>asciidoctor-maven-plugin</artifactId>
-			<version>1.5.0</version>
-			<executions>
-				<execution>
-					<id>output-html</id>
-					<phase>generate-resources</phase>
-					<goals>
-						<goal>process-asciidoc</goal>
-					</goals>
-				</execution>
-			</executions>
-			<configuration>
-				<backend>html</backend>
-				<attributes>
-					<skipFrontMatter>true</skipFrontMatter>
-				</attributes>
-			</configuration>
-		</plugin>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.asciidoctor</groupId>
+                <artifactId>asciidoctor-maven-plugin</artifactId>
+                <version>1.5.0</version>
+                <executions>
+                    <execution>
+                        <id>output-html</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>process-asciidoc</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <backend>html</backend>
+                    <attributes>
+                        <skipFrontMatter>true</skipFrontMatter>
+                    </attributes>
+                </configuration>
+            </plugin>
 		
-		<!-- This plugin is used to insert the Apache License into the output HMTL because
-		     AsciiDoc doesn't appear to provide a mechanism for doing this. -->
-		<plugin>
-            <groupId>com.google.code.maven-replacer-plugin</groupId>
-            <artifactId>replacer</artifactId>
-            <version>1.5.3</version>
-            <executions>
-                <execution>
-                    <phase>prepare-package</phase>
-                    <goals>
-                        <goal>replace</goal>
-                    </goals>
-                </execution>
-            </executions>
-            <configuration>
-                <file>target/generated-docs/nifi-user-guide.html</file>
-                <regexFlags>
-                	<regexFlag>DOTALL</regexFlag>
-                </regexFlags>
-                <token>(.*)</token>
-                <value>&lt;!--
+            <!-- This plugin is used to insert the Apache License into the output HMTL
because
+            AsciiDoc doesn't appear to provide a mechanism for doing this. -->
+            <plugin>
+                <groupId>com.google.code.maven-replacer-plugin</groupId>
+                <artifactId>replacer</artifactId>
+                <version>1.5.3</version>
+                <executions>
+                    <execution>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>replace</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <file>target/generated-docs/nifi-user-guide.html</file>
+                    <regex>true</regex>
+                    <regexFlags>
+                        <regexFlag>DOTALL</regexFlag>
+                        <regexFlag>MULTILINE</regexFlag>
+                    </regexFlags>
+                    <token>^(.*)$</token>
+                    <value>
+&lt;!--
 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.
@@ -62,7 +65,7 @@ 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,
@@ -71,12 +74,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 --&gt;
 $1
-				</value>
-            </configuration>
-        </plugin>
-	</plugins>
-  </build>
+                    </value>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
   
-  <dependencies>
-  </dependencies>
+    <dependencies>
+    </dependencies>
 </project>


Mime
View raw message