svn commit: r52134 - /release/nifi/1.15.2/
Author: joewitt Date: Tue Jan 18 16:58:21 2022 New Revision: 52134 Log: NIFI-9567 Removed: release/nifi/1.15.2/
[nifi] 01/01: Merge branch 'NIFI-9567-RC1' into support/nifi-1.15
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git commit d16511bdd81dc684ed04b76c4e7a0c614e014ece Merge: cbb68f2 7f4f27f Author: Joe Witt AuthorDate: Tue Jan 18 09:55:55 2022 -0700 Merge branch 'NIFI-9567-RC1' into support/nifi-1.15 minifi/minifi-assembly/pom.xml | 6 +- minifi/minifi-bootstrap/pom.xml| 2 +- minifi/minifi-c2/minifi-c2-api/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-assembly/pom.xml| 2 +- .../minifi-c2-cache-filesystem/pom.xml | 2 +- .../minifi-c2-cache/minifi-c2-cache-s3/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-cache/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-docker/pom.xml | 4 +- .../minifi-c2/minifi-c2-integration-tests/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-jetty/pom.xml | 2 +- .../minifi-c2-provider-cache/pom.xml | 2 +- .../minifi-c2-provider-delegating/pom.xml | 2 +- .../minifi-c2-provider-nifi-rest/pom.xml | 2 +- .../minifi-c2-provider-util/pom.xml| 2 +- minifi/minifi-c2/minifi-c2-provider/pom.xml| 2 +- minifi/minifi-c2/minifi-c2-service/pom.xml | 2 +- minifi/minifi-c2/pom.xml | 2 +- .../minifi-commons/minifi-commons-schema/pom.xml | 2 +- minifi/minifi-commons/minifi-utils/pom.xml | 2 +- minifi/minifi-commons/pom.xml | 2 +- minifi/minifi-docker/pom.xml | 4 +- minifi/minifi-docs/pom.xml | 2 +- minifi/minifi-integration-tests/pom.xml| 2 +- .../minifi-framework-nar/pom.xml | 2 +- .../minifi-framework/minifi-framework-api/pom.xml | 8 +- .../minifi-framework/minifi-framework-core/pom.xml | 6 +- .../minifi-framework/minifi-resources/pom.xml | 2 +- .../minifi-framework/minifi-runtime/pom.xml| 2 +- .../minifi-framework/minifi-server/pom.xml | 2 +- .../minifi-framework/pom.xml | 2 +- .../minifi-server-nar/pom.xml | 8 +- .../minifi-framework-bundle/pom.xml| 16 +- .../minifi-provenance-repositories/pom.xml | 2 +- .../minifi-provenance-repository-nar/pom.xml | 2 +- .../minifi-provenance-repository-bundle/pom.xml| 2 +- .../minifi-nar-bundles/minifi-standard-nar/pom.xml | 8 +- .../minifi-update-attribute-nar/pom.xml| 8 +- minifi/minifi-nar-bundles/pom.xml | 2 +- .../minifi-toolkit/minifi-toolkit-assembly/pom.xml | 2 +- .../minifi-toolkit-configuration/pom.xml | 2 +- minifi/minifi-toolkit/pom.xml | 2 +- minifi/pom.xml | 124 - nifi-api/pom.xml | 2 +- nifi-assembly/pom.xml | 280 ++--- nifi-bootstrap/pom.xml | 18 +- nifi-commons/nifi-bootstrap-utils/pom.xml | 2 +- nifi-commons/nifi-data-provenance-utils/pom.xml| 8 +- nifi-commons/nifi-expression-language/pom.xml | 10 +- nifi-commons/nifi-flow-encryptor/pom.xml | 4 +- nifi-commons/nifi-flowfile-packager/pom.xml| 2 +- nifi-commons/nifi-hl7-query-language/pom.xml | 2 +- nifi-commons/nifi-json-utils/pom.xml | 6 +- nifi-commons/nifi-logging-utils/pom.xml| 2 +- nifi-commons/nifi-metrics/pom.xml | 4 +- nifi-commons/nifi-parameter/pom.xml| 4 +- nifi-commons/nifi-properties/pom.xml | 4 +- nifi-commons/nifi-property-encryptor/pom.xml | 4 +- nifi-commons/nifi-property-utils/pom.xml | 2 +- nifi-commons/nifi-record-path/pom.xml | 10 +- nifi-commons/nifi-record/pom.xml | 2 +- nifi-commons/nifi-repository-encryption/pom.xml| 8 +- nifi-commons/nifi-rocksdb-utils/pom.xml| 8 +- nifi-commons/nifi-schema-utils/pom.xml | 2 +- nifi-commons/nifi-security-kerberos-api/pom.xml| 2 +- nifi-commons/nifi-security-kerberos/pom.xml| 6 +- nifi-commons/nifi-security-kms/pom.xml | 2 +- nifi-commons/nifi-security-socket-ssl/pom.xml | 6 +- nifi-commons/nifi-security-utils-api/pom.xml | 2 +- nifi-commons/nifi-security-utils/pom.xml | 12 +- .../nifi-sensitive-property-provider/pom.xml | 8 +- nifi-commons/nifi-single-user-utils/pom.xml| 2 +- nifi-commons/nifi-site-to-site-client/pom.xml | 12 +- nifi-commons/nifi-socket-utils/pom.xml | 8 +- nifi-commons/nifi-utils/pom.xml| 6 +- nifi-commons/nifi-uuid5/pom.xml| 2 +- nifi-commons/nifi-vault
[nifi] branch support/nifi-1.15 updated (cbb68f2 -> d16511b)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git. from cbb68f2 NIFI-9567 fixing docker version reference add 753c311 NIFI-9567-RC1 prepare release nifi-1.15.3-RC1 add 7f4f27f NIFI-9567-RC1 prepare for next development iteration new d16511b Merge branch 'NIFI-9567-RC1' into support/nifi-1.15 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: minifi/minifi-assembly/pom.xml | 6 +- minifi/minifi-bootstrap/pom.xml| 2 +- minifi/minifi-c2/minifi-c2-api/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-assembly/pom.xml| 2 +- .../minifi-c2-cache-filesystem/pom.xml | 2 +- .../minifi-c2-cache/minifi-c2-cache-s3/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-cache/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-docker/pom.xml | 4 +- .../minifi-c2/minifi-c2-integration-tests/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-jetty/pom.xml | 2 +- .../minifi-c2-provider-cache/pom.xml | 2 +- .../minifi-c2-provider-delegating/pom.xml | 2 +- .../minifi-c2-provider-nifi-rest/pom.xml | 2 +- .../minifi-c2-provider-util/pom.xml| 2 +- minifi/minifi-c2/minifi-c2-provider/pom.xml| 2 +- minifi/minifi-c2/minifi-c2-service/pom.xml | 2 +- minifi/minifi-c2/pom.xml | 2 +- .../minifi-commons/minifi-commons-schema/pom.xml | 2 +- minifi/minifi-commons/minifi-utils/pom.xml | 2 +- minifi/minifi-commons/pom.xml | 2 +- minifi/minifi-docker/pom.xml | 4 +- minifi/minifi-docs/pom.xml | 2 +- minifi/minifi-integration-tests/pom.xml| 2 +- .../minifi-framework-nar/pom.xml | 2 +- .../minifi-framework/minifi-framework-api/pom.xml | 8 +- .../minifi-framework/minifi-framework-core/pom.xml | 6 +- .../minifi-framework/minifi-resources/pom.xml | 2 +- .../minifi-framework/minifi-runtime/pom.xml| 2 +- .../minifi-framework/minifi-server/pom.xml | 2 +- .../minifi-framework/pom.xml | 2 +- .../minifi-server-nar/pom.xml | 8 +- .../minifi-framework-bundle/pom.xml| 16 +- .../minifi-provenance-repositories/pom.xml | 2 +- .../minifi-provenance-repository-nar/pom.xml | 2 +- .../minifi-provenance-repository-bundle/pom.xml| 2 +- .../minifi-nar-bundles/minifi-standard-nar/pom.xml | 8 +- .../minifi-update-attribute-nar/pom.xml| 8 +- minifi/minifi-nar-bundles/pom.xml | 2 +- .../minifi-toolkit/minifi-toolkit-assembly/pom.xml | 2 +- .../minifi-toolkit-configuration/pom.xml | 2 +- minifi/minifi-toolkit/pom.xml | 2 +- minifi/pom.xml | 124 - nifi-api/pom.xml | 2 +- nifi-assembly/pom.xml | 280 ++--- nifi-bootstrap/pom.xml | 18 +- nifi-commons/nifi-bootstrap-utils/pom.xml | 2 +- nifi-commons/nifi-data-provenance-utils/pom.xml| 8 +- nifi-commons/nifi-expression-language/pom.xml | 10 +- nifi-commons/nifi-flow-encryptor/pom.xml | 4 +- nifi-commons/nifi-flowfile-packager/pom.xml| 2 +- nifi-commons/nifi-hl7-query-language/pom.xml | 2 +- nifi-commons/nifi-json-utils/pom.xml | 6 +- nifi-commons/nifi-logging-utils/pom.xml| 2 +- nifi-commons/nifi-metrics/pom.xml | 4 +- nifi-commons/nifi-parameter/pom.xml| 4 +- nifi-commons/nifi-properties/pom.xml | 4 +- nifi-commons/nifi-property-encryptor/pom.xml | 4 +- nifi-commons/nifi-property-utils/pom.xml | 2 +- nifi-commons/nifi-record-path/pom.xml | 10 +- nifi-commons/nifi-record/pom.xml | 2 +- nifi-commons/nifi-repository-encryption/pom.xml| 8 +- nifi-commons/nifi-rocksdb-utils/pom.xml| 8 +- nifi-commons/nifi-schema-utils/pom.xml | 2 +- nifi-commons/nifi-security-kerberos-api/pom.xml| 2 +- nifi-commons/nifi-security-kerberos/pom.xml| 6 +- nifi-commons/nifi-security-kms/pom.xml | 2 +- nifi-commons/nifi-security-socket-ssl/pom.xml | 6 +- nifi-commons/nifi-security-utils-api/pom.xml | 2 +- nifi-commons/nifi-security-utils/pom.xml | 12 +- .../nifi-sensitive-property-provider
svn commit: r1897178 - in /nifi/site/trunk/docs/nifi-docs: ./ components/org.apache.nifi/nifi-ambari-nar/1.15.3/ components/org.apache.nifi/nifi-ambari-nar/1.15.3/org.apache.nifi.reporting.ambari.Amba
Author: joewitt Date: Tue Jan 18 16:55:23 2022 New Revision: 1897178 URL: http://svn.apache.org/viewvc?rev=1897178=rev Log: NIFI-9567 Added 1.15.3 docs to NiFi site. [This commit notification would consist of 57 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
[nifi] annotated tag rel/nifi-1.15.3 created (now cc00349)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to annotated tag rel/nifi-1.15.3 in repository https://gitbox.apache.org/repos/asf/nifi.git. at cc00349 (tag) tagging 753c311382005acadc16c64952d7b1eaaf2550d5 (commit) replaces rel/nifi-1.15.2 by Joe Witt on Tue Jan 18 09:55:08 2022 -0700 - Log - NIFI-9567 Signed release tag for approved release of NiFi 1.15.3 -BEGIN PGP SIGNATURE- iQEzBAABCgAdFiEE0vJLgJ/6seIa6gKDkJO/hU+BGhoFAmHm8OwACgkQkJO/hU+B GhosYQf/at8pKKqEgkglkggaMR1NJf7qECc+jWQu5M64VEIOjdwLPzO7nWb8V0Oz cPCAfFcvaFPyk/nD+EnVm7KL50Usef9cnE27Jj/cCyEH3NsRfhH1jZbYnn+DCP/O Csd6vmZlBy9hYCxhids8lBfhFFO1X7tmQanctE1Eqgoj7B2cZwAFVJX0gzOjItlg A1BhR4tiL3YBEaL3Xl3xRUm4HO3Jsqe8csi22lvk7hOAgZooAKKU25PkGN2qGXc/ FSBYQ8fbKGyYuFYuJoarj8tQbeFVYXbs3MH12rk8bFcIwzRH1GewglFZ3zq2krOr SZtXJnAHPQVE4esonKW5QVTzA/4/8A== =TARN -END PGP SIGNATURE- --- No new revisions were added by this update.
svn commit: r1897177 - in /nifi/site/trunk: download.html minifi/download.html registry.html security.html
Author: joewitt Date: Tue Jan 18 16:42:59 2022 New Revision: 1897177 URL: http://svn.apache.org/viewvc?rev=1897177=rev Log: NIFI-9567 Modified: nifi/site/trunk/download.html nifi/site/trunk/minifi/download.html nifi/site/trunk/registry.html nifi/site/trunk/security.html Modified: nifi/site/trunk/download.html URL: http://svn.apache.org/viewvc/nifi/site/trunk/download.html?rev=1897177=1897176=1897177=diff == --- nifi/site/trunk/download.html (original) +++ nifi/site/trunk/download.html Tue Jan 18 16:42:59 2022 @@ -129,30 +129,30 @@ Releases -1.15.2 +1.15.3 -Released December 22nd, 2021 +Released January 18, 20222 Sources: -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.2/nifi-1.15.2-source-release.zip;>nifi-1.15.2-source-release.zip ( https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-source-release.zip.asc;>asc, https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-source-release.zip.sha256;>sha256, https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-source-release.zip.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.3/nifi-1.15.3-source-release.zip;>nifi-1.15.3-source-release.zip ( https://downloads.apache.org/nifi/1.15.3/nifi-1.15.3-source-release.zip.asc;>asc, https://downloads.apache.org/nifi/1.15.3/nifi-1.15.3-source-release.zip.sha256;>sha256, https://downloads.apache.org/nifi/1.15.3/nifi-1.15.3-source-release.zip.sha512;>sha512 ) Binaries -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.2/nifi-1.15.2-bin.tar.gz;>nifi-1.15.2-bin.tar.gz ( https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-bin.tar.gz.asc;>asc, https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-bin.tar.gz.sha256;>sha256, https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-bin.tar.gz.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.3/nifi-1.15.3-bin.tar.gz;>nifi-1.15.3-bin.tar.gz ( https://downloads.apache.org/nifi/1.15.3/nifi-1.15.3-bin.tar.gz.asc;>asc, https://downloads.apache.org/nifi/1.15.3/nifi-1.15.3-bin.tar.gz.sha256;>sha256, https://downloads.apache.org/nifi/1.15.3/nifi-1.15.3-bin.tar.gz.sha512;>sha512 ) -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.2/nifi-1.15.2-bin.zip;>nifi-1.15.2-bin.zip ( https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-bin.zip.asc;>asc, https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-bin.zip.sha256;>sha256, https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-bin.zip.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.3/nifi-1.15.3-bin.zip;>nifi-1.15.3-bin.zip ( https://downloads.apache.org/nifi/1.15.3/nifi-1.15.3-bin.zip.asc;>asc, https://downloads.apache.org/nifi/1.15.3/nifi-1.15.3-bin.zip.sha256;>sha256, https://downloads.apache.org/nifi/1.15.3/nifi-1.15.3-bin.zip.sha512;>sha512 ) -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.2/nifi-toolkit-1.15.2-bin.tar.gz;>nifi-toolkit-1.15.2-bin.tar.gz ( https://downloads.apache.org/nifi/1.15.2/nifi-toolkit-1.15.2-bin.tar.gz.asc;>asc, https://downloads.apache.org/nifi/1.15.2/nifi-toolkit-1.15.2-bin.tar.gz.sha256;>sha256, https://downloads.apache.org/nifi/1.15.2/nifi-toolkit-1.15.2-bin.tar.gz.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.3/nifi-toolkit-1.15.3-bin.tar.gz;>nifi-toolkit-1.15.3-bin.tar.gz ( https://downloads.apache.org/nifi/1.15.3/nifi-toolkit-1.15.3-bin.tar.gz.asc;>asc, https://downloads.apache.org/nifi/1.15.3/nifi-toolkit-1.15.3-bin.tar.gz.sha256;>sha256, https://downloads.apache.org/nifi/1.15.3/nifi-toolkit-1.15.3-bin.tar.gz.sha512;>sha512 ) -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.2/nifi-toolkit-1.15.2-bin.zip;>nifi-toolkit-1.15.2-bin.zip ( https://downloads.apache.org/nifi/1.15.2/nifi-toolkit-1.15.2-bin.zip.asc;>asc, https://downloads.apache.org/nifi/1.15.2/nifi-toolkit-1.15.2-bin.zip.sha256;>sha256, https://downloads.apache.org/nifi/1.15.2/nifi-toolkit-1.15.2-bin.zip.sha512;>sha512 ) -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.2/nifi-stateless-1.15.2-bin.tar.gz;>nifi-stateless-1.15.2-bin.tar.gz ( https://downloads.apache.org/nifi/1.15.2/nifi-stateless-1.15.2-bin.tar.gz.asc;>asc, https://downloads.apache.org/nifi/1.15.2/nifi-stateless-1.15.2-bi
svn commit: r52133 - /dev/nifi/nifi-1.15.3/ /release/nifi/1.15.3/
Author: joewitt Date: Tue Jan 18 16:29:45 2022 New Revision: 52133 Log: NIFI-9567 Added: release/nifi/1.15.3/ - copied from r52132, dev/nifi/nifi-1.15.3/ Removed: dev/nifi/nifi-1.15.3/
svn commit: r52065 - /dev/nifi/nifi-1.15.3/
Author: joewitt Date: Thu Jan 13 20:44:21 2022 New Revision: 52065 Log: NIFI-9567 RC1 artifacts for 1.15.3 Added: dev/nifi/nifi-1.15.3/ dev/nifi/nifi-1.15.3/minifi-1.15.3-bin.tar.gz (with props) dev/nifi/nifi-1.15.3/minifi-1.15.3-bin.tar.gz.asc dev/nifi/nifi-1.15.3/minifi-1.15.3-bin.tar.gz.sha256 dev/nifi/nifi-1.15.3/minifi-1.15.3-bin.tar.gz.sha512 dev/nifi/nifi-1.15.3/minifi-1.15.3-bin.zip (with props) dev/nifi/nifi-1.15.3/minifi-1.15.3-bin.zip.asc dev/nifi/nifi-1.15.3/minifi-1.15.3-bin.zip.sha256 dev/nifi/nifi-1.15.3/minifi-1.15.3-bin.zip.sha512 dev/nifi/nifi-1.15.3/minifi-c2-1.15.3-bin.tar.gz (with props) dev/nifi/nifi-1.15.3/minifi-c2-1.15.3-bin.tar.gz.asc dev/nifi/nifi-1.15.3/minifi-c2-1.15.3-bin.tar.gz.sha256 dev/nifi/nifi-1.15.3/minifi-c2-1.15.3-bin.tar.gz.sha512 dev/nifi/nifi-1.15.3/minifi-c2-1.15.3-bin.zip (with props) dev/nifi/nifi-1.15.3/minifi-c2-1.15.3-bin.zip.asc dev/nifi/nifi-1.15.3/minifi-c2-1.15.3-bin.zip.sha256 dev/nifi/nifi-1.15.3/minifi-c2-1.15.3-bin.zip.sha512 dev/nifi/nifi-1.15.3/minifi-toolkit-1.15.3-bin.tar.gz (with props) dev/nifi/nifi-1.15.3/minifi-toolkit-1.15.3-bin.tar.gz.asc dev/nifi/nifi-1.15.3/minifi-toolkit-1.15.3-bin.tar.gz.sha256 dev/nifi/nifi-1.15.3/minifi-toolkit-1.15.3-bin.tar.gz.sha512 dev/nifi/nifi-1.15.3/minifi-toolkit-1.15.3-bin.zip (with props) dev/nifi/nifi-1.15.3/minifi-toolkit-1.15.3-bin.zip.asc dev/nifi/nifi-1.15.3/minifi-toolkit-1.15.3-bin.zip.sha256 dev/nifi/nifi-1.15.3/minifi-toolkit-1.15.3-bin.zip.sha512 dev/nifi/nifi-1.15.3/nifi-1.15.3-bin.tar.gz (with props) dev/nifi/nifi-1.15.3/nifi-1.15.3-bin.tar.gz.asc dev/nifi/nifi-1.15.3/nifi-1.15.3-bin.tar.gz.sha256 dev/nifi/nifi-1.15.3/nifi-1.15.3-bin.tar.gz.sha512 dev/nifi/nifi-1.15.3/nifi-1.15.3-bin.zip (with props) dev/nifi/nifi-1.15.3/nifi-1.15.3-bin.zip.asc dev/nifi/nifi-1.15.3/nifi-1.15.3-bin.zip.sha256 dev/nifi/nifi-1.15.3/nifi-1.15.3-bin.zip.sha512 dev/nifi/nifi-1.15.3/nifi-1.15.3-source-release.zip (with props) dev/nifi/nifi-1.15.3/nifi-1.15.3-source-release.zip.asc dev/nifi/nifi-1.15.3/nifi-1.15.3-source-release.zip.sha256 dev/nifi/nifi-1.15.3/nifi-1.15.3-source-release.zip.sha512 dev/nifi/nifi-1.15.3/nifi-registry-1.15.3-bin.tar.gz (with props) dev/nifi/nifi-1.15.3/nifi-registry-1.15.3-bin.tar.gz.asc dev/nifi/nifi-1.15.3/nifi-registry-1.15.3-bin.tar.gz.sha256 dev/nifi/nifi-1.15.3/nifi-registry-1.15.3-bin.tar.gz.sha512 dev/nifi/nifi-1.15.3/nifi-registry-1.15.3-bin.zip (with props) dev/nifi/nifi-1.15.3/nifi-registry-1.15.3-bin.zip.asc dev/nifi/nifi-1.15.3/nifi-registry-1.15.3-bin.zip.sha256 dev/nifi/nifi-1.15.3/nifi-registry-1.15.3-bin.zip.sha512 dev/nifi/nifi-1.15.3/nifi-registry-toolkit-1.15.3-bin.tar.gz (with props) dev/nifi/nifi-1.15.3/nifi-registry-toolkit-1.15.3-bin.tar.gz.asc dev/nifi/nifi-1.15.3/nifi-registry-toolkit-1.15.3-bin.tar.gz.sha256 dev/nifi/nifi-1.15.3/nifi-registry-toolkit-1.15.3-bin.tar.gz.sha512 dev/nifi/nifi-1.15.3/nifi-registry-toolkit-1.15.3-bin.zip (with props) dev/nifi/nifi-1.15.3/nifi-registry-toolkit-1.15.3-bin.zip.asc dev/nifi/nifi-1.15.3/nifi-registry-toolkit-1.15.3-bin.zip.sha256 dev/nifi/nifi-1.15.3/nifi-registry-toolkit-1.15.3-bin.zip.sha512 dev/nifi/nifi-1.15.3/nifi-stateless-1.15.3-bin.tar.gz (with props) dev/nifi/nifi-1.15.3/nifi-stateless-1.15.3-bin.tar.gz.asc dev/nifi/nifi-1.15.3/nifi-stateless-1.15.3-bin.tar.gz.sha256 dev/nifi/nifi-1.15.3/nifi-stateless-1.15.3-bin.tar.gz.sha512 dev/nifi/nifi-1.15.3/nifi-toolkit-1.15.3-bin.tar.gz (with props) dev/nifi/nifi-1.15.3/nifi-toolkit-1.15.3-bin.tar.gz.asc dev/nifi/nifi-1.15.3/nifi-toolkit-1.15.3-bin.tar.gz.sha256 dev/nifi/nifi-1.15.3/nifi-toolkit-1.15.3-bin.tar.gz.sha512 dev/nifi/nifi-1.15.3/nifi-toolkit-1.15.3-bin.zip (with props) dev/nifi/nifi-1.15.3/nifi-toolkit-1.15.3-bin.zip.asc dev/nifi/nifi-1.15.3/nifi-toolkit-1.15.3-bin.zip.sha256 dev/nifi/nifi-1.15.3/nifi-toolkit-1.15.3-bin.zip.sha512 Added: dev/nifi/nifi-1.15.3/minifi-1.15.3-bin.tar.gz == Binary file - no diff available. Propchange: dev/nifi/nifi-1.15.3/minifi-1.15.3-bin.tar.gz -- svn:mime-type = application/octet-stream Added: dev/nifi/nifi-1.15.3/minifi-1.15.3-bin.tar.gz.asc == --- dev/nifi/nifi-1.15.3/minifi-1.15.3-bin.tar.gz.asc (added) +++ dev/nifi/nifi-1.15.3/minifi-1.15.3-bin.tar.gz.asc Thu Jan 13 20:44:21 2022 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEE0vJLgJ/6seIa6gKDkJO/hU+BGhoFAmHgh7MACgkQkJO/hU+B +GhqqYAf/XxVOA4dcOMLaqBKWT/v6ZqRyiboRhrk5XbgrP4Zw/rwi75s5auQ+bSf0
[nifi] branch NIFI-9567-RC1 created (now 7f4f27f)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to branch NIFI-9567-RC1 in repository https://gitbox.apache.org/repos/asf/nifi.git. at 7f4f27f NIFI-9567-RC1 prepare for next development iteration This branch includes the following new commits: new 753c311 NIFI-9567-RC1 prepare release nifi-1.15.3-RC1 new 7f4f27f NIFI-9567-RC1 prepare for next development iteration The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[nifi] annotated tag nifi-1.15.3-RC1 created (now 30694da)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to annotated tag nifi-1.15.3-RC1 in repository https://gitbox.apache.org/repos/asf/nifi.git. at 30694da (tag) tagging 753c311382005acadc16c64952d7b1eaaf2550d5 (commit) replaces rel/nifi-1.15.2 by Joe Witt on Thu Jan 13 11:04:58 2022 -0700 - Log - NIFI-9567-RC1 copy for tag nifi-1.15.3-RC1 --- No new revisions were added by this update.
[nifi] branch support/nifi-1.15 updated: NIFI-9567 fixing docker version reference
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.15 by this push: new cbb68f2 NIFI-9567 fixing docker version reference cbb68f2 is described below commit cbb68f2493c445f3692037a758602d9f033592b1 Author: Joe Witt AuthorDate: Thu Jan 13 10:20:37 2022 -0700 NIFI-9567 fixing docker version reference --- nifi-docker/dockerhub/DockerImage.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-docker/dockerhub/DockerImage.txt b/nifi-docker/dockerhub/DockerImage.txt index e007ce1..b5fecec 100644 --- a/nifi-docker/dockerhub/DockerImage.txt +++ b/nifi-docker/dockerhub/DockerImage.txt @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -apache/nifi:1.15.2 +apache/nifi:1.15.3
[nifi] branch main updated: NIFI-9566 This closes #5657. Upgraded Logback from 1.2.9 to 1.2.10
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/main by this push: new 7aadb0f NIFI-9566 This closes #5657. Upgraded Logback from 1.2.9 to 1.2.10 7aadb0f is described below commit 7aadb0f0fd124f716d59187fc3fbe4e4e23c7920 Author: exceptionfactory AuthorDate: Thu Jan 13 10:18:55 2022 -0600 NIFI-9566 This closes #5657. Upgraded Logback from 1.2.9 to 1.2.10 Signed-off-by: Joe Witt --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7f7c447..f4413b7 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ 2.1.5 1.9.6 2.33 -1.2.9 +1.2.10 3.11.2 3.10.6.Final 4.1.72.Final
[nifi] branch support/nifi-1.15 updated: NIFI-9566 This closes #5657. Upgraded Logback from 1.2.9 to 1.2.10
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.15 by this push: new 87ee86c NIFI-9566 This closes #5657. Upgraded Logback from 1.2.9 to 1.2.10 87ee86c is described below commit 87ee86c444b59073b7a87067d857ca6c08cd0c99 Author: exceptionfactory AuthorDate: Thu Jan 13 10:18:55 2022 -0600 NIFI-9566 This closes #5657. Upgraded Logback from 1.2.9 to 1.2.10 Signed-off-by: Joe Witt --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1904f51..b8edf46 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 2.1.5 1.9.6 2.33 -1.2.9 +1.2.10 3.11.2 3.10.6.Final 4.1.69.Final
[nifi] 01/02: NIFI-7089 Upgraded Apache SSHD from 1.7.0 to 2.8.0
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 20fa5c90db5df54b324a827437098dea2d33da0c
Author: exceptionfactory
AuthorDate: Fri Jan 7 11:49:33 2022 -0600
NIFI-7089 Upgraded Apache SSHD from 1.7.0 to 2.8.0
- Replaced fake-sftp-server-rule with test Apache SSHD Server
Signed-off-by: Pierre Villard
This closes #5646.
---
.../nifi-standard-processors/pom.xml | 16 +-
.../nifi/processors/standard/TestGetSFTP.java | 12 +-
.../nifi/processors/standard/TestListSFTP.java | 224 +
.../nifi/processors/standard/TestPutSFTP.java | 5 -
.../processors/standard/util/SSHTestServer.java| 34 ++--
nifi-nar-bundles/nifi-standard-bundle/pom.xml | 10 +
6 files changed, 85 insertions(+), 216 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
index 18859c5..73864e5 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
@@ -329,12 +329,6 @@
test
-org.apache.sshd
-sshd-core
-1.7.0
-test
-
-
com.bazaarvoice.jolt
jolt-core
@@ -387,9 +381,13 @@
test
-com.github.stefanbirkner
-fake-sftp-server-rule
-2.0.1
+org.apache.sshd
+sshd-core
+test
+
+
+org.apache.sshd
+sshd-sftp
test
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetSFTP.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetSFTP.java
index 5d063c7..79d57cd 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetSFTP.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetSFTP.java
@@ -26,8 +26,6 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
@@ -36,8 +34,6 @@ import java.nio.file.Paths;
public class TestGetSFTP {
-private static final Logger logger =
LoggerFactory.getLogger(TestGetSFTP.class);
-
private TestRunner getSFTPRunner;
private static SSHTestServer sshTestServer;
@@ -90,7 +86,7 @@ public class TestGetSFTP {
//Verify files deleted
for(int i=1;i<5;i++){
Path file1 = Paths.get(sshTestServer.getVirtualFileSystemPath() +
"/testFile" + i + ".txt");
-Assert.assertTrue("File not deleted.",
!file1.toAbsolutePath().toFile().exists());
+Assert.assertFalse("File not deleted.",
file1.toAbsolutePath().toFile().exists());
}
getSFTPRunner.clearTransferState();
@@ -114,7 +110,7 @@ public class TestGetSFTP {
// Verify files deleted
for (int i = 1; i < 3; i++) {
Path file1 =
Paths.get(sshTestServer.getVirtualFileSystemPath() + "/testFile" + i + ".txt");
-Assert.assertTrue("File not deleted.",
!file1.toAbsolutePath().toFile().exists());
+Assert.assertFalse("File not deleted.",
file1.toAbsolutePath().toFile().exists());
}
getSFTPRunner.clearTransferState();
@@ -140,10 +136,10 @@ public class TestGetSFTP {
//Verify non-dotted files were deleted and dotted files were not
deleted
Path file1 = Paths.get(sshTestServer.getVirtualFileSystemPath() +
"/testFile1.txt");
-Assert.assertTrue("File not deleted.",
!file1.toAbsolutePath().toFile().exists());
+Assert.assertFalse("File not deleted.",
file1.toAbsolutePath().toFile().exists());
file1 = Paths.get(sshTestServer.getVirtualFileSystemPath() +
"/testFile3.txt");
-Assert.assertTrue("File not deleted.",
!file1.toAbsolutePath().toFile().exists());
+Assert.assertFalse("File not deleted.",
file1.toAbsolutePath().toFile().exists());
file1 = Paths.get(sshTestServer.getVirtualFileSystemPath() +
"/.testFile2.txt");
Assert.assertTrue("File deleted.",
file1.toAbsolutePath().toFile().exists());
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standa
[nifi] 02/02: NIFI-9549: Delegate NonFlushableOutputStream write methods to wrapped OutputStream
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 667cfcd780cde9876fe09e43384207a79834f54c
Author: Mark Payne
AuthorDate: Thu Jan 6 16:34:01 2022 -0500
NIFI-9549: Delegate NonFlushableOutputStream write methods to wrapped
OutputStream
Ensure that we delegate calls to write(byte[]) and write(byte[], int, int)
to the underlying OutputStream for NonFlushableOutputStream, instead of
allowing FilterOutputStream to iterate over every byte
This closes #5642
Signed-off-by: David Handermann
---
.../apache/nifi/stream/io/NonFlushableOutputStream.java | 15 +++
1 file changed, 15 insertions(+)
diff --git
a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/NonFlushableOutputStream.java
b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/NonFlushableOutputStream.java
index e951064..335d864 100644
---
a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/NonFlushableOutputStream.java
+++
b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/NonFlushableOutputStream.java
@@ -34,4 +34,19 @@ public class NonFlushableOutputStream extends
FilterOutputStream {
public void close() throws IOException {
out.close();
}
+
+@Override
+public void write(final byte[] b, final int off, final int len) throws
IOException {
+out.write(b, off, len);
+}
+
+@Override
+public void write(final byte[] b) throws IOException {
+out.write(b);
+}
+
+@Override
+public void write(final int b) throws IOException {
+out.write(b);
+}
}
[nifi] branch support/nifi-1.15 updated (6ead245 -> 667cfcd)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git. from 6ead245 NIFI-9552: Make sure cl-over-slf4j is included under ext/ranger/install/lib directory new 20fa5c9 NIFI-7089 Upgraded Apache SSHD from 1.7.0 to 2.8.0 new 667cfcd NIFI-9549: Delegate NonFlushableOutputStream write methods to wrapped OutputStream The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../nifi/stream/io/NonFlushableOutputStream.java | 15 ++ .../nifi-standard-processors/pom.xml | 16 +- .../nifi/processors/standard/TestGetSFTP.java | 12 +- .../nifi/processors/standard/TestListSFTP.java | 224 + .../nifi/processors/standard/TestPutSFTP.java | 5 - .../processors/standard/util/SSHTestServer.java| 34 ++-- nifi-nar-bundles/nifi-standard-bundle/pom.xml | 10 + 7 files changed, 100 insertions(+), 216 deletions(-)
[nifi] branch support/nifi-1.15 updated: NIFI-9552: Make sure cl-over-slf4j is included under ext/ranger/install/lib directory
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.15 by this push: new 6ead245 NIFI-9552: Make sure cl-over-slf4j is included under ext/ranger/install/lib directory 6ead245 is described below commit 6ead2455a771c22a4a774bce3e39fb1b9a4a3cee Author: Zoltan Kornel Torok AuthorDate: Fri Jan 7 12:40:48 2022 +0100 NIFI-9552: Make sure cl-over-slf4j is included under ext/ranger/install/lib directory Signed-off-by: Joe Witt --- nifi-assembly/src/main/assembly/ranger.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/nifi-assembly/src/main/assembly/ranger.xml b/nifi-assembly/src/main/assembly/ranger.xml index da18c37..9e22688 100644 --- a/nifi-assembly/src/main/assembly/ranger.xml +++ b/nifi-assembly/src/main/assembly/ranger.xml @@ -61,6 +61,7 @@ org.apache.nifi:nifi-ranger-resources:jar org.slf4j:slf4j-api +org.slf4j:jcl-over-slf4j
[nifi] 02/02: NIFI-9525 including same pattern for nifi registry. This is commmit 2/2 for NIFI-9525
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit bc2ba9537ac37e0907828a2fc6d7545413749e17
Author: Joe Witt
AuthorDate: Wed Jan 12 15:47:27 2022 -0700
NIFI-9525 including same pattern for nifi registry. This is commmit 2/2
for NIFI-9525
---
nifi-registry/nifi-registry-assembly/pom.xml | 50 +++-
1 file changed, 5 insertions(+), 45 deletions(-)
diff --git a/nifi-registry/nifi-registry-assembly/pom.xml
b/nifi-registry/nifi-registry-assembly/pom.xml
index c7ddd06..13db72f 100644
--- a/nifi-registry/nifi-registry-assembly/pom.xml
+++ b/nifi-registry/nifi-registry-assembly/pom.xml
@@ -371,51 +371,11 @@
/opt/nifi-registry/nifi-registry-${project.version}/lib
-
-
-
-
/opt/nifi-registry/nifi-registry-${project.version}/lib
-
-
-
org.apache.commons:commons-lang3
-
org.apache.nifi.registry:nifi-registry-utils
-
org.apache.nifi.registry:nifi-registry-bootstrap
-
org.apache.nifi.registry:nifi-registry-docs
-
-
-
-
-
/opt/nifi-registry/nifi-registry-${project.version}/lib/bootstrap
-
-
-
org.slf4j:slf4j-api
-
ch.qos.logback:logback-classic
-
ch.qos.logback:logback-core
-
org.apache.nifi.registry:nifi-registry-bootstrap
-
-
-
org.apache.commons:commons-lang3
-
org.apache.nifi.registry:nifi-registry-utils
-
-
-
-
-
/opt/nifi-registry/nifi-registry-${project.version}/lib/shared
-
-
-
org.apache.commons:commons-lang3
-
org.apache.nifi.registry:nifi-registry-utils
-
-
+
+
+
${project.build.directory}/nifi-registry-${project.version}-bin/nifi-registry-${project.version}/lib
+
+
/opt/nifi-registry/nifi-registry-${project.version}/docs
[nifi] branch main updated (5054fc3 -> bc2ba95)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git. from 5054fc3 NIFI-9564 This closes #5652. Removed unnecessary logback-classic test dependencies new 476c70e NIFI-9525 This closes #5626. modify lib packaging to use files from build directory new bc2ba95 NIFI-9525 including same pattern for nifi registry. This is commmit 2/2 for NIFI-9525 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: nifi-assembly/pom.xml| 139 +-- nifi-registry/nifi-registry-assembly/pom.xml | 50 +- 2 files changed, 10 insertions(+), 179 deletions(-)
[nifi] 01/02: NIFI-9525 This closes #5626. modify lib packaging to use files from build directory
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 476c70e220099e7d0e59d8100a8e57e95bc50474
Author: Gregory M. Foreman
AuthorDate: Tue Jan 4 08:04:19 2022 -0500
NIFI-9525 This closes #5626. modify lib packaging to use files from build
directory
Signed-off-by: Joe Witt
---
nifi-assembly/pom.xml | 139 ++
1 file changed, 5 insertions(+), 134 deletions(-)
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index 82b9a86..366229d 100644
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -1213,140 +1213,11 @@ language governing permissions and limitations under
the License. -->
/opt/nifi/nifi-${project.version}/lib
-
-
-
-
/opt/nifi/nifi-${project.version}/lib
-
-
-
org.bouncycastle:bcprov-jdk15on
-
org.apache.commons:commons-configuration2
-
org.apache.commons:commons-lang3
-
org.apache.commons:commons-text
-
-
-
-
-
javax.mail:mail
-
-
org.apache.nifi:nifi-bootstrap
-
org.apache.nifi:nifi-bootstrap-utils
-
org.apache.nifi:nifi-expression-language
-
org.apache.nifi:nifi-parameter
-
org.apache.nifi:nifi-processor-utils
-
-
org.apache.nifi:nifi-properties-loader
-
-
javax.activation:activation
-
com.sun.activation:javax.activation
-
org.antlr:antlr-runtime
-asm:asm
-
net.minidev:asm
-
org.ow2.asm:asm
-
net.minidev:accessors-smart
-
org.bouncycastle:bcpkix-jdk15on
-
commons-codec:commons-codec
-
commons-io:commons-io
-
commons-logging:commons-logging
-
com.fasterxml.jackson.core:jackson-annotations
-
com.fasterxml.jackson.core:jackson-core
-
com.fasterxml.jackson.core:jackson-databind
-
com.jayway.jsonpath:json-path
-
at.favre.lib:bcrypt
-
net.java.dev.jna:jna
-
net.java.dev.jna:jna-platform
-
net.minidev:json-smart
-
-
org.apache.nifi:nifi-security-utils
-
org.apache.nifi:nifi-utils
-
-
org.apache.nifi:nifi-resources
-
org.apache.nifi:nifi-docs
-
com.squareup.okhttp3:okhttp
-
com.squareup.okio:okio
-
-
-
org.glassfish.jaxb:jaxb-runt
[nifi] 01/02: NIFI-9525 This closes #5626. modify lib packaging to use files from build directory
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 80cbd4c4a30c2db0190ec20e4bd5fd16d5776e60
Author: Gregory M. Foreman
AuthorDate: Tue Jan 4 08:04:19 2022 -0500
NIFI-9525 This closes #5626. modify lib packaging to use files from build
directory
Signed-off-by: Joe Witt
---
nifi-assembly/pom.xml | 139 ++
1 file changed, 5 insertions(+), 134 deletions(-)
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index 6a6fc92..a1b16a3 100644
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -1175,140 +1175,11 @@ language governing permissions and limitations under
the License. -->
/opt/nifi/nifi-${project.version}/lib
-
-
-
-
/opt/nifi/nifi-${project.version}/lib
-
-
-
org.bouncycastle:bcprov-jdk15on
-
org.apache.commons:commons-configuration2
-
org.apache.commons:commons-lang3
-
org.apache.commons:commons-text
-
-
-
-
-
javax.mail:mail
-
-
org.apache.nifi:nifi-bootstrap
-
org.apache.nifi:nifi-bootstrap-utils
-
org.apache.nifi:nifi-expression-language
-
org.apache.nifi:nifi-parameter
-
org.apache.nifi:nifi-processor-utils
-
-
org.apache.nifi:nifi-properties-loader
-
-
javax.activation:activation
-
com.sun.activation:javax.activation
-
org.antlr:antlr-runtime
-asm:asm
-
net.minidev:asm
-
org.ow2.asm:asm
-
net.minidev:accessors-smart
-
org.bouncycastle:bcpkix-jdk15on
-
commons-codec:commons-codec
-
commons-io:commons-io
-
commons-logging:commons-logging
-
com.fasterxml.jackson.core:jackson-annotations
-
com.fasterxml.jackson.core:jackson-core
-
com.fasterxml.jackson.core:jackson-databind
-
com.jayway.jsonpath:json-path
-
at.favre.lib:bcrypt
-
net.java.dev.jna:jna
-
net.java.dev.jna:jna-platform
-
net.minidev:json-smart
-
-
org.apache.nifi:nifi-security-utils
-
org.apache.nifi:nifi-utils
-
-
org.apache.nifi:nifi-resources
-
org.apache.nifi:nifi-docs
-
com.squareup.okhttp3:okhttp
-
com.squareup.okio:okio
-
-
-
org.glassfish.jaxb:jaxb-runt
[nifi] 02/02: NIFI-9525 including same pattern for nifi registry
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 60ba2d1c544ee5ea2d6222cd51fd293b06a8ab37
Author: Joe Witt
AuthorDate: Wed Jan 12 15:47:27 2022 -0700
NIFI-9525 including same pattern for nifi registry
---
nifi-registry/nifi-registry-assembly/pom.xml | 50 +++-
1 file changed, 5 insertions(+), 45 deletions(-)
diff --git a/nifi-registry/nifi-registry-assembly/pom.xml
b/nifi-registry/nifi-registry-assembly/pom.xml
index 492e598..2b02c8c 100644
--- a/nifi-registry/nifi-registry-assembly/pom.xml
+++ b/nifi-registry/nifi-registry-assembly/pom.xml
@@ -371,51 +371,11 @@
/opt/nifi-registry/nifi-registry-${project.version}/lib
-
-
-
-
/opt/nifi-registry/nifi-registry-${project.version}/lib
-
-
-
org.apache.commons:commons-lang3
-
org.apache.nifi.registry:nifi-registry-utils
-
org.apache.nifi.registry:nifi-registry-bootstrap
-
org.apache.nifi.registry:nifi-registry-docs
-
-
-
-
-
/opt/nifi-registry/nifi-registry-${project.version}/lib/bootstrap
-
-
-
org.slf4j:slf4j-api
-
ch.qos.logback:logback-classic
-
ch.qos.logback:logback-core
-
org.apache.nifi.registry:nifi-registry-bootstrap
-
-
-
org.apache.commons:commons-lang3
-
org.apache.nifi.registry:nifi-registry-utils
-
-
-
-
-
/opt/nifi-registry/nifi-registry-${project.version}/lib/shared
-
-
-
org.apache.commons:commons-lang3
-
org.apache.nifi.registry:nifi-registry-utils
-
-
+
+
+
${project.build.directory}/nifi-registry-${project.version}-bin/nifi-registry-${project.version}/lib
+
+
/opt/nifi-registry/nifi-registry-${project.version}/docs
[nifi] 03/04: NIFI-9524 exclude commons-logging and log4j-core banned dependencies for other build profiles as well (#5625)
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit c71a18ff4770afe2d433d12b2582f54b98b02cb3
Author: Zoltán Kornél Török
AuthorDate: Tue Jan 4 15:14:04 2022 +0100
NIFI-9524 exclude commons-logging and log4j-core banned dependencies for
other build profiles as well (#5625)
---
.../nifi-hadoop-libraries-nar/pom.xml | 44 --
.../nifi-hive-bundle/nifi-hive3-nar/pom.xml| 24
.../nifi-ranger-bundle/nifi-ranger-plugin/pom.xml | 16
.../nifi-registry-ranger-plugin/pom.xml| 16
4 files changed, 88 insertions(+), 12 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml
b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml
index 6521ef8..2eda8b1 100644
---
a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml
+++
b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml
@@ -1,13 +1,13 @@
http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd;>
-
4.0.0
@@ -32,7 +32,7 @@
org.apache.hadoop
hadoop-client
-${hadoop.version}
+${hadoop.version}
com.google.code.findbugs
@@ -59,12 +59,12 @@
org.apache.avro
avro
-${avro.version}
+${avro.version}
org.apache.avro
avro-ipc
-${avro.version}
+${avro.version}
com.github.stephenc.findbugs
@@ -108,6 +108,10 @@
com.fasterxml.jackson.core
jackson-core
+
+commons-logging
+commons-logging
+
@@ -134,6 +138,12 @@
org.apache.hadoop
hadoop-cloud-storage
${hadoop.version}
+
+
+ commons-logging
+ commons-logging
+
+
@@ -148,6 +158,16 @@
org.apache.hadoop
hadoop-ozone-client
${ozone.version}
+
+
+ commons-logging
+ commons-logging
+
+
+ org.apache.logging.log4j
+ log4j-core
+
+
org.apache.hadoop
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/pom.xml
b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/pom.xml
index 6a78c0c..81e4327 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/pom.xml
@@ -67,6 +67,10 @@
+org.slf4j
+jcl-over-slf4j
+
+
org.apache.hadoop
hadoop-azure
${hadoop.version}
@@ -79,6 +83,10 @@
com.fasterxml.jackson.core
jackson-core
+
+commons-logging
+commons-logging
+
@@ -105,6 +113,12 @@
org.apache.hadoop
hadoop-cloud-storage
${hadoop.version}
+
+
+ commons-logging
+ commons-logging
+
+
@@ -119,6 +133,16 @@
org.apache.hadoop
hadoop-ozone-client
${ozone.version}
+
+
+ commons-logging
+ commons-logging
+
+
+ org.apache.logging.log4j
+ log4j-core
+
+
org.apache.hado
[nifi] 02/04: NIFI-8605 Adding a new property for ExecuteSQL and ExecuteSQLRecord processors to enable/disable auto committing change the default value of auto commit function to true Changed the auto
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 8f50e90e6f5633376081a9fcfe260c4a6031ff85
Author: Vibhath Ileperuma
AuthorDate: Sat Nov 27 20:43:51 2021 +0530
NIFI-8605 Adding a new property for ExecuteSQL and ExecuteSQLRecord
processors to enable/disable auto committing
change the default value of auto commit function to true
Changed the auto commit property name and add more details in the
description
If the auto commit is set to false, commit() is called for consistency
adds unit tests
Fix the check style issue of having more than 200 characters in single line
Signed-off-by: Matthew Burgess
This closes #5554
---
.../processors/standard/AbstractExecuteSQL.java| 339 +++--
.../nifi/processors/standard/ExecuteSQL.java | 1 +
.../nifi/processors/standard/ExecuteSQLRecord.java | 1 +
.../nifi/processors/standard/TestExecuteSQL.java | 17 ++
.../processors/standard/TestExecuteSQLRecord.java | 17 ++
5 files changed, 217 insertions(+), 158 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractExecuteSQL.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractExecuteSQL.java
index bd6962c..55a4326 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractExecuteSQL.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractExecuteSQL.java
@@ -169,6 +169,22 @@ public abstract class AbstractExecuteSQL extends
AbstractProcessor {
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
.build();
+public static final PropertyDescriptor AUTO_COMMIT = new
PropertyDescriptor.Builder()
+.name("esql-auto-commit")
+.displayName("Set Auto Commit")
+.description("Enables or disables the auto commit functionality of
the DB connection. Default value is 'true'. " +
+"The default value can be used with most of the JDBC
drivers and this functionality doesn't have any impact in most of the cases " +
+"since this processor is used to read data. " +
+"However, for some JDBC drivers such as PostgreSQL driver,
it is required to disable the auto committing functionality " +
+"to limit the number of result rows fetching at a time. " +
+"When auto commit is enabled, postgreSQL driver loads
whole result set to memory at once. " +
+"This could lead for a large amount of memory usage when
executing queries which fetch large data sets. " +
+"More Details of this behaviour in PostgreSQL driver can
be found in https://jdbc.postgresql.org//documentation/head/query.html. ")
+.allowableValues("true", "false")
+.defaultValue("true")
+.required(true)
+.build();
+
protected List propDescriptors;
protected DBCPService dbcpService;
@@ -236,195 +252,202 @@ public abstract class AbstractExecuteSQL extends
AbstractProcessor {
}
int resultCount = 0;
-try (final Connection con = dbcpService.getConnection(fileToProcess ==
null ? Collections.emptyMap() : fileToProcess.getAttributes());
- final PreparedStatement st = con.prepareStatement(selectQuery)) {
-if (fetchSize != null && fetchSize > 0) {
-try {
-st.setFetchSize(fetchSize);
-} catch (SQLException se) {
-// Not all drivers support this, just log the error (at
debug level) and move on
-logger.debug("Cannot set fetch size to {} due to {}", new
Object[]{fetchSize, se.getLocalizedMessage()}, se);
+try (final Connection con = dbcpService.getConnection(fileToProcess ==
null ? Collections.emptyMap() : fileToProcess.getAttributes())) {
+con.setAutoCommit(context.getProperty(AUTO_COMMIT).asBoolean());
+try (final PreparedStatement st =
con.prepareStatement(selectQuery)) {
+if (fetchSize != null && fetchSize > 0) {
+try {
+st.setFetchSize(fetchSize);
+} catch (SQLException se) {
+// Not all drivers support this, just log the error
(at debug level) and move on
+logger.debug("Cannot set fetch size to {} due to {}",
[nifi] 04/04: NIFI-9564 This closes #5652. Removed unnecessary logback-classic test dependencies
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git commit b5f34de4d78890f432157e51052e0ef4d700f8d6 Author: exceptionfactory AuthorDate: Wed Jan 12 10:48:56 2022 -0600 NIFI-9564 This closes #5652. Removed unnecessary logback-classic test dependencies Signed-off-by: Joe Witt --- nifi-bootstrap/pom.xml| 5 - nifi-commons/nifi-bootstrap-utils/pom.xml | 6 -- 2 files changed, 11 deletions(-) diff --git a/nifi-bootstrap/pom.xml b/nifi-bootstrap/pom.xml index 4c5ca71..5577489 100644 --- a/nifi-bootstrap/pom.xml +++ b/nifi-bootstrap/pom.xml @@ -85,10 +85,5 @@ language governing permissions and limitations under the License. --> nifi-properties-loader 1.15.3-SNAPSHOT - -ch.qos.logback -logback-classic -test - diff --git a/nifi-commons/nifi-bootstrap-utils/pom.xml b/nifi-commons/nifi-bootstrap-utils/pom.xml index 51abea5..4ca45fb 100644 --- a/nifi-commons/nifi-bootstrap-utils/pom.xml +++ b/nifi-commons/nifi-bootstrap-utils/pom.xml @@ -31,11 +31,5 @@ language governing permissions and limitations under the License. --> jna-platform 4.4.0 - - -ch.qos.logback -logback-classic -test -
[nifi] branch support/nifi-1.15 updated (91b50ca -> b5f34de)
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a change to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git.
from 91b50ca NIFI-9534 Upgraded Log4j 2 BOM from 2.17.0 to 2.17.1
new 87556a7 NIFI-7835 Added authenticated SOCKS proxy support for SFTP
new 8f50e90 NIFI-8605 Adding a new property for ExecuteSQL and
ExecuteSQLRecord processors to enable/disable auto committing change the
default value of auto commit function to true Changed the auto commit property
name and add more details in the description If the auto commit is set to
false, commit() is called for consistency adds unit tests Fix the check style
issue of having more than 200 characters in single line
new c71a18f NIFI-9524 exclude commons-logging and log4j-core banned
dependencies for other build profiles as well (#5625)
new b5f34de NIFI-9564 This closes #5652. Removed unnecessary
logback-classic test dependencies
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
nifi-bootstrap/pom.xml | 5 -
nifi-commons/nifi-bootstrap-utils/pom.xml | 6 -
.../nifi-hadoop-libraries-nar/pom.xml | 44 ++-
.../nifi-hive-bundle/nifi-hive3-nar/pom.xml| 24 ++
.../nifi-ranger-bundle/nifi-ranger-plugin/pom.xml | 16 +
.../nifi-standard-processors/pom.xml | 5 +
.../processors/standard/AbstractExecuteSQL.java| 339 +++--
.../nifi/processors/standard/ExecuteSQL.java | 1 +
.../nifi/processors/standard/ExecuteSQLRecord.java | 1 +
.../{ssh => socket}/ProxySocketFactory.java| 2 +-
.../standard/socket/SocketFactoryProvider.java | 20 +-
.../socket/StandardSocketFactoryProvider.java | 65
.../standard/ssh/StandardSSHClientProvider.java| 7 +-
.../nifi/processors/standard/TestExecuteSQL.java | 17 ++
.../processors/standard/TestExecuteSQLRecord.java | 17 ++
.../{ssh => socket}/ProxySocketFactoryTest.java| 2 +-
.../socket/StandardSocketFactoryProviderTest.java | 80 +
.../nifi-registry-ranger-plugin/pom.xml| 16 +
18 files changed, 474 insertions(+), 193 deletions(-)
rename
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/{ssh
=> socket}/ProxySocketFactory.java (98%)
copy
nifi-framework-api/src/main/java/org/apache/nifi/authorization/AuthorizationAuditor.java
=>
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/socket/SocketFactoryProvider.java
(65%)
create mode 100644
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/socket/StandardSocketFactoryProvider.java
rename
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/{ssh
=> socket}/ProxySocketFactoryTest.java (96%)
create mode 100644
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/socket/StandardSocketFactoryProviderTest.java
[nifi] 01/04: NIFI-7835 Added authenticated SOCKS proxy support for SFTP
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 87556a79c57340b00e95c6215e5a8e7e7490c2e6
Author: exceptionfactory
AuthorDate: Tue Nov 16 15:22:09 2021 -0600
NIFI-7835 Added authenticated SOCKS proxy support for SFTP
NIFI-7749 Added authenticated HTTP proxy support for SFTP
- Added StandardSocketFactoryProvider to return SocketFactory based on
credentials
Signed-off-by: Joe Gresock
This closes #5624.
---
.../nifi-standard-processors/pom.xml | 5 ++
.../{ssh => socket}/ProxySocketFactory.java| 2 +-
.../standard/socket/SocketFactoryProvider.java | 34 +
.../socket/StandardSocketFactoryProvider.java | 65 ++
.../standard/ssh/StandardSSHClientProvider.java| 7 +-
.../{ssh => socket}/ProxySocketFactoryTest.java| 2 +-
.../socket/StandardSocketFactoryProviderTest.java | 80 ++
7 files changed, 191 insertions(+), 4 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
index 0c61dcb..18859c5 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
@@ -142,6 +142,11 @@
sshj
+com.exceptionfactory.socketbroker
+socketbroker
+1.0.2
+
+
org.eclipse.jetty
jetty-server
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ssh/ProxySocketFactory.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/socket/ProxySocketFactory.java
similarity index 98%
rename from
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ssh/ProxySocketFactory.java
rename to
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/socket/ProxySocketFactory.java
index 4414880..d5125b0 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ssh/ProxySocketFactory.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/socket/ProxySocketFactory.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.nifi.processors.standard.ssh;
+package org.apache.nifi.processors.standard.socket;
import javax.net.SocketFactory;
import java.io.IOException;
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/socket/SocketFactoryProvider.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/socket/SocketFactoryProvider.java
new file mode 100644
index 000..357eb47
--- /dev/null
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/socket/SocketFactoryProvider.java
@@ -0,0 +1,34 @@
+/*
+ * 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.standard.socket;
+
+import org.apache.nifi.proxy.ProxyConfiguration;
+
+import javax.net.SocketFactory;
+
+/**
+ * Socket Factory Provider abstracts implementation selection based on Proxy
Configuration
+ */
+public interface SocketFactoryProvider {
+/**
+ * Get Socket Factory based on provided Proxy Configuration
+ *
+ * @param proxyConfiguration Proxy Configuration required
+ * @return Socket Factory
+ */
+SocketFactory getSocketFactory(ProxyConfiguration proxyConfiguration);
+}
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/
[nifi] branch main updated: NIFI-9564 This closes #5652. Removed unnecessary logback-classic test dependencies
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/main by this push: new 5054fc3 NIFI-9564 This closes #5652. Removed unnecessary logback-classic test dependencies 5054fc3 is described below commit 5054fc3ac68b3a5cef7429a6dc380cb446d0c685 Author: exceptionfactory AuthorDate: Wed Jan 12 10:48:56 2022 -0600 NIFI-9564 This closes #5652. Removed unnecessary logback-classic test dependencies Signed-off-by: Joe Witt --- nifi-bootstrap/pom.xml| 5 - nifi-commons/nifi-bootstrap-utils/pom.xml | 6 -- 2 files changed, 11 deletions(-) diff --git a/nifi-bootstrap/pom.xml b/nifi-bootstrap/pom.xml index ff40d5b..5fd23db 100644 --- a/nifi-bootstrap/pom.xml +++ b/nifi-bootstrap/pom.xml @@ -85,10 +85,5 @@ language governing permissions and limitations under the License. --> nifi-properties-loader 1.16.0-SNAPSHOT - -ch.qos.logback -logback-classic -test - diff --git a/nifi-commons/nifi-bootstrap-utils/pom.xml b/nifi-commons/nifi-bootstrap-utils/pom.xml index 9200e65..8cb3ca1 100644 --- a/nifi-commons/nifi-bootstrap-utils/pom.xml +++ b/nifi-commons/nifi-bootstrap-utils/pom.xml @@ -31,11 +31,5 @@ language governing permissions and limitations under the License. --> jna-platform 4.4.0 - - -ch.qos.logback -logback-classic -test -
[nifi] branch main updated: NIFI-9348 NIFI-7863 This closes #5495. Added temporary suffix and fixed [NIFI-7863] creation of the directories
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 6caffca NIFI-9348 NIFI-7863 This closes #5495. Added temporary suffix
and fixed [NIFI-7863] creation of the directories
6caffca is described below
commit 6caffca811bcebcd1d83561cb5a036a80206ea95
Author: Gabriel Barbu
AuthorDate: Fri Oct 29 16:03:42 2021 +0300
NIFI-9348 NIFI-7863 This closes #5495. Added temporary suffix and fixed
[NIFI-7863] creation of the directories
Signed-off-by: Joe Witt
---
.../org/apache/nifi/processors/smb/PutSmbFile.java | 136 -
.../apache/nifi/processors/smb/GetSmbFileTest.java | 4 -
.../apache/nifi/processors/smb/PutSmbFileTest.java | 101 +++
3 files changed, 205 insertions(+), 36 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/PutSmbFile.java
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/PutSmbFile.java
index 1d8a9e0..2accbbf 100644
---
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/PutSmbFile.java
+++
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/PutSmbFile.java
@@ -51,6 +51,7 @@ import java.net.URI;
import com.hierynomus.smbj.SMBClient;
import com.hierynomus.smbj.connection.Connection;
import com.hierynomus.smbj.auth.AuthenticationContext;
+import com.hierynomus.smbj.share.DiskEntry;
import com.hierynomus.smbj.share.DiskShare;
import com.hierynomus.smbj.session.Session;
import com.hierynomus.msfscc.FileAttributes;
@@ -148,6 +149,12 @@ public class PutSmbFile extends AbstractProcessor {
.addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR)
.defaultValue("100")
.build();
+public static final PropertyDescriptor RENAME_SUFFIX = new
PropertyDescriptor.Builder()
+.name("Temporary Suffix")
+.description("A temporary suffix which will be apended to the
filename while it's transfering. After the transfer is complete, the suffix
will be removed.")
+.required(false)
+.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+.build();
public static final Relationship REL_SUCCESS = new Relationship.Builder()
.name("success")
.description("Files that have been successfully written to the
output network path are transferred to this relationship")
@@ -178,6 +185,7 @@ public class PutSmbFile extends AbstractProcessor {
descriptors.add(SHARE_ACCESS);
descriptors.add(CONFLICT_RESOLUTION);
descriptors.add(BATCH_SIZE);
+descriptors.add(RENAME_SUFFIX);
this.descriptors = Collections.unmodifiableList(descriptors);
final Set relationships = new HashSet();
@@ -236,6 +244,29 @@ public class PutSmbFile extends AbstractProcessor {
this.smbClient = smbClient;
}
+private void createMissingDirectoriesRecursevly(ComponentLog logger,
DiskShare share, String pathToCreate) {
+List paths = new ArrayList<>();
+
+java.io.File file = new java.io.File(pathToCreate);
+paths.add(file.getPath());
+
+while (file.getParent() != null) {
+String parent = file.getParent();
+paths.add(parent);
+file = new java.io.File(parent);
+}
+
+Collections.reverse(paths);
+for (String path : paths) {
+if (!share.folderExists(path)) {
+logger.debug("Creating folder {}", new Object[]{path});
+share.mkdir(path);
+} else {
+logger.debug("Folder already exists {}. Moving on", new
Object[]{path});
+}
+}
+}
+
@Override
public void onTrigger(final ProcessContext context, final ProcessSession
session) throws ProcessException {
final int batchSize = context.getProperty(BATCH_SIZE).asInteger();
@@ -268,33 +299,40 @@ public class PutSmbFile extends AbstractProcessor {
DiskShare share = (DiskShare) smbSession.connectShare(shareName)) {
for (FlowFile flowFile : flowFiles) {
-String directory =
context.getProperty(DIRECTORY).evaluateAttributeExpressions(flowFile).getValue();
-final String filename =
flowFile.getAttribute(CoreAttributes.FILENAME.key());
-final long sendStart = System.nanoTime();
-String fullPath;
-
-if (directory == null) {
-directory = "";
-fullPath = filename;
-} else {
-fullPath = director
svn commit: r1896767 - /nifi/site/trunk/videos.html
Author: joewitt Date: Thu Jan 6 19:36:27 2022 New Revision: 1896767 URL: http://svn.apache.org/viewvc?rev=1896767=rev Log: added vid links Modified: nifi/site/trunk/videos.html Modified: nifi/site/trunk/videos.html URL: http://svn.apache.org/viewvc/nifi/site/trunk/videos.html?rev=1896767=1896766=1896767=diff == --- nifi/site/trunk/videos.html (original) +++ nifi/site/trunk/videos.html Thu Jan 6 19:36:27 2022 @@ -117,6 +117,9 @@ + +Conference Presentations + Hadoop Summit Ireland 2016 - Apache NiFi in the Hadoop Ecosystem Hadoop Summit 2016 - Apache NiFi in this Hadoop Ecosystem @@ -135,6 +138,85 @@ + + +What's New +What's New in NiFi 1.14 + +What's New in NiFi 1.14 + +https://www.youtube.com/embed/h503MibiENY; frameborder="0" allowfullscreen> + + + + + + + +Walkthroughs +NiFi with Kafka's Exactly Once Semantics + +NiFi with Kafka's Exactly Once Semantics + +https://www.youtube.com/embed/VyzoD8eh-t0; frameborder="0" allowfullscreen> + + + + + + + +NiFi Anti-Patterns +NiFi Anti-Patterns Part 1 + +Apache NiFi Anti-Patterns - Part 1 + +https://www.youtube.com/embed/RjWstt7nRVY; frameborder="0" allowfullscreen> + + + + +NiFi Anti-Patterns Part 2 + +Apache NiFi Anti-Patterns - Part 2 + +https://www.youtube.com/embed/v1CoQk730qs; frameborder="0" allowfullscreen> + + + + +NiFi Anti-Patterns Part 3 + +Apache NiFi Anti-Patterns - Part 3 + +https://www.youtube.com/embed/by9P0Zi8Dk8; frameborder="0" allowfullscreen> + + + + +NiFi Anti-Patterns Part 4 + +Apache NiFi Anti-Patterns - Part 4 + +https://www.youtube.com/embed/pZq0EbfDBy4; frameborder="0" allowfullscreen> + + + + +NiFi Anti-Patterns Part 5 + +Apache NiFi Anti-Patterns - Part 5 + +https://www.youtube.com/embed/JbUjYr6Kd3I; frameborder="0" allowfullscreen> + + + + + + + + +Getting Started Screencast: NiFi User Interface Overview NiFi User Interface Overview
svn commit: r51716 - /release/nifi/1.15.1/
Author: joewitt Date: Thu Dec 23 00:29:12 2021 New Revision: 51716 Log: NIFI-9508 removing old artifacts Removed: release/nifi/1.15.1/
svn commit: r1896297 - in /nifi/site/trunk/docs/nifi-docs: ./ components/org.apache.nifi/nifi-ambari-nar/1.15.2/ components/org.apache.nifi/nifi-ambari-nar/1.15.2/org.apache.nifi.reporting.ambari.Amba
Author: joewitt Date: Thu Dec 23 00:00:49 2021 New Revision: 1896297 URL: http://svn.apache.org/viewvc?rev=1896297=rev Log: NIFI-9508 Added 1.15.2 docs to NiFi site. [This commit notification would consist of 57 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
[nifi] 01/01: Merge branch 'NIFI-9508-RC1' into support/nifi-1.15
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git commit b7ff136a33385a9216168a01dc8a299aa1856d7c Merge: 2e2e550 32ad254 Author: Joe Witt AuthorDate: Wed Dec 22 17:00:41 2021 -0700 Merge branch 'NIFI-9508-RC1' into support/nifi-1.15 minifi/minifi-assembly/pom.xml | 6 +- minifi/minifi-bootstrap/pom.xml| 2 +- minifi/minifi-c2/minifi-c2-api/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-assembly/pom.xml| 2 +- .../minifi-c2-cache-filesystem/pom.xml | 2 +- .../minifi-c2-cache/minifi-c2-cache-s3/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-cache/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-docker/pom.xml | 4 +- .../minifi-c2/minifi-c2-integration-tests/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-jetty/pom.xml | 2 +- .../minifi-c2-provider-cache/pom.xml | 2 +- .../minifi-c2-provider-delegating/pom.xml | 2 +- .../minifi-c2-provider-nifi-rest/pom.xml | 2 +- .../minifi-c2-provider-util/pom.xml| 2 +- minifi/minifi-c2/minifi-c2-provider/pom.xml| 2 +- minifi/minifi-c2/minifi-c2-service/pom.xml | 2 +- minifi/minifi-c2/pom.xml | 2 +- .../minifi-commons/minifi-commons-schema/pom.xml | 2 +- minifi/minifi-commons/minifi-utils/pom.xml | 2 +- minifi/minifi-commons/pom.xml | 2 +- minifi/minifi-docker/pom.xml | 4 +- minifi/minifi-docs/pom.xml | 2 +- minifi/minifi-integration-tests/pom.xml| 2 +- .../minifi-framework-nar/pom.xml | 2 +- .../minifi-framework/minifi-framework-api/pom.xml | 8 +- .../minifi-framework/minifi-framework-core/pom.xml | 6 +- .../minifi-framework/minifi-resources/pom.xml | 2 +- .../minifi-framework/minifi-runtime/pom.xml| 2 +- .../minifi-framework/minifi-server/pom.xml | 2 +- .../minifi-framework/pom.xml | 2 +- .../minifi-server-nar/pom.xml | 8 +- .../minifi-framework-bundle/pom.xml| 16 +- .../minifi-provenance-repositories/pom.xml | 2 +- .../minifi-provenance-repository-nar/pom.xml | 2 +- .../minifi-provenance-repository-bundle/pom.xml| 2 +- .../minifi-nar-bundles/minifi-standard-nar/pom.xml | 8 +- .../minifi-update-attribute-nar/pom.xml| 8 +- minifi/minifi-nar-bundles/pom.xml | 2 +- .../minifi-toolkit/minifi-toolkit-assembly/pom.xml | 2 +- .../minifi-toolkit-configuration/pom.xml | 2 +- minifi/minifi-toolkit/pom.xml | 2 +- minifi/pom.xml | 124 - nifi-api/pom.xml | 2 +- nifi-assembly/pom.xml | 280 ++--- nifi-bootstrap/pom.xml | 18 +- nifi-commons/nifi-bootstrap-utils/pom.xml | 2 +- nifi-commons/nifi-data-provenance-utils/pom.xml| 8 +- nifi-commons/nifi-expression-language/pom.xml | 10 +- nifi-commons/nifi-flow-encryptor/pom.xml | 4 +- nifi-commons/nifi-flowfile-packager/pom.xml| 2 +- nifi-commons/nifi-hl7-query-language/pom.xml | 2 +- nifi-commons/nifi-json-utils/pom.xml | 6 +- nifi-commons/nifi-logging-utils/pom.xml| 2 +- nifi-commons/nifi-metrics/pom.xml | 4 +- nifi-commons/nifi-parameter/pom.xml| 4 +- nifi-commons/nifi-properties/pom.xml | 4 +- nifi-commons/nifi-property-encryptor/pom.xml | 4 +- nifi-commons/nifi-property-utils/pom.xml | 2 +- nifi-commons/nifi-record-path/pom.xml | 10 +- nifi-commons/nifi-record/pom.xml | 2 +- nifi-commons/nifi-repository-encryption/pom.xml| 8 +- nifi-commons/nifi-rocksdb-utils/pom.xml| 8 +- nifi-commons/nifi-schema-utils/pom.xml | 2 +- nifi-commons/nifi-security-kerberos-api/pom.xml| 2 +- nifi-commons/nifi-security-kerberos/pom.xml| 6 +- nifi-commons/nifi-security-kms/pom.xml | 2 +- nifi-commons/nifi-security-socket-ssl/pom.xml | 6 +- nifi-commons/nifi-security-utils-api/pom.xml | 2 +- nifi-commons/nifi-security-utils/pom.xml | 12 +- .../nifi-sensitive-property-provider/pom.xml | 8 +- nifi-commons/nifi-single-user-utils/pom.xml| 2 +- nifi-commons/nifi-site-to-site-client/pom.xml | 12 +- nifi-commons/nifi-socket-utils/pom.xml | 8 +- nifi-commons/nifi-utils/pom.xml| 6 +- nifi-commons/nifi-uuid5/pom.xml| 2 +- nifi-commons/nifi-vault
[nifi] branch support/nifi-1.15 updated (2e2e550 -> b7ff136)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git. from 2e2e550 NIFI-9509 updating docker version ref add 1ea460b NIFI-9508-RC1 prepare release nifi-1.15.2-RC1 add 32ad254 NIFI-9508-RC1 prepare for next development iteration new b7ff136 Merge branch 'NIFI-9508-RC1' into support/nifi-1.15 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: minifi/minifi-assembly/pom.xml | 6 +- minifi/minifi-bootstrap/pom.xml| 2 +- minifi/minifi-c2/minifi-c2-api/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-assembly/pom.xml| 2 +- .../minifi-c2-cache-filesystem/pom.xml | 2 +- .../minifi-c2-cache/minifi-c2-cache-s3/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-cache/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-docker/pom.xml | 4 +- .../minifi-c2/minifi-c2-integration-tests/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-jetty/pom.xml | 2 +- .../minifi-c2-provider-cache/pom.xml | 2 +- .../minifi-c2-provider-delegating/pom.xml | 2 +- .../minifi-c2-provider-nifi-rest/pom.xml | 2 +- .../minifi-c2-provider-util/pom.xml| 2 +- minifi/minifi-c2/minifi-c2-provider/pom.xml| 2 +- minifi/minifi-c2/minifi-c2-service/pom.xml | 2 +- minifi/minifi-c2/pom.xml | 2 +- .../minifi-commons/minifi-commons-schema/pom.xml | 2 +- minifi/minifi-commons/minifi-utils/pom.xml | 2 +- minifi/minifi-commons/pom.xml | 2 +- minifi/minifi-docker/pom.xml | 4 +- minifi/minifi-docs/pom.xml | 2 +- minifi/minifi-integration-tests/pom.xml| 2 +- .../minifi-framework-nar/pom.xml | 2 +- .../minifi-framework/minifi-framework-api/pom.xml | 8 +- .../minifi-framework/minifi-framework-core/pom.xml | 6 +- .../minifi-framework/minifi-resources/pom.xml | 2 +- .../minifi-framework/minifi-runtime/pom.xml| 2 +- .../minifi-framework/minifi-server/pom.xml | 2 +- .../minifi-framework/pom.xml | 2 +- .../minifi-server-nar/pom.xml | 8 +- .../minifi-framework-bundle/pom.xml| 16 +- .../minifi-provenance-repositories/pom.xml | 2 +- .../minifi-provenance-repository-nar/pom.xml | 2 +- .../minifi-provenance-repository-bundle/pom.xml| 2 +- .../minifi-nar-bundles/minifi-standard-nar/pom.xml | 8 +- .../minifi-update-attribute-nar/pom.xml| 8 +- minifi/minifi-nar-bundles/pom.xml | 2 +- .../minifi-toolkit/minifi-toolkit-assembly/pom.xml | 2 +- .../minifi-toolkit-configuration/pom.xml | 2 +- minifi/minifi-toolkit/pom.xml | 2 +- minifi/pom.xml | 124 - nifi-api/pom.xml | 2 +- nifi-assembly/pom.xml | 280 ++--- nifi-bootstrap/pom.xml | 18 +- nifi-commons/nifi-bootstrap-utils/pom.xml | 2 +- nifi-commons/nifi-data-provenance-utils/pom.xml| 8 +- nifi-commons/nifi-expression-language/pom.xml | 10 +- nifi-commons/nifi-flow-encryptor/pom.xml | 4 +- nifi-commons/nifi-flowfile-packager/pom.xml| 2 +- nifi-commons/nifi-hl7-query-language/pom.xml | 2 +- nifi-commons/nifi-json-utils/pom.xml | 6 +- nifi-commons/nifi-logging-utils/pom.xml| 2 +- nifi-commons/nifi-metrics/pom.xml | 4 +- nifi-commons/nifi-parameter/pom.xml| 4 +- nifi-commons/nifi-properties/pom.xml | 4 +- nifi-commons/nifi-property-encryptor/pom.xml | 4 +- nifi-commons/nifi-property-utils/pom.xml | 2 +- nifi-commons/nifi-record-path/pom.xml | 10 +- nifi-commons/nifi-record/pom.xml | 2 +- nifi-commons/nifi-repository-encryption/pom.xml| 8 +- nifi-commons/nifi-rocksdb-utils/pom.xml| 8 +- nifi-commons/nifi-schema-utils/pom.xml | 2 +- nifi-commons/nifi-security-kerberos-api/pom.xml| 2 +- nifi-commons/nifi-security-kerberos/pom.xml| 6 +- nifi-commons/nifi-security-kms/pom.xml | 2 +- nifi-commons/nifi-security-socket-ssl/pom.xml | 6 +- nifi-commons/nifi-security-utils-api/pom.xml | 2 +- nifi-commons/nifi-security-utils/pom.xml | 12 +- .../nifi-sensitive-property-provider/pom.xml
[nifi] annotated tag rel/nifi-1.15.2 created (now 4da346d)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to annotated tag rel/nifi-1.15.2 in repository https://gitbox.apache.org/repos/asf/nifi.git. at 4da346d (tag) tagging 1ea460b8556b07057366abb74a5552ace8946e87 (commit) replaces rel/nifi-1.15.1 by Joe Witt on Wed Dec 22 17:00:03 2021 -0700 - Log - NIFI-9508 Signed release tag for approved release of NiFi 1.15.2 -BEGIN PGP SIGNATURE- iQEzBAABCgAdFiEE0vJLgJ/6seIa6gKDkJO/hU+BGhoFAmHDvAMACgkQkJO/hU+B Ghp+twgAsAImdfrYManv51QTlnh8CWpdj46bILY/XkitEJhTZC58P7BMwGLTdjoB iIm3jDHWU5FJO5R02nG24vR31z9vNTFpIlcdhVxWLKfPX7gkO7Co+H3C2aDJkjJB 1+TAQOxPdY0jifsUKF8+Usmp0J9seKcTzBTznhOCxsJapQeGiXjMFSyX3oxu+GGO lpZvjXx1JZqy0dXpl6mO+D2eMbFEAgLJ45Qrg4OKRcdfC5rmLXO2Gr+o0wc/AAaN 1GUTvwityFVqyij3UYvKRaKNJdWfKSDPtDwlpAawVHsOo7POk7trSx/Z2yEnEAtC adCEshNep9HVQNk7KHuyndco3W5UmQ== =gZH7 -END PGP SIGNATURE- --- No new revisions were added by this update.
svn commit: r1896295 - /nifi/site/trunk/download.html
Author: joewitt Date: Wed Dec 22 23:10:25 2021 New Revision: 1896295 URL: http://svn.apache.org/viewvc?rev=1896295=rev Log: NIFI-9508 Modified: nifi/site/trunk/download.html Modified: nifi/site/trunk/download.html URL: http://svn.apache.org/viewvc/nifi/site/trunk/download.html?rev=1896295=1896294=1896295=diff == --- nifi/site/trunk/download.html (original) +++ nifi/site/trunk/download.html Wed Dec 22 23:10:25 2021 @@ -131,7 +131,7 @@ 1.15.2 -Released December 15th, 2021 +Released December 22nd, 2021 Sources:
[nifi-site] branch main updated: NIFI-9508
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-site.git The following commit(s) were added to refs/heads/main by this push: new 7fa0380 NIFI-9508 7fa0380 is described below commit 7fa03806301bd03a5886b3af194939d9bd8cbdb2 Author: Joe Witt AuthorDate: Wed Dec 22 16:08:02 2021 -0700 NIFI-9508 --- src/pages/html/download.hbs| 18 src/pages/html/minifi/download.hbs | 44 +++--- src/pages/html/registry.hbs| 20 - 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/pages/html/download.hbs b/src/pages/html/download.hbs index dd97f4b..29edef1 100644 --- a/src/pages/html/download.hbs +++ b/src/pages/html/download.hbs @@ -23,30 +23,30 @@ title: Apache NiFi Downloads Releases -1.15.1 +1.15.2 -Released December 15th, 2021 +Released December 22nd, 2021 Sources: -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.1/nifi-1.15.1-source-release.zip;>nifi-1.15.1-source-release.zip ( https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-source-release.zip.asc;>asc, https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-source-release.zip.sha256;>sha256, https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-source-release.zip.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.2/nifi-1.15.2-source-release.zip;>nifi-1.15.2-source-release.zip ( https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-source-release.zip.asc;>asc, https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-source-release.zip.sha256;>sha256, https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-source-release.zip.sha512;>sha512 ) Binaries -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.1/nifi-1.15.1-bin.tar.gz;>nifi-1.15.1-bin.tar.gz ( https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-bin.tar.gz.asc;>asc, https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-bin.tar.gz.sha256;>sha256, https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-bin.tar.gz.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.2/nifi-1.15.2-bin.tar.gz;>nifi-1.15.2-bin.tar.gz ( https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-bin.tar.gz.asc;>asc, https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-bin.tar.gz.sha256;>sha256, https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-bin.tar.gz.sha512;>sha512 ) -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.1/nifi-1.15.1-bin.zip;>nifi-1.15.1-bin.zip ( https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-bin.zip.asc;>asc, https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-bin.zip.sha256;>sha256, https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-bin.zip.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.2/nifi-1.15.2-bin.zip;>nifi-1.15.2-bin.zip ( https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-bin.zip.asc;>asc, https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-bin.zip.sha256;>sha256, https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-bin.zip.sha512;>sha512 ) -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.1/nifi-toolkit-1.15.1-bin.tar.gz;>nifi-toolkit-1.15.1-bin.tar.gz ( https://downloads.apache.org/nifi/1.15.1/nifi-toolkit-1.15.1-bin.tar.gz.asc;>asc, https://downloads.apache.org/nifi/1.15.1/nifi-toolkit-1.15.1-bin.tar.gz.sha256;>sha256, https://downloads.apache.org/nifi/1.15.1/nifi-toolkit-1.15.1-bin.tar.gz.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.2/nifi-toolkit-1.15.2-bin.tar.gz;>nifi-toolkit-1.15.2-bin.tar.gz ( https://downloads.apache.org/nifi/1.15.2/nifi-toolkit-1.15.2-bin.tar.gz.asc;>asc, https://downloads.apache.org/nifi/1.15.2/nifi-toolkit-1.15.2-bin.tar.gz.sha256;>sha256, https://downloads.apache.org/nifi/1.15.2/nifi-toolkit-1.15.2-bin.tar.gz.sha512;>sha512 ) -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.1/nifi-toolkit-1.15.1-bin.zip;>nifi-toolkit-1.15.1-bin.zip ( https://downloads.apache.org/nifi/1.15.1/nifi-toolkit-1.15.1-bin.zip.asc;>asc, https://downloads.apache.org/nifi/1.15.1/nifi-toolkit-1.15.1-bin.zip.sha256;>sha256, https://downloads.apache.org/nifi/1.15.1/nifi-toolkit-1.15.1-bin.zip.sha512;>sha512 ) -https://www.apache.org/
svn commit: r1896294 - in /nifi/site/trunk: download.html minifi/download.html registry.html
Author: joewitt Date: Wed Dec 22 23:05:53 2021 New Revision: 1896294 URL: http://svn.apache.org/viewvc?rev=1896294=rev Log: NIFI-9508 Modified: nifi/site/trunk/download.html nifi/site/trunk/minifi/download.html nifi/site/trunk/registry.html Modified: nifi/site/trunk/download.html URL: http://svn.apache.org/viewvc/nifi/site/trunk/download.html?rev=1896294=1896293=1896294=diff == --- nifi/site/trunk/download.html (original) +++ nifi/site/trunk/download.html Wed Dec 22 23:05:53 2021 @@ -129,30 +129,30 @@ Releases -1.15.1 +1.15.2 Released December 15th, 2021 Sources: -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.1/nifi-1.15.1-source-release.zip;>nifi-1.15.1-source-release.zip ( https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-source-release.zip.asc;>asc, https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-source-release.zip.sha256;>sha256, https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-source-release.zip.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.2/nifi-1.15.2-source-release.zip;>nifi-1.15.2-source-release.zip ( https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-source-release.zip.asc;>asc, https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-source-release.zip.sha256;>sha256, https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-source-release.zip.sha512;>sha512 ) Binaries -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.1/nifi-1.15.1-bin.tar.gz;>nifi-1.15.1-bin.tar.gz ( https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-bin.tar.gz.asc;>asc, https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-bin.tar.gz.sha256;>sha256, https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-bin.tar.gz.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.2/nifi-1.15.2-bin.tar.gz;>nifi-1.15.2-bin.tar.gz ( https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-bin.tar.gz.asc;>asc, https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-bin.tar.gz.sha256;>sha256, https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-bin.tar.gz.sha512;>sha512 ) -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.1/nifi-1.15.1-bin.zip;>nifi-1.15.1-bin.zip ( https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-bin.zip.asc;>asc, https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-bin.zip.sha256;>sha256, https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-bin.zip.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.2/nifi-1.15.2-bin.zip;>nifi-1.15.2-bin.zip ( https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-bin.zip.asc;>asc, https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-bin.zip.sha256;>sha256, https://downloads.apache.org/nifi/1.15.2/nifi-1.15.2-bin.zip.sha512;>sha512 ) -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.1/nifi-toolkit-1.15.1-bin.tar.gz;>nifi-toolkit-1.15.1-bin.tar.gz ( https://downloads.apache.org/nifi/1.15.1/nifi-toolkit-1.15.1-bin.tar.gz.asc;>asc, https://downloads.apache.org/nifi/1.15.1/nifi-toolkit-1.15.1-bin.tar.gz.sha256;>sha256, https://downloads.apache.org/nifi/1.15.1/nifi-toolkit-1.15.1-bin.tar.gz.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.2/nifi-toolkit-1.15.2-bin.tar.gz;>nifi-toolkit-1.15.2-bin.tar.gz ( https://downloads.apache.org/nifi/1.15.2/nifi-toolkit-1.15.2-bin.tar.gz.asc;>asc, https://downloads.apache.org/nifi/1.15.2/nifi-toolkit-1.15.2-bin.tar.gz.sha256;>sha256, https://downloads.apache.org/nifi/1.15.2/nifi-toolkit-1.15.2-bin.tar.gz.sha512;>sha512 ) -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.1/nifi-toolkit-1.15.1-bin.zip;>nifi-toolkit-1.15.1-bin.zip ( https://downloads.apache.org/nifi/1.15.1/nifi-toolkit-1.15.1-bin.zip.asc;>asc, https://downloads.apache.org/nifi/1.15.1/nifi-toolkit-1.15.1-bin.zip.sha256;>sha256, https://downloads.apache.org/nifi/1.15.1/nifi-toolkit-1.15.1-bin.zip.sha512;>sha512 ) -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.1/nifi-stateless-1.15.1-bin.tar.gz;>nifi-stateless-1.15.1-bin.tar.gz ( https://downloads.apache.org/nifi/1.15.1/nifi-stateless-1.15.1-bin.tar.gz.asc;>asc, https://downloads.apache.org/nifi/1.15.1/nifi-stateless-1.15.1-bin.tar.gz.sha256;>sha256, https://downloads.apache.org/nifi/1.15.1/nifi-stateless-1.15.1-bin.tar.g
svn commit: r51715 - /dev/nifi/nifi-1.15.2/ /release/nifi/1.15.2/
Author: joewitt Date: Wed Dec 22 23:00:44 2021 New Revision: 51715 Log: NIFI-9508 Added: release/nifi/1.15.2/ - copied from r51714, dev/nifi/nifi-1.15.2/ Removed: dev/nifi/nifi-1.15.2/
svn commit: r51692 - /dev/nifi/nifi-1.15.2/
Author: joewitt Date: Tue Dec 21 22:50:45 2021 New Revision: 51692 Log: NIFI-9508 artifacts for RC1 Added: dev/nifi/nifi-1.15.2/ dev/nifi/nifi-1.15.2/minifi-1.15.2-bin.tar.gz (with props) dev/nifi/nifi-1.15.2/minifi-1.15.2-bin.tar.gz.asc dev/nifi/nifi-1.15.2/minifi-1.15.2-bin.tar.gz.sha256 dev/nifi/nifi-1.15.2/minifi-1.15.2-bin.tar.gz.sha512 dev/nifi/nifi-1.15.2/minifi-1.15.2-bin.zip (with props) dev/nifi/nifi-1.15.2/minifi-1.15.2-bin.zip.asc dev/nifi/nifi-1.15.2/minifi-1.15.2-bin.zip.sha256 dev/nifi/nifi-1.15.2/minifi-1.15.2-bin.zip.sha512 dev/nifi/nifi-1.15.2/minifi-c2-1.15.2-bin.tar.gz (with props) dev/nifi/nifi-1.15.2/minifi-c2-1.15.2-bin.tar.gz.asc dev/nifi/nifi-1.15.2/minifi-c2-1.15.2-bin.tar.gz.sha256 dev/nifi/nifi-1.15.2/minifi-c2-1.15.2-bin.tar.gz.sha512 dev/nifi/nifi-1.15.2/minifi-c2-1.15.2-bin.zip (with props) dev/nifi/nifi-1.15.2/minifi-c2-1.15.2-bin.zip.asc dev/nifi/nifi-1.15.2/minifi-c2-1.15.2-bin.zip.sha256 dev/nifi/nifi-1.15.2/minifi-c2-1.15.2-bin.zip.sha512 dev/nifi/nifi-1.15.2/minifi-toolkit-1.15.2-bin.tar.gz (with props) dev/nifi/nifi-1.15.2/minifi-toolkit-1.15.2-bin.tar.gz.asc dev/nifi/nifi-1.15.2/minifi-toolkit-1.15.2-bin.tar.gz.sha256 dev/nifi/nifi-1.15.2/minifi-toolkit-1.15.2-bin.tar.gz.sha512 dev/nifi/nifi-1.15.2/minifi-toolkit-1.15.2-bin.zip (with props) dev/nifi/nifi-1.15.2/minifi-toolkit-1.15.2-bin.zip.asc dev/nifi/nifi-1.15.2/minifi-toolkit-1.15.2-bin.zip.sha256 dev/nifi/nifi-1.15.2/minifi-toolkit-1.15.2-bin.zip.sha512 dev/nifi/nifi-1.15.2/nifi-1.15.2-bin.tar.gz (with props) dev/nifi/nifi-1.15.2/nifi-1.15.2-bin.tar.gz.asc dev/nifi/nifi-1.15.2/nifi-1.15.2-bin.tar.gz.sha256 dev/nifi/nifi-1.15.2/nifi-1.15.2-bin.tar.gz.sha512 dev/nifi/nifi-1.15.2/nifi-1.15.2-bin.zip (with props) dev/nifi/nifi-1.15.2/nifi-1.15.2-bin.zip.asc dev/nifi/nifi-1.15.2/nifi-1.15.2-bin.zip.sha256 dev/nifi/nifi-1.15.2/nifi-1.15.2-bin.zip.sha512 dev/nifi/nifi-1.15.2/nifi-1.15.2-source-release.zip (with props) dev/nifi/nifi-1.15.2/nifi-1.15.2-source-release.zip.asc dev/nifi/nifi-1.15.2/nifi-1.15.2-source-release.zip.sha256 dev/nifi/nifi-1.15.2/nifi-1.15.2-source-release.zip.sha512 dev/nifi/nifi-1.15.2/nifi-registry-1.15.2-bin.tar.gz (with props) dev/nifi/nifi-1.15.2/nifi-registry-1.15.2-bin.tar.gz.asc dev/nifi/nifi-1.15.2/nifi-registry-1.15.2-bin.tar.gz.sha256 dev/nifi/nifi-1.15.2/nifi-registry-1.15.2-bin.tar.gz.sha512 dev/nifi/nifi-1.15.2/nifi-registry-1.15.2-bin.zip (with props) dev/nifi/nifi-1.15.2/nifi-registry-1.15.2-bin.zip.asc dev/nifi/nifi-1.15.2/nifi-registry-1.15.2-bin.zip.sha256 dev/nifi/nifi-1.15.2/nifi-registry-1.15.2-bin.zip.sha512 dev/nifi/nifi-1.15.2/nifi-registry-toolkit-1.15.2-bin.tar.gz (with props) dev/nifi/nifi-1.15.2/nifi-registry-toolkit-1.15.2-bin.tar.gz.asc dev/nifi/nifi-1.15.2/nifi-registry-toolkit-1.15.2-bin.tar.gz.sha256 dev/nifi/nifi-1.15.2/nifi-registry-toolkit-1.15.2-bin.tar.gz.sha512 dev/nifi/nifi-1.15.2/nifi-registry-toolkit-1.15.2-bin.zip (with props) dev/nifi/nifi-1.15.2/nifi-registry-toolkit-1.15.2-bin.zip.asc dev/nifi/nifi-1.15.2/nifi-registry-toolkit-1.15.2-bin.zip.sha256 dev/nifi/nifi-1.15.2/nifi-registry-toolkit-1.15.2-bin.zip.sha512 dev/nifi/nifi-1.15.2/nifi-stateless-1.15.2-bin.tar.gz (with props) dev/nifi/nifi-1.15.2/nifi-stateless-1.15.2-bin.tar.gz.asc dev/nifi/nifi-1.15.2/nifi-stateless-1.15.2-bin.tar.gz.sha256 dev/nifi/nifi-1.15.2/nifi-stateless-1.15.2-bin.tar.gz.sha512 dev/nifi/nifi-1.15.2/nifi-toolkit-1.15.2-bin.tar.gz (with props) dev/nifi/nifi-1.15.2/nifi-toolkit-1.15.2-bin.tar.gz.asc dev/nifi/nifi-1.15.2/nifi-toolkit-1.15.2-bin.tar.gz.sha256 dev/nifi/nifi-1.15.2/nifi-toolkit-1.15.2-bin.tar.gz.sha512 dev/nifi/nifi-1.15.2/nifi-toolkit-1.15.2-bin.zip (with props) dev/nifi/nifi-1.15.2/nifi-toolkit-1.15.2-bin.zip.asc dev/nifi/nifi-1.15.2/nifi-toolkit-1.15.2-bin.zip.sha256 dev/nifi/nifi-1.15.2/nifi-toolkit-1.15.2-bin.zip.sha512 Added: dev/nifi/nifi-1.15.2/minifi-1.15.2-bin.tar.gz == Binary file - no diff available. Propchange: dev/nifi/nifi-1.15.2/minifi-1.15.2-bin.tar.gz -- svn:mime-type = application/octet-stream Added: dev/nifi/nifi-1.15.2/minifi-1.15.2-bin.tar.gz.asc == --- dev/nifi/nifi-1.15.2/minifi-1.15.2-bin.tar.gz.asc (added) +++ dev/nifi/nifi-1.15.2/minifi-1.15.2-bin.tar.gz.asc Tue Dec 21 22:50:45 2021 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEE0vJLgJ/6seIa6gKDkJO/hU+BGhoFAmHCV48ACgkQkJO/hU+B +GhpYLgf+OkWrcybRytr3wUcZtUVGIWxM+dwLlY93S5IIO8fj3wDrs0SK0oP+b62a ++bu6
[nifi] annotated tag nifi-1.15.2-RC1 created (now d52b99f)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to annotated tag nifi-1.15.2-RC1 in repository https://gitbox.apache.org/repos/asf/nifi.git. at d52b99f (tag) tagging 1ea460b8556b07057366abb74a5552ace8946e87 (commit) replaces rel/nifi-1.15.1 by Joe Witt on Tue Dec 21 12:59:57 2021 -0700 - Log - NIFI-9508-RC1 copy for tag nifi-1.15.2-RC1 --- No new revisions were added by this update.
[nifi] branch NIFI-9508-RC1 created (now 32ad254)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to branch NIFI-9508-RC1 in repository https://gitbox.apache.org/repos/asf/nifi.git. at 32ad254 NIFI-9508-RC1 prepare for next development iteration This branch includes the following new commits: new 1ea460b NIFI-9508-RC1 prepare release nifi-1.15.2-RC1 new 32ad254 NIFI-9508-RC1 prepare for next development iteration The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[nifi] branch main updated: NIFI-9509 This closes #5618. Added PatchedSFTPEngine to correct SFTP rename flags handling
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 9747d6a NIFI-9509 This closes #5618. Added PatchedSFTPEngine to
correct SFTP rename flags handling
9747d6a is described below
commit 9747d6a410441bba6e8a7da6c60041b5b8d7fb3f
Author: exceptionfactory
AuthorDate: Tue Dec 21 12:41:26 2021 -0600
NIFI-9509 This closes #5618. Added PatchedSFTPEngine to correct SFTP rename
flags handling
- SSHJ 0.32.0 introduced support for rename flags in SFTP commands without
checking the protocol version
- PatchedSFTPEngine overrides the rename method to check the SFTP protocol
version
Signed-off-by: Joe Witt
---
.../processors/standard/ssh/PatchedSFTPEngine.java | 72 ++
.../processors/standard/util/SFTPTransfer.java | 3 +-
2 files changed, 74 insertions(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ssh/PatchedSFTPEngine.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ssh/PatchedSFTPEngine.java
new file mode 100644
index 000..1de696d
--- /dev/null
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ssh/PatchedSFTPEngine.java
@@ -0,0 +1,72 @@
+/*
+ * 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.standard.ssh;
+
+import net.schmizz.sshj.common.SSHException;
+import net.schmizz.sshj.connection.channel.direct.SessionFactory;
+import net.schmizz.sshj.sftp.PacketType;
+import net.schmizz.sshj.sftp.RenameFlags;
+import net.schmizz.sshj.sftp.Request;
+import net.schmizz.sshj.sftp.SFTPEngine;
+import net.schmizz.sshj.sftp.SFTPException;
+
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Patched SFTP Engine to workaround SFTP rename issue 751 in SSHJ 0.32.0
+ *
+ * This class can be removed once the issue is resolved in a future version of
SSHJ
+ */
+public class PatchedSFTPEngine extends SFTPEngine {
+
+public PatchedSFTPEngine(final SessionFactory sessionFactory) throws
SSHException {
+super(sessionFactory);
+}
+
+/**
+ * Override rename request packet generation to workaround handling of
rename flags
+ *
+ * @param oldPath Old path of file to be renamed
+ * @param newPath New path of file to be renamed
+ * @param flags Rename flags used for SFTP Version 5 or higher
+ * @throws IOException Thrown on unsupported protocol version or request
processing failures
+ */
+@Override
+public void rename(final String oldPath, final String newPath, final
Set flags) throws IOException {
+if (operativeVersion < 1) {
+throw new SFTPException("RENAME is not supported in SFTPv" +
operativeVersion);
+}
+
+final Charset remoteCharset = sub.getRemoteCharset();
+final Request request = newRequest(PacketType.RENAME)
+.putString(oldPath, remoteCharset)
+.putString(newPath, remoteCharset);
+// SFTP Version 5 introduced rename flags according to Section 6.5 of
the specification
+if (operativeVersion >= 5) {
+long renameFlagMask = 0L;
+for (RenameFlags flag : flags) {
+renameFlagMask = renameFlagMask | flag.longValue();
+}
+request.putUInt32(renameFlagMask);
+}
+
+request(request).retrieve(getTimeoutMs(),
TimeUnit.MILLISECONDS).ensureStatusPacketIsOK();
+}
+}
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java
index 1636bbd..13b8eec 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-s
[nifi] branch support/nifi-1.15 updated: NIFI-9509 updating docker version ref
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.15 by this push: new 2e2e550 NIFI-9509 updating docker version ref 2e2e550 is described below commit 2e2e5507333dcb18ea1fffcf667c40b2f3ca8791 Author: Joe Witt AuthorDate: Tue Dec 21 12:13:10 2021 -0700 NIFI-9509 updating docker version ref --- nifi-docker/dockerhub/DockerImage.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-docker/dockerhub/DockerImage.txt b/nifi-docker/dockerhub/DockerImage.txt index 2595173..e007ce1 100644 --- a/nifi-docker/dockerhub/DockerImage.txt +++ b/nifi-docker/dockerhub/DockerImage.txt @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -apache/nifi:1.15.1 +apache/nifi:1.15.2
[nifi] branch support/nifi-1.15 updated: NIFI-9509 Added PatchedSFTPEngine to correct SFTP rename flags handling
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.15 by this push:
new ae26f65 NIFI-9509 Added PatchedSFTPEngine to correct SFTP rename
flags handling
ae26f65 is described below
commit ae26f6580fe82afd3402d4b58762c8bb0d4d3f95
Author: exceptionfactory
AuthorDate: Tue Dec 21 12:41:26 2021 -0600
NIFI-9509 Added PatchedSFTPEngine to correct SFTP rename flags handling
- SSHJ 0.32.0 introduced support for rename flags in SFTP commands without
checking the protocol version
- PatchedSFTPEngine overrides the rename method to check the SFTP protocol
version
---
.../processors/standard/ssh/PatchedSFTPEngine.java | 72 ++
.../processors/standard/util/SFTPTransfer.java | 3 +-
2 files changed, 74 insertions(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ssh/PatchedSFTPEngine.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ssh/PatchedSFTPEngine.java
new file mode 100644
index 000..1de696d
--- /dev/null
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ssh/PatchedSFTPEngine.java
@@ -0,0 +1,72 @@
+/*
+ * 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.standard.ssh;
+
+import net.schmizz.sshj.common.SSHException;
+import net.schmizz.sshj.connection.channel.direct.SessionFactory;
+import net.schmizz.sshj.sftp.PacketType;
+import net.schmizz.sshj.sftp.RenameFlags;
+import net.schmizz.sshj.sftp.Request;
+import net.schmizz.sshj.sftp.SFTPEngine;
+import net.schmizz.sshj.sftp.SFTPException;
+
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Patched SFTP Engine to workaround SFTP rename issue 751 in SSHJ 0.32.0
+ *
+ * This class can be removed once the issue is resolved in a future version of
SSHJ
+ */
+public class PatchedSFTPEngine extends SFTPEngine {
+
+public PatchedSFTPEngine(final SessionFactory sessionFactory) throws
SSHException {
+super(sessionFactory);
+}
+
+/**
+ * Override rename request packet generation to workaround handling of
rename flags
+ *
+ * @param oldPath Old path of file to be renamed
+ * @param newPath New path of file to be renamed
+ * @param flags Rename flags used for SFTP Version 5 or higher
+ * @throws IOException Thrown on unsupported protocol version or request
processing failures
+ */
+@Override
+public void rename(final String oldPath, final String newPath, final
Set flags) throws IOException {
+if (operativeVersion < 1) {
+throw new SFTPException("RENAME is not supported in SFTPv" +
operativeVersion);
+}
+
+final Charset remoteCharset = sub.getRemoteCharset();
+final Request request = newRequest(PacketType.RENAME)
+.putString(oldPath, remoteCharset)
+.putString(newPath, remoteCharset);
+// SFTP Version 5 introduced rename flags according to Section 6.5 of
the specification
+if (operativeVersion >= 5) {
+long renameFlagMask = 0L;
+for (RenameFlags flag : flags) {
+renameFlagMask = renameFlagMask | flag.longValue();
+}
+request.putUInt32(renameFlagMask);
+}
+
+request(request).retrieve(getTimeoutMs(),
TimeUnit.MILLISECONDS).ensureStatusPacketIsOK();
+}
+}
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java
index 1636bbd..13b8eec 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/
[nifi] branch support/nifi-1.15 updated: NIFI-9507 Corrected SSH Client handling on connect failures
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.15 by this push:
new 898f9a4 NIFI-9507 Corrected SSH Client handling on connect failures
898f9a4 is described below
commit 898f9a48bcb75a68a77a8c241821c5d39e75ab24
Author: exceptionfactory
AuthorDate: Mon Dec 20 16:35:28 2021 -0600
NIFI-9507 Corrected SSH Client handling on connect failures
- Refactored SSH Client configuration and connection to SSHClientProvider
- Implemented exception handling for configuration and connection failures
- Named SSH keep-alive thread for improved runtime tracking
- Closed SSH Client and interrupted keep-alive thread on configuration
failures
- Added missing Compression Property to ListSFTP
- Corrected Hostname and Port property descriptors in ListSFTP
---
.../apache/nifi/processors/standard/ListSFTP.java | 9 +-
.../ssh/ClientAuthenticationException.java | 27 +++
.../standard/ssh/ClientConfigurationException.java | 29 +++
.../standard/ssh/ClientConnectException.java | 27 +++
.../standard/ssh/ProxySocketFactory.java | 80 +++
.../processors/standard/ssh/SSHClientProvider.java | 36
.../processors/standard/ssh/SSHConfigProvider.java | 34 +++
.../standard/ssh/StandardSSHClientProvider.java| 230
.../standard/ssh/StandardSSHConfigProvider.java| 133
.../processors/standard/util/SFTPTransfer.java | 235 +
.../nifi/processors/standard/TestListSFTP.java | 2 +-
.../standard/ssh/ProxySocketFactoryTest.java | 42
.../ssh/StandardSSHClientProviderTest.java | 117 ++
.../ssh/StandardSSHConfigProviderTest.java | 150 +
.../processors/standard/util/TestSFTPTransfer.java | 130
15 files changed, 917 insertions(+), 364 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListSFTP.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListSFTP.java
index c2c0aeb..19e3215 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListSFTP.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListSFTP.java
@@ -79,13 +79,11 @@ public class ListSFTP extends ListFileTransfer {
@Override
protected List getSupportedPropertyDescriptors() {
-final PropertyDescriptor port = new
PropertyDescriptor.Builder().fromPropertyDescriptor(UNDEFAULTED_PORT).defaultValue("22").build();
-
final List properties = new ArrayList<>();
properties.add(FILE_TRANSFER_LISTING_STRATEGY);
-properties.add(HOSTNAME);
-properties.add(port);
-properties.add(USERNAME);
+properties.add(SFTPTransfer.HOSTNAME);
+properties.add(SFTPTransfer.PORT);
+properties.add(SFTPTransfer.USERNAME);
properties.add(SFTPTransfer.PASSWORD);
properties.add(SFTPTransfer.PRIVATE_KEY_PATH);
properties.add(SFTPTransfer.PRIVATE_KEY_PASSPHRASE);
@@ -103,6 +101,7 @@ public class ListSFTP extends ListFileTransfer {
properties.add(SFTPTransfer.DATA_TIMEOUT);
properties.add(SFTPTransfer.USE_KEEPALIVE_ON_TIMEOUT);
properties.add(TARGET_SYSTEM_TIMESTAMP_PRECISION);
+properties.add(SFTPTransfer.USE_COMPRESSION);
properties.add(SFTPTransfer.PROXY_CONFIGURATION_SERVICE);
properties.add(FTPTransfer.PROXY_TYPE);
properties.add(FTPTransfer.PROXY_HOST);
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ssh/ClientAuthenticationException.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ssh/ClientAuthenticationException.java
new file mode 100644
index 000..38f486f
--- /dev/null
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ssh/ClientAuthenticationException.java
@@ -0,0 +1,27 @@
+/*
+ * 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 l
[nifi] branch main updated: NIFI-9507 This closes #5617. Corrected SSH Client handling on connect failures
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 4f28b28 NIFI-9507 This closes #5617. Corrected SSH Client handling on
connect failures
4f28b28 is described below
commit 4f28b28ba2b8ad049f4477335e9a85135cd0d0c1
Author: exceptionfactory
AuthorDate: Mon Dec 20 16:35:28 2021 -0600
NIFI-9507 This closes #5617. Corrected SSH Client handling on connect
failures
- Refactored SSH Client configuration and connection to SSHClientProvider
- Implemented exception handling for configuration and connection failures
- Named SSH keep-alive thread for improved runtime tracking
- Closed SSH Client and interrupted keep-alive thread on configuration
failures
- Added missing Compression Property to ListSFTP
- Corrected Hostname and Port property descriptors in ListSFTP
Signed-off-by: Joe Witt
---
.../apache/nifi/processors/standard/ListSFTP.java | 9 +-
.../ssh/ClientAuthenticationException.java | 27 +++
.../standard/ssh/ClientConfigurationException.java | 29 +++
.../standard/ssh/ClientConnectException.java | 27 +++
.../standard/ssh/ProxySocketFactory.java | 80 +++
.../processors/standard/ssh/SSHClientProvider.java | 36
.../processors/standard/ssh/SSHConfigProvider.java | 34 +++
.../standard/ssh/StandardSSHClientProvider.java| 230
.../standard/ssh/StandardSSHConfigProvider.java| 133
.../processors/standard/util/SFTPTransfer.java | 235 +
.../nifi/processors/standard/TestListSFTP.java | 2 +-
.../standard/ssh/ProxySocketFactoryTest.java | 42
.../ssh/StandardSSHClientProviderTest.java | 117 ++
.../ssh/StandardSSHConfigProviderTest.java | 150 +
.../processors/standard/util/TestSFTPTransfer.java | 130
15 files changed, 917 insertions(+), 364 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListSFTP.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListSFTP.java
index c2c0aeb..19e3215 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListSFTP.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListSFTP.java
@@ -79,13 +79,11 @@ public class ListSFTP extends ListFileTransfer {
@Override
protected List getSupportedPropertyDescriptors() {
-final PropertyDescriptor port = new
PropertyDescriptor.Builder().fromPropertyDescriptor(UNDEFAULTED_PORT).defaultValue("22").build();
-
final List properties = new ArrayList<>();
properties.add(FILE_TRANSFER_LISTING_STRATEGY);
-properties.add(HOSTNAME);
-properties.add(port);
-properties.add(USERNAME);
+properties.add(SFTPTransfer.HOSTNAME);
+properties.add(SFTPTransfer.PORT);
+properties.add(SFTPTransfer.USERNAME);
properties.add(SFTPTransfer.PASSWORD);
properties.add(SFTPTransfer.PRIVATE_KEY_PATH);
properties.add(SFTPTransfer.PRIVATE_KEY_PASSPHRASE);
@@ -103,6 +101,7 @@ public class ListSFTP extends ListFileTransfer {
properties.add(SFTPTransfer.DATA_TIMEOUT);
properties.add(SFTPTransfer.USE_KEEPALIVE_ON_TIMEOUT);
properties.add(TARGET_SYSTEM_TIMESTAMP_PRECISION);
+properties.add(SFTPTransfer.USE_COMPRESSION);
properties.add(SFTPTransfer.PROXY_CONFIGURATION_SERVICE);
properties.add(FTPTransfer.PROXY_TYPE);
properties.add(FTPTransfer.PROXY_HOST);
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ssh/ClientAuthenticationException.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ssh/ClientAuthenticationException.java
new file mode 100644
index 000..38f486f
--- /dev/null
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ssh/ClientAuthenticationException.java
@@ -0,0 +1,27 @@
+/*
+ * 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
[nifi] 04/05: NIFI-9504 Upgraded Logback from 1.2.8 to 1.2.9
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit abc45ac67f5dbc49eb0c7567a493c90ee350055c
Author: exceptionfactory
AuthorDate: Sat Dec 18 14:30:06 2021 -0600
NIFI-9504 Upgraded Logback from 1.2.8 to 1.2.9
NIFI-9505 Upgraded Log4j 2 from 2.16.0 to 2.17.0
Signed-off-by: Chris Sampson
This closes #5615
---
pom.xml | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 21152ae..6cf5ad3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,7 @@
2.1.5
1.9.6
2.33
-1.2.8
+1.2.9
3.11.2
3.10.6.Final
4.1.69.Final
@@ -484,11 +484,11 @@
aspectjweaver
${aspectj.version}
-
+
org.apache.logging.log4j
log4j-bom
-2.16.0
+2.17.0
import
pom
@@ -783,8 +783,8 @@
com.google.code.findbugs:jsr305:*:*:compile
log4j:log4j:*
-
-
org.apache.logging.log4j:log4j-core:(,2.15.0)
+
+
org.apache.logging.log4j:log4j-core:(,2.17.0)
commons-logging:commons-logging:*
[nifi] 02/05: NIFI-9491 Excluded commons-logging and added jcl-over-slf4j references
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git commit 283d2ee3751956d5fdc6be7965dcbe4f99787930 Author: exceptionfactory AuthorDate: Wed Dec 15 16:47:44 2021 -0600 NIFI-9491 Excluded commons-logging and added jcl-over-slf4j references Signed-off-by: Matthew Burgess This closes #5608 --- minifi/minifi-assembly/NOTICE | 5 -- minifi/minifi-c2/minifi-c2-assembly/NOTICE | 5 -- .../minifi-c2-cache/minifi-c2-cache-s3/pom.xml | 12 +++- .../src/main/resources/META-INF/NOTICE | 5 -- .../minifi-toolkit/minifi-toolkit-assembly/NOTICE | 5 -- nifi-assembly/NOTICE | 13 .../nifi-kafka-connector-assembly/NOTICE | 5 -- .../nifi-accumulo-processors/pom.xml | 4 ++ .../nifi-accumulo-services-api/pom.xml | 4 ++ nifi-nar-bundles/nifi-accumulo-bundle/pom.xml | 10 +++ .../src/main/resources/META-INF/NOTICE | 13 .../nifi-atlas-reporting-task/pom.xml | 16 +++-- nifi-nar-bundles/nifi-atlas-bundle/pom.xml | 12 .../nifi-aws-abstract-processors/pom.xml | 20 +++--- .../nifi-aws-bundle/nifi-aws-nar/pom.xml | 4 ++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-aws-bundle/nifi-aws-processors/pom.xml| 10 +++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-aws-bundle/nifi-aws-service-api/pom.xml | 10 --- nifi-nar-bundles/nifi-aws-bundle/pom.xml | 19 + .../nifi-azure-reporting-task/pom.xml | 5 +- nifi-nar-bundles/nifi-azure-bundle/pom.xml | 11 +++ .../src/main/resources/META-INF/NOTICE | 8 --- .../src/main/resources/META-INF/NOTICE | 8 --- .../src/main/resources/META-INF/NOTICE | 8 --- .../nifi-ccda-bundle/nifi-ccda-processors/pom.xml | 10 +++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-datadog-reporting-task/pom.xml| 8 +++ .../src/main/resources/META-INF/NOTICE | 13 .../nifi-druid-controller-service-api/pom.xml | 76 ++-- nifi-nar-bundles/nifi-druid-bundle/pom.xml | 80 ++ .../nifi-easyrules-service/pom.xml | 10 +++ .../src/main/resources/META-INF/NOTICE | 18 - .../src/main/resources/META-INF/NOTICE | 18 - .../nifi-elasticsearch-client-service/pom.xml | 15 +++- .../src/main/resources/META-INF/NOTICE | 18 - .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-email-processors/pom.xml | 10 +++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-enrich-processors/pom.xml | 8 +++ .../nifi-extension-utils/nifi-hadoop-utils/pom.xml | 18 + .../nifi-hadoop-record-utils/pom.xml | 8 +++ .../nifi-flume-processors/pom.xml | 16 + .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-framework/nifi-web/pom.xml| 6 ++ .../src/main/resources/META-INF/NOTICE | 5 -- .../src/main/resources/META-INF/NOTICE | 5 -- .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-gcp-bundle/nifi-gcp-processors/pom.xml| 29 +++- .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-gcp-bundle/nifi-gcp-services-api/pom.xml | 17 + .../nifi-graph-test-clients/pom.xml| 10 +++ .../src/main/resources/META-INF/NOTICE | 5 -- .../src/main/resources/META-INF/NOTICE | 13 .../nifi-grpc-nar/src/main/resources/NOTICE| 8 --- .../nifi-hdfs-processors/pom.xml | 12 .../nifi-hadoop-libraries-nar/pom.xml | 8 +++ .../src/main/resources/META-INF/NOTICE | 7 +- .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-hive-bundle/nifi-hive-processors/pom.xml | 26 +++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-hive-bundle/nifi-hive3-processors/pom.xml | 34 + .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-hive_1_1-processors/pom.xml | 26 +++ .../nifi-hl7-bundle/nifi-hl7-processors/pom.xml| 10 +++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-ignite-processors/pom.xml | 6 ++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-jms-bundle/nifi-jms-processors/pom.xml| 5 +- .../nifi-kite-bundle/nifi-kite-processors/pom.xml | 20 ++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-media-processors/pom.xml | 8 +++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-parquet-processors/pom.xml
[nifi] 05/05: NIFI-9483 This closes #5616. Excluded Log4j 2 log4j-core and related libraries
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 91f5cc3763c08c035d4474a035054091bd9a3c06
Author: exceptionfactory
AuthorDate: Sat Dec 18 18:23:31 2021 -0600
NIFI-9483 This closes #5616. Excluded Log4j 2 log4j-core and related
libraries
- Added log4j-core to list of banned dependencies
- Added log4j-to-slf4j for Elasticsearch 5 processors to support runtime
logging
Signed-off-by: Joe Witt
---
.../nifi-atlas-reporting-task/pom.xml | 11 +
.../nifi-druid-controller-service-api/pom.xml | 23 +++
.../nifi-elasticsearch-5-processors/pom.xml| 3 ++-
.../nifi-hive-bundle/nifi-hive3-processors/pom.xml | 26 ++
.../nifi-ignite-processors/pom.xml | 2 +-
.../nifi-ranger-bundle/nifi-ranger-plugin/pom.xml | 9
.../nifi-solr-bundle/nifi-solr-processors/pom.xml | 8 +++
.../nifi-registry-ranger-plugin/pom.xml| 9
pom.xml| 4 ++--
9 files changed, 91 insertions(+), 4 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/pom.xml
b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/pom.xml
index 2391532..5173d38 100644
--- a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/pom.xml
+++ b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/pom.xml
@@ -78,6 +78,17 @@
org.apache.atlas
atlas-notification
+
+
+
+org.apache.logging.log4j
+log4j-core
+
+
+org.apache.logging.log4j
+log4j-api
+
+
diff --git
a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml
b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml
index d8fa63b..8dd351c 100644
---
a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml
+++
b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml
@@ -54,6 +54,29 @@
io.druid
druid-processing
${druid.version}
+
+
+
+org.apache.logging.log4j
+log4j-api
+
+
+org.apache.logging.log4j
+log4j-core
+
+
+org.apache.logging.log4j
+log4j-slf4j-impl
+
+
+org.apache.logging.log4j
+log4j-jul
+
+
+org.apache.logging.log4j
+log4j-1.2-api
+
+
com.github.stephenc.findbugs
diff --git
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml
index a34d173..dcda8be 100644
---
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml
+++
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml
@@ -77,13 +77,14 @@ language governing permissions and limitations under the
License. -->
org.slf4j
jcl-over-slf4j
+
org.apache.logging.log4j
log4j-api
org.apache.logging.log4j
-log4j-core
+log4j-to-slf4j
org.apache.nifi
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml
b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml
index 6af7bd3..3d40ad4 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml
@@ -99,6 +99,19 @@
commons-logging
commons-logging
+
+
+org.apache.logging.log4j
+log4j-1.2-api
+
+
+org.apache.logging.log4j
+log4j-web
+
+
+org.apache.logging.log4j
+log4j-slf4j-impl
+
@@ -112,9 +125,22 @@
log4j
+org.slf4j
+slf4j-log4j12
+
+
commons-logging
commons-logg
[nifi] 03/05: NIFI-9497 Upgraded Bouncy Castle from 1.69 to 1.70
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git commit ba8ad3c17cd335f7654e276a22febd95a8c9e650 Author: exceptionfactory AuthorDate: Fri Dec 17 08:19:13 2021 -0600 NIFI-9497 Upgraded Bouncy Castle from 1.69 to 1.70 Signed-off-by: Pierre Villard This closes #5610. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f112ef1..21152ae 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ UTF-8 2014 4.9.2 -1.69 +1.70 1.7.32 2.1.0 9.4.44.v20210927
[nifi] 01/05: NIFI-9495 Corrected BulletinMergerTest using static timestamps
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit e6430115e59716325ba13aa41f94f018dd2238fd
Author: exceptionfactory
AuthorDate: Thu Dec 16 13:56:44 2021 -0600
NIFI-9495 Corrected BulletinMergerTest using static timestamps
- Replaced JUnit 4 and TestNG references with JUnit 5
- Added test method for bulletin sorting
Signed-off-by: Matthew Burgess
This closes #5607
---
.../nifi/cluster/manager/BulletinMergerTest.java | 77 +-
1 file changed, 45 insertions(+), 32 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/BulletinMergerTest.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/BulletinMergerTest.java
index cb0d181..5b79d27 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/BulletinMergerTest.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/BulletinMergerTest.java
@@ -19,68 +19,81 @@ package org.apache.nifi.cluster.manager;
import org.apache.nifi.cluster.protocol.NodeIdentifier;
import org.apache.nifi.web.api.dto.BulletinDTO;
import org.apache.nifi.web.api.entity.BulletinEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.Date;
+import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import static org.apache.nifi.cluster.manager.BulletinMerger.ALL_NODES_MESSAGE;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class BulletinMergerTest {
+private static final Date FIRST_TIMESTAMP = new Date(86400);
-long bulletinId = 0;
+private static final Date SECOND_TIMESTAMP = new Date(178000);
-private BulletinEntity createBulletin(final String message) {
+private static final NodeIdentifier FIRST_NODE = new
NodeIdentifier("node-1", "host-1", 8080, "host-address-1", , null, null,
null, false);
+
+private static final NodeIdentifier SECOND_NODE = new
NodeIdentifier("node-2", "host-2", 8080, "host-address-2", , null, null,
null, false);
+
+private long bulletinId = 0;
+
+private BulletinEntity createBulletin(final String message, final Date
timestamp, final boolean readable) {
final BulletinDTO bulletin = new BulletinDTO();
bulletin.setId(bulletinId++);
bulletin.setMessage(message);
-bulletin.setTimestamp(new Date());
+bulletin.setTimestamp(timestamp);
final BulletinEntity entity = new BulletinEntity();
entity.setId(bulletin.getId());
entity.setTimestamp(bulletin.getTimestamp());
-entity.setCanRead(true);
+entity.setCanRead(readable);
entity.setBulletin(bulletin);
return entity;
}
@Test
-public void mergeBulletins() throws Exception {
-final BulletinEntity bulletinEntity1 = createBulletin("This is
bulletin 1");
-final BulletinEntity bulletinEntity2 = createBulletin("This is
bulletin 2");
-
-final BulletinEntity unauthorizedBulletin = new BulletinEntity();
-unauthorizedBulletin.setId(bulletinId++);
-unauthorizedBulletin.setTimestamp(new Date());
-unauthorizedBulletin.setCanRead(false);
-
-final BulletinEntity copyOfBulletin1 = createBulletin("This is
bulletin 1");
-
-final NodeIdentifier node1 = new NodeIdentifier("node-1", "host-1",
8080, "host-1", 19998, null, null, null, false);
-final NodeIdentifier node2 = new NodeIdentifier("node-2", "host-2",
8081, "host-2", 1, null, null, null, false);
+public void testMergeBulletins() {
+final BulletinEntity bulletinEntity1 = createBulletin("This is
bulletin 1", FIRST_TIMESTAMP, true);
+final BulletinEntity bulletinEntity2 = createBulletin("This is
bulletin 2", FIRST_TIMESTAMP,true);
+final BulletinEntity unauthorizedBulletin = createBulletin("Protected
Bulletin", FIRST_TIMESTAMP, false);
+final List bulletins = Arrays.asList(bulletinEntity1,
bulletinEntity2, unauthorizedBulletin);
final Map> nodeMap = new
LinkedHashMap<>();
-nodeMap.put(node1, new ArrayList<>());
-n
[nifi] branch support/nifi-1.15 updated (d9bc4c0 -> 91f5cc3)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git. from d9bc4c0 NIFI-9480 new e643011 NIFI-9495 Corrected BulletinMergerTest using static timestamps new 283d2ee NIFI-9491 Excluded commons-logging and added jcl-over-slf4j references new ba8ad3c NIFI-9497 Upgraded Bouncy Castle from 1.69 to 1.70 new abc45ac NIFI-9504 Upgraded Logback from 1.2.8 to 1.2.9 new 91f5cc3 NIFI-9483 This closes #5616. Excluded Log4j 2 log4j-core and related libraries The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: minifi/minifi-assembly/NOTICE | 5 -- minifi/minifi-c2/minifi-c2-assembly/NOTICE | 5 -- .../minifi-c2-cache/minifi-c2-cache-s3/pom.xml | 12 +++- .../src/main/resources/META-INF/NOTICE | 5 -- .../minifi-toolkit/minifi-toolkit-assembly/NOTICE | 5 -- nifi-assembly/NOTICE | 13 .../nifi-kafka-connector-assembly/NOTICE | 5 -- .../nifi-accumulo-processors/pom.xml | 4 ++ .../nifi-accumulo-services-api/pom.xml | 4 ++ nifi-nar-bundles/nifi-accumulo-bundle/pom.xml | 10 +++ .../src/main/resources/META-INF/NOTICE | 13 .../nifi-atlas-reporting-task/pom.xml | 27 +-- nifi-nar-bundles/nifi-atlas-bundle/pom.xml | 12 .../nifi-aws-abstract-processors/pom.xml | 20 +++--- .../nifi-aws-bundle/nifi-aws-nar/pom.xml | 4 ++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-aws-bundle/nifi-aws-processors/pom.xml| 10 +++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-aws-bundle/nifi-aws-service-api/pom.xml | 10 --- nifi-nar-bundles/nifi-aws-bundle/pom.xml | 19 + .../nifi-azure-reporting-task/pom.xml | 5 +- nifi-nar-bundles/nifi-azure-bundle/pom.xml | 11 +++ .../src/main/resources/META-INF/NOTICE | 8 --- .../src/main/resources/META-INF/NOTICE | 8 --- .../src/main/resources/META-INF/NOTICE | 8 --- .../nifi-ccda-bundle/nifi-ccda-processors/pom.xml | 10 +++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-datadog-reporting-task/pom.xml| 8 +++ .../src/main/resources/META-INF/NOTICE | 13 .../nifi-druid-controller-service-api/pom.xml | 83 +- nifi-nar-bundles/nifi-druid-bundle/pom.xml | 80 + .../nifi-easyrules-service/pom.xml | 10 +++ .../src/main/resources/META-INF/NOTICE | 18 - .../nifi-elasticsearch-5-processors/pom.xml| 3 +- .../src/main/resources/META-INF/NOTICE | 18 - .../nifi-elasticsearch-client-service/pom.xml | 15 +++- .../src/main/resources/META-INF/NOTICE | 18 - .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-email-processors/pom.xml | 10 +++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-enrich-processors/pom.xml | 8 +++ .../nifi-extension-utils/nifi-hadoop-utils/pom.xml | 18 + .../nifi-hadoop-record-utils/pom.xml | 8 +++ .../nifi-flume-processors/pom.xml | 16 + .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi/cluster/manager/BulletinMergerTest.java | 77 +++- .../nifi-framework/nifi-web/pom.xml| 6 ++ .../src/main/resources/META-INF/NOTICE | 5 -- .../src/main/resources/META-INF/NOTICE | 5 -- .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-gcp-bundle/nifi-gcp-processors/pom.xml| 29 +++- .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-gcp-bundle/nifi-gcp-services-api/pom.xml | 17 + .../nifi-graph-test-clients/pom.xml| 10 +++ .../src/main/resources/META-INF/NOTICE | 5 -- .../src/main/resources/META-INF/NOTICE | 13 .../nifi-grpc-nar/src/main/resources/NOTICE| 8 --- .../nifi-hdfs-processors/pom.xml | 12 .../nifi-hadoop-libraries-nar/pom.xml | 8 +++ .../src/main/resources/META-INF/NOTICE | 7 +- .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-hive-bundle/nifi-hive-processors/pom.xml | 26 +++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-hive-bundle/nifi-hive3-processors/pom.xml | 60 .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-hive_1_1-processors/pom.xml | 26 +++
[nifi] branch main updated: NIFI-9483 This closes #5616. Excluded Log4j 2 log4j-core and related libraries
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 9dd6b5f NIFI-9483 This closes #5616. Excluded Log4j 2 log4j-core and
related libraries
9dd6b5f is described below
commit 9dd6b5f3e5fb7b2cfeab3a9b174132344a17db85
Author: exceptionfactory
AuthorDate: Sat Dec 18 18:23:31 2021 -0600
NIFI-9483 This closes #5616. Excluded Log4j 2 log4j-core and related
libraries
- Added log4j-core to list of banned dependencies
- Added log4j-to-slf4j for Elasticsearch 5 processors to support runtime
logging
Signed-off-by: Joe Witt
---
.../nifi-atlas-reporting-task/pom.xml | 11 +
.../nifi-druid-controller-service-api/pom.xml | 23 +++
.../nifi-elasticsearch-5-processors/pom.xml| 3 ++-
.../nifi-hive-bundle/nifi-hive3-processors/pom.xml | 26 ++
.../nifi-ignite-processors/pom.xml | 2 +-
.../nifi-ranger-bundle/nifi-ranger-plugin/pom.xml | 9
.../nifi-solr-bundle/nifi-solr-processors/pom.xml | 8 +++
.../nifi-registry-ranger-plugin/pom.xml| 9
pom.xml| 4 ++--
9 files changed, 91 insertions(+), 4 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/pom.xml
b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/pom.xml
index 5abaa5c..4de76db 100644
--- a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/pom.xml
+++ b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/pom.xml
@@ -78,6 +78,17 @@
org.apache.atlas
atlas-notification
+
+
+
+org.apache.logging.log4j
+log4j-core
+
+
+org.apache.logging.log4j
+log4j-api
+
+
diff --git
a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml
b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml
index eceddf4..a581a38 100644
---
a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml
+++
b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml
@@ -54,6 +54,29 @@
io.druid
druid-processing
${druid.version}
+
+
+
+org.apache.logging.log4j
+log4j-api
+
+
+org.apache.logging.log4j
+log4j-core
+
+
+org.apache.logging.log4j
+log4j-slf4j-impl
+
+
+org.apache.logging.log4j
+log4j-jul
+
+
+org.apache.logging.log4j
+log4j-1.2-api
+
+
com.github.stephenc.findbugs
diff --git
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml
index b7ea053..d98b33d 100644
---
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml
+++
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml
@@ -77,13 +77,14 @@ language governing permissions and limitations under the
License. -->
org.slf4j
jcl-over-slf4j
+
org.apache.logging.log4j
log4j-api
org.apache.logging.log4j
-log4j-core
+log4j-to-slf4j
org.apache.nifi
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml
b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml
index 5a3563c..7160e49 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml
@@ -99,6 +99,19 @@
commons-logging
commons-logging
+
+
+org.apache.logging.log4j
+log4j-1.2-api
+
+
+org.apache.logging.log4j
+log4j-web
+
+
+org.apache.logging.log4j
+log4j-slf4j-impl
+
@@ -112,9 +125,22 @@
lo
[nifi-site] branch main updated: NIFI-9480 updating download links
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-site.git The following commit(s) were added to refs/heads/main by this push: new 49bc27d NIFI-9480 updating download links 49bc27d is described below commit 49bc27d7bb6b7b39ee4ce170a55b09b064ecbe2c Author: Joe Witt AuthorDate: Wed Dec 15 14:25:45 2021 -0700 NIFI-9480 updating download links --- src/pages/html/download.hbs| 18 src/pages/html/minifi/download.hbs | 44 +++--- src/pages/html/registry.hbs| 20 - 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/pages/html/download.hbs b/src/pages/html/download.hbs index 05de9ae..dd97f4b 100644 --- a/src/pages/html/download.hbs +++ b/src/pages/html/download.hbs @@ -23,30 +23,30 @@ title: Apache NiFi Downloads Releases -1.15.0 +1.15.1 -Released November 7th, 2021 +Released December 15th, 2021 Sources: -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.0/nifi-1.15.0-source-release.zip;>nifi-1.15.0-source-release.zip ( https://downloads.apache.org/nifi/1.15.0/nifi-1.15.0-source-release.zip.asc;>asc, https://downloads.apache.org/nifi/1.15.0/nifi-1.15.0-source-release.zip.sha256;>sha256, https://downloads.apache.org/nifi/1.15.0/nifi-1.15.0-source-release.zip.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.1/nifi-1.15.1-source-release.zip;>nifi-1.15.1-source-release.zip ( https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-source-release.zip.asc;>asc, https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-source-release.zip.sha256;>sha256, https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-source-release.zip.sha512;>sha512 ) Binaries -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.0/nifi-1.15.0-bin.tar.gz;>nifi-1.15.0-bin.tar.gz ( https://downloads.apache.org/nifi/1.15.0/nifi-1.15.0-bin.tar.gz.asc;>asc, https://downloads.apache.org/nifi/1.15.0/nifi-1.15.0-bin.tar.gz.sha256;>sha256, https://downloads.apache.org/nifi/1.15.0/nifi-1.15.0-bin.tar.gz.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.1/nifi-1.15.1-bin.tar.gz;>nifi-1.15.1-bin.tar.gz ( https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-bin.tar.gz.asc;>asc, https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-bin.tar.gz.sha256;>sha256, https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-bin.tar.gz.sha512;>sha512 ) -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.0/nifi-1.15.0-bin.zip;>nifi-1.15.0-bin.zip ( https://downloads.apache.org/nifi/1.15.0/nifi-1.15.0-bin.zip.asc;>asc, https://downloads.apache.org/nifi/1.15.0/nifi-1.15.0-bin.zip.sha256;>sha256, https://downloads.apache.org/nifi/1.15.0/nifi-1.15.0-bin.zip.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.1/nifi-1.15.1-bin.zip;>nifi-1.15.1-bin.zip ( https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-bin.zip.asc;>asc, https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-bin.zip.sha256;>sha256, https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-bin.zip.sha512;>sha512 ) -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.0/nifi-toolkit-1.15.0-bin.tar.gz;>nifi-toolkit-1.15.0-bin.tar.gz ( https://downloads.apache.org/nifi/1.15.0/nifi-toolkit-1.15.0-bin.tar.gz.asc;>asc, https://downloads.apache.org/nifi/1.15.0/nifi-toolkit-1.15.0-bin.tar.gz.sha256;>sha256, https://downloads.apache.org/nifi/1.15.0/nifi-toolkit-1.15.0-bin.tar.gz.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.1/nifi-toolkit-1.15.1-bin.tar.gz;>nifi-toolkit-1.15.1-bin.tar.gz ( https://downloads.apache.org/nifi/1.15.1/nifi-toolkit-1.15.1-bin.tar.gz.asc;>asc, https://downloads.apache.org/nifi/1.15.1/nifi-toolkit-1.15.1-bin.tar.gz.sha256;>sha256, https://downloads.apache.org/nifi/1.15.1/nifi-toolkit-1.15.1-bin.tar.gz.sha512;>sha512 ) -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.0/nifi-toolkit-1.15.0-bin.zip;>nifi-toolkit-1.15.0-bin.zip ( https://downloads.apache.org/nifi/1.15.0/nifi-toolkit-1.15.0-bin.zip.asc;>asc, https://downloads.apache.org/nifi/1.15.0/nifi-toolkit-1.15.0-bin.zip.sha256;>sha256, https://downloads.apache.org/nifi/1.15.0/nifi-toolkit-1.15.0-bin.zip.sha512;>sha512 ) -
[nifi] 01/01: Merge branch 'NIFI-9480-RC1' into support/nifi-1.15
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git commit 4acb358bd36544cef6b7d07b9b4d667b0aaa1ab4 Merge: d9715d7 b09619d Author: Joe Witt AuthorDate: Wed Dec 15 14:50:59 2021 -0700 Merge branch 'NIFI-9480-RC1' into support/nifi-1.15 minifi/minifi-assembly/pom.xml | 6 +- minifi/minifi-bootstrap/pom.xml| 2 +- minifi/minifi-c2/minifi-c2-api/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-assembly/pom.xml| 2 +- .../minifi-c2-cache-filesystem/pom.xml | 2 +- .../minifi-c2-cache/minifi-c2-cache-s3/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-cache/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-docker/pom.xml | 4 +- .../minifi-c2/minifi-c2-integration-tests/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-jetty/pom.xml | 2 +- .../minifi-c2-provider-cache/pom.xml | 2 +- .../minifi-c2-provider-delegating/pom.xml | 2 +- .../minifi-c2-provider-nifi-rest/pom.xml | 2 +- .../minifi-c2-provider-util/pom.xml| 2 +- minifi/minifi-c2/minifi-c2-provider/pom.xml| 2 +- minifi/minifi-c2/minifi-c2-service/pom.xml | 2 +- minifi/minifi-c2/pom.xml | 2 +- .../minifi-commons/minifi-commons-schema/pom.xml | 2 +- minifi/minifi-commons/minifi-utils/pom.xml | 2 +- minifi/minifi-commons/pom.xml | 2 +- minifi/minifi-docker/pom.xml | 4 +- minifi/minifi-docs/pom.xml | 2 +- minifi/minifi-integration-tests/pom.xml| 2 +- .../minifi-framework-nar/pom.xml | 2 +- .../minifi-framework/minifi-framework-api/pom.xml | 8 +- .../minifi-framework/minifi-framework-core/pom.xml | 6 +- .../minifi-framework/minifi-resources/pom.xml | 2 +- .../minifi-framework/minifi-runtime/pom.xml| 2 +- .../minifi-framework/minifi-server/pom.xml | 2 +- .../minifi-framework/pom.xml | 2 +- .../minifi-server-nar/pom.xml | 8 +- .../minifi-framework-bundle/pom.xml| 16 +- .../minifi-provenance-repositories/pom.xml | 2 +- .../minifi-provenance-repository-nar/pom.xml | 2 +- .../minifi-provenance-repository-bundle/pom.xml| 2 +- .../minifi-nar-bundles/minifi-standard-nar/pom.xml | 8 +- .../minifi-update-attribute-nar/pom.xml| 8 +- minifi/minifi-nar-bundles/pom.xml | 2 +- .../minifi-toolkit/minifi-toolkit-assembly/pom.xml | 2 +- .../minifi-toolkit-configuration/pom.xml | 2 +- minifi/minifi-toolkit/pom.xml | 2 +- minifi/pom.xml | 124 - nifi-api/pom.xml | 2 +- nifi-assembly/pom.xml | 280 ++--- nifi-bootstrap/pom.xml | 18 +- nifi-commons/nifi-bootstrap-utils/pom.xml | 2 +- nifi-commons/nifi-data-provenance-utils/pom.xml| 8 +- nifi-commons/nifi-expression-language/pom.xml | 10 +- nifi-commons/nifi-flow-encryptor/pom.xml | 4 +- nifi-commons/nifi-flowfile-packager/pom.xml| 2 +- nifi-commons/nifi-hl7-query-language/pom.xml | 2 +- nifi-commons/nifi-json-utils/pom.xml | 6 +- nifi-commons/nifi-logging-utils/pom.xml| 2 +- nifi-commons/nifi-metrics/pom.xml | 4 +- nifi-commons/nifi-parameter/pom.xml| 4 +- nifi-commons/nifi-properties/pom.xml | 4 +- nifi-commons/nifi-property-encryptor/pom.xml | 4 +- nifi-commons/nifi-property-utils/pom.xml | 2 +- nifi-commons/nifi-record-path/pom.xml | 10 +- nifi-commons/nifi-record/pom.xml | 2 +- nifi-commons/nifi-repository-encryption/pom.xml| 8 +- nifi-commons/nifi-rocksdb-utils/pom.xml| 8 +- nifi-commons/nifi-schema-utils/pom.xml | 2 +- nifi-commons/nifi-security-kerberos-api/pom.xml| 2 +- nifi-commons/nifi-security-kerberos/pom.xml| 6 +- nifi-commons/nifi-security-kms/pom.xml | 2 +- nifi-commons/nifi-security-socket-ssl/pom.xml | 6 +- nifi-commons/nifi-security-utils-api/pom.xml | 2 +- nifi-commons/nifi-security-utils/pom.xml | 12 +- .../nifi-sensitive-property-provider/pom.xml | 8 +- nifi-commons/nifi-single-user-utils/pom.xml| 2 +- nifi-commons/nifi-site-to-site-client/pom.xml | 12 +- nifi-commons/nifi-socket-utils/pom.xml | 8 +- nifi-commons/nifi-utils/pom.xml| 6 +- nifi-commons/nifi-uuid5/pom.xml| 2 +- nifi-commons/nifi-vault
[nifi] branch support/nifi-1.15 updated (d9715d7 -> 4acb358)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git. from d9715d7 NIFI-9486 This closes #5604. Add compile scope to logging deps in nifi-registry-assembly NIFI-9486 Add compile scope to logging deps in minifi-assembly add 2a75637 NIFI-9480-RC1 prepare release nifi-1.15.1-RC1 add b09619d NIFI-9480-RC1 prepare for next development iteration new 4acb358 Merge branch 'NIFI-9480-RC1' into support/nifi-1.15 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: minifi/minifi-assembly/pom.xml | 6 +- minifi/minifi-bootstrap/pom.xml| 2 +- minifi/minifi-c2/minifi-c2-api/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-assembly/pom.xml| 2 +- .../minifi-c2-cache-filesystem/pom.xml | 2 +- .../minifi-c2-cache/minifi-c2-cache-s3/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-cache/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-docker/pom.xml | 4 +- .../minifi-c2/minifi-c2-integration-tests/pom.xml | 2 +- minifi/minifi-c2/minifi-c2-jetty/pom.xml | 2 +- .../minifi-c2-provider-cache/pom.xml | 2 +- .../minifi-c2-provider-delegating/pom.xml | 2 +- .../minifi-c2-provider-nifi-rest/pom.xml | 2 +- .../minifi-c2-provider-util/pom.xml| 2 +- minifi/minifi-c2/minifi-c2-provider/pom.xml| 2 +- minifi/minifi-c2/minifi-c2-service/pom.xml | 2 +- minifi/minifi-c2/pom.xml | 2 +- .../minifi-commons/minifi-commons-schema/pom.xml | 2 +- minifi/minifi-commons/minifi-utils/pom.xml | 2 +- minifi/minifi-commons/pom.xml | 2 +- minifi/minifi-docker/pom.xml | 4 +- minifi/minifi-docs/pom.xml | 2 +- minifi/minifi-integration-tests/pom.xml| 2 +- .../minifi-framework-nar/pom.xml | 2 +- .../minifi-framework/minifi-framework-api/pom.xml | 8 +- .../minifi-framework/minifi-framework-core/pom.xml | 6 +- .../minifi-framework/minifi-resources/pom.xml | 2 +- .../minifi-framework/minifi-runtime/pom.xml| 2 +- .../minifi-framework/minifi-server/pom.xml | 2 +- .../minifi-framework/pom.xml | 2 +- .../minifi-server-nar/pom.xml | 8 +- .../minifi-framework-bundle/pom.xml| 16 +- .../minifi-provenance-repositories/pom.xml | 2 +- .../minifi-provenance-repository-nar/pom.xml | 2 +- .../minifi-provenance-repository-bundle/pom.xml| 2 +- .../minifi-nar-bundles/minifi-standard-nar/pom.xml | 8 +- .../minifi-update-attribute-nar/pom.xml| 8 +- minifi/minifi-nar-bundles/pom.xml | 2 +- .../minifi-toolkit/minifi-toolkit-assembly/pom.xml | 2 +- .../minifi-toolkit-configuration/pom.xml | 2 +- minifi/minifi-toolkit/pom.xml | 2 +- minifi/pom.xml | 124 - nifi-api/pom.xml | 2 +- nifi-assembly/pom.xml | 280 ++--- nifi-bootstrap/pom.xml | 18 +- nifi-commons/nifi-bootstrap-utils/pom.xml | 2 +- nifi-commons/nifi-data-provenance-utils/pom.xml| 8 +- nifi-commons/nifi-expression-language/pom.xml | 10 +- nifi-commons/nifi-flow-encryptor/pom.xml | 4 +- nifi-commons/nifi-flowfile-packager/pom.xml| 2 +- nifi-commons/nifi-hl7-query-language/pom.xml | 2 +- nifi-commons/nifi-json-utils/pom.xml | 6 +- nifi-commons/nifi-logging-utils/pom.xml| 2 +- nifi-commons/nifi-metrics/pom.xml | 4 +- nifi-commons/nifi-parameter/pom.xml| 4 +- nifi-commons/nifi-properties/pom.xml | 4 +- nifi-commons/nifi-property-encryptor/pom.xml | 4 +- nifi-commons/nifi-property-utils/pom.xml | 2 +- nifi-commons/nifi-record-path/pom.xml | 10 +- nifi-commons/nifi-record/pom.xml | 2 +- nifi-commons/nifi-repository-encryption/pom.xml| 8 +- nifi-commons/nifi-rocksdb-utils/pom.xml| 8 +- nifi-commons/nifi-schema-utils/pom.xml | 2 +- nifi-commons/nifi-security-kerberos-api/pom.xml| 2 +- nifi-commons/nifi-security-kerberos/pom.xml| 6 +- nifi-commons/nifi-security-kms/pom.xml | 2 +- nifi-commons/nifi-security-socket-ssl/pom.xml | 6 +- nifi-commons/nifi-security-utils-api/pom.xml
svn commit: r1896011 - in /nifi/site/trunk/docs/nifi-docs: ./ components/org.apache.nifi/nifi-ambari-nar/1.15.1/ components/org.apache.nifi/nifi-ambari-nar/1.15.1/org.apache.nifi.reporting.ambari.Amba
Author: joewitt Date: Wed Dec 15 21:50:53 2021 New Revision: 1896011 URL: http://svn.apache.org/viewvc?rev=1896011=rev Log: NIFI-9480 Added 1.15.1 docs to NiFi site. [This commit notification would consist of 57 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
[nifi] annotated tag rel/nifi-1.15.1 created (now 7748870)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to annotated tag rel/nifi-1.15.1 in repository https://gitbox.apache.org/repos/asf/nifi.git. at 7748870 (tag) tagging 2a756372fc7097ece6258c2af47b9a5f26384b02 (commit) replaces rel/nifi-1.15.0 by Joe Witt on Wed Dec 15 14:50:18 2021 -0700 - Log - NIFI-9480 Signed release tag for approved release of NiFi 1.15.1 -BEGIN PGP SIGNATURE- iQEzBAABCgAdFiEE0vJLgJ/6seIa6gKDkJO/hU+BGhoFAmG6YxoACgkQkJO/hU+B GhrzfggAuXZXuaR0O6ajeDgOhcsXkGDHOnM+O5amjmPYTXpQ/RSkt7Y7CKKB548Q oOM8Y3oUP3fbMfOoMvlrcBB+5Kj3hetXk2fcF/9DYTiq9MrLQdPjNIQLjh7Djzty +yP6kVALWrBiA5Hz7s7EKovt8bMb3dDaQy+utpHVQTjPrDwFV+I21islUB2qm1ad K2uIO3OnveWQc13agyDR9PRKL4vJ3kLUlpVeoCNH7VWxARxlgQgUUYT5p6H6 rAtoBQkS9GCsJUdhJccih9G9S3Czk+IcHU6VexMv+1JjHXVM3MbRQCNFhRpFkqdW /URT4sv4W2h3r0+phmMjDQOUDApoag== =fPn9 -END PGP SIGNATURE- --- No new revisions were added by this update.
svn commit: r1896009 - in /nifi/site/trunk: download.html minifi/download.html registry.html
Author: joewitt Date: Wed Dec 15 21:29:03 2021 New Revision: 1896009 URL: http://svn.apache.org/viewvc?rev=1896009=rev Log: NIFI-9480 link updates Modified: nifi/site/trunk/download.html nifi/site/trunk/minifi/download.html nifi/site/trunk/registry.html Modified: nifi/site/trunk/download.html URL: http://svn.apache.org/viewvc/nifi/site/trunk/download.html?rev=1896009=1896008=1896009=diff == --- nifi/site/trunk/download.html (original) +++ nifi/site/trunk/download.html Wed Dec 15 21:29:03 2021 @@ -129,30 +129,30 @@ Releases -1.15.0 +1.15.1 -Released November 7th, 2021 +Released December 15th, 2021 Sources: -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.0/nifi-1.15.0-source-release.zip;>nifi-1.15.0-source-release.zip ( https://downloads.apache.org/nifi/1.15.0/nifi-1.15.0-source-release.zip.asc;>asc, https://downloads.apache.org/nifi/1.15.0/nifi-1.15.0-source-release.zip.sha256;>sha256, https://downloads.apache.org/nifi/1.15.0/nifi-1.15.0-source-release.zip.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.1/nifi-1.15.1-source-release.zip;>nifi-1.15.1-source-release.zip ( https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-source-release.zip.asc;>asc, https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-source-release.zip.sha256;>sha256, https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-source-release.zip.sha512;>sha512 ) Binaries -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.0/nifi-1.15.0-bin.tar.gz;>nifi-1.15.0-bin.tar.gz ( https://downloads.apache.org/nifi/1.15.0/nifi-1.15.0-bin.tar.gz.asc;>asc, https://downloads.apache.org/nifi/1.15.0/nifi-1.15.0-bin.tar.gz.sha256;>sha256, https://downloads.apache.org/nifi/1.15.0/nifi-1.15.0-bin.tar.gz.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.1/nifi-1.15.1-bin.tar.gz;>nifi-1.15.1-bin.tar.gz ( https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-bin.tar.gz.asc;>asc, https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-bin.tar.gz.sha256;>sha256, https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-bin.tar.gz.sha512;>sha512 ) -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.0/nifi-1.15.0-bin.zip;>nifi-1.15.0-bin.zip ( https://downloads.apache.org/nifi/1.15.0/nifi-1.15.0-bin.zip.asc;>asc, https://downloads.apache.org/nifi/1.15.0/nifi-1.15.0-bin.zip.sha256;>sha256, https://downloads.apache.org/nifi/1.15.0/nifi-1.15.0-bin.zip.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.1/nifi-1.15.1-bin.zip;>nifi-1.15.1-bin.zip ( https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-bin.zip.asc;>asc, https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-bin.zip.sha256;>sha256, https://downloads.apache.org/nifi/1.15.1/nifi-1.15.1-bin.zip.sha512;>sha512 ) -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.0/nifi-toolkit-1.15.0-bin.tar.gz;>nifi-toolkit-1.15.0-bin.tar.gz ( https://downloads.apache.org/nifi/1.15.0/nifi-toolkit-1.15.0-bin.tar.gz.asc;>asc, https://downloads.apache.org/nifi/1.15.0/nifi-toolkit-1.15.0-bin.tar.gz.sha256;>sha256, https://downloads.apache.org/nifi/1.15.0/nifi-toolkit-1.15.0-bin.tar.gz.sha512;>sha512 ) +https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.1/nifi-toolkit-1.15.1-bin.tar.gz;>nifi-toolkit-1.15.1-bin.tar.gz ( https://downloads.apache.org/nifi/1.15.1/nifi-toolkit-1.15.1-bin.tar.gz.asc;>asc, https://downloads.apache.org/nifi/1.15.1/nifi-toolkit-1.15.1-bin.tar.gz.sha256;>sha256, https://downloads.apache.org/nifi/1.15.1/nifi-toolkit-1.15.1-bin.tar.gz.sha512;>sha512 ) -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.0/nifi-toolkit-1.15.0-bin.zip;>nifi-toolkit-1.15.0-bin.zip ( https://downloads.apache.org/nifi/1.15.0/nifi-toolkit-1.15.0-bin.zip.asc;>asc, https://downloads.apache.org/nifi/1.15.0/nifi-toolkit-1.15.0-bin.zip.sha256;>sha256, https://downloads.apache.org/nifi/1.15.0/nifi-toolkit-1.15.0-bin.zip.sha512;>sha512 ) -https://www.apache.org/dyn/closer.lua?path=/nifi/1.15.0/nifi-stateless-1.15.0-bin.tar.gz;>nifi-stateless-1.15.0-bin.tar.gz ( https://downloads.apache.org/nifi/1.15.0/nifi-stateless-1.15.0-bin.tar.gz.asc;>asc, https://downloads.apache.org/nifi/1.15.0/nifi-stateless-1.15.0-bin.tar.gz.sha256;>sha256, https://d
svn commit: r51478 - /release/nifi/1.15.0/
Author: joewitt Date: Wed Dec 15 21:19:55 2021 New Revision: 51478 Log: NIFI-9480 have pushed 1.15.1 and confirmed 1.15.0 in archive Removed: release/nifi/1.15.0/
svn commit: r51474 - /dev/nifi/nifi-1.15.1/ /release/nifi/1.15.1/
Author: joewitt Date: Wed Dec 15 19:41:02 2021 New Revision: 51474 Log: NIFI-9480 Added: release/nifi/1.15.1/ - copied from r51473, dev/nifi/nifi-1.15.1/ Removed: dev/nifi/nifi-1.15.1/
svn commit: r51452 - /dev/nifi/nifi-1.15.1/
Author: joewitt Date: Wed Dec 15 03:30:21 2021 New Revision: 51452 Log: NIFI-9480 uploading RC1 artifacts Added: dev/nifi/nifi-1.15.1/ dev/nifi/nifi-1.15.1/minifi-1.15.1-bin.tar.gz (with props) dev/nifi/nifi-1.15.1/minifi-1.15.1-bin.tar.gz.asc dev/nifi/nifi-1.15.1/minifi-1.15.1-bin.tar.gz.sha256 dev/nifi/nifi-1.15.1/minifi-1.15.1-bin.tar.gz.sha512 dev/nifi/nifi-1.15.1/minifi-1.15.1-bin.zip (with props) dev/nifi/nifi-1.15.1/minifi-1.15.1-bin.zip.asc dev/nifi/nifi-1.15.1/minifi-1.15.1-bin.zip.sha256 dev/nifi/nifi-1.15.1/minifi-1.15.1-bin.zip.sha512 dev/nifi/nifi-1.15.1/minifi-c2-1.15.1-bin.tar.gz (with props) dev/nifi/nifi-1.15.1/minifi-c2-1.15.1-bin.tar.gz.asc dev/nifi/nifi-1.15.1/minifi-c2-1.15.1-bin.tar.gz.sha256 dev/nifi/nifi-1.15.1/minifi-c2-1.15.1-bin.tar.gz.sha512 dev/nifi/nifi-1.15.1/minifi-c2-1.15.1-bin.zip (with props) dev/nifi/nifi-1.15.1/minifi-c2-1.15.1-bin.zip.asc dev/nifi/nifi-1.15.1/minifi-c2-1.15.1-bin.zip.sha256 dev/nifi/nifi-1.15.1/minifi-c2-1.15.1-bin.zip.sha512 dev/nifi/nifi-1.15.1/minifi-toolkit-1.15.1-bin.tar.gz (with props) dev/nifi/nifi-1.15.1/minifi-toolkit-1.15.1-bin.tar.gz.asc dev/nifi/nifi-1.15.1/minifi-toolkit-1.15.1-bin.tar.gz.sha256 dev/nifi/nifi-1.15.1/minifi-toolkit-1.15.1-bin.tar.gz.sha512 dev/nifi/nifi-1.15.1/minifi-toolkit-1.15.1-bin.zip (with props) dev/nifi/nifi-1.15.1/minifi-toolkit-1.15.1-bin.zip.asc dev/nifi/nifi-1.15.1/minifi-toolkit-1.15.1-bin.zip.sha256 dev/nifi/nifi-1.15.1/minifi-toolkit-1.15.1-bin.zip.sha512 dev/nifi/nifi-1.15.1/nifi-1.15.1-bin.tar.gz (with props) dev/nifi/nifi-1.15.1/nifi-1.15.1-bin.tar.gz.asc dev/nifi/nifi-1.15.1/nifi-1.15.1-bin.tar.gz.sha256 dev/nifi/nifi-1.15.1/nifi-1.15.1-bin.tar.gz.sha512 dev/nifi/nifi-1.15.1/nifi-1.15.1-bin.zip (with props) dev/nifi/nifi-1.15.1/nifi-1.15.1-bin.zip.asc dev/nifi/nifi-1.15.1/nifi-1.15.1-bin.zip.sha256 dev/nifi/nifi-1.15.1/nifi-1.15.1-bin.zip.sha512 dev/nifi/nifi-1.15.1/nifi-1.15.1-source-release.zip (with props) dev/nifi/nifi-1.15.1/nifi-1.15.1-source-release.zip.asc dev/nifi/nifi-1.15.1/nifi-1.15.1-source-release.zip.sha256 dev/nifi/nifi-1.15.1/nifi-1.15.1-source-release.zip.sha512 dev/nifi/nifi-1.15.1/nifi-registry-1.15.1-bin.tar.gz (with props) dev/nifi/nifi-1.15.1/nifi-registry-1.15.1-bin.tar.gz.asc dev/nifi/nifi-1.15.1/nifi-registry-1.15.1-bin.tar.gz.sha256 dev/nifi/nifi-1.15.1/nifi-registry-1.15.1-bin.tar.gz.sha512 dev/nifi/nifi-1.15.1/nifi-registry-1.15.1-bin.zip (with props) dev/nifi/nifi-1.15.1/nifi-registry-1.15.1-bin.zip.asc dev/nifi/nifi-1.15.1/nifi-registry-1.15.1-bin.zip.sha256 dev/nifi/nifi-1.15.1/nifi-registry-1.15.1-bin.zip.sha512 dev/nifi/nifi-1.15.1/nifi-registry-toolkit-1.15.1-bin.tar.gz (with props) dev/nifi/nifi-1.15.1/nifi-registry-toolkit-1.15.1-bin.tar.gz.asc dev/nifi/nifi-1.15.1/nifi-registry-toolkit-1.15.1-bin.tar.gz.sha256 dev/nifi/nifi-1.15.1/nifi-registry-toolkit-1.15.1-bin.tar.gz.sha512 dev/nifi/nifi-1.15.1/nifi-registry-toolkit-1.15.1-bin.zip (with props) dev/nifi/nifi-1.15.1/nifi-registry-toolkit-1.15.1-bin.zip.asc dev/nifi/nifi-1.15.1/nifi-registry-toolkit-1.15.1-bin.zip.sha256 dev/nifi/nifi-1.15.1/nifi-registry-toolkit-1.15.1-bin.zip.sha512 dev/nifi/nifi-1.15.1/nifi-stateless-1.15.1-bin.tar.gz (with props) dev/nifi/nifi-1.15.1/nifi-stateless-1.15.1-bin.tar.gz.asc dev/nifi/nifi-1.15.1/nifi-stateless-1.15.1-bin.tar.gz.sha256 dev/nifi/nifi-1.15.1/nifi-stateless-1.15.1-bin.tar.gz.sha512 dev/nifi/nifi-1.15.1/nifi-toolkit-1.15.1-bin.tar.gz (with props) dev/nifi/nifi-1.15.1/nifi-toolkit-1.15.1-bin.tar.gz.asc dev/nifi/nifi-1.15.1/nifi-toolkit-1.15.1-bin.tar.gz.sha256 dev/nifi/nifi-1.15.1/nifi-toolkit-1.15.1-bin.tar.gz.sha512 dev/nifi/nifi-1.15.1/nifi-toolkit-1.15.1-bin.zip (with props) dev/nifi/nifi-1.15.1/nifi-toolkit-1.15.1-bin.zip.asc dev/nifi/nifi-1.15.1/nifi-toolkit-1.15.1-bin.zip.sha256 dev/nifi/nifi-1.15.1/nifi-toolkit-1.15.1-bin.zip.sha512 Added: dev/nifi/nifi-1.15.1/minifi-1.15.1-bin.tar.gz == Binary file - no diff available. Propchange: dev/nifi/nifi-1.15.1/minifi-1.15.1-bin.tar.gz -- svn:mime-type = application/octet-stream Added: dev/nifi/nifi-1.15.1/minifi-1.15.1-bin.tar.gz.asc == --- dev/nifi/nifi-1.15.1/minifi-1.15.1-bin.tar.gz.asc (added) +++ dev/nifi/nifi-1.15.1/minifi-1.15.1-bin.tar.gz.asc Wed Dec 15 03:30:21 2021 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEE0vJLgJ/6seIa6gKDkJO/hU+BGhoFAmG5XZQACgkQkJO/hU+B +Ghquegf9Gl1OaQR2V1ylqbUFHxD4GRd6oZUAxDWQyGOz9Nl8pv1yZyee2vwb+NMX
[nifi] annotated tag nifi-1.15.1-RC1 created (now d9b7436)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to annotated tag nifi-1.15.1-RC1 in repository https://gitbox.apache.org/repos/asf/nifi.git. at d9b7436 (tag) tagging 2a756372fc7097ece6258c2af47b9a5f26384b02 (commit) replaces rel/nifi-1.15.0 by Joe Witt on Tue Dec 14 15:27:36 2021 -0700 - Log - NIFI-9480-RC1 copy for tag nifi-1.15.1-RC1 --- No new revisions were added by this update.
[nifi] branch NIFI-9480-RC1 created (now b09619d)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to branch NIFI-9480-RC1 in repository https://gitbox.apache.org/repos/asf/nifi.git. at b09619d NIFI-9480-RC1 prepare for next development iteration This branch includes the following new commits: new 2a75637 NIFI-9480-RC1 prepare release nifi-1.15.1-RC1 new b09619d NIFI-9480-RC1 prepare for next development iteration The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[nifi] branch support/nifi-1.15 updated: NIFI-9486 This closes #5604. Add compile scope to logging deps in nifi-registry-assembly NIFI-9486 Add compile scope to logging deps in minifi-assembly
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.15 by this push: new d9715d7 NIFI-9486 This closes #5604. Add compile scope to logging deps in nifi-registry-assembly NIFI-9486 Add compile scope to logging deps in minifi-assembly d9715d7 is described below commit d9715d7aff26ebaf55e5277a8b5db33f908df14c Author: Bryan Bende AuthorDate: Tue Dec 14 14:54:21 2021 -0500 NIFI-9486 This closes #5604. Add compile scope to logging deps in nifi-registry-assembly NIFI-9486 Add compile scope to logging deps in minifi-assembly This commit is 2 of 2. Signed-off-by: Joe Witt --- minifi/minifi-assembly/pom.xml | 1 + nifi-registry/nifi-registry-assembly/pom.xml | 4 2 files changed, 5 insertions(+) diff --git a/minifi/minifi-assembly/pom.xml b/minifi/minifi-assembly/pom.xml index e0b2729..2ea6a32 100644 --- a/minifi/minifi-assembly/pom.xml +++ b/minifi/minifi-assembly/pom.xml @@ -68,6 +68,7 @@ limitations under the License. ch.qos.logback logback-classic +compile org.slf4j diff --git a/nifi-registry/nifi-registry-assembly/pom.xml b/nifi-registry/nifi-registry-assembly/pom.xml index 4001e9f..0153f71 100644 --- a/nifi-registry/nifi-registry-assembly/pom.xml +++ b/nifi-registry/nifi-registry-assembly/pom.xml @@ -58,18 +58,22 @@ ch.qos.logback logback-classic +compile org.slf4j jcl-over-slf4j +compile org.slf4j jul-to-slf4j +compile org.slf4j log4j-over-slf4j +compile org.slf4j
[nifi] branch main updated: NIFI-9486 This closes #5604. Add compile scope to logging deps in nifi-registry-assembly NIFI-9486 Add compile scope to logging deps in minifi-assembly
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/main by this push: new e7449bf NIFI-9486 This closes #5604. Add compile scope to logging deps in nifi-registry-assembly NIFI-9486 Add compile scope to logging deps in minifi-assembly e7449bf is described below commit e7449bf0d3fa1612f2019603f09b8bc99d0b26a7 Author: Bryan Bende AuthorDate: Tue Dec 14 14:54:21 2021 -0500 NIFI-9486 This closes #5604. Add compile scope to logging deps in nifi-registry-assembly NIFI-9486 Add compile scope to logging deps in minifi-assembly This commit is 2 of 2. Signed-off-by: Joe Witt --- minifi/minifi-assembly/pom.xml | 1 + nifi-registry/nifi-registry-assembly/pom.xml | 4 2 files changed, 5 insertions(+) diff --git a/minifi/minifi-assembly/pom.xml b/minifi/minifi-assembly/pom.xml index a30d9f7..f492235 100644 --- a/minifi/minifi-assembly/pom.xml +++ b/minifi/minifi-assembly/pom.xml @@ -68,6 +68,7 @@ limitations under the License. ch.qos.logback logback-classic +compile org.slf4j diff --git a/nifi-registry/nifi-registry-assembly/pom.xml b/nifi-registry/nifi-registry-assembly/pom.xml index eb006f7..c7ddd06 100644 --- a/nifi-registry/nifi-registry-assembly/pom.xml +++ b/nifi-registry/nifi-registry-assembly/pom.xml @@ -58,18 +58,22 @@ ch.qos.logback logback-classic +compile org.slf4j jcl-over-slf4j +compile org.slf4j jul-to-slf4j +compile org.slf4j log4j-over-slf4j +compile org.slf4j
[nifi] branch support/nifi-1.15 updated: NIFI-9486 This closes #5604. Upgrade to logback 1.2.8, remove unnecessary dependencyManagement entries in minifi and nifi-registry in favor of root pom Remove
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.15 by this push:
new 0cb61f6 NIFI-9486 This closes #5604. Upgrade to logback 1.2.8, remove
unnecessary dependencyManagement entries in minifi and nifi-registry in favor
of root pom Remove unnecessary use of slf4j-simple
0cb61f6 is described below
commit 0cb61f63ccd0eb500d1edfba0ef3f021404f60d7
Author: Bryan Bende
AuthorDate: Tue Dec 14 13:48:53 2021 -0500
NIFI-9486 This closes #5604. Upgrade to logback 1.2.8, remove unnecessary
dependencyManagement entries in minifi and nifi-registry in favor of root pom
Remove unnecessary use of slf4j-simple
---
.../minifi-framework-nar/pom.xml | 13 +--
minifi/pom.xml | 44 --
.../nifi-accumulo-processors/pom.xml | 5 ---
.../nifi-smb-bundle/nifi-smb-processors/pom.xml| 5 ---
.../nifi-registry-client/pom.xml | 6 ---
.../nifi-registry-properties/pom.xml | 6 ---
.../nifi-registry-revision-entity-service/pom.xml | 7
.../nifi-registry-ranger-plugin/pom.xml| 7
nifi-registry/pom.xml | 25
pom.xml| 2 +-
10 files changed, 2 insertions(+), 118 deletions(-)
diff --git
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
index 0d44d54..5b3d60d 100644
---
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
+++
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
@@ -84,17 +84,6 @@ limitations under the License.
cglib-nodep
compile
-
-
-
-ch.qos.logback
-logback-classic
-provided
-
-
-ch.qos.logback
-logback-core
-provided
-
+
\ No newline at end of file
diff --git a/minifi/pom.xml b/minifi/pom.xml
index 46583ea..5e5b028 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -60,11 +60,6 @@ limitations under the License.
mockito-all
test
-
-org.slf4j
-slf4j-simple
-test
-
@@ -160,40 +155,6 @@ limitations under the License.
-ch.qos.logback
-logback-classic
-${logback.version}
-
-
-ch.qos.logback
-logback-core
-${logback.version}
-
-
-org.slf4j
-jcl-over-slf4j
-${org.slf4j.version}
-provided
-
-
-org.slf4j
-log4j-over-slf4j
-${org.slf4j.version}
-provided
-
-
-org.slf4j
-jul-to-slf4j
-${org.slf4j.version}
-provided
-
-
-org.slf4j
-slf4j-api
-${org.slf4j.version}
-provided
-
-
org.eclipse.jetty
jetty-util
${jetty.version}
@@ -517,11 +478,6 @@ limitations under the License.
test
-org.slf4j
-slf4j-simple
-${org.slf4j.version}
-
-
com.squareup.okhttp3
okhttp
3.12.3
diff --git
a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml
b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml
index 3ecab43..9cd3422 100644
--- a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml
@@ -79,11 +79,6 @@
1.15.1-SNAPSHOT
-org.slf4j
-slf4j-simple
-test
-
-
org.apache.accumulo
accumulo-minicluster
${accumulo.version}
diff --git a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/pom.xml
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/pom.xml
index d1444a4..4c86a52 100644
--- a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/pom.xml
@@ -46,10 +46,5 @@
1.15.1-SNAPSHOT
test
-
-org.slf4j
-slf4j-simple
-test
-
diff --git a/nifi
[nifi] branch main updated: NIFI-9486 This closes #5604. Upgrade to logback 1.2.8, remove unnecessary dependencyManagement entries in minifi and nifi-registry in favor of root pom Remove unnecessary u
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 09f254c NIFI-9486 This closes #5604. Upgrade to logback 1.2.8, remove
unnecessary dependencyManagement entries in minifi and nifi-registry in favor
of root pom Remove unnecessary use of slf4j-simple
09f254c is described below
commit 09f254c6113c4c0747201eed67a0e0101424cd12
Author: Bryan Bende
AuthorDate: Tue Dec 14 13:48:53 2021 -0500
NIFI-9486 This closes #5604. Upgrade to logback 1.2.8, remove unnecessary
dependencyManagement entries in minifi and nifi-registry in favor of root pom
Remove unnecessary use of slf4j-simple
---
.../minifi-framework-nar/pom.xml | 13 +--
minifi/pom.xml | 44 --
.../nifi-accumulo-processors/pom.xml | 5 ---
.../nifi-smb-bundle/nifi-smb-processors/pom.xml| 5 ---
.../nifi-registry-client/pom.xml | 6 ---
.../nifi-registry-properties/pom.xml | 6 ---
.../nifi-registry-revision-entity-service/pom.xml | 7
.../nifi-registry-ranger-plugin/pom.xml| 7
nifi-registry/pom.xml | 25
pom.xml| 2 +-
10 files changed, 2 insertions(+), 118 deletions(-)
diff --git
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
index 628cc1b..e60b752 100644
---
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
+++
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
@@ -84,17 +84,6 @@ limitations under the License.
cglib-nodep
compile
-
-
-
-ch.qos.logback
-logback-classic
-provided
-
-
-ch.qos.logback
-logback-core
-provided
-
+
\ No newline at end of file
diff --git a/minifi/pom.xml b/minifi/pom.xml
index 70a24932..e01dabc 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -60,11 +60,6 @@ limitations under the License.
mockito-all
test
-
-org.slf4j
-slf4j-simple
-test
-
@@ -160,40 +155,6 @@ limitations under the License.
-ch.qos.logback
-logback-classic
-${logback.version}
-
-
-ch.qos.logback
-logback-core
-${logback.version}
-
-
-org.slf4j
-jcl-over-slf4j
-${org.slf4j.version}
-provided
-
-
-org.slf4j
-log4j-over-slf4j
-${org.slf4j.version}
-provided
-
-
-org.slf4j
-jul-to-slf4j
-${org.slf4j.version}
-provided
-
-
-org.slf4j
-slf4j-api
-${org.slf4j.version}
-provided
-
-
org.eclipse.jetty
jetty-util
${jetty.version}
@@ -517,11 +478,6 @@ limitations under the License.
test
-org.slf4j
-slf4j-simple
-${org.slf4j.version}
-
-
com.squareup.okhttp3
okhttp
3.12.3
diff --git
a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml
b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml
index d24a84a..b991fbe 100644
--- a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml
@@ -79,11 +79,6 @@
1.16.0-SNAPSHOT
-org.slf4j
-slf4j-simple
-test
-
-
org.apache.accumulo
accumulo-minicluster
${accumulo.version}
diff --git a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/pom.xml
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/pom.xml
index 5429fec..153f242 100644
--- a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/pom.xml
@@ -46,10 +46,5 @@
1.16.0-SNAPSHOT
test
-
-org.slf4j
-slf4j-simple
-test
-
diff --git a/nifi-registry/nifi-registry
[nifi] branch support/nifi-1.15 updated: NIFI-9417: Update BulletinMergerTest.java
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.15 by this push:
new 8181949 NIFI-9417: Update BulletinMergerTest.java
8181949 is described below
commit 81819495408fd69f370af9ddbb33317d15f79944
Author: Yiming Li <46290389+leoyimin...@users.noreply.github.com>
AuthorDate: Wed Nov 10 11:26:51 2021 -0600
NIFI-9417: Update BulletinMergerTest.java
Signed-off-by: Matthew Burgess
This closes #5572
---
.../org/apache/nifi/cluster/manager/BulletinMergerTest.java| 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/BulletinMergerTest.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/BulletinMergerTest.java
index 1502433..cb0d181 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/BulletinMergerTest.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/BulletinMergerTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import java.util.ArrayList;
import java.util.Date;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -65,7 +65,7 @@ public class BulletinMergerTest {
final NodeIdentifier node1 = new NodeIdentifier("node-1", "host-1",
8080, "host-1", 19998, null, null, null, false);
final NodeIdentifier node2 = new NodeIdentifier("node-2", "host-2",
8081, "host-2", 1, null, null, null, false);
-final Map> nodeMap = new
HashMap<>();
+final Map> nodeMap = new
LinkedHashMap<>();
nodeMap.put(node1, new ArrayList<>());
nodeMap.put(node2, new ArrayList<>());
@@ -77,10 +77,10 @@ public class BulletinMergerTest {
final List bulletinEntities =
BulletinMerger.mergeBulletins(nodeMap, nodeMap.size());
assertEquals(bulletinEntities.size(), 3);
-assertTrue(bulletinEntities.contains(copyOfBulletin1));
-assertEquals(copyOfBulletin1.getNodeAddress(), ALL_NODES_MESSAGE);
+assertTrue(bulletinEntities.contains(bulletinEntity1));
+assertEquals(bulletinEntity1.getNodeAddress(), ALL_NODES_MESSAGE);
assertTrue(bulletinEntities.contains(bulletinEntity2));
assertTrue(bulletinEntities.contains(unauthorizedBulletin));
}
-}
\ No newline at end of file
+}
[nifi] branch support/nifi-1.15 updated: Revert "Update BulletinMergerTest.java"
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.15 by this push:
new aa85bc3 Revert "Update BulletinMergerTest.java"
aa85bc3 is described below
commit aa85bc3b8d45fc947540fb8ff16d91b0489f4286
Author: Joe Witt
AuthorDate: Tue Dec 14 11:12:00 2021 -0700
Revert "Update BulletinMergerTest.java"
This reverts commit 6d03718ca2f54fbe77a4e41a7cfa6a50c295da90.
---
.../org/apache/nifi/cluster/manager/BulletinMergerTest.java| 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/BulletinMergerTest.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/BulletinMergerTest.java
index cb0d181..1502433 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/BulletinMergerTest.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/BulletinMergerTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import java.util.ArrayList;
import java.util.Date;
-import java.util.LinkedHashMap;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -65,7 +65,7 @@ public class BulletinMergerTest {
final NodeIdentifier node1 = new NodeIdentifier("node-1", "host-1",
8080, "host-1", 19998, null, null, null, false);
final NodeIdentifier node2 = new NodeIdentifier("node-2", "host-2",
8081, "host-2", 1, null, null, null, false);
-final Map> nodeMap = new
LinkedHashMap<>();
+final Map> nodeMap = new
HashMap<>();
nodeMap.put(node1, new ArrayList<>());
nodeMap.put(node2, new ArrayList<>());
@@ -77,10 +77,10 @@ public class BulletinMergerTest {
final List bulletinEntities =
BulletinMerger.mergeBulletins(nodeMap, nodeMap.size());
assertEquals(bulletinEntities.size(), 3);
-assertTrue(bulletinEntities.contains(bulletinEntity1));
-assertEquals(bulletinEntity1.getNodeAddress(), ALL_NODES_MESSAGE);
+assertTrue(bulletinEntities.contains(copyOfBulletin1));
+assertEquals(copyOfBulletin1.getNodeAddress(), ALL_NODES_MESSAGE);
assertTrue(bulletinEntities.contains(bulletinEntity2));
assertTrue(bulletinEntities.contains(unauthorizedBulletin));
}
-}
+}
\ No newline at end of file
[nifi] branch support/nifi-1.15 updated: NIFI-9480 fixing version ref
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.15 by this push: new 32a6533 NIFI-9480 fixing version ref 32a6533 is described below commit 32a65332caa321b0b9f40da38a29a800b577a32e Author: Joe Witt AuthorDate: Tue Dec 14 10:31:45 2021 -0700 NIFI-9480 fixing version ref --- nifi-registry/nifi-registry-core/nifi-registry-bootstrap/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-registry/nifi-registry-core/nifi-registry-bootstrap/pom.xml b/nifi-registry/nifi-registry-core/nifi-registry-bootstrap/pom.xml index d1874ed..8b42baa 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-bootstrap/pom.xml +++ b/nifi-registry/nifi-registry-core/nifi-registry-bootstrap/pom.xml @@ -33,7 +33,7 @@ org.apache.nifi nifi-bootstrap-utils -1.16.0-SNAPSHOT +1.15.1-SNAPSHOT
[nifi] branch support/nifi-1.15 updated: NIFI-9376 Updated Admin Guide removing reference to default password
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.15 by this push: new 5e2df44 NIFI-9376 Updated Admin Guide removing reference to default password 5e2df44 is described below commit 5e2df44dcde4969244c66752e7740e2834071f45 Author: exceptionfactory AuthorDate: Fri Nov 12 15:29:30 2021 -0600 NIFI-9376 Updated Admin Guide removing reference to default password Signed-off-by: Pierre Villard This closes #5519. --- nifi-docs/src/main/asciidoc/administration-guide.adoc | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc b/nifi-docs/src/main/asciidoc/administration-guide.adoc index 6de57a7..2e66b6e 100644 --- a/nifi-docs/src/main/asciidoc/administration-guide.adoc +++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc @@ -1782,7 +1782,12 @@ Each Key Derivation Function uses the following default parameters: ** Block Size Factor (r): 8 ** Parallelization Factor (p): 1 -All options require a password (`nifi.sensitive.props.key` value) of *at least 12 characters*. This means the "default" value (if left empty, a hard-coded default is used) will not be sufficient. +All options require a password (`nifi.sensitive.props.key` value) of *at least 12 characters*. + +In new standalone installations of 1.14.0 or later, NiFi generates a random value when `nifi.sensitive.props.key` is +empty. NiFi writes the generated value to `nifi.properties` and logs a warning. + +Clustered installations of NiFi require the same value to be configured on all nodes. [[encrypt-config_tool]] == Encrypted Passwords in Configuration Files
[nifi] 15/15: NIFI-5821 Added Engine Name to Script Engine property descriptions
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 4e88943e60817aac6d779cf0bf2c970e9cfdb16b
Author: exceptionfactory
AuthorDate: Wed Nov 17 08:53:14 2021 -0600
NIFI-5821 Added Engine Name to Script Engine property descriptions
Signed-off-by: Matthew Burgess
This closes #5529
---
.../nifi/script/ScriptingComponentHelper.java | 15 +-
.../script/TestScriptingComponentHelper.java | 54 ++
2 files changed, 68 insertions(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/ScriptingComponentHelper.java
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/ScriptingComponentHelper.java
index cf92340..1db75bf 100644
---
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/ScriptingComponentHelper.java
+++
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/ScriptingComponentHelper.java
@@ -48,10 +48,13 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicBoolean;
+import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
+
/**
* This class contains variables and methods common to scripting processors,
reporting tasks, etc.
*/
public class ScriptingComponentHelper {
+private static final String UNKNOWN_VERSION = "UNKNOWN";
public PropertyDescriptor SCRIPT_ENGINE;
@@ -155,7 +158,8 @@ public class ScriptingComponentHelper {
List engineList = new LinkedList<>();
for (ScriptEngineFactory factory : scriptEngineFactories) {
if (!requireInvocable || factory.getScriptEngine() instanceof
Invocable) {
-engineList.add(new
AllowableValue(factory.getLanguageName()));
+final AllowableValue scriptEngineAllowableValue =
getScriptLanguageAllowableValue(factory);
+engineList.add(scriptEngineAllowableValue);
scriptEngineFactoryMap.put(factory.getLanguageName(),
factory);
}
}
@@ -269,4 +273,13 @@ public class ScriptingComponentHelper {
scriptRunnerQ.clear();
}
}
+
+private AllowableValue getScriptLanguageAllowableValue(final
ScriptEngineFactory factory) {
+final String languageName = factory.getLanguageName();
+final String languageVersion =
defaultIfBlank(factory.getLanguageVersion(), UNKNOWN_VERSION);
+final String engineVersion =
defaultIfBlank(factory.getEngineVersion(), UNKNOWN_VERSION);
+
+final String description = String.format("%s %s [%s %s]",
languageName, languageVersion, factory.getEngineName(), engineVersion);
+return new AllowableValue(languageName, languageName, description);
+}
}
diff --git
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptingComponentHelper.java
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptingComponentHelper.java
new file mode 100644
index 000..459e673
--- /dev/null
+++
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptingComponentHelper.java
@@ -0,0 +1,54 @@
+/*
+ * 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.script;
+
+import org.apache.nifi.components.AllowableValue;
+import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.script.ScriptingComponentHelper;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue
[nifi] branch support/nifi-1.15 updated: NIFI-9375 Refactored Registry using OSUtils from nifi-bootstrap-utils
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.15 by this push:
new 4cfa7f7 NIFI-9375 Refactored Registry using OSUtils from
nifi-bootstrap-utils
4cfa7f7 is described below
commit 4cfa7f7eeb768c624380b9f05271638a39fc8ad5
Author: exceptionfactory
AuthorDate: Fri Nov 12 16:02:09 2021 -0600
NIFI-9375 Refactored Registry using OSUtils from nifi-bootstrap-utils
Signed-off-by: Pierre Villard
This closes #5520.
---
.../nifi-registry-bootstrap/pom.xml| 6 +-
.../nifi/registry/bootstrap/RunNiFiRegistry.java | 4 +-
.../nifi/registry/bootstrap/util/OSUtils.java | 134 -
3 files changed, 5 insertions(+), 139 deletions(-)
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-bootstrap/pom.xml
b/nifi-registry/nifi-registry-core/nifi-registry-bootstrap/pom.xml
index 385b4ff..d1874ed 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-bootstrap/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-bootstrap/pom.xml
@@ -31,9 +31,9 @@
commons-lang3
-net.java.dev.jna
-jna-platform
-4.4.0
+org.apache.nifi
+nifi-bootstrap-utils
+1.16.0-SNAPSHOT
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-bootstrap/src/main/java/org/apache/nifi/registry/bootstrap/RunNiFiRegistry.java
b/nifi-registry/nifi-registry-core/nifi-registry-bootstrap/src/main/java/org/apache/nifi/registry/bootstrap/RunNiFiRegistry.java
index b73dcfc..f75edcb 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-bootstrap/src/main/java/org/apache/nifi/registry/bootstrap/RunNiFiRegistry.java
+++
b/nifi-registry/nifi-registry-core/nifi-registry-bootstrap/src/main/java/org/apache/nifi/registry/bootstrap/RunNiFiRegistry.java
@@ -17,7 +17,7 @@
package org.apache.nifi.registry.bootstrap;
import org.apache.commons.lang3.StringUtils;
-import org.apache.nifi.registry.bootstrap.util.OSUtils;
+import org.apache.nifi.bootstrap.util.OSUtils;
import org.apache.nifi.registry.util.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -1024,7 +1024,7 @@ public class RunNiFiRegistry {
final Properties pidProperties = new Properties();
pidProperties.setProperty(PID_KEY,
String.valueOf(nifiRegistryPid));
savePidProperties(pidProperties, cmdLogger);
-cmdLogger.info("Launched Apache NiFi Registry with Process ID " +
pid);
+cmdLogger.info("Launched Apache NiFi Registry with Process ID {}",
pid);
}
shutdownHook = new ShutdownHook(process, this, secretKey,
gracefulShutdownSeconds, loggingExecutor);
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-bootstrap/src/main/java/org/apache/nifi/registry/bootstrap/util/OSUtils.java
b/nifi-registry/nifi-registry-core/nifi-registry-bootstrap/src/main/java/org/apache/nifi/registry/bootstrap/util/OSUtils.java
deleted file mode 100644
index 4b70866..000
---
a/nifi-registry/nifi-registry-core/nifi-registry-bootstrap/src/main/java/org/apache/nifi/registry/bootstrap/util/OSUtils.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * 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.registry.bootstrap.util;
-
-import com.sun.jna.Pointer;
-import com.sun.jna.platform.win32.Kernel32;
-import com.sun.jna.platform.win32.WinNT;
-import org.slf4j.Logger;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-/**
- * OS specific utilities with generic method interfaces
- */
-public final class OSUtils {
-/**
- * @param process NiFi Process Reference
- * @param logger Logger Reference for Debug
- * @returnReturns pid or null in-case pid could not be determined
- * This method takes {@link Process} and {@link Logger} and returns
- * the platform specific ProcessId for Unix like systems, a.k.a p
[nifi] 01/02: NIFI-9355 Upgraded Apache Curator from 4.2.0 to 5.2.0
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 488ca1bcfde22597e9d25038864ddbbb22fbf844
Author: exceptionfactory
AuthorDate: Mon Nov 1 08:21:54 2021 -0500
NIFI-9355 Upgraded Apache Curator from 4.2.0 to 5.2.0
- Removed unused Curator dependency declaration from MiNiFi
Signed-off-by: Nathan Gough
This closes #5503.
---
minifi/pom.xml | 18 --
nifi-nar-bundles/nifi-framework-bundle/pom.xml | 10 ++
nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml | 8 +---
3 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/minifi/pom.xml b/minifi/pom.xml
index 4fc3c28..46583ea 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -956,24 +956,6 @@ limitations under the License.
3.5.5
-org.apache.curator
-curator-framework
-2.11.0
-
-
-org.apache.curator
-curator-recipes
-2.11.0
-
-
-
-
-org.apache.curator
-curator-test
-2.9.1
-test
-
-
org.testng
testng
6.8.8
diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index 1721585..bf79d07 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -23,8 +23,10 @@
pom
NiFi: Framework Bundle
+5.2.0
5.3.11
5.5.2
+3.5.9
nifi-framework
@@ -595,7 +597,7 @@
org.apache.curator
curator-test
-4.2.0
+${curator.version}
test
@@ -612,12 +614,12 @@
org.apache.zookeeper
zookeeper
-3.5.6
+${zookeeper.version}
org.apache.curator
curator-framework
-4.2.0
+${curator.version}
org.apache.zookeeper
@@ -628,7 +630,7 @@
org.apache.curator
curator-recipes
-4.2.0
+${curator.version}
org.apache.zookeeper
diff --git a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
index 7ff80b1..8d11e67 100644
--- a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
@@ -23,7 +23,9 @@
nifi-toolkit
1.15.1-SNAPSHOT
-
+
+5.2.0
+
commons-cli
@@ -78,13 +80,13 @@
org.apache.curator
curator-test
-4.2.0
+${curator.version}
test
org.apache.curator
curator-client
-4.2.0
+${curator.version}
test
[nifi] branch support/nifi-1.15 updated (7cedb9b -> 4aefc67)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git. from 7cedb9b NIFI-9448 Improved S2S HTTP Extend Transaction Exception Handling new 488ca1b NIFI-9355 Upgraded Apache Curator from 4.2.0 to 5.2.0 new 4aefc67 NIFI-9457 Support microseconds for String Timestamps in PutKudu The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: minifi/pom.xml | 18 .../serialization/record/field/FieldConverter.java | 22 ++-- .../field/ObjectTimestampFieldConverter.java | 86 .../field/ObjectTimestampFieldConverterTest.java | 114 + nifi-nar-bundles/nifi-framework-bundle/pom.xml | 10 +- .../processors/kudu/AbstractKuduProcessor.java | 31 +- .../apache/nifi/processors/kudu/TestPutKudu.java | 39 +++ .../nifi-toolkit-zookeeper-migrator/pom.xml| 8 +- 8 files changed, 290 insertions(+), 38 deletions(-) copy nifi-nar-bundles/nifi-pgp-bundle/nifi-pgp-service-api/src/main/java/org/apache/nifi/pgp/service/api/PGPPrivateKeyService.java => nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/field/FieldConverter.java (57%) create mode 100644 nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/field/ObjectTimestampFieldConverter.java create mode 100644 nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/field/ObjectTimestampFieldConverterTest.java
[nifi] 02/02: NIFI-9457 Support microseconds for String Timestamps in PutKudu
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 4aefc67ccefe4b018483c89ac018798c35871c2c
Author: exceptionfactory
AuthorDate: Thu Dec 9 12:22:04 2021 -0600
NIFI-9457 Support microseconds for String Timestamps in PutKudu
- Implemented override for Timestamp Record Field Type format handling to
add support for optional microseconds
- Added FieldConverter and ObjectTimestampFieldConverter implementation for
generalized Timestamp parsing using DateTimeFormatter
- Updated PutKudu unit tests for standard Timestamp and Timestamp with
microseconds
Signed-off-by: Pierre Villard
This closes #5589.
---
.../serialization/record/field/FieldConverter.java | 37 +++
.../field/ObjectTimestampFieldConverter.java | 86
.../field/ObjectTimestampFieldConverterTest.java | 114 +
.../processors/kudu/AbstractKuduProcessor.java | 31 +-
.../apache/nifi/processors/kudu/TestPutKudu.java | 39 +++
5 files changed, 304 insertions(+), 3 deletions(-)
diff --git
a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/field/FieldConverter.java
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/field/FieldConverter.java
new file mode 100644
index 000..7520be3
--- /dev/null
+++
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/field/FieldConverter.java
@@ -0,0 +1,37 @@
+/*
+ * 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.serialization.record.field;
+
+import java.util.Optional;
+
+/**
+ * Generalized Field Converter interface for handling type conversion with
optional format parsing
+ *
+ * @param Input Field Type
+ * @param Output Field Type
+ */
+public interface FieldConverter {
+/**
+ * Convert Field using Output Field Type with optional format parsing
+ *
+ * @param field Input field to be converted
+ * @param pattern Format pattern optional for parsing
+ * @param name Input field name for tracking
+ * @return Converted Field can be null when input field is null or empty
+ */
+O convertField(I field, Optional pattern, String name);
+}
diff --git
a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/field/ObjectTimestampFieldConverter.java
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/field/ObjectTimestampFieldConverter.java
new file mode 100644
index 000..a624845
--- /dev/null
+++
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/field/ObjectTimestampFieldConverter.java
@@ -0,0 +1,86 @@
+/*
+ * 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.serialization.record.field;
+
+import
org.apache.nifi.serialization.record.util.IllegalTypeConversionException;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.util.Date;
+import java.util.Optional;
+
+/**
+ * Convert Object to java.sql.Timestamp using instanceof evaluation and
optional format pattern for DateTimeFormatter
+ */
+public class ObjectTimestampFieldConverter implements FieldConverter {
+/**
+ * Convert
[nifi] branch support/nifi-1.15 updated: NIFI-9448 Improved S2S HTTP Extend Transaction Exception Handling
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.15 by this push:
new 7cedb9b NIFI-9448 Improved S2S HTTP Extend Transaction Exception
Handling
7cedb9b is described below
commit 7cedb9b8a89f2d3e8e258be24c99f70a34198d71
Author: exceptionfactory
AuthorDate: Mon Dec 6 13:24:40 2021 -0600
NIFI-9448 Improved S2S HTTP Extend Transaction Exception Handling
- Refactor background transaction extension to ExtendTransactionCommand
- Avoid closing S2S HTTP client for IllegalStateExceptions
- Avoid creating additional S2S HTTP client instance for transaction
extension commands
- Add check for extend transaction requests received in client test class
- Add null check for Peer Persistence implementation in PeerSelector
Signed-off-by: Joe Gresock
This closes #5577.
---
.../apache/nifi/remote/client/PeerSelector.java| 4 +-
.../nifi/remote/util/ExtendTransactionCommand.java | 68 +++
.../nifi/remote/util/SiteToSiteRestApiClient.java | 75 ++--
.../nifi/remote/client/http/TestHttpClient.java| 52
.../remote/client/socket/SiteToSiteClientIT.java | 99 --
.../remote/util/TestExtendTransactionCommand.java | 85 +++
6 files changed, 216 insertions(+), 167 deletions(-)
diff --git
a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/PeerSelector.java
b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/PeerSelector.java
index 03d191f..c423295 100644
---
a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/PeerSelector.java
+++
b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/PeerSelector.java
@@ -540,7 +540,9 @@ public class PeerSelector {
this.peerStatusCache = peerStatusCache;
// The #save mechanism persists the cache to stateful or
file-based storage
-peerPersistence.save(peerStatusCache);
+if (peerPersistence != null) {
+peerPersistence.save(peerStatusCache);
+}
} catch (final IOException e) {
error(logger, eventReporter, "Failed to persist list of peers due
to {}; if restarted" +
" and the nodes specified at the remote instance are
down," +
diff --git
a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/util/ExtendTransactionCommand.java
b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/util/ExtendTransactionCommand.java
new file mode 100644
index 000..8e427a6
--- /dev/null
+++
b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/util/ExtendTransactionCommand.java
@@ -0,0 +1,68 @@
+/*
+ * 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.remote.util;
+
+import org.apache.nifi.events.EventReporter;
+import org.apache.nifi.reporting.Severity;
+import org.apache.nifi.web.api.entity.TransactionResultEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Site-to-Site Extend Transaction Command executes background requests for
transfer transactions
+ */
+public class ExtendTransactionCommand implements Runnable {
+private static final String CATEGORY = "Site-to-Site";
+
+private static final Logger logger =
LoggerFactory.getLogger(ExtendTransactionCommand.class);
+
+private final SiteToSiteRestApiClient client;
+
+private final String transactionUrl;
+
+private final EventReporter eventReporter;
+
+ExtendTransactionCommand(final SiteToSiteRestApiClient client, final
String transactionUrl, final EventReporter eventReporter) {
+this.client = client;
+this.transactionUrl = transactionUrl;
+this.eventReporter = eventReporter;
+}
+
+/**
+ * Run Command and attempt to extend transaction
+ */
+@Override
+public void run() {
+try {
[nifi] 06/15: NIFI-9408 - MiNiFi - remove Ignite dependencies
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git commit bd16b93da6ee5911872f3e868d43464d70da0621 Author: Pierre Villard AuthorDate: Tue Nov 23 14:13:57 2021 +0100 NIFI-9408 - MiNiFi - remove Ignite dependencies Signed-off-by: Matthew Burgess This closes #5546 --- minifi/pom.xml | 15 --- 1 file changed, 15 deletions(-) diff --git a/minifi/pom.xml b/minifi/pom.xml index 6a6e122..1dd9afb 100644 --- a/minifi/pom.xml +++ b/minifi/pom.xml @@ -558,21 +558,6 @@ limitations under the License. 1.5.3-M1 -org.apache.ignite -ignite-core -1.6.0 - - -org.apache.ignite -ignite-spring -1.6.0 - - -org.apache.ignite -ignite-log4j2 -1.6.0 - - commons-cli commons-cli 1.3.1
[nifi] 09/15: NIFI-9394 Removed RequestLogger and TimerFilter
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 73b32464303bb75e89b01a7c817f059e52f03d5b
Author: exceptionfactory
AuthorDate: Fri Nov 19 14:58:04 2021 -0600
NIFI-9394 Removed RequestLogger and TimerFilter
- Removed logger references from logback.xml
Signed-off-by: Joe Gresock
This closes #5543.
---
.../src/main/resources/conf/logback.xml| 3 -
.../org/apache/nifi/web/filter/RequestLogger.java | 77 --
.../org/apache/nifi/web/filter/TimerFilter.java| 72
.../nifi-web-api/src/main/webapp/WEB-INF/web.xml | 16 -
.../resources/conf/clustered/node1/logback.xml | 3 -
.../resources/conf/clustered/node2/logback.xml | 3 -
.../src/test/resources/conf/default/logback.xml| 3 -
.../src/test/resources/conf/logback.xml| 3 -
.../src/test/resources/upgrade/conf/logback.xml| 3 -
9 files changed, 183 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
index 93a9afa..e6e50e4 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
@@ -157,9 +157,6 @@
-
-
-
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/RequestLogger.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/RequestLogger.java
deleted file mode 100644
index bb30a1e..000
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/RequestLogger.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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.web.filter;
-
-import java.io.IOException;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.nifi.authorization.user.NiFiUserUtils;
-import org.apache.nifi.logging.NiFiLog;
-import org.apache.nifi.authorization.user.NiFiUser;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * A filter to log requests.
- *
- */
-public class RequestLogger implements Filter {
-
-private static final Logger logger = new
NiFiLog(LoggerFactory.getLogger(RequestLogger.class));
-
-@Override
-public void doFilter(final ServletRequest req, final ServletResponse resp,
final FilterChain filterChain)
-throws IOException, ServletException {
-
-final HttpServletRequest request = (HttpServletRequest) req;
-
-// only log http requests has https requests are logged elsewhere
-if ("http".equalsIgnoreCase(request.getScheme())) {
-final NiFiUser user = NiFiUserUtils.getNiFiUser();
-
-// get the user details for the log message
-String identity = "";
-if (user != null) {
-identity = user.getIdentity();
-}
-
-// log the request attempt - response details will be logged later
-logger.info(String.format("Attempting request for (%s) %s %s
(source ip: %s)", identity, request.getMethod(),
-request.getRequestURL().toString(),
request.getRemoteAddr()));
-}
-
-// continue the filter chain
-filterChain.doFilter(req, resp);
-}
-
-@Override
-public void init(final FilterConfig config) {
-}
-
-@Override
-public void destroy() {
-}
-
-}
diff --git
a/nifi-nar-bundles/nifi-framework-bu
[nifi] 05/15: NIFI-9419 ParseCEF - Upgraded parcefone and supported empty extensions
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 25a273834ec76032e426a6fa3f12ba570925b7c9
Author: Pierre Villard
AuthorDate: Mon Nov 29 18:45:54 2021 +0100
NIFI-9419 ParseCEF - Upgraded parcefone and supported empty extensions
- Upgraded com.fluenda:parcefone from 2.0.0 to 2.1.0
- Added Accept empty extensions property to ParseCEF
This closes #
Co-authored-by: David Handermann
Signed-off-by: David Handermann
---
.../apache/nifi/processors/standard/ParseCEF.java | 20 +++---
.../nifi/processors/standard/TestParseCEF.java | 32 ++
nifi-nar-bundles/nifi-standard-bundle/pom.xml | 2 +-
3 files changed, 49 insertions(+), 5 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ParseCEF.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ParseCEF.java
index 4d8c7f6..de486a2 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ParseCEF.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ParseCEF.java
@@ -147,6 +147,16 @@ public class ParseCEF extends AbstractProcessor {
.allowableValues("true", "false")
.build();
+public static final PropertyDescriptor ACCEPT_EMPTY_EXTENSIONS = new
PropertyDescriptor.Builder()
+.name("ACCEPT_EMPTY_EXTENSIONS")
+.displayName("Accept empty extensions")
+.description("If set to true, empty extensions will be accepted
and will be associated to a null value.")
+.addValidator(StandardValidators.BOOLEAN_VALIDATOR)
+.required(true)
+.defaultValue("false")
+.allowableValues("true", "false")
+.build();
+
public static final PropertyDescriptor VALIDATE_DATA = new
PropertyDescriptor.Builder()
.name("VALIDATE_DATA")
.displayName("Validate the CEF event")
@@ -200,6 +210,7 @@ public class ParseCEF extends AbstractProcessor {
properties.add(FIELDS_DESTINATION);
properties.add(APPEND_RAW_MESSAGE_TO_JSON);
properties.add(INCLUDE_CUSTOM_EXTENSIONS);
+properties.add(ACCEPT_EMPTY_EXTENSIONS);
properties.add(VALIDATE_DATA);
properties.add(TIME_REPRESENTATION);
properties.add(DATETIME_REPRESENTATION);
@@ -262,12 +273,13 @@ public class ParseCEF extends AbstractProcessor {
// validator failed to identify an invalid Locale
final Locale parcefoneLocale =
Locale.forLanguageTag(context.getProperty(DATETIME_REPRESENTATION).getValue());
final boolean validateData =
context.getProperty(VALIDATE_DATA).asBoolean();
-event = parser.parse(buffer, validateData, parcefoneLocale);
+final boolean acceptEmptyExtensions =
context.getProperty(ACCEPT_EMPTY_EXTENSIONS).asBoolean();
+event = parser.parse(buffer, validateData, acceptEmptyExtensions,
parcefoneLocale);
} catch (Exception e) {
// This should never trigger but adding in here as a fencing
mechanism to
// address possible ParCEFone bugs.
-getLogger().error("Parser returned unexpected Exception {} while
processing {}; routing to failure", new Object[] {e, flowFile});
+getLogger().error("CEF Parsing Failed: {}", flowFile, e);
session.transfer(flowFile, REL_FAILURE);
return;
}
@@ -339,7 +351,7 @@ public class ParseCEF extends AbstractProcessor {
session.transfer(flowFile, REL_SUCCESS);
} catch (CEFHandlingException e) {
// The flowfile has failed parsing & validation, routing to
failure and committing
-getLogger().error("Failed to parse {} as a CEF message due to {};
routing to failure", new Object[] {flowFile, e});
+getLogger().error("Reading CEF Event Failed: {}", flowFile, e);
// Create a provenance event recording the routing to failure
session.getProvenanceReporter().route(flowFile, REL_FAILURE);
session.transfer(flowFile, REL_FAILURE);
@@ -379,6 +391,7 @@ public class ParseCEF extends AbstractProcessor {
return new
ValidationResult.Builder().subject(subject).input(input).valid(false)
.explanation(subject + " cannot be empty").build();
}
+
final Locale testLocale = Locale.forLanguageTag(input);
final Locale[] availableL
[nifi] 12/15: NIFI-9260 Making the 'write and rename' behaviour optional for PutHDFS
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 534e6eafe7b8622e6d141802a40d7c6e01a09361
Author: Bence Simon
AuthorDate: Thu Sep 30 15:57:41 2021 +0200
NIFI-9260 Making the 'write and rename' behaviour optional for PutHDFS
This closes #5423.
Signed-off-by: Peter Turcsanyi
---
.../org/apache/nifi/processors/hadoop/PutHDFS.java | 35 --
.../apache/nifi/processors/hadoop/PutHDFSTest.java | 74 +-
2 files changed, 90 insertions(+), 19 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/PutHDFS.java
b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/PutHDFS.java
index 62b7996..d5d85fc 100644
---
a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/PutHDFS.java
+++
b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/PutHDFS.java
@@ -125,6 +125,9 @@ public class PutHDFS extends AbstractHadoopProcessor {
protected static final String FAIL_RESOLUTION = "fail";
protected static final String APPEND_RESOLUTION = "append";
+protected static final String WRITE_AND_RENAME = "writeAndRename";
+protected static final String SIMPLE_WRITE = "simpleWrite";
+
protected static final AllowableValue REPLACE_RESOLUTION_AV = new
AllowableValue(REPLACE_RESOLUTION,
REPLACE_RESOLUTION, "Replaces the existing file if any.");
protected static final AllowableValue IGNORE_RESOLUTION_AV = new
AllowableValue(IGNORE_RESOLUTION, IGNORE_RESOLUTION,
@@ -134,6 +137,11 @@ public class PutHDFS extends AbstractHadoopProcessor {
protected static final AllowableValue APPEND_RESOLUTION_AV = new
AllowableValue(APPEND_RESOLUTION, APPEND_RESOLUTION,
"Appends to the existing file if any, creates a new file
otherwise.");
+protected static final AllowableValue WRITE_AND_RENAME_AV = new
AllowableValue(WRITE_AND_RENAME, "Write and rename",
+"The processor writes FlowFile data into a temporary file and
renames it after completion. This prevents other processes from reading
partially written files.");
+protected static final AllowableValue SIMPLE_WRITE_AV = new
AllowableValue(SIMPLE_WRITE, "Simple write",
+"The processor writes FlowFile data directly to the destination
file. In some cases this might cause reading partially written files.");
+
protected static final PropertyDescriptor CONFLICT_RESOLUTION = new
PropertyDescriptor.Builder()
.name("Conflict Resolution Strategy")
.description("Indicates what should happen when a file with the
same name already exists in the output directory")
@@ -142,6 +150,15 @@ public class PutHDFS extends AbstractHadoopProcessor {
.allowableValues(REPLACE_RESOLUTION_AV, IGNORE_RESOLUTION_AV,
FAIL_RESOLUTION_AV, APPEND_RESOLUTION_AV)
.build();
+protected static final PropertyDescriptor WRITING_STRATEGY = new
PropertyDescriptor.Builder()
+.name("writing-strategy")
+.displayName("Writing Strategy")
+.description("Defines the approach for writing the FlowFile data.")
+.required(true)
+.defaultValue(WRITE_AND_RENAME_AV.getValue())
+.allowableValues(WRITE_AND_RENAME_AV, SIMPLE_WRITE_AV)
+.build();
+
public static final PropertyDescriptor BLOCK_SIZE = new
PropertyDescriptor.Builder()
.name("Block Size")
.description("Size of each block as written to HDFS. This
overrides the Hadoop Configuration")
@@ -219,6 +236,7 @@ public class PutHDFS extends AbstractHadoopProcessor {
.description("The parent HDFS directory to which files should
be written. The directory will be created if it doesn't exist.")
.build());
props.add(CONFLICT_RESOLUTION);
+props.add(WRITING_STRATEGY);
props.add(BLOCK_SIZE);
props.add(BUFFER_SIZE);
props.add(REPLICATION_FACTOR);
@@ -280,6 +298,7 @@ public class PutHDFS extends AbstractHadoopProcessor {
Path tempDotCopyFile = null;
FlowFile putFlowFile = flowFile;
try {
+final String writingStrategy =
context.getProperty(WRITING_STRATEGY).getValue();
final Path dirPath = getNormalizedPath(context, DIRECTORY,
putFlowFile);
final String conflictResponse =
context.getProperty(CONFLICT_RESOLUTION).getValue();
final
[nifi] 11/15: Revert "NIFI-9394 Removed RequestLogger and TimerFilter"
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 7208cc8b2287927a58bc16262114365e1fbe1900
Author: Joe Witt
AuthorDate: Tue Dec 14 10:07:40 2021 -0700
Revert "NIFI-9394 Removed RequestLogger and TimerFilter"
This reverts commit 73b32464303bb75e89b01a7c817f059e52f03d5b.
---
.../src/main/resources/conf/logback.xml| 3 +
.../org/apache/nifi/web/filter/RequestLogger.java | 77 ++
.../org/apache/nifi/web/filter/TimerFilter.java| 72
.../nifi-web-api/src/main/webapp/WEB-INF/web.xml | 16 +
.../resources/conf/clustered/node1/logback.xml | 3 +
.../resources/conf/clustered/node2/logback.xml | 3 +
.../src/test/resources/conf/default/logback.xml| 3 +
.../src/test/resources/conf/logback.xml| 3 +
.../src/test/resources/upgrade/conf/logback.xml| 3 +
9 files changed, 183 insertions(+)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
index e6e50e4..93a9afa 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
@@ -157,6 +157,9 @@
+
+
+
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/RequestLogger.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/RequestLogger.java
new file mode 100644
index 000..bb30a1e
--- /dev/null
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/RequestLogger.java
@@ -0,0 +1,77 @@
+/*
+ * 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.web.filter;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.nifi.authorization.user.NiFiUserUtils;
+import org.apache.nifi.logging.NiFiLog;
+import org.apache.nifi.authorization.user.NiFiUser;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A filter to log requests.
+ *
+ */
+public class RequestLogger implements Filter {
+
+private static final Logger logger = new
NiFiLog(LoggerFactory.getLogger(RequestLogger.class));
+
+@Override
+public void doFilter(final ServletRequest req, final ServletResponse resp,
final FilterChain filterChain)
+throws IOException, ServletException {
+
+final HttpServletRequest request = (HttpServletRequest) req;
+
+// only log http requests has https requests are logged elsewhere
+if ("http".equalsIgnoreCase(request.getScheme())) {
+final NiFiUser user = NiFiUserUtils.getNiFiUser();
+
+// get the user details for the log message
+String identity = "";
+if (user != null) {
+identity = user.getIdentity();
+}
+
+// log the request attempt - response details will be logged later
+logger.info(String.format("Attempting request for (%s) %s %s
(source ip: %s)", identity, request.getMethod(),
+request.getRequestURL().toString(),
request.getRemoteAddr()));
+}
+
+// continue the filter chain
+filterChain.doFilter(req, resp);
+}
+
+@Override
+public void init(final FilterConfig config) {
+}
+
+@Override
+public void destroy() {
+}
+
+}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-a
[nifi] branch support/nifi-1.15 updated (200538a -> 4e88943)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git. from 200538a NIFI-9399 Apply Secure Processing to TransformXml XSLT new ffebbab NIFI-9473 - Upgrade Jackson from 2.12.3 to 2.12.5 new e66c21a NIFI-9468 - Bump Kafka client from 2.6.0 to 2.6.3 new c7be58a NIFI-9426 Removed unused jackson-mapper-asl from MiNiFi new 95159eb NIFI-9420 Upgraded MiNiFi Guava from 26.0 to 31.0.1 new 25a2738 NIFI-9419 ParseCEF - Upgraded parcefone and supported empty extensions new bd16b93 NIFI-9408 - MiNiFi - remove Ignite dependencies new b79714c NIFI-9396 - MiNiFi - bump junit to 4.13.2 new 94fee5b NIFI-9395 - MiNiFi - bump httpclient to 4.5.13 new 73b3246 NIFI-9394 Removed RequestLogger and TimerFilter new 3955b88 NIFI-9393 Set Port Scheduled State for Flow Definitions new 7208cc8 Revert "NIFI-9394 Removed RequestLogger and TimerFilter" new 534e6ea NIFI-9260 Making the 'write and rename' behaviour optional for PutHDFS new 2273fe5 NIFI-9194: Upsert for Oracle12+ new 2f9963a NIFI-9185 Add Avro logical type to SelectHive3QL processor new 4e88943 NIFI-5821 Added Engine Name to Script Engine property descriptions The 15 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../provider/nifi/rest/TemplatesIteratorTest.java | 14 +-- .../minifi-framework/minifi-framework-core/pom.xml | 5 - minifi/pom.xml | 26 + .../apache/nifi/groups/StandardProcessGroup.java | 7 ++ .../flow/mapping/NiFiRegistryFlowMapper.java | 11 +- .../flow/mapping/NiFiRegistryFlowMapperTest.java | 6 + .../org/apache/nifi/processors/hadoop/PutHDFS.java | 35 +- .../apache/nifi/processors/hadoop/PutHDFSTest.java | 74 +--- .../apache/nifi/processors/hive/SelectHive3QL.java | 19 +++- .../org/apache/nifi/util/hive/HiveJdbcCommon.java | 72 ++-- .../nifi/processors/hive/TestSelectHive3QL.java| 124 + nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 2 +- .../nifi/script/ScriptingComponentHelper.java | 15 ++- .../script/TestScriptingComponentHelper.java | 54 + .../apache/nifi/processors/standard/ParseCEF.java | 20 +++- .../standard/db/impl/Oracle12DatabaseAdapter.java | 105 - .../nifi/processors/standard/TestParseCEF.java | 32 ++ .../db/impl/TestOracle12DatabaseAdapter.java | 79 + nifi-nar-bundles/nifi-standard-bundle/pom.xml | 2 +- pom.xml| 2 +- 20 files changed, 622 insertions(+), 82 deletions(-) create mode 100644 nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptingComponentHelper.java
[nifi] 14/15: NIFI-9185 Add Avro logical type to SelectHive3QL processor
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 2f9963a534d55df2608fe4efaa0841bee7bba393
Author: Timea Barna
AuthorDate: Tue Aug 31 13:44:34 2021 +0200
NIFI-9185 Add Avro logical type to SelectHive3QL processor
Modifying unit test to avoid systemdefault timezone usuage
NIFI-9185 Applying review recommendations removing duplicate dependency
from pom.xml
Signed-off-by: Matthew Burgess
This closes #5358
---
.../apache/nifi/processors/hive/SelectHive3QL.java | 19 +++-
.../org/apache/nifi/util/hive/HiveJdbcCommon.java | 72 ++--
.../nifi/processors/hive/TestSelectHive3QL.java| 124 +
3 files changed, 202 insertions(+), 13 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/processors/hive/SelectHive3QL.java
b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/processors/hive/SelectHive3QL.java
index f124c73..af87bd1 100644
---
a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/processors/hive/SelectHive3QL.java
+++
b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/processors/hive/SelectHive3QL.java
@@ -236,6 +236,21 @@ public class SelectHive3QL extends
AbstractHive3QLProcessor {
.expressionLanguageSupported(ExpressionLanguageScope.NONE)
.build();
+public static final PropertyDescriptor USE_AVRO_LOGICAL_TYPES = new
PropertyDescriptor.Builder()
+.name("use-logical-types")
+.displayName("Use Avro Logical Types")
+.description("Whether to use Avro Logical Types for DECIMAL, DATE
and TIMESTAMP columns. "
++ "If disabled, written as string. "
++ "If enabled, Logical types are used and written as its
underlying type, specifically, "
++ "DECIMAL as logical 'decimal': written as bytes with
additional precision and scale meta data, "
++ "DATE as logical 'date': written as int denoting days
since Unix epoch (1970-01-01), "
++ "and TIMESTAMP as logical 'timestamp-millis': written as
long denoting milliseconds since Unix epoch. "
++ "If a reader of written Avro records also knows these
logical types, then these values can be deserialized with more context
depending on reader implementation.")
+.allowableValues("true", "false")
+.defaultValue("false")
+.required(true)
+.build();
+
private final static List propertyDescriptors;
private final static Set relationships;
@@ -255,6 +270,7 @@ public class SelectHive3QL extends AbstractHive3QLProcessor
{
_propertyDescriptors.add(MAX_FRAGMENTS);
_propertyDescriptors.add(HIVEQL_OUTPUT_FORMAT);
_propertyDescriptors.add(NORMALIZE_NAMES_FOR_AVRO);
+_propertyDescriptors.add(USE_AVRO_LOGICAL_TYPES);
_propertyDescriptors.add(HIVEQL_CSV_HEADER);
_propertyDescriptors.add(HIVEQL_CSV_ALT_HEADER);
_propertyDescriptors.add(HIVEQL_CSV_DELIMITER);
@@ -344,6 +360,7 @@ public class SelectHive3QL extends AbstractHive3QLProcessor
{
final String delimiter =
context.getProperty(HIVEQL_CSV_DELIMITER).evaluateAttributeExpressions(fileToProcess).getValue();
final boolean quote =
context.getProperty(HIVEQL_CSV_QUOTE).asBoolean();
final boolean escape =
context.getProperty(HIVEQL_CSV_HEADER).asBoolean();
+final boolean useLogicalTypes =
context.getProperty(USE_AVRO_LOGICAL_TYPES).asBoolean();
final String fragmentIdentifier = UUID.randomUUID().toString();
try (final Connection con = dbcpService.getConnection(fileToProcess ==
null ? Collections.emptyMap() : fileToProcess.getAttributes());
@@ -411,7 +428,7 @@ public class SelectHive3QL extends AbstractHive3QLProcessor
{
flowfile = session.write(flowfile, out -> {
try {
if (AVRO.equals(outputFormat)) {
-
nrOfRows.set(HiveJdbcCommon.convertToAvroStream(resultSet, out,
maxRowsPerFlowFile, convertNamesForAvro));
+
nrOfRows.set(HiveJdbcCommon.convertToAvroStream(resultSet, out,
maxRowsPerFlowFile, convertNamesForAvro, useLogicalTypes));
} else if (CSV.equals(outputFormat)) {
CsvOutputOptions options = new
CsvOutputOptions(header, altHeader, delimiter, quote, escape,
maxRowsPerFlowFile);
nrOfRows.set(HiveJdbcCom
[nifi] 08/15: NIFI-9395 - MiNiFi - bump httpclient to 4.5.13
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git commit 94fee5b289ad86d8d7d56f4f3e52c23dab00d5e7 Author: Pierre Villard AuthorDate: Fri Nov 19 12:54:52 2021 +0100 NIFI-9395 - MiNiFi - bump httpclient to 4.5.13 Signed-off-by: Matthew Burgess This closes #5537 --- minifi/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minifi/pom.xml b/minifi/pom.xml index 54d4f32..4fc3c28 100644 --- a/minifi/pom.xml +++ b/minifi/pom.xml @@ -580,7 +580,7 @@ limitations under the License. org.apache.httpcomponents httpclient -4.5.3 +4.5.13 javax.mail
[nifi] 04/15: NIFI-9420 Upgraded MiNiFi Guava from 26.0 to 31.0.1
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 95159ebe4823e401aad57b2669f50be798a47d38
Author: exceptionfactory
AuthorDate: Mon Nov 29 11:51:47 2021 -0600
NIFI-9420 Upgraded MiNiFi Guava from 26.0 to 31.0.1
- Replaced usage of Guava Lists with standard Java classes in
TemplatesIteratorTest
Signed-off-by: Matthew Burgess
This closes #5556
---
.../c2/provider/nifi/rest/TemplatesIteratorTest.java | 14 +++---
minifi/pom.xml | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-nifi-rest/src/test/java/org/apache/nifi/minifi/c2/provider/nifi/rest/TemplatesIteratorTest.java
b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-nifi-rest/src/test/java/org/apache/nifi/minifi/c2/provider/nifi/rest/TemplatesIteratorTest.java
index c8e19b2..3e2fe9d 100644
---
a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-nifi-rest/src/test/java/org/apache/nifi/minifi/c2/provider/nifi/rest/TemplatesIteratorTest.java
+++
b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-nifi-rest/src/test/java/org/apache/nifi/minifi/c2/provider/nifi/rest/TemplatesIteratorTest.java
@@ -18,7 +18,6 @@
package org.apache.nifi.minifi.c2.provider.nifi.rest;
import com.fasterxml.jackson.core.JsonFactory;
-import com.google.common.collect.Lists;
import org.apache.nifi.minifi.c2.api.ConfigurationProviderException;
import org.apache.nifi.minifi.c2.api.util.Pair;
import org.apache.nifi.minifi.c2.provider.util.HttpConnector;
@@ -27,6 +26,7 @@ import org.junit.Test;
import java.io.IOException;
import java.net.HttpURLConnection;
+import java.util.ArrayList;
import java.util.List;
import java.util.NoSuchElementException;
@@ -64,9 +64,9 @@ public class TemplatesIteratorTest {
@Test
public void testIteratorNoTemplates() throws
ConfigurationProviderException, IOException {
when(httpURLConnection.getInputStream()).thenReturn(TemplatesIteratorTest.class.getClassLoader().getResourceAsStream("noTemplates.json"));
-List> idToNameList;
+List> idToNameList = new ArrayList<>();
try (TemplatesIterator templatesIterator = new
TemplatesIterator(httpConnector, jsonFactory)) {
-idToNameList = Lists.newArrayList(templatesIterator);
+templatesIterator.forEachRemaining(idToNameList::add);
}
assertEquals(0, idToNameList.size());
@@ -76,9 +76,9 @@ public class TemplatesIteratorTest {
@Test
public void testIteratorSingleTemplate() throws
ConfigurationProviderException, IOException {
when(httpURLConnection.getInputStream()).thenReturn(TemplatesIteratorTest.class.getClassLoader().getResourceAsStream("oneTemplate.json"));
-List> idToNameList;
+List> idToNameList = new ArrayList<>();
try (TemplatesIterator templatesIterator = new
TemplatesIterator(httpConnector, jsonFactory)) {
-idToNameList = Lists.newArrayList(templatesIterator);
+templatesIterator.forEachRemaining(idToNameList::add);
}
assertEquals(1, idToNameList.size());
Pair idNamePair = idToNameList.get(0);
@@ -91,9 +91,9 @@ public class TemplatesIteratorTest {
@Test
public void testIteratorTwoTemplates() throws
ConfigurationProviderException, IOException {
when(httpURLConnection.getInputStream()).thenReturn(TemplatesIteratorTest.class.getClassLoader().getResourceAsStream("twoTemplates.json"));
-List> idToNameList;
+List> idToNameList = new ArrayList<>();
try (TemplatesIterator templatesIterator = new
TemplatesIterator(httpConnector, jsonFactory)) {
-idToNameList = Lists.newArrayList(templatesIterator);
+templatesIterator.forEachRemaining(idToNameList::add);
}
assertEquals(2, idToNameList.size());
Pair idNamePair = idToNameList.get(0);
diff --git a/minifi/pom.xml b/minifi/pom.xml
index 0eb96ac..6a6e122 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -948,7 +948,7 @@ limitations under the License.
com.google.guava
guava
-26.0-jre
+31.0.1-jre
com.h2database
[nifi] 02/15: NIFI-9468 - Bump Kafka client from 2.6.0 to 2.6.3
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git commit e66c21a38042f433d5c9bd7ca8eadbf29ba5f7b7 Author: Pierre Villard AuthorDate: Thu Dec 9 18:13:53 2021 +0100 NIFI-9468 - Bump Kafka client from 2.6.0 to 2.6.3 This closes #5588 Signed-off-by: David Handermann --- nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-kafka-bundle/pom.xml b/nifi-nar-bundles/nifi-kafka-bundle/pom.xml index fcddda0..921f594 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-kafka-bundle/pom.xml @@ -29,7 +29,7 @@ 0.11.0.3 1.0.2 2.0.0 - 2.6.0 + 2.6.3
[nifi] 10/15: NIFI-9393 Set Port Scheduled State for Flow Definitions
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 3955b88302b5f60e104c12b656fed64b5169b8b1
Author: exceptionfactory
AuthorDate: Thu Nov 18 14:04:17 2021 -0600
NIFI-9393 Set Port Scheduled State for Flow Definitions
- Set Scheduled State for Versioned Port and Versioned Remote Port when
mapping Flow Definition
- Updated StandardProcessGroup to set disable Port based on Scheduled State
of DISABLED
- Updated StandardProcessGroup to set Remote Port transmitting based on
Scheduled State of ENABLED
Signed-off-by: Nathan Gough
This closes #5534.
---
.../java/org/apache/nifi/groups/StandardProcessGroup.java | 7 +++
.../nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java| 11 +--
.../registry/flow/mapping/NiFiRegistryFlowMapperTest.java | 6 ++
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
index 3583444..8618bd7 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
@@ -4930,6 +4930,9 @@ public final class StandardProcessGroup implements
ProcessGroup {
port.setName(name);
port.setPosition(new Position(proposed.getPosition().getX(),
proposed.getPosition().getY()));
port.setMaxConcurrentTasks(proposed.getConcurrentlySchedulableTaskCount());
+if (org.apache.nifi.flow.ScheduledState.DISABLED ==
proposed.getScheduledState()) {
+port.disable();
+}
}
private Port addInputPort(final ProcessGroup destination, final
VersionedPort proposed, final String componentIdSeed, final String
temporaryName) {
@@ -5185,6 +5188,10 @@ public final class StandardProcessGroup implements
ProcessGroup {
descriptor.setId(generateUuid(proposed.getIdentifier(), rpgId,
componentIdSeed));
descriptor.setName(proposed.getName());
descriptor.setUseCompression(proposed.isUseCompression());
+
+final boolean transmitting =
org.apache.nifi.flow.ScheduledState.ENABLED == proposed.getScheduledState();
+descriptor.setTransmitting(transmitting);
+
return descriptor;
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java
index b0b3334..889f3f1 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java
@@ -581,6 +581,7 @@ public class NiFiRegistryFlowMapper {
versionedPort.setName(port.getName());
versionedPort.setPosition(mapPosition(port.getPosition()));
versionedPort.setType(PortType.valueOf(port.getConnectableType().name()));
+
versionedPort.setScheduledState(mapScheduledState(port.getScheduledState()));
if (port instanceof PublicPort) {
versionedPort.setAllowRemoteAccess(true);
@@ -621,8 +622,7 @@ public class NiFiRegistryFlowMapper {
processor.setSchedulingStrategy(procNode.getSchedulingStrategy().name());
processor.setStyle(procNode.getStyle());
processor.setYieldDuration(procNode.getYieldPeriod());
-processor.setScheduledState(procNode.getScheduledState() ==
ScheduledState.DISABLED ? org.apache.nifi.flow.ScheduledState.DISABLED
-: org.apache.nifi.flow.ScheduledState.ENABLED);
+
processor.setScheduledState(mapScheduledState(procNode.getScheduledState()));
return processor;
}
@@ -664,6 +664,7 @@ public class NiFiRegistryFlowMapper {
port.setBatchSize(mapBatchSettings(remotePort));
port.setTargetId(remotePort.getTargetIdentifier());
port.setComponentType(componentType);
+
port.setScheduledState(mapScheduledState(remotePort.getScheduledState()));
return port;
}
@@ -730,4 +731,10 @@ public class NiFiRegistryFlowMapper {
versionedParameter.setValue(descriptor.isSensitive() ? null :
parameter.getValue
[nifi] 01/15: NIFI-9473 - Upgrade Jackson from 2.12.3 to 2.12.5
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git commit ffebbab4bc983fef2bc42666520bce1555bf8629 Author: Pierre Villard AuthorDate: Fri Dec 10 12:52:22 2021 +0100 NIFI-9473 - Upgrade Jackson from 2.12.3 to 2.12.5 This closes #5591 Signed-off-by: David Handermann --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index daba91e..7794014 100644 --- a/pom.xml +++ b/pom.xml @@ -97,7 +97,7 @@ 1.7.32 2.1.0 9.4.44.v20210927 -2.12.3 +2.12.5 2.3.5 2.3.3 2.5.14
[nifi] 07/15: NIFI-9396 - MiNiFi - bump junit to 4.13.2
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git commit b79714c6f6e1273c7a83511d639389779c6506ef Author: Pierre Villard AuthorDate: Fri Nov 19 13:04:27 2021 +0100 NIFI-9396 - MiNiFi - bump junit to 4.13.2 This closes #5538 Signed-off-by: David Handermann --- minifi/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minifi/pom.xml b/minifi/pom.xml index 1dd9afb..54d4f32 100644 --- a/minifi/pom.xml +++ b/minifi/pom.xml @@ -508,7 +508,7 @@ limitations under the License. junit junit -4.12 +4.13.2 org.mockito
[nifi] 03/15: NIFI-9426 Removed unused jackson-mapper-asl from MiNiFi
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit c7be58abe6023d52ad52d2bda40dbd29019e9d60
Author: exceptionfactory
AuthorDate: Tue Nov 30 14:32:29 2021 -0600
NIFI-9426 Removed unused jackson-mapper-asl from MiNiFi
Signed-off-by: Matthew Burgess
This closes #5561
---
.../minifi-framework/minifi-framework-core/pom.xml | 5 -
minifi/pom.xml | 5 -
2 files changed, 10 deletions(-)
diff --git
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml
index 91b43c1..6b147dd 100644
---
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml
+++
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml
@@ -38,11 +38,6 @@ limitations under the License.
provided
-org.codehaus.jackson
-jackson-mapper-asl
-
-
-
org.eclipse.jetty
jetty-servlet
${jetty.version}
diff --git a/minifi/pom.xml b/minifi/pom.xml
index 068ae01..0eb96ac 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -956,11 +956,6 @@ limitations under the License.
1.4.199
-org.codehaus.jackson
-jackson-mapper-asl
-1.9.13
-
-
com.fasterxml.jackson.core
jackson-databind
${jackson.version}
[nifi] 13/15: NIFI-9194: Upsert for Oracle12+
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 2273fe57660cad05943e018abcbeb2fec8d4325c
Author: Roberto Santos
AuthorDate: Sat Sep 4 08:40:16 2021 -0300
NIFI-9194: Upsert for Oracle12+
Fixes pr #5366.
Fixes pr #5366. Replace tabchars fot whitespaces.
Fixes pr #5366. Replaced tabchars for whitespaces. Removed unnecessary
comments.
Signed-off-by: Matthew Burgess
This closes #5366
---
.../standard/db/impl/Oracle12DatabaseAdapter.java | 105 -
.../db/impl/TestOracle12DatabaseAdapter.java | 79
2 files changed, 179 insertions(+), 5 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/Oracle12DatabaseAdapter.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/Oracle12DatabaseAdapter.java
index 18f3ceb..63e7379 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/Oracle12DatabaseAdapter.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/Oracle12DatabaseAdapter.java
@@ -16,12 +16,14 @@
*/
package org.apache.nifi.processors.standard.db.impl;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.processors.standard.db.DatabaseAdapter;
-/**
- * A database adapter that generates MS SQL Compatible SQL.
- */
public class Oracle12DatabaseAdapter implements DatabaseAdapter {
@Override
public String getName() {
@@ -34,12 +36,14 @@ public class Oracle12DatabaseAdapter implements
DatabaseAdapter {
}
@Override
-public String getSelectStatement(String tableName, String columnNames,
String whereClause, String orderByClause, Long limit, Long offset) {
+public String getSelectStatement(String tableName, String columnNames,
String whereClause, String orderByClause,
+Long limit, Long offset) {
return getSelectStatement(tableName, columnNames, whereClause,
orderByClause, limit, offset, null);
}
@Override
-public String getSelectStatement(String tableName, String columnNames,
String whereClause, String orderByClause, Long limit, Long offset, String
columnForPartitioning) {
+public String getSelectStatement(String tableName, String columnNames,
String whereClause, String orderByClause,
+Long limit, Long offset, String columnForPartitioning) {
if (StringUtils.isEmpty(tableName)) {
throw new IllegalArgumentException("Table name cannot be null or
empty");
}
@@ -93,4 +97,95 @@ public class Oracle12DatabaseAdapter implements
DatabaseAdapter {
public String getTableAliasClause(String tableName) {
return tableName;
}
+
+@Override
+public boolean supportsUpsert() {
+return true;
+}
+
+@Override
+public String getUpsertStatement(String table, List columnNames,
Collection uniqueKeyColumnNames)
+throws IllegalArgumentException {
+if (StringUtils.isEmpty(table)) {
+throw new IllegalArgumentException("Table name cannot be null or
blank");
+}
+if (columnNames == null || columnNames.isEmpty()) {
+throw new IllegalArgumentException("Column names cannot be null or
empty");
+}
+if (uniqueKeyColumnNames == null || uniqueKeyColumnNames.isEmpty()) {
+throw new IllegalArgumentException("Key column names cannot be
null or empty");
+}
+
+String newValuesAlias = "n";
+
+String columns = columnNames.stream().collect(Collectors.joining(", ?
"));
+
+columns = "? " + columns;
+
+List columnsAssignment = getColumnsAssignment(columnNames,
newValuesAlias, table);
+
+List conflictColumnsClause =
getConflictColumnsClause(uniqueKeyColumnNames, columnsAssignment, table,
+newValuesAlias);
+String conflictClause = "(" +
conflictColumnsClause.stream().collect(Collectors.joining(" AND ")) + ")";
+
+String insertStatement =
columnNames.stream().collect(Collectors.joining(", "));
+String insertValues = newValuesAlias + "."
++ columnNames.stream().collect(Collectors.joining(", " +
newValuesAlias + "."));
+
+columnsAssignment.removeAll(conflictColumnsClause);
+String updateStatement =
columnsAssignment.stream().collect(Collect
[nifi] branch support/nifi-1.15 updated: NIFI-9399 Apply Secure Processing to TransformXml XSLT
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.15 by this push: new 200538a NIFI-9399 Apply Secure Processing to TransformXml XSLT 200538a is described below commit 200538a2903be98567ecfa1981967e714920d8cd Author: exceptionfactory AuthorDate: Fri Nov 19 13:30:26 2021 -0600 NIFI-9399 Apply Secure Processing to TransformXml XSLT - Added XML Stream Reader processing for XSLT with external entities disabled - Removed unused XsltValidator - Upgraded Saxon-HE from 9.6.0-5 to 10.6 --- nifi-assembly/NOTICE | 2 +- .../src/main/resources/META-INF/NOTICE | 2 +- .../nifi/processors/standard/TransformXml.java | 180 ++--- .../nifi/processors/standard/TestTransformXml.java | 46 +- .../test/resources/TestTransformXml/doc-node.xsl | 22 +++ .../TestTransformXml/doctype-entity-file-uri.xsl | 19 +++ .../src/test/resources/TestTransformXml/math.html | 2 +- nifi-nar-bundles/nifi-standard-bundle/pom.xml | 2 +- 8 files changed, 164 insertions(+), 111 deletions(-) diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE index 095913f..baa8552 100644 --- a/nifi-assembly/NOTICE +++ b/nifi-assembly/NOTICE @@ -2108,7 +2108,7 @@ Mozilla Public License v2.0 The following binary components are provided under the Mozilla Public License v2.0. See project link for details. -(MPL 2.0) Saxon HE (net.sf.saxon:Saxon-HE:jar:9.6.0-5 - http://www.saxonica.com/) +(MPL 2.0) Saxon HE (net.sf.saxon:Saxon-HE:jar:10.6 - http://www.saxonica.com/) (MPL 2.0) Rhino (org.mozilla:rhino:jar:1.7R5 - https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Rhino/Download_Rhino) * diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE index bd1941f..550196c 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE @@ -272,7 +272,7 @@ Mozilla Public License v2.0 The following binary components are provided under the Mozilla Public License v2.0. See project link for details. -(MPL 2.0) Saxon HE (net.sf.saxon:Saxon-HE:jar:9.6.0-5 - http://www.saxonica.com/) +(MPL 2.0) Saxon HE (net.sf.saxon:Saxon-HE:jar:10.6 - http://www.saxonica.com/) * Public Domain diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java index fd20b0c..b55d62a 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java @@ -33,7 +33,6 @@ import org.apache.nifi.components.PropertyDescriptor; import org.apache.nifi.components.PropertyValue; import org.apache.nifi.components.ValidationContext; import org.apache.nifi.components.ValidationResult; -import org.apache.nifi.components.Validator; import org.apache.nifi.components.resource.ResourceCardinality; import org.apache.nifi.components.resource.ResourceType; import org.apache.nifi.expression.AttributeExpression; @@ -49,26 +48,28 @@ import org.apache.nifi.processor.ProcessSession; import org.apache.nifi.processor.ProcessorInitializationContext; import org.apache.nifi.processor.Relationship; import org.apache.nifi.processor.exception.ProcessException; -import org.apache.nifi.processor.io.StreamCallback; import org.apache.nifi.processor.util.StandardValidators; +import org.apache.nifi.security.xml.XmlUtils; import org.apache.nifi.util.StopWatch; -import org.apache.nifi.util.Tuple; import javax.xml.XMLConstants; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; import javax.xml.transform.OutputKeys; +import javax.xml.transform.Result; +import javax.xml.transform.Source; import javax.xml.transform.Templates; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerFactory; +import javax.xml.transform.stax.StAXSource; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import java.io.BufferedInputStream; -import java.io.ByteArrayInputStream; -import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream
[nifi] branch main updated: NIFI-9482 This closes #5600. Upgrade Log4j 2 from 2.15.0 to 2.16.0
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 1321b25 NIFI-9482 This closes #5600. Upgrade Log4j 2 from 2.15.0 to
2.16.0
1321b25 is described below
commit 1321b25f6670fb96e3e75076addb6fbe7e691c84
Author: exceptionfactory
AuthorDate: Mon Dec 13 15:03:07 2021 -0600
NIFI-9482 This closes #5600. Upgrade Log4j 2 from 2.15.0 to 2.16.0
Signed-off-by: Joe Witt
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8c4aa72..03d2b18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -485,11 +485,11 @@
aspectjweaver
${aspectj.version}
-
+
org.apache.logging.log4j
log4j-bom
-2.15.0
+2.16.0
import
pom
[nifi] branch support/nifi-1.15 updated: Revert "NIFI-9392 PutHive3Streaming processor throws java.lang.NoClassDefFoundError on startup"
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.15 in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.15 by this push: new 8f90e9e Revert "NIFI-9392 PutHive3Streaming processor throws java.lang.NoClassDefFoundError on startup" 8f90e9e is described below commit 8f90e9efc01d6314bc30a2419e3c2c3990461cbb Author: Joe Witt AuthorDate: Mon Dec 13 14:19:27 2021 -0700 Revert "NIFI-9392 PutHive3Streaming processor throws java.lang.NoClassDefFoundError on startup" This commit on 1.16 isn't quite ready so removing from the 1.15.1 release This reverts commit 8581799f78dadfe81bac1b6a66438e51c017e6d6. --- nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml | 4 1 file changed, 4 deletions(-) diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml index f950604..3428b89 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml @@ -158,10 +158,6 @@ log4j log4j - -hadoop-common -org.apache.hadoop -
[nifi] branch support/nifi-1.15 updated: NIFI-9482 Upgrade Log4j 2 from 2.15.0 to 2.16.0
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.15 by this push:
new f2314de NIFI-9482 Upgrade Log4j 2 from 2.15.0 to 2.16.0
f2314de is described below
commit f2314de1c038b97673a1df530ebabda870ca
Author: exceptionfactory
AuthorDate: Mon Dec 13 15:03:07 2021 -0600
NIFI-9482 Upgrade Log4j 2 from 2.15.0 to 2.16.0
Signed-off-by: Joe Witt
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index a470828..daba91e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -483,11 +483,11 @@
aspectjweaver
${aspectj.version}
-
+
org.apache.logging.log4j
log4j-bom
-2.15.0
+2.16.0
import
pom
[nifi] 15/22: NIFI-9365: Changed HashMap to ConcurrentHashMap in StandardProcessorNode for the activeThreads, because we have a need to iterate over it outside of synchronized keyword
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 36ecf43a300a274d5cf3b4468e29ac91dc10332d
Author: Mark Payne
AuthorDate: Thu Nov 4 14:57:57 2021 -0400
NIFI-9365: Changed HashMap to ConcurrentHashMap in StandardProcessorNode
for the activeThreads, because we have a need to iterate over it outside of
synchronized keyword
---
.../nifi/controller/StandardProcessorNode.java | 3 +-
.../org/apache/nifi/tests/system/NiFiSystemIT.java | 2 +-
.../nifi/tests/system/clustering/OffloadIT.java| 136 +
3 files changed, 139 insertions(+), 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
index a23fd0e..0e47331 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
@@ -96,6 +96,7 @@ import java.util.Optional;
import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Future;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@@ -152,7 +153,7 @@ public class StandardProcessorNode extends ProcessorNode
implements Connectable
private SchedulingStrategy schedulingStrategy; // guarded by synchronized
keyword
private ExecutionNode executionNode;
-private final Map activeThreads = new HashMap<>(48);
+private final Map activeThreads = new
ConcurrentHashMap<>(48);
private final int hashCode;
private volatile boolean hasActiveThreads = false;
diff --git
a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiSystemIT.java
b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiSystemIT.java
index 23e3a6f..d94529d 100644
---
a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiSystemIT.java
+++
b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiSystemIT.java
@@ -273,7 +273,7 @@ public abstract class NiFiSystemIT {
waitForQueueCountToMatch(connectionId, size -> size > 0, "greater than
0");
-logger.info("Waiting for Queue on Connection {} is not empty",
connectionId);
+logger.info("Queue on Connection {} is not empty", connectionId);
}
protected void waitForQueueCount(final String connectionId, final int
queueSize) throws InterruptedException {
diff --git
a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/OffloadIT.java
b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/OffloadIT.java
new file mode 100644
index 000..1e66fc3
--- /dev/null
+++
b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/OffloadIT.java
@@ -0,0 +1,136 @@
+/*
+ * 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.tests.system.clustering;
+
+import org.apache.nifi.tests.system.NiFiInstanceFactory;
+import org.apache.nifi.tests.system.NiFiSystemIT;
+import org.apache.nifi.tests.system.SpawnedClusterNiFiInstanceFactory;
+import org.apache.nifi.toolkit.cli.impl.client.nifi.NiFiClientException;
+import org.apache.nifi.web.api.dto.NodeDTO;
+import org.apache.nifi.web.api.dto.ProcessorConfigDTO;
+import org.apache.nifi.web.api.entity.ClusterEntity;
+import org.apache.nifi.web.api.entity.ConnectionEntity;
+import org.apache.nifi.web.api.entity.ProcessorEntity;
+import org.junit.Test;
[nifi] 22/22: NIFI-8153 custom date/time format properties for PutElasticsearchRecord
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 5e9c09c4c95213ebeaaeff078d02d09fcc8e158a
Author: Chris Sampson
AuthorDate: Fri Nov 26 12:31:49 2021 +
NIFI-8153 custom date/time format properties for PutElasticsearchRecord
---
.../elasticsearch/PutElasticsearchRecord.java | 61 ++
.../PutElasticsearchRecordTest.groovy | 128 -
2 files changed, 168 insertions(+), 21 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchRecord.java
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchRecord.java
index ec3c3f2..900870e 100644
---
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchRecord.java
+++
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchRecord.java
@@ -55,6 +55,7 @@ import
org.apache.nifi.serialization.SimpleDateFormatValidator;
import org.apache.nifi.serialization.record.DataType;
import org.apache.nifi.serialization.record.PushBackRecordSet;
import org.apache.nifi.serialization.record.Record;
+import org.apache.nifi.serialization.record.RecordField;
import org.apache.nifi.serialization.record.RecordFieldType;
import org.apache.nifi.serialization.record.type.ChoiceDataType;
import org.apache.nifi.serialization.record.util.DataTypeUtils;
@@ -202,36 +203,34 @@ public class PutElasticsearchRecord extends
AbstractProcessor implements Elastic
.required(false)
.build();
-static final PropertyDescriptor AT_TIMESTAMP_DATE_FORMAT = new
PropertyDescriptor.Builder()
+static final PropertyDescriptor DATE_FORMAT = new
PropertyDescriptor.Builder()
.name("put-es-record-at-timestamp-date-format")
-.displayName("@Timestamp Record Path Date Format")
-.description("Specifies the format to use when writing Date field for
@timestamp. "
+.displayName("Date Format")
+.description("Specifies the format to use when writing Date fields. "
+ "If not specified, the default format '" +
RecordFieldType.DATE.getDefaultFormat() + "' is used. "
+ "If specified, the value must match the Java Simple Date
Format (for example, MM/dd/ for a two-digit month, followed by "
+ "a two-digit day, followed by a four-digit year, all
separated by '/' characters, as in 01/25/2017).")
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.addValidator(new SimpleDateFormatValidator())
.required(false)
-.dependsOn(AT_TIMESTAMP_RECORD_PATH)
.build();
-static final PropertyDescriptor AT_TIMESTAMP_TIME_FORMAT = new
PropertyDescriptor.Builder()
+static final PropertyDescriptor TIME_FORMAT = new
PropertyDescriptor.Builder()
.name("put-es-record-at-timestamp-time-format")
-.displayName("@Timestamp Record Path Time Format")
-.description("Specifies the format to use when writing Time field for
@timestamp. "
+.displayName("Time Format")
+.description("Specifies the format to use when writing Time fields. "
+ "If not specified, the default format '" +
RecordFieldType.TIME.getDefaultFormat() + "' is used. "
+ "If specified, the value must match the Java Simple Date
Format (for example, HH:mm:ss for a two-digit hour in 24-hour format, followed
by "
+ "a two-digit minute, followed by a two-digit second, all
separated by ':' characters, as in 18:04:15).")
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.addValidator(new SimpleDateFormatValidator())
.required(false)
-.dependsOn(AT_TIMESTAMP_RECORD_PATH)
.build();
-static final PropertyDescriptor AT_TIMESTAMP_TIMESTAMP_FORMAT = new
PropertyDescriptor.Builder()
+static final PropertyDescriptor TIMESTAMP_FORMAT = new
PropertyDescriptor.Builder()
.name("put-es-record-at-timestamp-timestamp-format")
-.displayName("@Timestamp Record Path Timestamp Format")
-.description("Specifies the format to use when writing Timestamp field
for @timestamp. "
+.displayName("Timestamp Format")
+.description("Specifies the format to use when writing Timestamp
fields. &
