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/02/02 15:28:05 UTC

[15/15] incubator-nifi git commit: Merge branch 'develop' into NIFI-250

Merge branch 'develop' into NIFI-250


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

Branch: refs/heads/NIFI-250
Commit: 13fb1a758b59cd7e205caed694f28b4d0dba9d82
Parents: 22822d3 037f36d
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon Feb 2 09:27:26 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Feb 2 09:27:26 2015 -0500

----------------------------------------------------------------------
 nifi-nar-maven-plugin/pom.xml                   |  2 +-
 nifi/nifi-api/pom.xml                           |  4 +-
 nifi/nifi-assembly/pom.xml                      |  6 +-
 nifi/nifi-bootstrap/pom.xml                     |  2 +-
 .../nifi-data-provenance-utils/pom.xml          |  4 +-
 .../nifi-expression-language/pom.xml            |  4 +-
 .../nifi-commons/nifi-flowfile-packager/pom.xml |  4 +-
 nifi/nifi-commons/nifi-logging-utils/pom.xml    |  4 +-
 .../nifi-processor-utilities/pom.xml            |  4 +-
 nifi/nifi-commons/nifi-properties/pom.xml       |  4 +-
 nifi/nifi-commons/nifi-security-utils/pom.xml   |  4 +-
 nifi/nifi-commons/nifi-socket-utils/pom.xml     |  4 +-
 nifi/nifi-commons/nifi-utils/pom.xml            |  4 +-
 nifi/nifi-commons/nifi-web-utils/pom.xml        |  4 +-
 nifi/nifi-commons/nifi-write-ahead-log/pom.xml  |  4 +-
 nifi/nifi-commons/pom.xml                       |  5 +-
 nifi/nifi-docs/pom.xml                          |  6 +-
 .../nifi-processor-bundle-archetype/pom.xml     |  2 +-
 nifi/nifi-maven-archetypes/pom.xml              |  2 +-
 nifi/nifi-mock/pom.xml                          |  4 +-
 .../nifi-framework-nar/pom.xml                  |  4 +-
 .../nifi-framework/nifi-administration/pom.xml  |  4 +-
 .../nifi-framework/nifi-client-dto/pom.xml      |  2 +-
 .../nifi-cluster-authorization-provider/pom.xml |  2 +-
 .../nifi-cluster-protocol/pom.xml               |  2 +-
 .../nifi-framework/nifi-cluster-web/pom.xml     |  2 +-
 .../nifi-framework/nifi-cluster/pom.xml         |  2 +-
 .../nifi-file-authorization-provider/pom.xml    |  4 +-
 .../nifi-framework-core-api/pom.xml             |  4 +-
 .../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        |  4 +-
 .../nifi-framework/nifi-site-to-site/pom.xml    |  4 +-
 .../nifi-framework/nifi-user-actions/pom.xml    |  4 +-
 .../nifi-web/nifi-custom-ui-utilities/pom.xml   |  2 +-
 .../nifi-framework/nifi-web/nifi-jetty/pom.xml  |  2 +-
 .../nifi-web/nifi-web-api/pom.xml               |  4 +-
 .../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             | 10 +--
 .../nifi-framework/pom.xml                      |  4 +-
 .../nifi-framework-bundle/pom.xml               | 36 +++++------
 .../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml  |  4 +-
 .../nifi-hdfs-processors/pom.xml                |  2 +-
 .../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml |  6 +-
 .../nifi-hadoop-libraries-nar/pom.xml           |  4 +-
 .../nifi-hadoop-libraries-bundle/pom.xml        |  4 +-
 nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml |  4 +-
 .../nifi-kafka-bundle/nifi-kafka-nar/pom.xml    |  4 +-
 .../nifi-kafka-processors/pom.xml               |  2 +-
 nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml |  4 +-
 .../pom.xml                                     |  2 +-
 .../nifi-provenance-repository-nar/pom.xml      |  4 +-
 .../nifi-volatile-provenance-repository/pom.xml |  2 +-
 .../nifi-provenance-repository-bundle/pom.xml   |  8 +--
 .../nifi-standard-nar/pom.xml                   |  4 +-
 .../nifi-standard-prioritizers/pom.xml          |  2 +-
 .../nifi-standard-processors/pom.xml            |  2 +-
 .../nifi-standard-reporting-tasks/pom.xml       |  2 +-
 .../nifi-standard-bundle/pom.xml                | 10 +--
 .../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 |  4 +-
 .../pom.xml                                     |  4 +-
 .../nifi-load-distribution-service-api/pom.xml  |  4 +-
 .../nifi-ssl-context-nar/pom.xml                |  4 +-
 .../nifi-ssl-context-service/pom.xml            |  2 +-
 .../nifi-ssl-context-bundle/pom.xml             |  4 +-
 .../nifi-ssl-context-service-api/pom.xml        |  2 +-
 .../nifi-standard-services-api-nar/pom.xml      |  4 +-
 .../nifi-standard-services/pom.xml              |  4 +-
 .../nifi-update-attribute-model/pom.xml         |  2 +-
 .../nifi-update-attribute-nar/pom.xml           |  4 +-
 .../nifi-update-attribute-processor/pom.xml     |  2 +-
 .../nifi-update-attribute-ui/pom.xml            |  2 +-
 .../nifi-update-attribute-bundle/pom.xml        | 10 +--
 nifi/nifi-nar-bundles/pom.xml                   | 31 +++++-----
 nifi/pom.xml                                    | 64 ++++++++++----------
 85 files changed, 207 insertions(+), 209 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/13fb1a75/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
----------------------------------------------------------------------