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 2015/04/23 17:53:20 UTC

[2/3] incubator-nifi git commit: NIFI-271: - If a module has custom rat plugin configuration it overrides the global configuration. Need to copy over any required items.

NIFI-271:
- If a module has custom rat plugin configuration it overrides the global configuration. Need to copy over any required items.

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

Branch: refs/heads/develop
Commit: 7678dd907b209ab4825b08938687602f68e8a1b5
Parents: f547942
Author: Matt Gilman <ma...@gmail.com>
Authored: Thu Apr 23 10:17:24 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Apr 23 10:17:24 2015 -0400

----------------------------------------------------------------------
 .../nifi-framework/nifi-web/nifi-web-ui/pom.xml                     | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7678dd90/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
index eeaeb39..d3af86e 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
@@ -596,6 +596,7 @@
                         <artifactId>apache-rat-plugin</artifactId>
                         <configuration>
                             <excludes>
+                                <exclude>nbactions.xml</exclude>
                                 <exclude>src/main/webapp/js/json2.js</exclude>
                                 <exclude>src/main/webapp/js/jquery/</exclude>
                                 <exclude>src/main/webapp/js/d3/d3.min.js</exclude>