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:26 UTC

[14/31] incubator-nifi git commit: NIFI-150 fixed error with inserting license header - still need to figure out the license header addition

NIFI-150 fixed error with inserting license header - still need to figure out the license header addition


Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/4031bd54
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/4031bd54
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/4031bd54

Branch: refs/heads/NIFI-182
Commit: 4031bd5495bd9ac62a3c3d8da2d3e9083d59fdfa
Parents: b0a5115
Author: joewitt <jo...@apache.org>
Authored: Fri Dec 19 14:57:13 2014 -0500
Committer: joewitt <jo...@apache.org>
Committed: Fri Dec 19 14:57:13 2014 -0500

----------------------------------------------------------------------
 nifi-docs/pom.xml | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4031bd54/nifi-docs/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-docs/pom.xml b/nifi-docs/pom.xml
index 79ae0ac..bfa9e44 100644
--- a/nifi-docs/pom.xml
+++ b/nifi-docs/pom.xml
@@ -49,6 +49,7 @@
                     </execution>
                 </executions>
                 <configuration>
+                    <ignoreErrors>true</ignoreErrors>
                     <file>target/generated-docs/nifi-user-guide.html</file>
                     <regex>true</regex>
                     <regexFlags>
@@ -58,22 +59,22 @@
                     <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.
-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.
---&gt;
-$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.
+                        --&gt;
+                        $1
                     </value>
                 </configuration>
             </plugin>