From 92099ede2ffde8af346b19092977d724442eb33e Mon Sep 17 00:00:00 2001 From: joewitt Date: Fri, 6 Nov 2015 23:20:03 -0500 Subject: [PATCH 1/6] NIFI-1058 --- nifi-docs/src/main/asciidoc/administration-guide.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc b/nifi-docs/src/main/asciidoc/administration-guide.adoc index fb109c99a1..be7b21e27b 100644 --- a/nifi-docs/src/main/asciidoc/administration-guide.adoc +++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc @@ -588,9 +588,9 @@ nifi.provenance.repository.directory.content2=/repos/provenance2 + + Providing three total locations, including _nifi.content.repository.directory.default_. |nifi.content.repository.archive.max.retention.period|If archiving is enabled (see nifi.content.repository.archive.enabled below), then -this property specifies the maximum amount of time to keep the archived data. It is blank by default. -|nifi.content.repository.archive.max.usage.percentage|If archiving is enabled (see nifi.content.repository.archive.enabled below), then this property also must have a value to indicate the maximum percentage of disk space that may be used for archiving. It is blank by default. -|nifi.content.repository.archive.enabled|To enable archiving, set this to _true_ and specify a value for the nifi.content.repository.archive.max.usage.percentage property above. By default, archiving is not enabled. +this property specifies the maximum amount of time to keep the archived data. It is 12 hours by default. +|nifi.content.repository.archive.max.usage.percentage|If archiving is enabled (see nifi.content.repository.archive.enabled below), then this property also must have a value to indicate the maximum percentage of disk space that may be used before archive data is removed. If this value is already met even before archiving then arhival will not be of much use. It is 50% by default. +|nifi.content.repository.archive.enabled|To enable archiving, set this to _true_ and specify a value for the nifi.content.repository.archive.max.usage.percentage property above. By default, archiving is enabled. |nifi.content.repository.always.sync|If set to _true_, any change to the repository will be synchronized to the disk, meaning that NiFi will ask the operating system not to cache the information. This is very expensive and can significantly reduce NiFi performance. However, if it is _false_, there could be the potential for data loss if either there is a sudden power loss or the operating system crashes. The default value is _false_. |nifi.content.viewer.url|The URL for a web-based content viewer if one is available. It is blank by default. |==== From 99629646fe2bf67e814533c4073247a25506c8fa Mon Sep 17 00:00:00 2001 From: joewitt Date: Fri, 6 Nov 2015 23:41:15 -0500 Subject: [PATCH 2/6] NIFI-1122 moved to 0.4.0-SNAPSHOT --- nifi-api/pom.xml | 2 +- nifi-assembly/pom.xml | 2 +- nifi-bootstrap/pom.xml | 2 +- .../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-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-nar-bundles/nifi-avro-bundle/pom.xml | 4 +- .../nifi-aws-bundle/nifi-aws-nar/pom.xml | 4 +- .../nifi-aws-processors/pom.xml | 2 +- nifi-nar-bundles/nifi-aws-bundle/pom.xml | 2 +- .../nifi-couchbase-nar/pom.xml | 6 +- .../nifi-couchbase-processors/pom.xml | 2 +- .../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-administration/pom.xml | 2 +- .../nifi-framework/nifi-client-dto/pom.xml | 2 +- .../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-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-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-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-processors/pom.xml | 2 +- nifi-nar-bundles/nifi-geo-bundle/pom.xml | 4 +- .../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-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-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 +- .../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 +- .../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 +- .../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-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 | 100 +++++++++--------- 146 files changed, 272 insertions(+), 272 deletions(-) diff --git a/nifi-api/pom.xml b/nifi-api/pom.xml index 349f8ab2eb..ae31ed5912 100644 --- a/nifi-api/pom.xml +++ b/nifi-api/pom.xml @@ -18,7 +18,7 @@ org.apache.nifi nifi - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-api jar diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml index de4fdcb4e5..e80c2d5092 100644 --- a/nifi-assembly/pom.xml +++ b/nifi-assembly/pom.xml @@ -14,7 +14,7 @@ language governing permissions and limitations under the License. --> org.apache.nifi nifi - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-assembly pom diff --git a/nifi-bootstrap/pom.xml b/nifi-bootstrap/pom.xml index 96032af10a..26494b80ee 100644 --- a/nifi-bootstrap/pom.xml +++ b/nifi-bootstrap/pom.xml @@ -14,7 +14,7 @@ org.apache.nifi nifi - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-bootstrap jar diff --git a/nifi-commons/nifi-data-provenance-utils/pom.xml b/nifi-commons/nifi-data-provenance-utils/pom.xml index 3aa4f36ccf..bc8009a0c5 100644 --- a/nifi-commons/nifi-data-provenance-utils/pom.xml +++ b/nifi-commons/nifi-data-provenance-utils/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi nifi-commons - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-data-provenance-utils jar diff --git a/nifi-commons/nifi-expression-language/pom.xml b/nifi-commons/nifi-expression-language/pom.xml index c940a73e70..2dc8839022 100644 --- a/nifi-commons/nifi-expression-language/pom.xml +++ b/nifi-commons/nifi-expression-language/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi nifi-commons - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-expression-language jar diff --git a/nifi-commons/nifi-flowfile-packager/pom.xml b/nifi-commons/nifi-flowfile-packager/pom.xml index a84a8ec02f..54ba577c0c 100644 --- a/nifi-commons/nifi-flowfile-packager/pom.xml +++ b/nifi-commons/nifi-flowfile-packager/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi nifi-commons - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-flowfile-packager jar diff --git a/nifi-commons/nifi-hl7-query-language/pom.xml b/nifi-commons/nifi-hl7-query-language/pom.xml index ae5d968a8f..492ee138f2 100644 --- a/nifi-commons/nifi-hl7-query-language/pom.xml +++ b/nifi-commons/nifi-hl7-query-language/pom.xml @@ -19,7 +19,7 @@ org.apache.nifi nifi-commons - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-hl7-query-language diff --git a/nifi-commons/nifi-logging-utils/pom.xml b/nifi-commons/nifi-logging-utils/pom.xml index 0e94f65360..8561cdf2e7 100644 --- a/nifi-commons/nifi-logging-utils/pom.xml +++ b/nifi-commons/nifi-logging-utils/pom.xml @@ -18,7 +18,7 @@ org.apache.nifi nifi-commons - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-logging-utils Utilities for logging diff --git a/nifi-commons/nifi-processor-utilities/pom.xml b/nifi-commons/nifi-processor-utilities/pom.xml index 8f62b64830..02397717e2 100644 --- a/nifi-commons/nifi-processor-utilities/pom.xml +++ b/nifi-commons/nifi-processor-utilities/pom.xml @@ -18,7 +18,7 @@ org.apache.nifi nifi-commons - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-processor-utils jar diff --git a/nifi-commons/nifi-properties/pom.xml b/nifi-commons/nifi-properties/pom.xml index 65b5b71faa..95c93918a1 100644 --- a/nifi-commons/nifi-properties/pom.xml +++ b/nifi-commons/nifi-properties/pom.xml @@ -18,7 +18,7 @@ org.apache.nifi nifi-commons - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-properties diff --git a/nifi-commons/nifi-security-utils/pom.xml b/nifi-commons/nifi-security-utils/pom.xml index adbbbd0961..75be1c2b6e 100644 --- a/nifi-commons/nifi-security-utils/pom.xml +++ b/nifi-commons/nifi-security-utils/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi nifi-commons - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-security-utils Contains security functionality. diff --git a/nifi-commons/nifi-site-to-site-client/pom.xml b/nifi-commons/nifi-site-to-site-client/pom.xml index c08786df93..3d6ad25e56 100644 --- a/nifi-commons/nifi-site-to-site-client/pom.xml +++ b/nifi-commons/nifi-site-to-site-client/pom.xml @@ -19,7 +19,7 @@ org.apache.nifi nifi-commons - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-site-to-site-client @@ -42,7 +42,7 @@ org.apache.nifi nifi-client-dto - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT diff --git a/nifi-commons/nifi-socket-utils/pom.xml b/nifi-commons/nifi-socket-utils/pom.xml index cff5c31cc1..72467f9b44 100644 --- a/nifi-commons/nifi-socket-utils/pom.xml +++ b/nifi-commons/nifi-socket-utils/pom.xml @@ -18,7 +18,7 @@ org.apache.nifi nifi-commons - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-socket-utils Utilities for socket communication diff --git a/nifi-commons/nifi-utils/pom.xml b/nifi-commons/nifi-utils/pom.xml index 6414182d68..39a067e34d 100644 --- a/nifi-commons/nifi-utils/pom.xml +++ b/nifi-commons/nifi-utils/pom.xml @@ -18,10 +18,10 @@ org.apache.nifi nifi-commons - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-utils - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT jar org.apache.nifi nifi-standard-bundle - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-standard-processors jar diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml index 18e307cb85..d6efadd39d 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi nifi-standard-bundle - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-standard-reporting-tasks jar diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/pom.xml index 19c3c201b4..5a78127a03 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml @@ -18,7 +18,7 @@ org.apache.nifi nifi-nar-bundles - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-standard-bundle pom @@ -35,23 +35,23 @@ org.apache.nifi nifi-standard-processors - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-standard-prioritizers - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-standard-reporting-tasks - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-standard-content-viewer war - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-api/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-api/pom.xml index eb457b5812..7df6539dd0 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-api/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-api/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi nifi-standard-services - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-dbcp-service-api diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service-nar/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service-nar/pom.xml index 63d9e395a2..2cc55bb7f3 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service-nar/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service-nar/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi nifi-dbcp-service-bundle - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-dbcp-service-nar @@ -31,7 +31,7 @@ org.apache.nifi nifi-dbcp-service - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/pom.xml index 1da9d26138..f1c8a2e215 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi nifi-dbcp-service-bundle - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-dbcp-service jar diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/pom.xml index f74daac3f4..e2869c8575 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi nifi-standard-services - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-dbcp-service-bundle diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-client-service-api/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-client-service-api/pom.xml index 33cc5b058a..b7ee726872 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-client-service-api/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-client-service-api/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi nifi-standard-services - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-distributed-cache-client-service-api jar diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/pom.xml index e54b49d945..e05f4dc2a0 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi nifi-distributed-cache-services-bundle - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-distributed-cache-client-service jar diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-protocol/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-protocol/pom.xml index 5ede7b05a8..133c14b658 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-protocol/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-protocol/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi nifi-distributed-cache-services-bundle - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-distributed-cache-protocol diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/pom.xml index 5888e3a22a..69f2d19a25 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi nifi-distributed-cache-services-bundle - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-distributed-cache-server Provides a Controller Service for hosting Distributed Caches diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-services-nar/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-services-nar/pom.xml index f4dc2dac87..947d5e2581 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-services-nar/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-services-nar/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi nifi-distributed-cache-services-bundle - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-distributed-cache-services-nar nar diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/pom.xml index e74fcf9017..2f45205693 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi nifi-standard-services - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-distributed-cache-services-bundle pom diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-api/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-api/pom.xml index e94c4ba664..1b3f68932e 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-api/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-api/pom.xml @@ -18,7 +18,7 @@ org.apache.nifi nifi-standard-services - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-http-context-map-api diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map-nar/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map-nar/pom.xml index 25e310ef6f..a8ca6783f2 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map-nar/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map-nar/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi nifi-http-context-map-bundle - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-http-context-map-nar diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/pom.xml index a818b41b21..0f1949af13 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi nifi-http-context-map-bundle - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-http-context-map diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/pom.xml index 39a4130f80..eba47c2f32 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi nifi-standard-services - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-http-context-map-bundle diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-load-distribution-service-api/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-load-distribution-service-api/pom.xml index d77a35b26a..6426da2eeb 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-load-distribution-service-api/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-load-distribution-service-api/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi nifi-standard-services - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-load-distribution-service-api jar diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml index c1cf658985..9a95bec60d 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi nifi-ssl-context-bundle - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-ssl-context-service-nar nar diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/pom.xml index c58652fe25..0aaf9fec39 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi nifi-ssl-context-bundle - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-ssl-context-service jar diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/pom.xml index dc5ddefafc..4ce903ba7c 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi nifi-standard-services - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-ssl-context-bundle pom diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-service-api/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-service-api/pom.xml index ea45a331a3..e479891dfc 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-service-api/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-service-api/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi nifi-standard-services - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-ssl-context-service-api jar diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml index d2efc1b482..eb2eb7e17f 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi nifi-standard-services - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-standard-services-api-nar nar diff --git a/nifi-nar-bundles/nifi-standard-services/pom.xml b/nifi-nar-bundles/nifi-standard-services/pom.xml index 3e27a661f9..17318f4dc8 100644 --- a/nifi-nar-bundles/nifi-standard-services/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/pom.xml @@ -18,7 +18,7 @@ org.apache.nifi nifi-nar-bundles - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-standard-services pom diff --git a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/pom.xml b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/pom.xml index 5d0b1f1657..3b8eb9d76a 100644 --- a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/pom.xml +++ b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/pom.xml @@ -18,7 +18,7 @@ org.apache.nifi nifi-update-attribute-bundle - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-update-attribute-model diff --git a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml index 6cdbbdbd53..a1f7a442a5 100644 --- a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml +++ b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi nifi-update-attribute-bundle - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-update-attribute-nar nar diff --git a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml index 7f7f722ddd..c648b73162 100644 --- a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml +++ b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml @@ -18,7 +18,7 @@ org.apache.nifi nifi-update-attribute-bundle - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-update-attribute-processor diff --git a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml index ad5d7cd90a..a13545d6c7 100644 --- a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml +++ b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml @@ -18,7 +18,7 @@ org.apache.nifi nifi-update-attribute-bundle - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-update-attribute-ui war diff --git a/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml b/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml index 744a3373fe..fa86f81e3f 100644 --- a/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml @@ -18,7 +18,7 @@ org.apache.nifi nifi-nar-bundles - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nifi-update-attribute-bundle pom @@ -34,18 +34,18 @@ org.apache.nifi nifi-update-attribute-model - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-update-attribute-processor - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-update-attribute-ui war - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT diff --git a/nifi-nar-bundles/pom.xml b/nifi-nar-bundles/pom.xml index d48b755422..ce9310938f 100644 --- a/nifi-nar-bundles/pom.xml +++ b/nifi-nar-bundles/pom.xml @@ -18,7 +18,7 @@ org.apache.nifi nifi - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-nar-bundles @@ -52,81 +52,81 @@ org.apache.nifi nifi-distributed-cache-client-service - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-distributed-cache-client-service-api - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT provided org.apache.nifi nifi-ssl-context-service-api - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT provided org.apache.nifi nifi-load-distribution-service-api - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT provided org.apache.nifi nifi-http-context-map-api - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT provided org.apache.nifi nifi-distributed-cache-protocol - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-distributed-cache-server - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-ssl-context-service - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-http-context-map - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-volatile-provenance-repository - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT test org.apache.nifi nifi-api - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT provided org.apache.nifi nifi-runtime - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT provided org.apache.nifi nifi-nar-utils - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT provided org.apache.nifi nifi-properties - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT provided diff --git a/pom.xml b/pom.xml index 74dc4a94e6..ded7257b02 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.apache.nifi nifi - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT pom Apache NiFi is an easy to use, powerful, and reliable system to process and distribute data. @@ -683,67 +683,67 @@ org.apache.nifi nifi-api - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-utils - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-site-to-site-client - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-web-utils - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-expression-language - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-custom-ui-utilities - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-ui-extension - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-flowfile-packager - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-socket-utils - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-data-provenance-utils - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-runtime - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-bootstrap - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-resources - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT resources runtime zip @@ -751,7 +751,7 @@ org.apache.nifi nifi-docs - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT resources runtime zip @@ -759,204 +759,204 @@ org.apache.nifi nifi-framework-nar - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-provenance-repository-nar - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-standard-services-api-nar - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-ssl-context-service-nar - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-distributed-cache-services-nar - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-standard-nar - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-jetty-bundle - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-update-attribute-nar - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-hadoop-libraries-nar - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-hadoop-nar - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-kite-nar - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-mongodb-nar - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-solr-nar - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-kafka-nar - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-http-context-map-nar - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-social-media-nar - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-hl7-nar - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-language-translation-nar - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-geo-nar - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-aws-nar - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-flume-nar - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-dbcp-service-nar - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-ambari-nar - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-avro-nar - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-image-nar - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-couchbase-nar - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT nar org.apache.nifi nifi-properties - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-security-utils - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-logging-utils - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-nar-utils - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-processor-utils - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-mock - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT test org.apache.nifi nifi-write-ahead-log - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-dbcp-service - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT org.apache.nifi nifi-dbcp-service-api - 0.3.1-SNAPSHOT + 0.4.0-SNAPSHOT com.jayway.jsonpath From 77de51df19b768ea1180d52e0e6106629161add0 Mon Sep 17 00:00:00 2001 From: Venkatesh Sellappa Date: Sat, 7 Nov 2015 21:09:18 -0500 Subject: [PATCH 3/6] NIFI-1025 Updated aws-sdk and joda-time to resolve AWS issues with Java 1.8 update 60. - Refactored tests - created AbstractS3Test for common utility methods - Corrected incorrect unit test in TestDeleteS3Object, and adjusted processor documentation to reflect behavior - moved aws dependency management to root pom This closes #107 Tested, Reviewed and Amended by Tony Kurc () --- .../processors/aws/s3/DeleteS3Object.java | 3 +- .../processors/aws/s3/AbstractS3Test.java | 151 ++++++++++++++++++ .../processors/aws/s3/TestDeleteS3Object.java | 120 +++++--------- .../processors/aws/s3/TestFetchS3Object.java | 61 +++++-- .../processors/aws/s3/TestPutS3Object.java | 42 +++-- nifi-nar-bundles/nifi-aws-bundle/pom.xml | 10 -- pom.xml | 7 +- 7 files changed, 277 insertions(+), 117 deletions(-) create mode 100644 nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/AbstractS3Test.java diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java index 836e0d88ea..056ff01ad3 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java @@ -41,7 +41,7 @@ import org.apache.nifi.processor.util.StandardValidators; @SeeAlso({PutS3Object.class}) @Tags({"Amazon", "S3", "AWS", "Archive", "Delete"}) @CapabilityDescription("Deletes FlowFiles on an Amazon S3 Bucket. " + - "And the FlowFiles are checked if exists or not before deleting.") + "If attempting to delete a file that does not exist, FlowFile is routed to success.") public class DeleteS3Object extends AbstractS3Processor { public static final PropertyDescriptor VERSION_ID = new PropertyDescriptor.Builder() @@ -80,6 +80,7 @@ public class DeleteS3Object extends AbstractS3Processor { try { if (versionId == null) { final DeleteObjectRequest r = new DeleteObjectRequest(bucket, key); + // This call returns success if object doesn't exist s3.deleteObject(r); } else { final DeleteVersionRequest r = new DeleteVersionRequest(bucket, key, versionId); diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/AbstractS3Test.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/AbstractS3Test.java new file mode 100644 index 0000000000..167c16b2ad --- /dev/null +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/AbstractS3Test.java @@ -0,0 +1,151 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.processors.aws.s3; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Iterator; + +import org.apache.nifi.util.file.FileUtils; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; + +import static org.junit.Assert.fail; + +import com.amazonaws.auth.PropertiesCredentials; +import com.amazonaws.services.s3.AmazonS3Client; +import com.amazonaws.services.s3.model.AmazonS3Exception; +import com.amazonaws.services.s3.model.CreateBucketRequest; +import com.amazonaws.services.s3.model.DeleteBucketRequest; +import com.amazonaws.services.s3.model.ObjectListing; +import com.amazonaws.services.s3.model.PutObjectRequest; +import com.amazonaws.services.s3.model.S3ObjectSummary; + +/** + * Base class for S3 tests. Establishes a bucket and helper methods for creating test scenarios + */ +public abstract class AbstractS3Test { + protected final static String CREDENTIALS_FILE = System.getProperty("user.home") + "/aws-credentials.properties"; + protected final static String BUCKET_NAME = "test-bucket-00000000-0000-0000-0000-123456789021"; + protected final static String SAMPLE_FILE_RESOURCE_NAME = "/hello.txt"; + protected final static String REGION = "eu-west-1"; + + // Static so multiple Tests can use same client + protected static AmazonS3Client client; + + @BeforeClass + public static void oneTimeSetup() { + // Creates a client and bucket for this test + + final FileInputStream fis; + try { + fis = new FileInputStream(CREDENTIALS_FILE); + } catch (FileNotFoundException e1) { + fail("Could not open credentials file " + CREDENTIALS_FILE + ": " + e1.getLocalizedMessage()); + return; + } + try { + final PropertiesCredentials credentials = new PropertiesCredentials(fis); + client = new AmazonS3Client(credentials); + + if (client.doesBucketExist(BUCKET_NAME)) { + fail("Bucket " + BUCKET_NAME + " exists. Choose a different bucket name to continue test"); + } + + CreateBucketRequest request = new CreateBucketRequest(BUCKET_NAME, REGION); + client.createBucket(request); + + } catch (final AmazonS3Exception e) { + fail("Can't create the key " + BUCKET_NAME + ": " + e.getLocalizedMessage()); + } catch (final IOException e) { + fail("Caught IOException preparing tests: " + e.getLocalizedMessage()); + } finally { + FileUtils.closeQuietly(fis); + } + + if (!client.doesBucketExist(BUCKET_NAME)) { + fail("Setup incomplete, tests will fail"); + } + } + + @AfterClass + public static void oneTimeTearDown() { + // Empty the bucket before deleting it. + try { + ObjectListing objectListing = client.listObjects(BUCKET_NAME); + + while (true) { + for (Iterator iterator = objectListing.getObjectSummaries().iterator(); iterator.hasNext(); ) { + S3ObjectSummary objectSummary = (S3ObjectSummary) iterator.next(); + client.deleteObject(BUCKET_NAME, objectSummary.getKey()); + } + + if (objectListing.isTruncated()) { + objectListing = client.listNextBatchOfObjects(objectListing); + } else { + break; + } + } + + DeleteBucketRequest dbr = new DeleteBucketRequest(BUCKET_NAME); + client.deleteBucket(dbr); + } catch (final AmazonS3Exception e) { + System.err.println("Unable to delete bucket " + BUCKET_NAME + e.toString()); + } + + if (client.doesBucketExist(BUCKET_NAME)) { + Assert.fail("Incomplete teardown, subsequent tests might fail"); + } + + } + + protected void putTestFile(String key, File file) throws AmazonS3Exception { + PutObjectRequest putRequest = new PutObjectRequest(BUCKET_NAME, key, file); + + client.putObject(putRequest); + } + + protected Path getResourcePath(String resourceName) { + Path path = null; + + try { + path = Paths.get(getClass().getResource(resourceName).toURI()); + } catch (URISyntaxException e) { + Assert.fail("Resource: " + resourceName + " does not exist" + e.getLocalizedMessage()); + } + + return path; + } + + protected File getFileFromResourceName(String resourceName) { + URI uri = null; + try { + uri = this.getClass().getResource(resourceName).toURI(); + } catch (URISyntaxException e) { + Assert.fail("Cannot proceed without File : " + resourceName); + } + + return new File(uri); + } +} \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestDeleteS3Object.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestDeleteS3Object.java index 509a31fe1c..643aa11c57 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestDeleteS3Object.java +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestDeleteS3Object.java @@ -16,77 +16,33 @@ */ package org.apache.nifi.processors.aws.s3; -import java.io.File; -import java.io.FileInputStream; import java.io.IOException; -import java.net.URL; import java.util.HashMap; import java.util.Map; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; - -import com.amazonaws.auth.PropertiesCredentials; -import com.amazonaws.services.s3.AmazonS3Client; -import com.amazonaws.services.s3.model.AmazonS3Exception; -import com.amazonaws.services.s3.model.CreateBucketRequest; -import com.amazonaws.services.s3.model.DeleteBucketRequest; -import com.amazonaws.services.s3.model.PutObjectRequest; -import com.amazonaws.services.s3.model.PutObjectResult; import org.apache.nifi.util.TestRunner; import org.apache.nifi.util.TestRunners; - +import org.junit.Ignore; +import org.junit.Test; @Ignore("For local testing only - interacts with S3 so the credentials file must be configured and all necessary buckets created") -public class TestDeleteS3Object { - - private static final String CREDENTIALS_FILE = System.getProperty("user.home") + "/aws-credentials.properties"; - - // When you want to test this, you should create a bucket on Amazon S3 as follows. - private static final String TEST_REGION = "ap-northeast-1"; - private static final String TEST_BUCKET = "test-bucket-00000000-0000-0000-0000-1234567890123"; - - @BeforeClass - public static void oneTimeSetUp() { - // Creates a new bucket for this test - try { - PropertiesCredentials credentials = new PropertiesCredentials(new FileInputStream(CREDENTIALS_FILE)); - AmazonS3Client client = new AmazonS3Client(credentials); - CreateBucketRequest request = new CreateBucketRequest(TEST_BUCKET, TEST_REGION); - client.createBucket(request); - } catch (final AmazonS3Exception e) { - System.out.println("Can't create the key " + TEST_BUCKET + ":" + e.toString()); - } catch (final IOException e) { - System.out.println(CREDENTIALS_FILE + " doesn't exist."); - } - } - - @AfterClass - public static void oneTimeTearDown() throws IOException { - // Delete a bucket for this test - PropertiesCredentials credentials = new PropertiesCredentials(new FileInputStream(CREDENTIALS_FILE)); - AmazonS3Client client = new AmazonS3Client(credentials); - DeleteBucketRequest dbr = new DeleteBucketRequest(TEST_BUCKET); - client.deleteBucket(dbr); - } +public class TestDeleteS3Object extends AbstractS3Test { @Test public void testSimpleDelete() throws IOException { // Prepares for this test - uploadTestFile("hello.txt"); + putTestFile("delete-me", getFileFromResourceName(SAMPLE_FILE_RESOURCE_NAME)); + + final TestRunner runner = TestRunners.newTestRunner(new DeleteS3Object()); - DeleteS3Object deleter = new DeleteS3Object(); - final TestRunner runner = TestRunners.newTestRunner(deleter); runner.setProperty(DeleteS3Object.CREDENTAILS_FILE, CREDENTIALS_FILE); - runner.setProperty(DeleteS3Object.REGION, TEST_REGION); - runner.setProperty(DeleteS3Object.BUCKET, TEST_BUCKET); - runner.setProperty(DeleteS3Object.KEY, "hello.txt"); + runner.setProperty(DeleteS3Object.REGION, REGION); + runner.setProperty(DeleteS3Object.BUCKET, BUCKET_NAME); final Map attrs = new HashMap<>(); - attrs.put("filename", "hello.txt"); + attrs.put("filename", "delete-me"); runner.enqueue(new byte[0], attrs); + runner.run(1); runner.assertAllFlowFilesTransferred(DeleteS3Object.REL_SUCCESS, 1); @@ -95,18 +51,39 @@ public class TestDeleteS3Object { @Test public void testDeleteFolder() throws IOException { // Prepares for this test - uploadTestFile("folder/1.txt"); + putTestFile("folder/delete-me", getFileFromResourceName(SAMPLE_FILE_RESOURCE_NAME)); + + final TestRunner runner = TestRunners.newTestRunner(new DeleteS3Object()); - DeleteS3Object deleter = new DeleteS3Object(); - final TestRunner runner = TestRunners.newTestRunner(deleter); runner.setProperty(DeleteS3Object.CREDENTAILS_FILE, CREDENTIALS_FILE); - runner.setProperty(DeleteS3Object.REGION, TEST_REGION); - runner.setProperty(DeleteS3Object.BUCKET, TEST_BUCKET); - runner.setProperty(DeleteS3Object.KEY, "folder/1.txt"); + runner.setProperty(DeleteS3Object.REGION, REGION); + runner.setProperty(DeleteS3Object.BUCKET, BUCKET_NAME); final Map attrs = new HashMap<>(); - attrs.put("filename", "hello.txt"); + attrs.put("filename", "folder/delete-me"); runner.enqueue(new byte[0], attrs); + + runner.run(1); + + runner.assertAllFlowFilesTransferred(DeleteS3Object.REL_SUCCESS, 1); + } + + @Test + public void testDeleteFolderNoExpressionLanguage() throws IOException { + // Prepares for this test + putTestFile("folder/delete-me", getFileFromResourceName(SAMPLE_FILE_RESOURCE_NAME)); + + final TestRunner runner = TestRunners.newTestRunner(new DeleteS3Object()); + + runner.setProperty(DeleteS3Object.CREDENTAILS_FILE, CREDENTIALS_FILE); + runner.setProperty(DeleteS3Object.REGION, REGION); + runner.setProperty(DeleteS3Object.BUCKET, BUCKET_NAME); + runner.setProperty(DeleteS3Object.KEY, "folder/delete-me"); + + final Map attrs = new HashMap<>(); + attrs.put("filename", "a-different-name"); + runner.enqueue(new byte[0], attrs); + runner.run(1); runner.assertAllFlowFilesTransferred(DeleteS3Object.REL_SUCCESS, 1); @@ -114,28 +91,19 @@ public class TestDeleteS3Object { @Test public void testTryToDeleteNotExistingFile() throws IOException { - DeleteS3Object deleter = new DeleteS3Object(); - final TestRunner runner = TestRunners.newTestRunner(deleter); + final TestRunner runner = TestRunners.newTestRunner(new DeleteS3Object()); + runner.setProperty(DeleteS3Object.CREDENTAILS_FILE, CREDENTIALS_FILE); - runner.setProperty(DeleteS3Object.REGION, TEST_REGION); - runner.setProperty(DeleteS3Object.BUCKET, TEST_BUCKET); - runner.setProperty(DeleteS3Object.BUCKET, "no-such-a-key"); + runner.setProperty(DeleteS3Object.REGION, REGION); + runner.setProperty(DeleteS3Object.BUCKET, BUCKET_NAME); final Map attrs = new HashMap<>(); attrs.put("filename", "no-such-a-file"); runner.enqueue(new byte[0], attrs); + runner.run(1); - runner.assertAllFlowFilesTransferred(DeleteS3Object.REL_FAILURE, 1); + runner.assertAllFlowFilesTransferred(DeleteS3Object.REL_SUCCESS, 1); } - // Uploads a test file - private void uploadTestFile(String key) throws IOException { - PropertiesCredentials credentials = new PropertiesCredentials(new FileInputStream(CREDENTIALS_FILE)); - AmazonS3Client client = new AmazonS3Client(credentials); - URL fileURL = this.getClass().getClassLoader().getResource("hello.txt"); - File file = new File(fileURL.getPath()); - PutObjectRequest putRequest = new PutObjectRequest(TEST_BUCKET, key, file); - PutObjectResult result = client.putObject(putRequest); - } } diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestFetchS3Object.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestFetchS3Object.java index 0321514946..e7d3e8b7b6 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestFetchS3Object.java +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestFetchS3Object.java @@ -18,7 +18,6 @@ package org.apache.nifi.processors.aws.s3; import java.io.IOException; import java.nio.file.Files; -import java.nio.file.Paths; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -30,32 +29,70 @@ import org.junit.Ignore; import org.junit.Test; @Ignore("For local testing only - interacts with S3 so the credentials file must be configured and all necessary buckets created") -public class TestFetchS3Object { - - private final String CREDENTIALS_FILE = System.getProperty("user.home") + "/aws-credentials.properties"; - +public class TestFetchS3Object extends AbstractS3Test { @Test - public void testGet() throws IOException { + public void testSimpleGet() throws IOException { + putTestFile("test-file", getFileFromResourceName(SAMPLE_FILE_RESOURCE_NAME)); + final TestRunner runner = TestRunners.newTestRunner(new FetchS3Object()); - runner.setProperty(FetchS3Object.BUCKET, "anonymous-test-bucket-00000000"); + runner.setProperty(FetchS3Object.CREDENTAILS_FILE, CREDENTIALS_FILE); - runner.setProperty(FetchS3Object.KEY, "folder/1.txt"); + runner.setProperty(FetchS3Object.REGION, REGION); + runner.setProperty(FetchS3Object.BUCKET, BUCKET_NAME); final Map attrs = new HashMap<>(); - attrs.put("start", "0"); - + attrs.put("filename", "test-file"); runner.enqueue(new byte[0], attrs); + runner.run(1); runner.assertAllFlowFilesTransferred(FetchS3Object.REL_SUCCESS, 1); + } + + @Test + public void testTryToFetchNotExistingFile() throws IOException { + final TestRunner runner = TestRunners.newTestRunner(new FetchS3Object()); + + runner.setProperty(FetchS3Object.CREDENTAILS_FILE, CREDENTIALS_FILE); + runner.setProperty(FetchS3Object.REGION, REGION); + runner.setProperty(FetchS3Object.BUCKET, BUCKET_NAME); + + final Map attrs = new HashMap<>(); + attrs.put("filename", "no-such-a-file"); + runner.enqueue(new byte[0], attrs); + + runner.run(1); + + runner.assertAllFlowFilesTransferred(FetchS3Object.REL_FAILURE, 1); + } + + @Test + public void testContentsOfFileRetrieved() throws IOException { + String key = "folder/1.txt"; + putTestFile(key, getFileFromResourceName(SAMPLE_FILE_RESOURCE_NAME)); + + final TestRunner runner = TestRunners.newTestRunner(new FetchS3Object()); + + runner.setProperty(FetchS3Object.CREDENTAILS_FILE, CREDENTIALS_FILE); + runner.setProperty(FetchS3Object.REGION, REGION); + runner.setProperty(FetchS3Object.BUCKET, BUCKET_NAME); + + final Map attrs = new HashMap<>(); + attrs.put("filename", key); + runner.enqueue(new byte[0], attrs); + + runner.run(1); + + runner.assertAllFlowFilesTransferred(FetchS3Object.REL_SUCCESS, 1); + final List ffs = runner.getFlowFilesForRelationship(FetchS3Object.REL_SUCCESS); final MockFlowFile out = ffs.iterator().next(); - final byte[] expectedBytes = Files.readAllBytes(Paths.get("src/test/resources/hello.txt")); + final byte[] expectedBytes = Files.readAllBytes(getResourcePath(SAMPLE_FILE_RESOURCE_NAME)); out.assertContentEquals(new String(expectedBytes)); + for (final Map.Entry entry : out.getAttributes().entrySet()) { System.out.println(entry.getKey() + " : " + entry.getValue()); } } - } diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestPutS3Object.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestPutS3Object.java index de7816db70..4dac0d4f9b 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestPutS3Object.java +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestPutS3Object.java @@ -17,7 +17,6 @@ package org.apache.nifi.processors.aws.s3; import java.io.IOException; -import java.nio.file.Paths; import java.util.HashMap; import java.util.Map; @@ -30,22 +29,22 @@ import org.junit.Test; import com.amazonaws.services.s3.model.StorageClass; @Ignore("For local testing only - interacts with S3 so the credentials file must be configured and all necessary buckets created") -public class TestPutS3Object { - - private final String CREDENTIALS_FILE = System.getProperty("user.home") + "/aws-credentials.properties"; +public class TestPutS3Object extends AbstractS3Test { @Test public void testSimplePut() throws IOException { final TestRunner runner = TestRunners.newTestRunner(new PutS3Object()); + runner.setProperty(PutS3Object.CREDENTAILS_FILE, CREDENTIALS_FILE); - runner.setProperty(PutS3Object.BUCKET, "test-bucket-00000000-0000-0000-0000-123456789012"); - runner.setProperty(PutS3Object.EXPIRATION_RULE_ID, "Expire Quickly"); + runner.setProperty(PutS3Object.REGION, REGION); + runner.setProperty(PutS3Object.BUCKET, BUCKET_NAME); + Assert.assertTrue(runner.setProperty("x-custom-prop", "hello").isValid()); for (int i = 0; i < 3; i++) { final Map attrs = new HashMap<>(); attrs.put("filename", String.valueOf(i) + ".txt"); - runner.enqueue(Paths.get("src/test/resources/hello.txt"), attrs); + runner.enqueue(getResourcePath(SAMPLE_FILE_RESOURCE_NAME), attrs); } runner.run(3); @@ -55,14 +54,17 @@ public class TestPutS3Object { @Test public void testPutInFolder() throws IOException { final TestRunner runner = TestRunners.newTestRunner(new PutS3Object()); - runner.setProperty(PutS3Object.BUCKET, "test-bucket-00000000-0000-0000-0000-123456789012"); + runner.setProperty(PutS3Object.CREDENTAILS_FILE, CREDENTIALS_FILE); - runner.setProperty(PutS3Object.EXPIRATION_RULE_ID, "Expire Quickly"); + runner.setProperty(PutS3Object.REGION, REGION); + runner.setProperty(PutS3Object.BUCKET, BUCKET_NAME); + Assert.assertTrue(runner.setProperty("x-custom-prop", "hello").isValid()); final Map attrs = new HashMap<>(); attrs.put("filename", "folder/1.txt"); - runner.enqueue(Paths.get("src/test/resources/hello.txt"), attrs); + runner.enqueue(getResourcePath(SAMPLE_FILE_RESOURCE_NAME), attrs); + runner.run(); runner.assertAllFlowFilesTransferred(PutS3Object.REL_SUCCESS, 1); @@ -71,14 +73,18 @@ public class TestPutS3Object { @Test public void testStorageClass() throws IOException { final TestRunner runner = TestRunners.newTestRunner(new PutS3Object()); - runner.setProperty(PutS3Object.BUCKET, "test-bucket-00000000-0000-0000-0000-123456789012"); + runner.setProperty(PutS3Object.CREDENTAILS_FILE, CREDENTIALS_FILE); + runner.setProperty(PutS3Object.REGION, REGION); + runner.setProperty(PutS3Object.BUCKET, BUCKET_NAME); runner.setProperty(PutS3Object.STORAGE_CLASS, StorageClass.ReducedRedundancy.name()); + Assert.assertTrue(runner.setProperty("x-custom-prop", "hello").isValid()); final Map attrs = new HashMap<>(); attrs.put("filename", "folder/2.txt"); - runner.enqueue(Paths.get("src/test/resources/hello.txt"), attrs); + runner.enqueue(getResourcePath(SAMPLE_FILE_RESOURCE_NAME), attrs); + runner.run(); runner.assertAllFlowFilesTransferred(PutS3Object.REL_SUCCESS, 1); @@ -87,16 +93,18 @@ public class TestPutS3Object { @Test public void testPermissions() throws IOException { final TestRunner runner = TestRunners.newTestRunner(new PutS3Object()); - runner.setProperty(PutS3Object.BUCKET, "test-bucket-00000000-0000-0000-0000-123456789012"); + runner.setProperty(PutS3Object.CREDENTAILS_FILE, CREDENTIALS_FILE); - runner.setProperty(PutS3Object.FULL_CONTROL_USER_LIST, "28545acd76c35c7e91f8409b95fd1aa0c0914bfa1ac60975d9f48bc3c5e090b5"); + runner.setProperty(PutS3Object.BUCKET, BUCKET_NAME); + runner.setProperty(PutS3Object.FULL_CONTROL_USER_LIST,"28545acd76c35c7e91f8409b95fd1aa0c0914bfa1ac60975d9f48bc3c5e090b5"); + runner.setProperty(PutS3Object.REGION, REGION); final Map attrs = new HashMap<>(); attrs.put("filename", "folder/4.txt"); - runner.enqueue(Paths.get("src/test/resources/hello.txt"), attrs); + runner.enqueue(getResourcePath(SAMPLE_FILE_RESOURCE_NAME), attrs); + runner.run(); runner.assertAllFlowFilesTransferred(PutS3Object.REL_SUCCESS, 1); } - -} +} \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-aws-bundle/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/pom.xml index a43bb80b94..2470e411f2 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-aws-bundle/pom.xml @@ -30,14 +30,4 @@ nifi-aws-nar - - - - com.amazonaws - aws-java-sdk - 1.9.24 - - - - diff --git a/pom.xml b/pom.xml index ded7257b02..08a227fbdb 100644 --- a/pom.xml +++ b/pom.xml @@ -492,7 +492,7 @@ joda-time joda-time - 2.8 + 2.8.2 com.yammer.metrics @@ -968,6 +968,11 @@ derby 10.11.1.1 + + com.amazonaws + aws-java-sdk + 1.10.32 + From 440e4c4940a8eed51f8accdaf599e3d4a4b685e7 Mon Sep 17 00:00:00 2001 From: Tony Kurc Date: Sun, 8 Nov 2015 12:27:41 -0500 Subject: [PATCH 4/6] NIFI-1106 fixed platform-specific object separator. --- .../java/org/apache/nifi/processors/avro/ConvertAvroToJSON.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/main/java/org/apache/nifi/processors/avro/ConvertAvroToJSON.java b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/main/java/org/apache/nifi/processors/avro/ConvertAvroToJSON.java index f0f1630fb3..33951d7c8a 100644 --- a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/main/java/org/apache/nifi/processors/avro/ConvertAvroToJSON.java +++ b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/main/java/org/apache/nifi/processors/avro/ConvertAvroToJSON.java @@ -138,7 +138,7 @@ public class ConvertAvroToJSON extends AbstractProcessor { if (containerOption.equals(CONTAINER_ARRAY)) { out.write(','); } else { - out.write(System.lineSeparator().getBytes(StandardCharsets.UTF_8)); + out.write('\n'); } final GenericRecord nextRecord = reader.next(record); From de498df4c997c6e51c1031726e5d1f412e62ff5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Baptiste=20Onofr=C3=A9?= Date: Sat, 7 Nov 2015 18:57:32 +0100 Subject: [PATCH 5/6] NIFI-925 - Upgrade to hadoop 2.6.2. This closes #83. Signed-off-by: joewitt --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 08a227fbdb..d563408282 100644 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,7 @@ 4.1.6.RELEASE 3.2.7.RELEASE 1.19 - 2.6.0 + 2.6.2 2.2.0 From 64b1fc983c09d09fd5d8aa7ecd39d4bc487f8094 Mon Sep 17 00:00:00 2001 From: joewitt Date: Sun, 8 Nov 2015 22:15:11 -0500 Subject: [PATCH 6/6] NIFI-925 reviewed patch/ builds well/ fixed licensing gaps. --- nifi-assembly/NOTICE | 27 ++++++++++++++++ .../src/main/resources/META-INF/NOTICE | 32 +++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE index 1f7e3f123a..495c74c36e 100644 --- a/nifi-assembly/NOTICE +++ b/nifi-assembly/NOTICE @@ -323,11 +323,34 @@ The following binary components are provided under the Apache Software License v Apache Commons Daemon Copyright 1999-2013 The Apache Software Foundation + (ASLv2) Apache Commons EL + The following NOTICE information applies: + Apache Commons EL + Copyright 1999-2007 The Apache Software Foundation + + EL-8 patch - Copyright 2004-2007 Jamie Taylor + http://issues.apache.org/jira/browse/EL-8 + (ASLv2) Jetty The following NOTICE information applies: Jetty Web Container Copyright 1995-2015 Mort Bay Consulting Pty Ltd. + (ASLv2) Apache Tomcat + The following NOTICE information applies: + Apache Tomcat + Copyright 2007 The Apache Software Foundation + + Java Management Extensions (JMX) support is provided by + the MX4J package, which is open source software. The + original software and related information is available + at http://mx4j.sourceforge.net. + + Java compilation software for JSP pages is provided by Eclipse, + which is open source software. The orginal software and + related infomation is available at + http://www.eclipse.org. + (ASLv2) Apache Kafka The following NOTICE information applies: Apache Kafka @@ -558,6 +581,10 @@ The following binary components are provided under the Apache Software License v Swagger Core 1.5.3-M1 Copyright 2015 Reverb Technologies, Inc. + (ASLv2) Google GSON + The following NOTICE information applies: + Copyright 2008 Google Inc. + (ASLv2) JSON-SMART The following NOTICE information applies: Copyright 2011 JSON-SMART authors diff --git a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/src/main/resources/META-INF/NOTICE index 7f1f51d71e..87e34ceb40 100644 --- a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/src/main/resources/META-INF/NOTICE @@ -254,6 +254,34 @@ The following binary components are provided under the Apache Software License v Apache Software Foundation that were originally developed at iClick, Inc., software copyright (c) 1999. + (ASLv2) Apache Commons EL + The following NOTICE information applies: + Apache Commons EL + Copyright 1999-2007 The Apache Software Foundation + + EL-8 patch - Copyright 2004-2007 Jamie Taylor + http://issues.apache.org/jira/browse/EL-8 + + (ASLv2) Jetty + The following NOTICE information applies: + Jetty Web Container + Copyright 1995-2015 Mort Bay Consulting Pty Ltd. + + (ASLv2) Apache Tomcat + The following NOTICE information applies: + Apache Tomcat + Copyright 2007 The Apache Software Foundation + + Java Management Extensions (JMX) support is provided by + the MX4J package, which is open source software. The + original software and related information is available + at http://mx4j.sourceforge.net. + + Java compilation software for JSP pages is provided by Eclipse, + which is open source software. The orginal software and + related infomation is available at + http://www.eclipse.org. + (ASLv2) Google Guice The following NOTICE information applies: Google Guice - Core Library @@ -262,6 +290,10 @@ The following binary components are provided under the Apache Software License v Google Guice - Extensions - Servlet Copyright 2006-2011 Google, Inc. + (ASLv2) Google GSON + The following NOTICE information applies: + Copyright 2008 Google Inc. + ************************ Common Development and Distribution License 1.1 ************************