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/07/16 16:55:31 UTC
[5/5] incubator-nifi git commit: Merge branch
'release-nifi-0.2.0-incubating-rc1' into develop
Merge branch 'release-nifi-0.2.0-incubating-rc1' 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/5662436b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/5662436b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/5662436b
Branch: refs/heads/develop
Commit: 5662436b9f6a7f4403f55e7ffd81b6d26ca3cb7c
Parents: 0034462 de8ec6f
Author: Matt Gilman <ma...@gmail.com>
Authored: Thu Jul 16 10:48:42 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Jul 16 10:48:42 2015 -0400
----------------------------------------------------------------------
nifi/nifi-api/pom.xml | 2 +-
nifi/nifi-assembly/pom.xml | 12 +-
nifi/nifi-bootstrap/pom.xml | 2 +-
.../nifi-data-provenance-utils/pom.xml | 2 +-
.../nifi-expression-language/pom.xml | 2 +-
.../nifi-commons/nifi-flowfile-packager/pom.xml | 2 +-
.../nifi-hl7-query-language/pom.xml | 2 +-
nifi/nifi-commons/nifi-logging-utils/pom.xml | 2 +-
.../nifi-processor-utilities/pom.xml | 2 +-
nifi/nifi-commons/nifi-properties/pom.xml | 2 +-
nifi/nifi-commons/nifi-security-utils/pom.xml | 2 +-
.../nifi-site-to-site-client/pom.xml | 4 +-
nifi/nifi-commons/nifi-socket-utils/pom.xml | 2 +-
nifi/nifi-commons/nifi-utils/pom.xml | 4 +-
nifi/nifi-commons/nifi-web-utils/pom.xml | 2 +-
nifi/nifi-commons/nifi-write-ahead-log/pom.xml | 2 +-
nifi/nifi-commons/pom.xml | 2 +-
nifi/nifi-docs/pom.xml | 2 +-
.../nifi-nifi-example-nar/pom.xml | 70 +++++-----
.../nifi-nifi-example-processors/pom.xml | 140 +++++++++----------
nifi/nifi-external/nifi-example-bundle/pom.xml | 84 +++++------
nifi/nifi-external/nifi-spark-receiver/pom.xml | 2 +-
nifi/nifi-external/nifi-storm-spout/pom.xml | 2 +-
nifi/nifi-external/pom.xml | 2 +-
.../nifi-processor-bundle-archetype/pom.xml | 2 +-
nifi/nifi-maven-archetypes/pom.xml | 2 +-
nifi/nifi-mock/pom.xml | 2 +-
.../nifi-aws-bundle/nifi-aws-nar/pom.xml | 4 +-
.../nifi-aws-bundle/nifi-aws-processors/pom.xml | 2 +-
nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml | 2 +-
.../nifi-framework-nar/pom.xml | 2 +-
.../nifi-framework/nifi-administration/pom.xml | 2 +-
.../nifi-framework/nifi-client-dto/pom.xml | 2 +-
.../nifi-cluster-authorization-provider/pom.xml | 2 +-
.../nifi-framework/nifi-documentation/pom.xml | 2 +-
.../nifi-file-authorization-provider/pom.xml | 2 +-
.../nifi-framework-cluster-protocol/pom.xml | 2 +-
.../nifi-framework-cluster-web/pom.xml | 2 +-
.../nifi-framework-cluster/pom.xml | 2 +-
.../nifi-framework-core-api/pom.xml | 2 +-
.../nifi-framework/nifi-framework-core/pom.xml | 2 +-
.../nifi-framework/nifi-nar-utils/pom.xml | 2 +-
.../nifi-framework/nifi-resources/pom.xml | 2 +-
.../nifi-framework/nifi-runtime/pom.xml | 2 +-
.../nifi-framework/nifi-security/pom.xml | 2 +-
.../nifi-framework/nifi-site-to-site/pom.xml | 2 +-
.../nifi-framework/nifi-user-actions/pom.xml | 2 +-
.../nifi-web/nifi-custom-ui-utilities/pom.xml | 2 +-
.../nifi-framework/nifi-web/nifi-jetty/pom.xml | 2 +-
.../nifi-web/nifi-ui-extension/pom.xml | 2 +-
.../nifi-web/nifi-web-api/pom.xml | 2 +-
.../nifi-web/nifi-web-content-access/pom.xml | 2 +-
.../nifi-web/nifi-web-content-viewer/pom.xml | 2 +-
.../nifi-web/nifi-web-docs/pom.xml | 2 +-
.../nifi-web/nifi-web-error/pom.xml | 2 +-
.../nifi-web-optimistic-locking/pom.xml | 2 +-
.../nifi-web/nifi-web-security/pom.xml | 2 +-
.../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 2 +-
.../nifi-framework/nifi-web/pom.xml | 12 +-
.../nifi-framework/pom.xml | 2 +-
.../nifi-framework-bundle/pom.xml | 38 ++---
.../nifi-geo-bundle/nifi-geo-nar/pom.xml | 2 +-
.../nifi-geo-bundle/nifi-geo-processors/pom.xml | 2 +-
nifi/nifi-nar-bundles/nifi-geo-bundle/pom.xml | 4 +-
.../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml | 2 +-
.../nifi-hdfs-processors/pom.xml | 2 +-
.../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml | 4 +-
.../nifi-hadoop-libraries-nar/pom.xml | 2 +-
.../nifi-hadoop-libraries-bundle/pom.xml | 2 +-
.../nifi-hl7-bundle/nifi-hl7-nar/pom.xml | 4 +-
.../nifi-hl7-bundle/nifi-hl7-processors/pom.xml | 4 +-
nifi/nifi-nar-bundles/nifi-hl7-bundle/pom.xml | 2 +-
nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml | 2 +-
.../nifi-kafka-bundle/nifi-kafka-nar/pom.xml | 2 +-
.../nifi-kafka-processors/pom.xml | 2 +-
nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 4 +-
.../nifi-kite-bundle/nifi-kite-nar/pom.xml | 2 +-
.../nifi-kite-processors/pom.xml | 2 +-
nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml | 4 +-
.../nifi-language-translation-nar/pom.xml | 4 +-
.../nifi-yandex-processors/pom.xml | 2 +-
.../nifi-language-translation-bundle/pom.xml | 2 +-
.../nifi-mongodb-nar/pom.xml | 6 +-
.../nifi-mongodb-processors/pom.xml | 2 +-
.../nifi-mongodb-bundle/pom.xml | 4 +-
.../pom.xml | 2 +-
.../nifi-provenance-repository-nar/pom.xml | 2 +-
.../nifi-volatile-provenance-repository/pom.xml | 2 +-
.../nifi-provenance-repository-bundle/pom.xml | 6 +-
.../nifi-social-media-nar/pom.xml | 4 +-
.../nifi-twitter-processors/pom.xml | 2 +-
.../nifi-social-media-bundle/pom.xml | 2 +-
.../nifi-solr-bundle/nifi-solr-nar/pom.xml | 4 +-
.../nifi-solr-processors/pom.xml | 2 +-
nifi/nifi-nar-bundles/nifi-solr-bundle/pom.xml | 2 +-
.../nifi-standard-content-viewer/pom.xml | 2 +-
.../nifi-standard-nar/pom.xml | 2 +-
.../nifi-standard-prioritizers/pom.xml | 2 +-
.../nifi-standard-processors/pom.xml | 5 +-
.../nifi-standard-reporting-tasks/pom.xml | 2 +-
.../nifi-standard-bundle/pom.xml | 10 +-
.../nifi-dbcp-service-api/pom.xml | 2 +-
.../nifi-dbcp-service-nar/pom.xml | 4 +-
.../nifi-dbcp-service/pom.xml | 4 +-
.../nifi-dbcp-service-bundle/pom.xml | 2 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
.../nifi-distributed-cache-protocol/pom.xml | 2 +-
.../nifi-distributed-cache-server/pom.xml | 2 +-
.../nifi-distributed-cache-services-nar/pom.xml | 2 +-
.../pom.xml | 2 +-
.../nifi-http-context-map-api/pom.xml | 2 +-
.../nifi-http-context-map-nar/pom.xml | 2 +-
.../nifi-http-context-map/pom.xml | 2 +-
.../nifi-http-context-map-bundle/pom.xml | 2 +-
.../nifi-load-distribution-service-api/pom.xml | 2 +-
.../nifi-ssl-context-nar/pom.xml | 2 +-
.../nifi-ssl-context-service/pom.xml | 2 +-
.../nifi-ssl-context-bundle/pom.xml | 2 +-
.../nifi-ssl-context-service-api/pom.xml | 2 +-
.../nifi-standard-services-api-nar/pom.xml | 4 +-
.../nifi-standard-services/pom.xml | 2 +-
.../nifi-update-attribute-model/pom.xml | 2 +-
.../nifi-update-attribute-nar/pom.xml | 2 +-
.../nifi-update-attribute-processor/pom.xml | 2 +-
.../nifi-update-attribute-ui/pom.xml | 2 +-
.../nifi-update-attribute-bundle/pom.xml | 8 +-
nifi/nifi-nar-bundles/pom.xml | 30 ++--
nifi/pom.xml | 86 ++++++------
129 files changed, 385 insertions(+), 386 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5662436b/nifi/nifi-assembly/pom.xml
----------------------------------------------------------------------
diff --cc nifi/nifi-assembly/pom.xml
index 0293c70,ddbc80a..473b947
--- a/nifi/nifi-assembly/pom.xml
+++ b/nifi/nifi-assembly/pom.xml
@@@ -169,13 -169,8 +169,13 @@@ language governing permissions and limi
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-flume-nar</artifactId>
+ <type>nar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
<artifactId>nifi-dbcp-service-nar</artifactId>
- <version>0.2.0-incubating-SNAPSHOT</version>
+ <version>0.2.1-incubating-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5662436b/nifi/nifi-nar-bundles/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5662436b/nifi/pom.xml
----------------------------------------------------------------------
diff --cc nifi/pom.xml
index 66a328c,cd5ec9c..eb94719
--- a/nifi/pom.xml
+++ b/nifi/pom.xml
@@@ -808,14 -808,8 +808,14 @@@
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-flume-nar</artifactId>
+ <version>0.2.0-incubating-SNAPSHOT</version>
+ <type>nar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
<artifactId>nifi-properties</artifactId>
- <version>0.2.0-incubating-SNAPSHOT</version>
+ <version>0.2.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>