You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by tk...@apache.org on 2016/02/17 02:14:30 UTC

[7/7] nifi git commit: Merge branch 'NIFI-1379-RC3'

Merge branch 'NIFI-1379-RC3'


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

Branch: refs/heads/master
Commit: 6c2ba997a098f05bd827612c273e509dbfe37ec6
Parents: e4d0ec7 ad73b5c
Author: Tony Kurc <tr...@gmail.com>
Authored: Tue Feb 16 20:13:41 2016 -0500
Committer: Tony Kurc <tr...@gmail.com>
Committed: Tue Feb 16 20:13:41 2016 -0500

----------------------------------------------------------------------
 nifi-api/pom.xml                                |   2 +-
 nifi-assembly/pom.xml                           |   6 +-
 nifi-bootstrap/pom.xml                          |   2 +-
 nifi-commons/nifi-data-provenance-utils/pom.xml |   2 +-
 nifi-commons/nifi-expression-language/pom.xml   |   2 +-
 nifi-commons/nifi-flowfile-packager/pom.xml     |   2 +-
 nifi-commons/nifi-hl7-query-language/pom.xml    |   2 +-
 nifi-commons/nifi-logging-utils/pom.xml         |   2 +-
 nifi-commons/nifi-processor-utilities/pom.xml   |   2 +-
 nifi-commons/nifi-properties/pom.xml            |   2 +-
 nifi-commons/nifi-security-utils/pom.xml        |   2 +-
 nifi-commons/nifi-site-to-site-client/pom.xml   |   4 +-
 nifi-commons/nifi-socket-utils/pom.xml          |   2 +-
 nifi-commons/nifi-utils/pom.xml                 |   4 +-
 nifi-commons/nifi-web-utils/pom.xml             |   2 +-
 nifi-commons/nifi-write-ahead-log/pom.xml       |   2 +-
 nifi-commons/pom.xml                            |   2 +-
 nifi-docs/pom.xml                               |   2 +-
 .../nifi-nifi-example-nar/pom.xml               |   2 +-
 .../nifi-nifi-example-processors/pom.xml        |   2 +-
 nifi-external/nifi-example-bundle/pom.xml       |   4 +-
 nifi-external/nifi-spark-receiver/pom.xml       |   2 +-
 nifi-external/nifi-storm-spout/pom.xml          |   2 +-
 nifi-external/pom.xml                           |   2 +-
 .../nifi-processor-bundle-archetype/pom.xml     |   2 +-
 .../nifi-service-bundle-archetype/pom.xml       |   2 +-
 nifi-maven-archetypes/pom.xml                   |   2 +-
 nifi-mock/pom.xml                               |   2 +-
 .../nifi-ambari-bundle/nifi-ambari-nar/pom.xml  |   4 +-
 .../nifi-ambari-reporting-task/pom.xml          |   2 +-
 nifi-nar-bundles/nifi-ambari-bundle/pom.xml     |   2 +-
 .../nifi-amqp-bundle/nifi-amqp-nar/pom.xml      |   4 +-
 .../nifi-amqp-processors/pom.xml                |   5 +-
 nifi-nar-bundles/nifi-amqp-bundle/pom.xml       |   6 +-
 .../nifi-avro-bundle/nifi-avro-nar/pom.xml      |   6 +-
 .../nifi-avro-processors/pom.xml                |   2 +-
 nifi-nar-bundles/nifi-avro-bundle/pom.xml       |   4 +-
 .../nifi-aws-bundle/nifi-aws-nar/pom.xml        |   4 +-
 .../nifi-aws-bundle/nifi-aws-processors/pom.xml |   2 +-
 nifi-nar-bundles/nifi-aws-bundle/pom.xml        |   2 +-
 .../nifi-azure-bundle/nifi-azure-nar/pom.xml    |   6 +-
 .../nifi-azure-processors/pom.xml               |   2 +-
 nifi-nar-bundles/nifi-azure-bundle/pom.xml      |   4 +-
 .../nifi-couchbase-nar/pom.xml                  |   6 +-
 .../nifi-couchbase-processors/pom.xml           |   2 +-
 nifi-nar-bundles/nifi-couchbase-bundle/pom.xml  |   4 +-
 .../nifi-elasticsearch-nar/pom.xml              |   6 +-
 .../nifi-elasticsearch-processors/pom.xml       |   6 +-
 .../nifi-elasticsearch-bundle/pom.xml           |   8 +-
 .../nifi-flume-bundle/nifi-flume-nar/pom.xml    |   4 +-
 .../nifi-flume-processors/pom.xml               |   2 +-
 nifi-nar-bundles/nifi-flume-bundle/pom.xml      |   6 +-
 .../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-nar-bundles/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-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-hbase-bundle/nifi-hbase-nar/pom.xml    |   2 +-
 .../nifi-hbase-processors/pom.xml               |   6 +-
 nifi-nar-bundles/nifi-hbase-bundle/pom.xml      |   4 +-
 .../nifi-hl7-bundle/nifi-hl7-nar/pom.xml        |   4 +-
 .../nifi-hl7-bundle/nifi-hl7-processors/pom.xml |   4 +-
 nifi-nar-bundles/nifi-hl7-bundle/pom.xml        |   2 +-
 .../nifi-html-bundle/nifi-html-nar/pom.xml      |   2 +-
 .../nifi-html-processors/pom.xml                |   2 +-
 nifi-nar-bundles/nifi-html-bundle/pom.xml       |   4 +-
 .../nifi-image-bundle/nifi-image-nar/pom.xml    |   8 +-
 .../nifi-image-processors/pom.xml               |   2 +-
 .../nifi-image-bundle/nifi-image-viewer/pom.xml |   2 +-
 nifi-nar-bundles/nifi-image-bundle/pom.xml      |   4 +-
 nifi-nar-bundles/nifi-jetty-bundle/pom.xml      |   2 +-
 .../nifi-kafka-bundle/nifi-kafka-nar/pom.xml    |   2 +-
 .../nifi-kafka-processors/pom.xml               |   4 +-
 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-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-ldap-iaa-providers-nar/pom.xml         |   2 +-
 .../nifi-ldap-iaa-providers/pom.xml             |   2 +-
 .../nifi-ldap-iaa-providers-bundle/pom.xml      |   4 +-
 .../nifi-mongodb-nar/pom.xml                    |   6 +-
 .../nifi-mongodb-processors/pom.xml             |   2 +-
 nifi-nar-bundles/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-riemann-nar/pom.xml                    |   6 +-
 .../nifi-riemann-processors/pom.xml             |   6 +-
 nifi-nar-bundles/nifi-riemann-bundle/pom.xml    |   8 +-
 .../nifi-scripting-nar/pom.xml                  |   2 +-
 .../nifi-scripting-processors/pom.xml           |   5 +-
 nifi-nar-bundles/nifi-scripting-bundle/pom.xml  |   4 +-
 .../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-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            |   2 +-
 .../nifi-standard-reporting-tasks/pom.xml       |   2 +-
 nifi-nar-bundles/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                   |   2 +-
 .../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-hbase-client-service-api/pom.xml       |   2 +-
 .../nifi-hbase_1_1_2-client-service-nar/pom.xml |   6 +-
 .../nifi-hbase_1_1_2-client-service/pom.xml     |   4 +-
 .../pom.xml                                     |   4 +-
 .../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      |   2 +-
 nifi-nar-bundles/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-nar-bundles/pom.xml                        |  30 +--
 pom.xml                                         | 203 ++++++++-----------
 174 files changed, 366 insertions(+), 409 deletions(-)
----------------------------------------------------------------------