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/24 23:28:37 UTC
[1/2] incubator-nifi git commit: NIFI-271: - Adding a profile to
disable rat check in development mode.
Repository: incubator-nifi
Updated Branches:
refs/heads/develop d68f71b12 -> 9033173eb
NIFI-271:
- Adding a profile to disable rat check in development mode.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/8fa012c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/8fa012c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/8fa012c2
Branch: refs/heads/develop
Commit: 8fa012c266657c0bfc55d1077b338fe201122594
Parents: dca93a5
Author: Matt Gilman <ma...@gmail.com>
Authored: Fri Apr 24 17:24:33 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Fri Apr 24 17:24:33 2015 -0400
----------------------------------------------------------------------
.../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/8fa012c2/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 d3af86e..bb90ab5 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
@@ -216,6 +216,23 @@
</build>
<profiles>
<profile>
+ <id>dev</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>minify-and-compress</id>
<activation>
<activeByDefault>true</activeByDefault>
[2/2] incubator-nifi git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Posted by mc...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/9033173e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/9033173e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/9033173e
Branch: refs/heads/develop
Commit: 9033173eb3b7f22db81f8e9625f159a021417f33
Parents: 8fa012c d68f71b
Author: Matt Gilman <ma...@gmail.com>
Authored: Fri Apr 24 17:28:15 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Fri Apr 24 17:28:15 2015 -0400
----------------------------------------------------------------------
nifi/nifi-external/nifi-spark-receiver/pom.xml | 22 +-
.../org/apache/nifi/spark/NiFiDataPacket.java | 23 +-
.../org/apache/nifi/spark/NiFiReceiver.java | 236 ++++++++++---------
3 files changed, 145 insertions(+), 136 deletions(-)
----------------------------------------------------------------------