Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nifi
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/5f8fdae9 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/5f8fdae9 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/5f8fdae9 Branch: refs/heads/master Commit: 5f8fdae909ee19d97690841e8677621c8e134074 Parents: 59a49ae 64b1fc9 Author: Mark Payne <[email protected]> Authored: Mon Nov 9 12:07:45 2015 -0500 Committer: Mark Payne <[email protected]> Committed: Mon Nov 9 12:07:45 2015 -0500 ---------------------------------------------------------------------- nifi-api/pom.xml | 2 +- nifi-assembly/NOTICE | 27 ++++ nifi-assembly/pom.xml | 2 +- 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 +- .../src/main/asciidoc/administration-guide.adoc | 6 +- .../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-avro-bundle/nifi-avro-nar/pom.xml | 6 +- .../nifi-avro-processors/pom.xml | 2 +- .../nifi/processors/avro/ConvertAvroToJSON.java | 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/processors/aws/s3/DeleteS3Object.java | 3 +- .../nifi/processors/aws/s3/AbstractS3Test.java | 151 +++++++++++++++++++ .../processors/aws/s3/TestDeleteS3Object.java | 118 ++++++--------- .../processors/aws/s3/TestFetchS3Object.java | 55 +++++-- .../nifi/processors/aws/s3/TestPutS3Object.java | 42 +++--- nifi-nar-bundles/nifi-aws-bundle/pom.xml | 12 +- .../nifi-couchbase-nar/pom.xml | 6 +- .../nifi-couchbase-processors/pom.xml | 2 +- nifi-nar-bundles/nifi-couchbase-bundle/pom.xml | 4 +- .../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 +- .../src/main/resources/META-INF/NOTICE | 32 ++++ .../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-nar-bundles/nifi-hl7-bundle/pom.xml | 2 +- .../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 | 2 +- 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-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-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-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 | 109 ++++++------- 155 files changed, 609 insertions(+), 390 deletions(-) ----------------------------------------------------------------------
