(nifi) branch main updated: NIFI-13310 merged RAT declarations
This is an automated email from the ASF dual-hosted git repository. pvillard 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 1c0297bba2 NIFI-13310 merged RAT declarations 1c0297bba2 is described below commit 1c0297bba24d97219cae04960e2b1b9985ffd301 Author: Joseph Witt AuthorDate: Mon Jun 3 15:52:25 2024 -0700 NIFI-13310 merged RAT declarations Signed-off-by: Pierre Villard This closes #8916. --- .../nifi-jolt-bundle/nifi-jolt-transform-json-ui/pom.xml| 13 - 1 file changed, 13 deletions(-) diff --git a/nifi-extension-bundles/nifi-jolt-bundle/nifi-jolt-transform-json-ui/pom.xml b/nifi-extension-bundles/nifi-jolt-bundle/nifi-jolt-transform-json-ui/pom.xml index ce37a32d27..abb38955f2 100644 --- a/nifi-extension-bundles/nifi-jolt-bundle/nifi-jolt-transform-json-ui/pom.xml +++ b/nifi-extension-bundles/nifi-jolt-bundle/nifi-jolt-transform-json-ui/pom.xml @@ -200,22 +200,9 @@ language governing permissions and limitations under the License. --> nbactions.xml src/main/frontend/package.json src/main/frontend/package-lock.json - src/main/webapp/js/jquery/jquery.base64.js src/main/webapp/js/codemirror/ -src/main/webapp/fonts/**/* - - - - -org.apache.rat -apache-rat-plugin - - -src/main/frontend/package.json -src/main/frontend/package-lock.json src/main/webapp/css/main.css src/main/webapp/js/js-beautify/* -src/main/webapp/js/codemirror/ src/main/webapp/fonts/**/*
(nifi) branch main updated: NIFI-13329 - Updating the standard content viewer to render an error message when there is an error formatting.
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 48edbeed90 NIFI-13329 - Updating the standard content viewer to render
an error message when there is an error formatting.
48edbeed90 is described below
commit 48edbeed9066a564bfe6f80778f4b603c46a
Author: Matt Gilman
AuthorDate: Fri May 31 14:29:26 2024 -0400
NIFI-13329 - Updating the standard content viewer to render an error
message when there is an error formatting.
Co-authored-by: Pierre Villard
Signed-off-by: Pierre Villard
This closes #8905.
---
.../nifi-standard-content-viewer/pom.xml | 1 +
.../nifi/web/StandardContentViewerController.java | 138 +++--
.../src/main/webapp/WEB-INF/jsp/format-error.jsp | 22
.../src/main/webapp/css/main.css | 30 +
4 files changed, 124 insertions(+), 67 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml
index 02095ac086..6eec34603d 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml
@@ -57,6 +57,7 @@
WEB-INF/jsp
codemirror.jsp
+format-error.jsp
true
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java
index e07d613713..e41ebec606 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java
@@ -25,8 +25,9 @@ import org.apache.avro.generic.GenericData;
import org.apache.avro.generic.GenericDatumReader;
import org.apache.avro.io.DatumReader;
import org.apache.nifi.web.ViewableContent.DisplayMode;
-import org.apache.nifi.xml.processing.ProcessingException;
import org.apache.nifi.xml.processing.transform.StandardTransformProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
@@ -44,6 +45,8 @@ import java.util.Set;
public class StandardContentViewerController extends HttpServlet {
+private static final Logger logger =
LoggerFactory.getLogger(StandardContentViewerController.class);
+
private static final Set supportedMimeTypes = new HashSet<>();
static {
@@ -84,16 +87,15 @@ public class StandardContentViewerController extends
HttpServlet {
if (DisplayMode.Original.equals(content.getDisplayMode())) {
formatted = content.getContent();
} else {
-if ("application/json".equals(contentType)) {
-// format json
-final ObjectMapper mapper = new ObjectMapper();
-final Object objectJson =
mapper.readValue(content.getContentStream(), Object.class);
-formatted =
mapper.writerWithDefaultPrettyPrinter().writeValueAsString(objectJson);
-} else if ("application/xml".equals(contentType) ||
"text/xml".equals(contentType)) {
-// format xml
-final StringWriter writer = new StringWriter();
-
-try {
+try {
+if ("application/json".equals(contentType)) {
+// format json
+final ObjectMapper mapper = new ObjectMapper();
+final Object objectJson =
mapper.readValue(content.getContentStream(), Object.class);
+formatted =
mapper.writerWithDefaultPrettyPrinter().writeValueAsString(objectJson);
+} else if ("application/xml".equals(contentType) ||
"text/xml".equals(contentType)) {
+// format xml
+final StringWriter writer = new StringWriter();
final StreamSource source = new
StreamSource(content.getContentStream());
final StreamResult result = new StreamResult(writer);
@@ -101,67 +103,69 @@ public class StandardContentViewerController extends
HttpS
(nifi) branch main updated: NIFI-13336 updating various deps for aws google azure and more
This is an automated email from the ASF dual-hosted git repository. pvillard 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 477aa8fe35 NIFI-13336 updating various deps for aws google azure and more 477aa8fe35 is described below commit 477aa8fe3553009a12d3ba6f290e0a1f889140ad Author: Joseph Witt AuthorDate: Fri May 31 13:51:21 2024 -0700 NIFI-13336 updating various deps for aws google azure and more - com.amazonaws * 1.12.730 1.12.733 - com.azure azure-sdk-bom 1.2.23 1.2.24 - com.google.cloud libraries-bom 26.39.0 26.40.0 - commons-cli 1.7.0 1.8.0 - commons-net 3.10.0 3.11.0 - io.fabric8 * 6.12.1 6.13.0 - org.apache.commons commons-compress 1.26.1 1.26.2 - software.amazon.awssdk 2.25.60 2.25.63 - com.google.apis google-api-services-drive v3-rev20240327-2.0.0 v3-rev20240521-2.0.0 - org.neo4j.driver neo4j-java-driver 5.20.0 5.21.0 - org.springframework.integration spring-integration-mail 6.2.4 6.2.5 Signed-off-by: Joseph Witt Signed-off-by: Pierre Villard This closes #8907. Signed-off-by: Pierre Villard --- nifi-commons/nifi-property-protection-azure/pom.xml | 2 +- nifi-commons/nifi-property-protection-factory/pom.xml| 2 +- nifi-extension-bundles/nifi-azure-bundle/pom.xml | 2 +- .../nifi-email-bundle/nifi-email-processors/pom.xml | 2 +- .../nifi-gcp-bundle/nifi-gcp-processors/pom.xml | 2 +- nifi-extension-bundles/nifi-gcp-bundle/pom.xml | 2 +- .../nifi-graph-bundle/nifi-neo4j-cypher-service/pom.xml | 2 +- pom.xml | 12 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/nifi-commons/nifi-property-protection-azure/pom.xml b/nifi-commons/nifi-property-protection-azure/pom.xml index b247968840..5e7ba04adc 100644 --- a/nifi-commons/nifi-property-protection-azure/pom.xml +++ b/nifi-commons/nifi-property-protection-azure/pom.xml @@ -26,7 +26,7 @@ com.azure azure-sdk-bom -1.2.23 +1.2.24 import pom diff --git a/nifi-commons/nifi-property-protection-factory/pom.xml b/nifi-commons/nifi-property-protection-factory/pom.xml index a0293338a6..8f8f853ade 100644 --- a/nifi-commons/nifi-property-protection-factory/pom.xml +++ b/nifi-commons/nifi-property-protection-factory/pom.xml @@ -26,7 +26,7 @@ com.azure azure-sdk-bom -1.2.23 +1.2.24 import pom diff --git a/nifi-extension-bundles/nifi-azure-bundle/pom.xml b/nifi-extension-bundles/nifi-azure-bundle/pom.xml index e78152c5cc..9592a01794 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/pom.xml +++ b/nifi-extension-bundles/nifi-azure-bundle/pom.xml @@ -28,7 +28,7 @@ -1.2.23 +1.2.24 1.15.0 0.34.1 diff --git a/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/pom.xml b/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/pom.xml index 66a1811313..e67afa41cf 100644 --- a/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/pom.xml +++ b/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/pom.xml @@ -25,7 +25,7 @@ nifi-email-processors jar -6.2.4 +6.2.5 5.2.5 diff --git a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml index 6cd44c3e51..0af4803c3f 100644 --- a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml +++ b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml @@ -125,7 +125,7 @@ com.google.apis google-api-services-drive -v3-rev20240327-2.0.0 +v3-rev20240521-2.0.0 com.tdunning diff --git a/nifi-extension-bundles/nifi-gcp-bundle/pom.xml b/nifi-extension-bundles/nifi-gcp-bundle/pom.xml index c66b58bdc7..1dd484b0c8 100644 --- a/nifi-extension-bundles/nifi-gcp-bundle/pom.xml +++ b/nifi-extension-bundles/nifi-gcp-bundle/pom.xml @@ -25,7 +25,7 @@ pom -26.39.0 +26.40.0 diff --git a/nifi-extension-bundles/nifi-graph-bundle/nifi-neo4j-cypher-service/pom.xml b/nifi-extension-bundles/nifi-graph-bundle/nifi-neo4j-cypher-service/pom.xml index 5f8401e40a..e48a36690d 100644 --- a/nifi-extension-bundles/nifi-graph-bundle/nifi-neo4j-cypher-service/pom.xml +++ b/nifi-extension-bundles/nifi-graph-bundle/nifi-neo4j-cypher-service/pom.xml @@ -19,7 +19,7 @@ jar -5.20.0 +5.21.0 5.19 diff --git
(nifi) branch main updated: NIFI-13320 Upgraded Spring Boot from 3.2.6 to 3.3.0
This is an automated email from the ASF dual-hosted git repository. pvillard 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 6c8cc2dd3a NIFI-13320 Upgraded Spring Boot from 3.2.6 to 3.3.0 6c8cc2dd3a is described below commit 6c8cc2dd3a9a74ee134fc3d620eba6c6466a6891 Author: exceptionfactory AuthorDate: Thu May 30 09:43:15 2024 -0500 NIFI-13320 Upgraded Spring Boot from 3.2.6 to 3.3.0 Signed-off-by: Pierre Villard This closes #8899. --- nifi-registry/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml index 29b55b48b4..e51e3ffe56 100644 --- a/nifi-registry/pom.xml +++ b/nifi-registry/pom.xml @@ -35,7 +35,7 @@ nifi-registry-docker-maven -3.2.6 +3.3.0 10.13.0 10.0.0 3.12.0
(nifi-maven) annotated tag rel/nifi-nar-maven-plugin-2.0.0 created (now 9bf766c)
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a change to annotated tag rel/nifi-nar-maven-plugin-2.0.0 in repository https://gitbox.apache.org/repos/asf/nifi-maven.git at 9bf766c (tag) tagging d0de49a34a1197988eaa007d28e6eb20ab6d701f (commit) replaces rel/nifi-nar-maven-plugin-1.5.1 by Pierre Villard on Wed May 29 00:31:30 2024 +0200 - Log - NIFI-13273 Signed release tag for NiFi NAR Maven Plugin 2.0.0 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEP+klwr7XRAIeYWmi+SqTswwHxtUFAmZWW0IACgkQ+SqTswwH xtVlLg//Uw1MnOWo+xzQxlDVvTEDjmzqabhiq2eN2TdzWa3Ck2AfUK4y+e89S9kJ 2BR8pc4xKMbAwEVCqeWYgTDDtTQwO0TodSUlgE0D/u4/2OK3LgKbs/qLq5FCBnqE SJrGllix2vnZNf4VDCK3LSVaW3X6UL2qVdbS4FJSyqsh5fnYIECLf8hFX0XSR47c iMT1K9YNE0eBBpn6+lO/9C0QbqXx6gjS9TSynm4I1G3sj0w/Q88oCnskEqQrJlGc WEkTrV6JQVWtKA4Vcgjc8wdofJHAc0ze6+RnYCVQ/R+cKMvlmQmr+QfdgBAIXYnb 36Ru8V//uEDGJDpPy6G+xo48znIn8/Kw1WDwYlRst283KLf0N9TYBGcgqLbYONpm znHhFzKDmWiPYNWQHhWWxj1TpkGTBs71vTbFX240Z86ulPf1xEV2mnwHMluheOT9 CtvIfnqVA8DGBUcGEOhIs2uUlb7eS3cVuwwhRPQECWoTWdCU0KOgcfivxe6ggXab oli//nSpp6f9a9dR6ofj/9stStvrevn91baI9h3XV1rUjkkro8ICmns/GGZJ4ODN fh07Jv5qFAaxey1IMlN4yjAkxjRqPAbx55V3/dw7F8z33I4XS5Z0hRrRMkIRZcco CUxTg85lunmyfwnjoSy2HXJg+nMbyGn2/LqGv+PqUyQVn+4ogvI= =O9AO -END PGP SIGNATURE- --- No new revisions were added by this update.
(nifi-maven) 01/01: Merge branch 'NIFI-13273-RC1'
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-maven.git commit 2da7df596b710b2e70d8e8ec4b56ffdbff82468a Merge: 61260ee 5060eda Author: Pierre Villard AuthorDate: Wed May 29 00:27:57 2024 +0200 Merge branch 'NIFI-13273-RC1' pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(nifi-maven) branch main updated (61260ee -> 2da7df5)
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi-maven.git from 61260ee NIFI-13274 - Dependencies and switch to 2.0.0-SNAPSHOT and update git workflow This closes #38 add d0de49a NIFI-13273-RC1 prepare release nifi-maven-2.0.0-RC1 add 5060eda NIFI-13273-RC1 prepare for next development iteration new 2da7df5 Merge branch 'NIFI-13273-RC1' 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: pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
svn commit: r69430 - /dev/nifi/nifi-nar-maven-plugin-2.0.0/ /release/nifi/nifi-nar-maven-plugin-2.0.0/
Author: pvillard Date: Tue May 28 22:22:11 2024 New Revision: 69430 Log: NIFI-13273 Added: release/nifi/nifi-nar-maven-plugin-2.0.0/ - copied from r69429, dev/nifi/nifi-nar-maven-plugin-2.0.0/ Removed: dev/nifi/nifi-nar-maven-plugin-2.0.0/
(nifi) branch support/nifi-1.x updated: NIFI-11658 Streamline using single Parameter Context for nested PGs
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 4aae517cca NIFI-11658 Streamline using single Parameter Context for
nested PGs
4aae517cca is described below
commit 4aae517cca997b12e254a7778199a6fe048d2439
Author: Timea Barna
AuthorDate: Fri Jun 2 10:58:44 2023 +0200
NIFI-11658 Streamline using single Parameter Context for nested PGs
Including applicable modifications from NIFI-12101 by Mark Payne
This closes #7353
Co-authored-by: Matt Gilman
Signed-off-by: David Handermann
(cherry picked from commit 42910e80d1d0a71c8f3de51bdd5c6dd0183da26d)
Signed-off-by: Pierre Villard
This closes #8868.
---
.../nifi/web/api/entity/ProcessGroupEntity.java| 14 ++
.../web/api/entity/ProcessGroupRecursivity.java| 22 +++
.../org/apache/nifi/web/NiFiServiceFacade.java | 10 +-
.../apache/nifi/web/StandardNiFiServiceFacade.java | 5 +-
.../apache/nifi/web/api/ProcessGroupResource.java | 149 +-
.../org/apache/nifi/web/dao/ProcessGroupDAO.java | 4 +-
.../nifi/web/dao/impl/StandardProcessGroupDAO.java | 9 +-
.../nifi/web/api/TestProcessGroupResource.java | 43 +++-
.../nifi-framework/nifi-web/nifi-web-ui/pom.xml| 1 +
.../partials/canvas/new-process-group-dialog.jsp | 15 +-
.../canvas/process-group-configuration.jsp | 8 +-
.../nifi-web-ui/src/main/webapp/css/canvas.css | 1 +
.../nifi-web-ui/src/main/webapp/css/common-ui.css | 2 +-
.../nifi-web-ui/src/main/webapp/css/main.css | 28 +--
.../main/webapp/css/new-process-group-dialog.css | 37
.../webapp/css/process-group-configuration.css | 17 +-
.../main/webapp/js/jquery/combo/jquery.combo.css | 4 +-
.../header/components/nf-ng-group-component.js | 217 ++---
.../main/webapp/js/nf/canvas/nf-flow-version.js| 12 +-
.../js/nf/canvas/nf-process-group-configuration.js | 44 ++---
.../nifi-web-ui/src/main/webapp/js/nf/nf-common.js | 40
21 files changed, 474 insertions(+), 208 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java
index 1e726dc21d..7d46e8a13a 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java
@@ -56,6 +56,8 @@ public class ProcessGroupEntity extends ComponentEntity
implements Permissiblehttp://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.api.entity;
+
+public enum ProcessGroupRecursivity {
+DIRECT_CHILDREN,
+ALL_DESCENDANTS
+}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
index ee6f8571ab..e819f4d342 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
@@ -91,7 +91,6 @@ import org.apache.nifi.web.api.entity.AccessPolicyEntity;
import org.apache.nifi.web.api.entity.ActionEntity;
import org.apache.nifi.web.api.entity.ActivateControllerServicesEntity;
import org.apache.nifi.web.api.entity.AffectedComponentEntity;
-import org.apache.nifi.web.api.entity.FlowRegistryBucketEntity;
import org.apache.nifi.web.api.entity.BulletinEntity;
import org.apache.nifi.web.api.entity.ComponentValidationResultEntity;
import org.apache.nifi.web.api.entity.ConfigurationAnalysisEntity;
@@ -106,6 +105,8 @@ import org.apache.nifi.web.api.entity.CurrentUserEntity;
import org.apache.nifi.web.api.entity.FlowComparisonEntity;
import org.apache.nifi.web.api.entity.FlowConfigurationEntity;
import org.apache.nifi.web.api.entity.FlowEntity;
+import org.apache.nifi.web.api.entity.FlowRegistryBucketEntity;
+import org.apache.nifi.web.api.entity.FlowRegistryCl
(nifi) branch main updated: NIFI-13283 - Fix exception thrown in PutKinesisFirehose processor by ensuring value exists before referencing
This is an automated email from the ASF dual-hosted git repository. pvillard 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 99253b9673 NIFI-13283 - Fix exception thrown in PutKinesisFirehose processor by ensuring value exists before referencing 99253b9673 is described below commit 99253b9673ac7aab19e6612599a0e687d8eb438f Author: Evan Shelton AuthorDate: Wed May 22 14:08:04 2024 -0400 NIFI-13283 - Fix exception thrown in PutKinesisFirehose processor by ensuring value exists before referencing Signed-off-by: Pierre Villard This closes #8867. --- .../apache/nifi/processors/aws/kinesis/firehose/PutKinesisFirehose.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/firehose/PutKinesisFirehose.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/firehose/PutKinesisFirehose.java index 46ba510b10..3f810070b2 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/firehose/PutKinesisFirehose.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/firehose/PutKinesisFirehose.java @@ -130,9 +130,9 @@ public class PutKinesisFirehose extends AbstractAwsSyncProcessor new ArrayList<>()); session.read(flowFile, in -> recordHash.get(firehoseStreamName).add(Record.builder().data(SdkBytes.fromInputStream(in)).build())); -recordHash.computeIfAbsent(firehoseStreamName, k -> new ArrayList<>()); final List flowFilesForStream = hashFlowFiles.computeIfAbsent(firehoseStreamName, k -> new ArrayList<>()); flowFilesForStream.add(flowFile); }
(nifi-maven) annotated tag nifi-maven-2.0.0-RC1 created (now bff31b6)
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a change to annotated tag nifi-maven-2.0.0-RC1 in repository https://gitbox.apache.org/repos/asf/nifi-maven.git at bff31b6 (tag) tagging d0de49a34a1197988eaa007d28e6eb20ab6d701f (commit) replaces rel/nifi-nar-maven-plugin-1.5.1 by Pierre Villard on Wed May 22 12:54:24 2024 +0200 - Log - NIFI-13273-RC1 copy for tag nifi-maven-2.0.0-RC1 --- No new revisions were added by this update.
(nifi-maven) 02/02: NIFI-13273-RC1 prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch NIFI-13273-RC1 in repository https://gitbox.apache.org/repos/asf/nifi-maven.git commit 5060edae764fcf5e8c628da677c48ba6b82c5eac Author: Pierre Villard AuthorDate: Wed May 22 12:54:24 2024 +0200 NIFI-13273-RC1 prepare for next development iteration --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 9fb9d80..3312196 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.nifi nifi-nar-maven-plugin -2.0.0 +2.1.0-SNAPSHOT maven-plugin Apache NiFi Nar Maven Plugin http://nifi.apache.org @@ -64,7 +64,7 @@ scm:git:git://git.apache.org/nifi-maven.git scm:git:https://git-wip-us.apache.org/repos/asf/nifi-maven.git https://git-wip-us.apache.org/repos/asf?p=nifi-maven.git -nifi-maven-2.0.0-RC1 +HEAD JIRA @@ -75,7 +75,7 @@ true UTF-8 UTF-8 - 2024-05-22T10:54:14Z + 2024-05-22T10:54:24Z 2014 5.12.0 5.10.2
(nifi-maven) branch NIFI-13273-RC1 created (now 5060eda)
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a change to branch NIFI-13273-RC1 in repository https://gitbox.apache.org/repos/asf/nifi-maven.git at 5060eda NIFI-13273-RC1 prepare for next development iteration This branch includes the following new commits: new d0de49a NIFI-13273-RC1 prepare release nifi-maven-2.0.0-RC1 new 5060eda NIFI-13273-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-maven) 01/02: NIFI-13273-RC1 prepare release nifi-maven-2.0.0-RC1
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch NIFI-13273-RC1 in repository https://gitbox.apache.org/repos/asf/nifi-maven.git commit d0de49a34a1197988eaa007d28e6eb20ab6d701f Author: Pierre Villard AuthorDate: Wed May 22 12:54:24 2024 +0200 NIFI-13273-RC1 prepare release nifi-maven-2.0.0-RC1 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 0e7f6d1..9fb9d80 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.nifi nifi-nar-maven-plugin -2.0.0-SNAPSHOT +2.0.0 maven-plugin Apache NiFi Nar Maven Plugin http://nifi.apache.org @@ -64,7 +64,7 @@ scm:git:git://git.apache.org/nifi-maven.git scm:git:https://git-wip-us.apache.org/repos/asf/nifi-maven.git https://git-wip-us.apache.org/repos/asf?p=nifi-maven.git -HEAD +nifi-maven-2.0.0-RC1 JIRA @@ -75,7 +75,7 @@ true UTF-8 UTF-8 - 2023-06-14T20:31:06Z + 2024-05-22T10:54:14Z 2014 5.12.0 5.10.2
svn commit: r69329 - /dev/nifi/nifi-nar-maven-plugin-2.0.0/
Author: pvillard Date: Wed May 22 11:09:32 2024 New Revision: 69329 Log: NIFI-13273 Uploaded RC1 artifacts for NiFi NAR Maven plugin 2.0.0 Added: dev/nifi/nifi-nar-maven-plugin-2.0.0/ dev/nifi/nifi-nar-maven-plugin-2.0.0/nifi-nar-maven-plugin-2.0.0-source-release.zip (with props) dev/nifi/nifi-nar-maven-plugin-2.0.0/nifi-nar-maven-plugin-2.0.0-source-release.zip.asc dev/nifi/nifi-nar-maven-plugin-2.0.0/nifi-nar-maven-plugin-2.0.0-source-release.zip.sha256 dev/nifi/nifi-nar-maven-plugin-2.0.0/nifi-nar-maven-plugin-2.0.0-source-release.zip.sha512 Added: dev/nifi/nifi-nar-maven-plugin-2.0.0/nifi-nar-maven-plugin-2.0.0-source-release.zip == Binary file - no diff available. Propchange: dev/nifi/nifi-nar-maven-plugin-2.0.0/nifi-nar-maven-plugin-2.0.0-source-release.zip -- svn:mime-type = application/octet-stream Added: dev/nifi/nifi-nar-maven-plugin-2.0.0/nifi-nar-maven-plugin-2.0.0-source-release.zip.asc == --- dev/nifi/nifi-nar-maven-plugin-2.0.0/nifi-nar-maven-plugin-2.0.0-source-release.zip.asc (added) +++ dev/nifi/nifi-nar-maven-plugin-2.0.0/nifi-nar-maven-plugin-2.0.0-source-release.zip.asc Wed May 22 11:09:32 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEP+klwr7XRAIeYWmi+SqTswwHxtUFAmZN0ZAACgkQ+SqTswwH +xtXftg/9GDsv62HUpknJJdR2W0AWJzkvX6vzYsJOL1bYbCZX8XAKIFz22r1IYs5l +DAwernbuntS/JxdO3LxHVDiBNslnIbfjja2mDDA+iUxUBLQnXkjJWAC87dxLdakF +QJ1Qk7ywNIBPHz6LVzzJJ99JmWdCCbePmnCV1XK5Zd90QbRqi1JvqamDIEGnVvKe +dg5lrefhXTrn3HFO+XSRdSRYwHWsBNjB8Dzd+EtA6GgP902xb5X1rZmcrc17hyR1 +esOOmOg/9bAjUKz+Z0VtZsWIRJM6WtZafeTQ62aEikEaaPZMspHGMj3mTyXCR+1K +293eLh2moscU9lO8X25LVsUd4Lxrxfy6J86/WY3P3NsmTH8aPZkcPYFwJE4YONTC +Bc1tjeVx4e+FDPtUuePz42KjNtlm7IUqFiHSh3/KA2NrG8h/qQnCHwUH/D0zT7Ym +baNxoobXN89Du82bRb6ApLTyA4uJMyfjozE97HNM5G6dwlC3g4b4Q0Mf+mg4c2e1 +A5Lbyjd/9ifTnq7243mSxPXjP/RorxD/frRRrqKzG8JwR+nI/cysXHJ4tlapSGA7 +cqfmCbLNY3cBrIQDJUNCAnW3YDVmPTguUcBbPVQg5KVhbdZOyDyzllCHWynW36l9 +jbwWRfq+lkIGfiPIE+mo26fLGXw5s6xMDBsUVpMtXgLf/C8vxuI= +=rJ92 +-END PGP SIGNATURE- Added: dev/nifi/nifi-nar-maven-plugin-2.0.0/nifi-nar-maven-plugin-2.0.0-source-release.zip.sha256 == --- dev/nifi/nifi-nar-maven-plugin-2.0.0/nifi-nar-maven-plugin-2.0.0-source-release.zip.sha256 (added) +++ dev/nifi/nifi-nar-maven-plugin-2.0.0/nifi-nar-maven-plugin-2.0.0-source-release.zip.sha256 Wed May 22 11:09:32 2024 @@ -0,0 +1 @@ +ae889c843a82c4823fca0bf5fedf275dbb812c2b11e25ae26b0bd4ad7d26ccae Added: dev/nifi/nifi-nar-maven-plugin-2.0.0/nifi-nar-maven-plugin-2.0.0-source-release.zip.sha512 == --- dev/nifi/nifi-nar-maven-plugin-2.0.0/nifi-nar-maven-plugin-2.0.0-source-release.zip.sha512 (added) +++ dev/nifi/nifi-nar-maven-plugin-2.0.0/nifi-nar-maven-plugin-2.0.0-source-release.zip.sha512 Wed May 22 11:09:32 2024 @@ -0,0 +1 @@ +c9afefb093d8b9568012d6697f302eb4a138f0a65a7045eaeb1bff551fb4bff23c805294700ca20984a3493eb61fe80a39d8b5b393afc85cf3f6ab1a28df831c
(nifi-maven) branch main updated: NIFI-13264 Add extension-manifest.xml to the build artifacts produced by the NAR plugin
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git
The following commit(s) were added to refs/heads/main by this push:
new b079dd1 NIFI-13264 Add extension-manifest.xml to the build artifacts
produced by the NAR plugin
b079dd1 is described below
commit b079dd163b2366dc33c935a6fff49540b5e41872
Author: Bryan Bende
AuthorDate: Mon May 20 10:02:18 2024 -0400
NIFI-13264 Add extension-manifest.xml to the build artifacts produced by
the NAR plugin
Signed-off-by: Pierre Villard
This closes #37.
---
src/main/java/org/apache/nifi/NarMojo.java | 30 +++---
1 file changed, 27 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/nifi/NarMojo.java
b/src/main/java/org/apache/nifi/NarMojo.java
index 333bc72..4429e73 100644
--- a/src/main/java/org/apache/nifi/NarMojo.java
+++ b/src/main/java/org/apache/nifi/NarMojo.java
@@ -1041,16 +1041,22 @@ public class NarMojo extends AbstractMojo {
}
private void makeNar() throws MojoExecutionException {
-File narFile = createArchive();
+final NarResult narResult = createArchive();
+final File narFile = narResult.getNarFile();
if (classifier != null) {
projectHelper.attachArtifact(project, "nar", classifier, narFile);
} else {
project.getArtifact().setFile(narFile);
}
+
+final File extensionDocsFile = narResult.getExtensionDocsFile();
+if (extensionDocsFile != null && !skipDocGeneration) {
+projectHelper.attachArtifact(project, "xml",
"nar-extension-manifest", extensionDocsFile);
+}
}
-public File createArchive() throws MojoExecutionException {
+private NarResult createArchive() throws MojoExecutionException {
final File outputDirectory = projectBuildDirectory;
File narFile = getNarFile(outputDirectory, finalName, classifier);
MavenArchiver archiver = new MavenArchiver();
@@ -1122,7 +1128,7 @@ public class NarMojo extends AbstractMojo {
archive.addManifestEntry("Clone-During-Instance-Class-Loading",
String.valueOf(cloneDuringInstanceClassLoading));
archiver.createArchive(session, project, archive);
-return narFile;
+return new NarResult(narFile, extensionDocsFile);
} catch (ArchiverException | MojoExecutionException |
ManifestException | IOException | DependencyResolutionRequiredException e) {
throw new MojoExecutionException("Error assembling NAR", e);
}
@@ -1219,4 +1225,22 @@ public class NarMojo extends AbstractMojo {
}
}
+private static class NarResult {
+private final File narFile;
+private final File extensionDocsFile;
+
+public NarResult(final File narFile, final File extensionDocsFile) {
+this.narFile = narFile;
+this.extensionDocsFile = extensionDocsFile;
+}
+
+public File getNarFile() {
+return narFile;
+}
+
+public File getExtensionDocsFile() {
+return extensionDocsFile;
+}
+}
+
}
(nifi) branch main updated: NIFI-13256 Corrected Example WriteHelloWorld Processor Attributes
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 15ac906725 NIFI-13256 Corrected Example WriteHelloWorld Processor
Attributes
15ac906725 is described below
commit 15ac906725d84494467605eff9047890c1f188a5
Author: exceptionfactory
AuthorDate: Thu May 16 10:25:21 2024 -0500
NIFI-13256 Corrected Example WriteHelloWorld Processor Attributes
Signed-off-by: Pierre Villard
This closes #8841.
---
nifi-docs/src/main/asciidoc/python-developer-guide.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nifi-docs/src/main/asciidoc/python-developer-guide.adoc
b/nifi-docs/src/main/asciidoc/python-developer-guide.adoc
index fc85521ecb..3adbec6eaa 100644
--- a/nifi-docs/src/main/asciidoc/python-developer-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/python-developer-guide.adoc
@@ -153,10 +153,10 @@ class WriteHelloWorld(FlowFileTransform):
version = '0.0.1-SNAPSHOT'
def __init__(self, **kwargs):
-super().__init__(**kwargs)
+pass
def transform(self, context, flowfile):
-return FlowFileTransformResult(relationship = "success", contents =
"Hello World", attributes = {"greeting", "hello"})
+return FlowFileTransformResult(relationship = "success", contents =
"Hello World", attributes = {"greeting": "hello"})
The `transform` method is expected to take two arguments: the context (of type
`nifiapi.properties.ProcessContext`) and
(nifi) branch main updated: NIFI-13210 Added CODECOV_TOKEN to GitHub Workflow
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 5f9f5247d6 NIFI-13210 Added CODECOV_TOKEN to GitHub Workflow
5f9f5247d6 is described below
commit 5f9f5247d6dbb8f2206f46e49cd5f5c7ff17af37
Author: exceptionfactory
AuthorDate: Fri May 10 09:46:59 2024 -0500
NIFI-13210 Added CODECOV_TOKEN to GitHub Workflow
- Set Codecov action to be conditional based on running in the context of
the Apache organization
Signed-off-by: Pierre Villard
This closes #8808.
---
.github/workflows/ci-workflow.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.github/workflows/ci-workflow.yml
b/.github/workflows/ci-workflow.yml
index 0937a3a26e..83ad753baf 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -187,8 +187,10 @@ jobs:
${{ env.MAVEN_PROJECTS }}
- name: Codecov
uses: codecov/codecov-action@v4
+if: github.repository_owner == 'apache'
with:
files: ./nifi-code-coverage/target/site/jacoco-aggregate/jacoco.xml
+ token: ${{ secrets.CODECOV_TOKEN }}
- name: Upload Test Reports
uses: actions/upload-artifact@v4
with:
(nifi) annotated tag rel/nifi-1.26.0 created (now 666055b31c)
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a change to annotated tag rel/nifi-1.26.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at 666055b31c (tag) tagging 338083f6850b61cd2651e41bbd73b3cb5330d98c (commit) replaces rel/nifi-1.25.0 by Pierre Villard on Mon May 6 21:08:03 2024 +0300 - Log - NIFI-13133 Signed release tag for NiFi 1.26.0 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEP+klwr7XRAIeYWmi+SqTswwHxtUFAmY5HIMACgkQ+SqTswwH xtWaOA//UKX+NKcpkkYM7uIAorVwCGopXlb2w5TkdqTH737d/qRfeoFxN47LVr8t bJG3eAykjCVGZKaaOhMd5Wzqdk/9fB/oi7B36PXdWMi5b/CsvHRM1yft1nQSzpi1 u+1Zb9UkqF41U92vr4lGoryNpkDXTqIa/zR0hI4lZchKAU+LZnOKLMkx64C9p0lo LDDrVP2Nvb1DmmpkveWuPSwVf9hufyJZ5AVQ5JZqxL4AUEHLoaFxnsTVIPHd0+P6 4h0GV8wl7kfbbK7mJ1SfMyBWPS8yw3S/nh2s9uNu0ziiQD34uQFvGDWpwMz2XH+Z Bl37cxbtHde0kGuBnTX5w3u7FEjGF3C39/qoYo2EYBZhNhQNI5F8UlHc4X15tHRJ tTQw+fRwrhi6RTFxnJcwwWTNKPA3LU5KJF2zbFPuF6+MvhEXGPhzqRRYCTJEtfnN 0C+VVJSaJEGzoBQEyYzvg9MIakjLyjTPUem0x2APPNZQYW0P3IJEybh/FMWPbOIw zK36jFksQ+tmzi9fXU79z+aU5llywJ34/eQWjTNnvRDZEgDGD9y0c+dlXbKXUWLz zHWePxek35YG1k8Ia/1jAxNX4IMjD4A2W8OPF1kLNDUAJDucmdHpMAbuj9oy478h iBEb11TborK63WzOsVh/PX1SmtKaNh3oUCYCR7kqkLMMHdWh0c4= =Ctbn -END PGP SIGNATURE- --- No new revisions were added by this update.
(nifi) 03/03: Merge branch 'NIFI-13133-RC1' into support/nifi-1.x
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git commit 8771c1e3d2937835075aff39e42257421d5aa7ff Merge: a4d1123820 16584a9560 Author: Pierre Villard AuthorDate: Mon May 6 21:06:41 2024 +0300 Merge branch 'NIFI-13133-RC1' into support/nifi-1.x
(nifi) branch support/nifi-1.x updated (d3a7549e81 -> 8771c1e3d2)
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a change to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git from d3a7549e81 NIFI-12231 FetchSmb supports Move and Delete Completion Strategies new c94be900cf NIFI-13133-RC1 prepare release nifi-1.26.0-RC1 new a4d1123820 NIFI-13133-RC1 prepare for next development iteration add 338083f685 NIFI-13133-RC1 prepare release nifi-1.26.0-RC1 add 16584a9560 NIFI-13133-RC1 prepare for next development iteration new 8771c1e3d2 Merge branch 'NIFI-13133-RC1' into support/nifi-1.x The 3 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: c2/c2-client-bundle/c2-client-api/pom.xml | 4 +- c2/c2-client-bundle/c2-client-base/pom.xml | 6 +- c2/c2-client-bundle/c2-client-http/pom.xml | 8 +- c2/c2-client-bundle/c2-client-service/pom.xml | 8 +- c2/c2-client-bundle/pom.xml| 2 +- c2/c2-protocol/c2-protocol-api/pom.xml | 4 +- c2/c2-protocol/c2-protocol-component-api/pom.xml | 2 +- c2/c2-protocol/pom.xml | 2 +- c2/pom.xml | 4 +- 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 | 6 +- minifi/minifi-c2/pom.xml | 2 +- minifi/minifi-commons/minifi-commons-api/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 | 2 +- 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| 20 +- .../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| 6 +- 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 | 150 - nifi-api/pom.xml | 2 +- nifi-assembly/pom.xml | 364 ++--- nifi-bootstrap/pom.xml | 24 +- nifi-commons/nifi-bootstrap-utils/pom.xml | 2 +- nifi-commons/nifi-build/pom.xml| 2 +- nifi-commons/nifi-data-provenance-utils/pom.xml| 8 +- nifi-commons/nifi-deprecation-log/pom.xml | 2 +- nifi-commons/nifi-expression-language/pom.xml | 10 +- nifi-commons/nifi-external-resource-utils/pom.xml | 4 +- nifi-commons/nifi-flow-encryptor/pom.xml | 6 +- nifi-commons/nifi-flowfile-packager/pom.xml| 2 +- nifi-commons/nifi-hashicorp-vault-api/pom.xml | 2 +- nifi-commons/nifi-hashicorp-vault/pom.xml | 10 +- nifi-commons/nifi-hl7-query-language/pom.xml | 2 +- nifi-commons/nifi-jetty-configuration/pom.xml
svn commit: r68978 - /dev/nifi/nifi-1.26.0/ /release/nifi/1.26.0/
Author: pvillard Date: Mon May 6 17:43:09 2024 New Revision: 68978 Log: NIFI-13133 Added: release/nifi/1.26.0/ - copied from r68977, dev/nifi/nifi-1.26.0/ Removed: dev/nifi/nifi-1.26.0/
(nifi) branch support/nifi-1.x updated: NIFI-12231 FetchSmb supports Move and Delete Completion Strategies
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new d3a7549e81 NIFI-12231 FetchSmb supports Move and Delete Completion
Strategies
d3a7549e81 is described below
commit d3a7549e8109774b06e79f13d570ef5da04c451f
Author: Peter Turcsanyi
AuthorDate: Tue Apr 9 18:09:13 2024 +0200
NIFI-12231 FetchSmb supports Move and Delete Completion Strategies
Signed-off-by: Pierre Villard
This closes #8617.
---
.../processors/smb/util/CompletionStrategy.java| 49 +
.../apache/nifi/services/smb/SmbClientService.java | 10 +-
.../org/apache/nifi/processors/smb/FetchSmb.java | 152 ++-
.../org/apache/nifi/processors/smb/ListSmb.java| 2 +-
.../org/apache/nifi/processors/smb/FetchSmbIT.java | 212 +++--
.../apache/nifi/processors/smb/ListSmbTest.java| 4 +-
.../nifi/processors/smb/SambaTestContainers.java | 59 --
.../nifi/services/smb/SmbjClientService.java | 113 +++
.../nifi/services/smb/SmbjClientServiceIT.java | 2 +-
.../nifi/services/smb/SmbjClientServiceTest.java | 2 +-
10 files changed, 482 insertions(+), 123 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/util/CompletionStrategy.java
b/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/util/CompletionStrategy.java
new file mode 100644
index 00..cf3dd0fcbf
--- /dev/null
+++
b/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/util/CompletionStrategy.java
@@ -0,0 +1,49 @@
+/*
+ * 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.smb.util;
+
+import org.apache.nifi.components.DescribedValue;
+
+public enum CompletionStrategy implements DescribedValue {
+
+NONE("None", "Leaves the file as-is."),
+MOVE("Move File", "Moves the file to the specified directory on the remote
system. This option cannot be used when DFS is enabled on 'SMB Client Provider
Service'."),
+DELETE("Delete File", "Deletes the file from the remote system.");
+
+private final String displayName;
+private final String description;
+
+CompletionStrategy(String displayName, String description) {
+this.displayName = displayName;
+this.description = description;
+}
+
+@Override
+public String getValue() {
+return name();
+}
+
+@Override
+public String getDisplayName() {
+return displayName;
+}
+
+@Override
+public String getDescription() {
+return description;
+}
+}
diff --git
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-client-api/src/main/java/org/apache/nifi/services/smb/SmbClientService.java
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-client-api/src/main/java/org/apache/nifi/services/smb/SmbClientService.java
index 9eb0e41a67..c70dea133e 100644
---
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-client-api/src/main/java/org/apache/nifi/services/smb/SmbClientService.java
+++
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-client-api/src/main/java/org/apache/nifi/services/smb/SmbClientService.java
@@ -25,9 +25,13 @@ import java.util.stream.Stream;
*/
public interface SmbClientService extends AutoCloseable {
-Stream listRemoteFiles(String path);
+Stream listFiles(String directoryPath);
-void createDirectory(String path);
+void ensureDirectory(String directoryPath);
-void readFile(String fileName, OutputStream outputStream) throws
IOException;
+void readFile(String filePath, OutputStream outputStream) throws
IOException;
+
+void moveFile(String filePath, String directoryPath);
+
+void deleteFile(String filePath);
}
diff --git
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/FetchSmb.java
b/nifi-nar-bundles/nifi-smb-bundle/nifi
(nifi) branch main updated: NIFI-12231 FetchSmb supports Move and Delete Completion Strategies
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 9f69ff233c NIFI-12231 FetchSmb supports Move and Delete Completion
Strategies
9f69ff233c is described below
commit 9f69ff233c1780c7bcf09ca67fbf68985a766c18
Author: Peter Turcsanyi
AuthorDate: Tue Apr 9 18:09:13 2024 +0200
NIFI-12231 FetchSmb supports Move and Delete Completion Strategies
Signed-off-by: Pierre Villard
This closes #8617.
---
.../apache/nifi/services/smb/SmbClientService.java | 10 +-
.../org/apache/nifi/processors/smb/FetchSmb.java | 152 ++-
.../org/apache/nifi/processors/smb/ListSmb.java| 2 +-
.../processors/smb/util/CompletionStrategy.java| 49 +
.../org/apache/nifi/processors/smb/FetchSmbIT.java | 212 +++--
.../apache/nifi/processors/smb/ListSmbTest.java| 4 +-
.../nifi/processors/smb/SambaTestContainers.java | 59 --
.../nifi/services/smb/SmbjClientService.java | 113 +++
.../nifi/services/smb/SmbjClientServiceIT.java | 2 +-
.../nifi/services/smb/SmbjClientServiceTest.java | 2 +-
10 files changed, 482 insertions(+), 123 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-client-api/src/main/java/org/apache/nifi/services/smb/SmbClientService.java
b/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-client-api/src/main/java/org/apache/nifi/services/smb/SmbClientService.java
index 9eb0e41a67..c70dea133e 100644
---
a/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-client-api/src/main/java/org/apache/nifi/services/smb/SmbClientService.java
+++
b/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-client-api/src/main/java/org/apache/nifi/services/smb/SmbClientService.java
@@ -25,9 +25,13 @@ import java.util.stream.Stream;
*/
public interface SmbClientService extends AutoCloseable {
-Stream listRemoteFiles(String path);
+Stream listFiles(String directoryPath);
-void createDirectory(String path);
+void ensureDirectory(String directoryPath);
-void readFile(String fileName, OutputStream outputStream) throws
IOException;
+void readFile(String filePath, OutputStream outputStream) throws
IOException;
+
+void moveFile(String filePath, String directoryPath);
+
+void deleteFile(String filePath);
}
diff --git
a/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/FetchSmb.java
b/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/FetchSmb.java
index c38216058d..b5f58b5890 100644
---
a/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/FetchSmb.java
+++
b/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/FetchSmb.java
@@ -16,16 +16,6 @@
*/
package org.apache.nifi.processors.smb;
-import static java.util.Arrays.asList;
-import static java.util.Collections.unmodifiableSet;
-import static
org.apache.nifi.expression.ExpressionLanguageScope.FLOWFILE_ATTRIBUTES;
-import static
org.apache.nifi.processor.util.StandardValidators.ATTRIBUTE_EXPRESSION_LANGUAGE_VALIDATOR;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.WritesAttribute;
import org.apache.nifi.annotation.behavior.WritesAttributes;
@@ -33,17 +23,29 @@ import
org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.SeeAlso;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.components.PropertyDescriptor.Builder;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.Relationship;
import org.apache.nifi.processor.exception.ProcessException;
+import org.apache.nifi.processor.util.StandardValidators;
+import org.apache.nifi.processors.smb.util.CompletionStrategy;
import org.apache.nifi.services.smb.SmbClientProviderService;
import org.apache.nifi.services.smb.SmbClientService;
import org.apache.nifi.services.smb.SmbException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.unmodifiableSet;
+import static
org.apache.nifi.expression.ExpressionLanguageScope.FLOWFILE_ATTRIBUTES;
+import static
(nifi) branch main updated: NIFI-12973 Add Process Group scope to Flow Analysis rules
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 bc75ef108c NIFI-12973 Add Process Group scope to Flow Analysis rules
bc75ef108c is described below
commit bc75ef108c13cf5e75c4fbb20634c906f65c10d4
Author: tpalfy
AuthorDate: Mon Apr 22 18:52:09 2024 +0200
NIFI-12973 Add Process Group scope to Flow Analysis rules
Signed-off-by: Pierre Villard
This closes #8682.
---
.../nifi/flow/VersionedFlowAnalysisRule.java | 10 +++
.../nifi/web/api/dto/FlowAnalysisRuleDTO.java | 9 ++
.../flowanalysis/AbstractFlowAnalysisRuleNode.java | 12
.../StandardVersionedComponentSynchronizer.java| 1 +
.../flow/mapping/NiFiRegistryFlowMapper.java | 1 +
.../nifi/controller/FlowAnalysisRuleNode.java | 4 +++
.../org/apache/nifi/controller/FlowController.java | 2 +-
.../serialization/VersionedFlowSynchronizer.java | 1 +
.../nifi/flowanalysis/StandardFlowAnalyzer.java| 34 +-
.../apache/nifi/audit/FlowAnalysisRuleAuditor.java | 22 ++
.../org/apache/nifi/web/api/dto/DtoFactory.java| 1 +
.../web/dao/impl/StandardFlowAnalysisRuleDAO.java | 4 +++
.../canvas/flow-analysis-rule-configuration.jsp| 12
.../webapp/js/nf/canvas/nf-flow-analysis-rule.js | 9 ++
14 files changed, 120 insertions(+), 2 deletions(-)
diff --git
a/nifi-api/src/main/java/org/apache/nifi/flow/VersionedFlowAnalysisRule.java
b/nifi-api/src/main/java/org/apache/nifi/flow/VersionedFlowAnalysisRule.java
index 0d5abd829b..1b7154 100644
--- a/nifi-api/src/main/java/org/apache/nifi/flow/VersionedFlowAnalysisRule.java
+++ b/nifi-api/src/main/java/org/apache/nifi/flow/VersionedFlowAnalysisRule.java
@@ -25,6 +25,8 @@ public class VersionedFlowAnalysisRule extends
VersionedConfigurableExtension {
private ScheduledState scheduledState;
private EnforcementPolicy enforcementPolicy;
+private String scope;
+
@Schema(description = "How to handle violations.")
public EnforcementPolicy getEnforcementPolicy() {
return enforcementPolicy;
@@ -34,6 +36,14 @@ public class VersionedFlowAnalysisRule extends
VersionedConfigurableExtension {
this.enforcementPolicy = enforcementPolicy;
}
+public String getScope() {
+return scope;
+}
+
+public void setScope(String scope) {
+this.scope = scope;
+}
+
@Override
public ComponentType getComponentType() {
return ComponentType.FLOW_ANALYSIS_RULE;
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowAnalysisRuleDTO.java
b/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowAnalysisRuleDTO.java
index 33e2058214..20c964f4b5 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowAnalysisRuleDTO.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowAnalysisRuleDTO.java
@@ -42,6 +42,7 @@ public class FlowAnalysisRuleDTO extends ComponentDTO {
private Boolean supportsSensitiveDynamicProperties;
private String enforcementPolicy;
+private String scope;
private Map properties;
private Map descriptors;
@@ -208,6 +209,14 @@ public class FlowAnalysisRuleDTO extends ComponentDTO {
this.enforcementPolicy = enforcementPolicy;
}
+public String getScope() {
+return scope;
+}
+
+public void setScope(String scope) {
+this.scope = scope;
+}
+
/**
* @return flow analysis rule's properties
*/
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/flowanalysis/AbstractFlowAnalysisRuleNode.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/flowanalysis/AbstractFlowAnalysisRuleNode.java
index 02fe471646..13c617002e 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/flowanalysis/AbstractFlowAnalysisRuleNode.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/flowanalysis/AbstractFlowAnalysisRuleNode.java
@@ -77,6 +77,8 @@ public abstract class AbstractFlowAnalysisRuleNode extends
AbstractComponentNode
private volatile String comment;
private EnforcementPolicy enforcementPolicy;
+private String scope;
+
private volatile FlowAnalysisRuleState state =
FlowAnalysisRuleState.DISABLED;
public AbstractFlowAnalysisRuleNode(final
LoggableComponent flowAnalysisRule, final String id,
@@ -114,6 +116,16 @@ public abstract class AbstractFlowAnalys
(nifi) branch NIFI-13133-RC1 created (now 16584a9560)
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a change to branch NIFI-13133-RC1 in repository https://gitbox.apache.org/repos/asf/nifi.git at 16584a9560 NIFI-13133-RC1 prepare for next development iteration This branch includes the following new commits: new 338083f685 NIFI-13133-RC1 prepare release nifi-1.26.0-RC1 new 16584a9560 NIFI-13133-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.26.0-RC1 created (now 2d32490bda)
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a change to annotated tag nifi-1.26.0-RC1 in repository https://gitbox.apache.org/repos/asf/nifi.git at 2d32490bda (tag) tagging 338083f6850b61cd2651e41bbd73b3cb5330d98c (commit) replaces rel/nifi-1.25.0 by Pierre Villard on Fri May 3 12:17:21 2024 +0200 - Log - NIFI-13133-RC1 copy for tag nifi-1.26.0-RC1 --- No new revisions were added by this update.
svn commit: r68932 - /dev/nifi/nifi-1.26.0/
Author: pvillard Date: Fri May 3 12:32:02 2024 New Revision: 68932 Log: NIFI-13133 Uploaded RC1 artifacts for NiFi 1.26.0 Added: dev/nifi/nifi-1.26.0/ dev/nifi/nifi-1.26.0/minifi-1.26.0-bin.zip (with props) dev/nifi/nifi-1.26.0/minifi-1.26.0-bin.zip.asc dev/nifi/nifi-1.26.0/minifi-1.26.0-bin.zip.sha256 dev/nifi/nifi-1.26.0/minifi-1.26.0-bin.zip.sha512 dev/nifi/nifi-1.26.0/minifi-c2-1.26.0-bin.zip (with props) dev/nifi/nifi-1.26.0/minifi-c2-1.26.0-bin.zip.asc dev/nifi/nifi-1.26.0/minifi-c2-1.26.0-bin.zip.sha256 dev/nifi/nifi-1.26.0/minifi-c2-1.26.0-bin.zip.sha512 dev/nifi/nifi-1.26.0/minifi-toolkit-1.26.0-bin.zip (with props) dev/nifi/nifi-1.26.0/minifi-toolkit-1.26.0-bin.zip.asc dev/nifi/nifi-1.26.0/minifi-toolkit-1.26.0-bin.zip.sha256 dev/nifi/nifi-1.26.0/minifi-toolkit-1.26.0-bin.zip.sha512 dev/nifi/nifi-1.26.0/nifi-1.26.0-bin.zip (with props) dev/nifi/nifi-1.26.0/nifi-1.26.0-bin.zip.asc dev/nifi/nifi-1.26.0/nifi-1.26.0-bin.zip.sha256 dev/nifi/nifi-1.26.0/nifi-1.26.0-bin.zip.sha512 dev/nifi/nifi-1.26.0/nifi-1.26.0-source-release.zip (with props) dev/nifi/nifi-1.26.0/nifi-1.26.0-source-release.zip.asc dev/nifi/nifi-1.26.0/nifi-1.26.0-source-release.zip.sha256 dev/nifi/nifi-1.26.0/nifi-1.26.0-source-release.zip.sha512 dev/nifi/nifi-1.26.0/nifi-kafka-connector-assembly-1.26.0.zip (with props) dev/nifi/nifi-1.26.0/nifi-kafka-connector-assembly-1.26.0.zip.asc dev/nifi/nifi-1.26.0/nifi-kafka-connector-assembly-1.26.0.zip.sha256 dev/nifi/nifi-1.26.0/nifi-kafka-connector-assembly-1.26.0.zip.sha512 dev/nifi/nifi-1.26.0/nifi-registry-1.26.0-bin.zip (with props) dev/nifi/nifi-1.26.0/nifi-registry-1.26.0-bin.zip.asc dev/nifi/nifi-1.26.0/nifi-registry-1.26.0-bin.zip.sha256 dev/nifi/nifi-1.26.0/nifi-registry-1.26.0-bin.zip.sha512 dev/nifi/nifi-1.26.0/nifi-registry-toolkit-1.26.0-bin.zip (with props) dev/nifi/nifi-1.26.0/nifi-registry-toolkit-1.26.0-bin.zip.asc dev/nifi/nifi-1.26.0/nifi-registry-toolkit-1.26.0-bin.zip.sha256 dev/nifi/nifi-1.26.0/nifi-registry-toolkit-1.26.0-bin.zip.sha512 dev/nifi/nifi-1.26.0/nifi-stateless-1.26.0-bin.zip (with props) dev/nifi/nifi-1.26.0/nifi-stateless-1.26.0-bin.zip.asc dev/nifi/nifi-1.26.0/nifi-stateless-1.26.0-bin.zip.sha256 dev/nifi/nifi-1.26.0/nifi-stateless-1.26.0-bin.zip.sha512 dev/nifi/nifi-1.26.0/nifi-toolkit-1.26.0-bin.zip (with props) dev/nifi/nifi-1.26.0/nifi-toolkit-1.26.0-bin.zip.asc dev/nifi/nifi-1.26.0/nifi-toolkit-1.26.0-bin.zip.sha256 dev/nifi/nifi-1.26.0/nifi-toolkit-1.26.0-bin.zip.sha512 Added: dev/nifi/nifi-1.26.0/minifi-1.26.0-bin.zip == Binary file - no diff available. Propchange: dev/nifi/nifi-1.26.0/minifi-1.26.0-bin.zip -- svn:mime-type = application/octet-stream Added: dev/nifi/nifi-1.26.0/minifi-1.26.0-bin.zip.asc == --- dev/nifi/nifi-1.26.0/minifi-1.26.0-bin.zip.asc (added) +++ dev/nifi/nifi-1.26.0/minifi-1.26.0-bin.zip.asc Fri May 3 12:32:02 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEP+klwr7XRAIeYWmi+SqTswwHxtUFAmY00hsACgkQ+SqTswwH +xtXH9w/9HF0QX8DZYO6COWA/TQ6UDe9KaUIVdoGzR3lUgX3pRB7AkYtGdyaT/1OQ +UGvvQk0rRQ2dFTRnOWkTuhV4yv+RzJ50O9FxPDh/f2w9gOnwQcJh+YNb1VhFXrK8 +GD6frM7U+OQNJmD2CHdSLXlvD5YM0kUN6hE+dECd3FI0Jdhh1oUhMLMR2XY8ui4O +o9euELPri7clF2GfQBy35njyb194fo9WGTA5FXa0tMB8CukWFXysBv8RaWG2hICr +lMz9q8Wk779Kw5x6NEtCJwJ0rE1zXmGDgxfpIPE05ScfNdkcj2KYt7wvKJBWjL7h +irdE9dTmUP+3zNNwS5MpU1KzAEhrYaLZQuVYM0p5398jw+wRmELhXhja9WlSlXYX +YDceFz+YYessepeezJD6MJ1wsnn0DGx5F88FvxFgbA5LKYr1stcxtbQMp9sEvc7D +Gqx5KrqidBzlG9X/HBol5CCJeXju0h2oWH8H0uh5dAko59KxZkj4hcfyaQPBWHOY +nbadx+UzQh1vjSAffRyXdXd2vJ6OSDbyItVruz6H26BKlqQ1xFXewT80vFkLPHy3 +5mhHeaI4k+2OzI0cSYOYy24ozfP1kRFmYV+swna6srJ05aEZH4eSoT7GGcvS2Hmf +gzHNBhtVIG05V7YVLzOYdOtdzcfbY6ogjWKlI+0AJzQ6Y7dp/v8= +=lB0O +-END PGP SIGNATURE- Added: dev/nifi/nifi-1.26.0/minifi-1.26.0-bin.zip.sha256 == --- dev/nifi/nifi-1.26.0/minifi-1.26.0-bin.zip.sha256 (added) +++ dev/nifi/nifi-1.26.0/minifi-1.26.0-bin.zip.sha256 Fri May 3 12:32:02 2024 @@ -0,0 +1 @@ +9a7575faae6fca0a37747719f29b8398dee945f2da571d92e2016c0bc6ca814e Added: dev/nifi/nifi-1.26.0/minifi-1.26.0-bin.zip.sha512 == --- dev/nifi/nifi-1.26.0/minifi-1.26.0-bin.zip.sha512 (added) +++ dev/nifi/nifi-1.26.0/minifi-1.26.0-bin.zip.sha512 Fri May 3 12:32:02 2024 @@ -0,0 +1 @@ +dbe913014d722ff33352180534faf775b472b53a45d463d127cbe98967ff086a74c700926b98a793feba13c73e271968eb0ac996f4b2eef57ba4f4179b1c80fe Added: dev/nifi/nifi-1.26.0/minifi-c2-1.26.0-bin.zip
(nifi) branch support/nifi-1.x updated: NIFI-13131 dependency updates
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new 540cddee46 NIFI-13131 dependency updates 540cddee46 is described below commit 540cddee4635f2432ac4ac4f40256fc778d4b88a Author: Joseph Witt AuthorDate: Thu May 2 16:15:30 2024 -0700 NIFI-13131 dependency updates Signed-off-by: Pierre Villard This closes #8732. --- nifi-nar-bundles/nifi-azure-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-gcp-bundle/pom.xml | 2 +- pom.xml| 18 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/nifi-nar-bundles/nifi-azure-bundle/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/pom.xml index 5815067f1f..004c0d4c43 100644 --- a/nifi-nar-bundles/nifi-azure-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-azure-bundle/pom.xml @@ -28,7 +28,7 @@ 8.6.6 -1.2.21 +1.2.23 1.14.3 0.34.1 diff --git a/nifi-nar-bundles/nifi-gcp-bundle/pom.xml b/nifi-nar-bundles/nifi-gcp-bundle/pom.xml index 7d6388c3dd..d33ff446f8 100644 --- a/nifi-nar-bundles/nifi-gcp-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-gcp-bundle/pom.xml @@ -27,7 +27,7 @@ pom -26.25.0 +26.37.0 diff --git a/pom.xml b/pom.xml index ec321421f4..506d764479 100644 --- a/pom.xml +++ b/pom.xml @@ -104,24 +104,24 @@ UTF-8 UTF-8 2014 -1.12.686 - 2.25.16 +1.12.710 + 2.25.40 2.10.1 1.9.23 4.12.0 3.9.0 -1.6.0 - 1.16.1 +1.7.0 + 1.17.0 1.26.1 - 1.5.6-1 + 1.5.6-3 3.14.0 3.10.0 2.16.1 - 1.11.0 + 1.12.0 4.5.14 4.4.16 1.78.1 -1.19.4 +1.19.7 2.0.12 2.9.0 2.4.0 @@ -140,7 +140,7 @@ 2.1.5 1.9.6 2.41 -2.23.0 +2.23.1 4.11.0 1.3.14 3.10.6.Final @@ -698,7 +698,7 @@ org.jsoup jsoup -1.17.1 +1.17.2 com.github.ben-manes.caffeine
(nifi) branch main updated: NIFI-12831: Add PutOpenSearchVector and QueryOpenSearchVector processors
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 b608e5a2f0 NIFI-12831: Add PutOpenSearchVector and
QueryOpenSearchVector processors
b608e5a2f0 is described below
commit b608e5a2f0002a0f9c6d6121815b54f6dae67dc4
Author: Mark Bathori
AuthorDate: Wed Feb 21 15:13:47 2024 +0100
NIFI-12831: Add PutOpenSearchVector and QueryOpenSearchVector processors
Signed-off-by: Pierre Villard
This closes #8441.
---
.../python/vectorstores/OpenSearchVectorUtils.py | 142
.../python/vectorstores/PutOpenSearchVector.py | 245 +
.../python/vectorstores/QueryOpenSearchVector.py | 219 ++
.../src/main/python/vectorstores/requirements.txt | 3 +
4 files changed, 609 insertions(+)
diff --git
a/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/vectorstores/OpenSearchVectorUtils.py
b/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/vectorstores/OpenSearchVectorUtils.py
new file mode 100644
index 00..a10eaba7c9
--- /dev/null
+++
b/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/vectorstores/OpenSearchVectorUtils.py
@@ -0,0 +1,142 @@
+# 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.
+
+from nifiapi.properties import PropertyDescriptor, StandardValidators,
ExpressionLanguageScope, PropertyDependency
+from EmbeddingUtils import OPENAI, HUGGING_FACE, EMBEDDING_MODEL
+
+# Space types
+L2 = ("L2 (Euclidean distance)", "l2")
+L1 = ("L1 (Manhattan distance)", "l1")
+LINF = ("L-infinity (chessboard) distance", "linf")
+COSINESIMIL = ("Cosine similarity", "cosinesimil")
+
+HUGGING_FACE_API_KEY = PropertyDescriptor(
+name="HuggingFace API Key",
+description="The API Key for interacting with HuggingFace",
+required=True,
+sensitive=True,
+validators=[StandardValidators.NON_EMPTY_VALIDATOR],
+dependencies=[PropertyDependency(EMBEDDING_MODEL, HUGGING_FACE)]
+)
+HUGGING_FACE_MODEL = PropertyDescriptor(
+name="HuggingFace Model",
+description="The name of the HuggingFace model to use",
+default_value="sentence-transformers/all-MiniLM-L6-v2",
+required=True,
+validators=[StandardValidators.NON_EMPTY_VALIDATOR],
+dependencies=[PropertyDependency(EMBEDDING_MODEL, HUGGING_FACE)]
+)
+OPENAI_API_KEY = PropertyDescriptor(
+name="OpenAI API Key",
+description="The API Key for OpenAI in order to create embeddings",
+required=True,
+sensitive=True,
+validators=[StandardValidators.NON_EMPTY_VALIDATOR],
+dependencies=[PropertyDependency(EMBEDDING_MODEL, OPENAI)]
+)
+OPENAI_API_MODEL = PropertyDescriptor(
+name="OpenAI Model",
+description="The API Key for OpenAI in order to create embeddings",
+default_value="text-embedding-ada-002",
+required=True,
+validators=[StandardValidators.NON_EMPTY_VALIDATOR],
+dependencies=[PropertyDependency(EMBEDDING_MODEL, OPENAI)]
+)
+HTTP_HOST = PropertyDescriptor(
+name="HTTP Host",
+description="URL where OpenSearch is hosted.",
+default_value="http://localhost:9200;,
+required=True,
+validators=[StandardValidators.URL_VALIDATOR]
+)
+USERNAME = PropertyDescriptor(
+name="Username",
+description="The username to use for authenticating to OpenSearch server",
+required=False,
+validators=[StandardValidators.NON_EMPTY_VALIDATOR]
+)
+PASSWORD = PropertyDescriptor(
+name="Password",
+description="The password to use for authenticating to OpenSearch server",
+required=False,
+sensitive=True,
+validators=[StandardValidators.NON_EMPTY_VALIDATOR]
+)
+INDEX_NAME = PropertyDescriptor(
+name="Index Name",
+description="The name of the OpenSearch index.",
+sensitive=False,
+required=True,
+validators=[St
(nifi) branch main updated: NIFI-13097 Set project.version in Python Extension Processors
This is an automated email from the ASF dual-hosted git repository. pvillard 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 49c8d1b490 NIFI-13097 Set project.version in Python Extension Processors 49c8d1b490 is described below commit 49c8d1b4903ac9c23b10cbb89f1ff8b135b5bcf8 Author: exceptionfactory AuthorDate: Wed Apr 24 22:50:30 2024 -0500 NIFI-13097 Set project.version in Python Extension Processors - Enabled resource filtering for Python Extension modules Signed-off-by: Pierre Villard This closes #8700. --- nifi-python-extensions/nifi-openai-module/pom.xml | 1 + .../nifi-openai-module/src/main/python/PromptChatGPT.py | 2 +- nifi-python-extensions/nifi-text-embeddings-module/pom.xml | 1 + .../nifi-text-embeddings-module/src/main/python/ChunkDocument.py| 2 +- .../nifi-text-embeddings-module/src/main/python/ParseDocument.py| 2 +- .../src/main/python/vectorstores/PutChroma.py | 2 +- .../src/main/python/vectorstores/PutPinecone.py | 2 +- .../src/main/python/vectorstores/QueryChroma.py | 2 +- .../src/main/python/vectorstores/QueryPinecone.py | 2 +- 9 files changed, 9 insertions(+), 7 deletions(-) diff --git a/nifi-python-extensions/nifi-openai-module/pom.xml b/nifi-python-extensions/nifi-openai-module/pom.xml index 084bf997cc..bb45dcd1ba 100644 --- a/nifi-python-extensions/nifi-openai-module/pom.xml +++ b/nifi-python-extensions/nifi-openai-module/pom.xml @@ -35,6 +35,7 @@ src/main/python +true **/ diff --git a/nifi-python-extensions/nifi-openai-module/src/main/python/PromptChatGPT.py b/nifi-python-extensions/nifi-openai-module/src/main/python/PromptChatGPT.py index a372a20690..3b1f3fe3c7 100644 --- a/nifi-python-extensions/nifi-openai-module/src/main/python/PromptChatGPT.py +++ b/nifi-python-extensions/nifi-openai-module/src/main/python/PromptChatGPT.py @@ -30,7 +30,7 @@ class PromptChatGPT(FlowFileTransform): implements = ['org.apache.nifi.python.processor.FlowFileTransform'] class ProcessorDetails: -version = '2.0.0-SNAPSHOT' +version = '@project.version@' description = "Submits a prompt to ChatGPT, writing the results either to a FlowFile attribute or to the contents of the FlowFile" tags = ["text", "chatgpt", "gpt", "machine learning", "ML", "artificial intelligence", "ai", "document", "langchain"] dependencies = ['langchain==0.1.2', 'openai==1.9.0', 'jsonpath-ng'] diff --git a/nifi-python-extensions/nifi-text-embeddings-module/pom.xml b/nifi-python-extensions/nifi-text-embeddings-module/pom.xml index d82c2be03b..60a46cbc36 100644 --- a/nifi-python-extensions/nifi-text-embeddings-module/pom.xml +++ b/nifi-python-extensions/nifi-text-embeddings-module/pom.xml @@ -35,6 +35,7 @@ src/main/python +true **/ diff --git a/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ChunkDocument.py b/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ChunkDocument.py index 0300868593..db658df5bd 100644 --- a/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ChunkDocument.py +++ b/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ChunkDocument.py @@ -104,7 +104,7 @@ class ChunkDocument(FlowFileTransform): class Java: implements = ['org.apache.nifi.python.processor.FlowFileTransform'] class ProcessorDetails: -version = '2.0.0-SNAPSHOT' +version = '@project.version@' description = """Chunks incoming documents that are formatted as JSON Lines into chunks that are appropriately sized for creating Text Embeddings. The input is expected to be in "json-lines" format, with each line having a 'text' and a 'metadata' element. Each line will then be split into one or more lines in the output.""" diff --git a/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ParseDocument.py b/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ParseDocument.py index 796694f51a..7210015e95 100644 --- a/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ParseDocument.py +++ b/nifi-python-extension
(nifi) branch main updated: NIFI-12858 Corrected Order of Previous Property Values
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 259a734a4b NIFI-12858 Corrected Order of Previous Property Values
259a734a4b is described below
commit 259a734a4b882343efd7c660fda829dcfffedc0c
Author: exceptionfactory
AuthorDate: Fri Apr 19 10:12:19 2024 -0500
NIFI-12858 Corrected Order of Previous Property Values
- Reversed default order of previous values to return oldest entries before
newest entries
Signed-off-by: Pierre Villard
This closes #8673.
---
.../nifi/admin/service/EntityStoreAuditService.java | 3 ++-
.../admin/service/EntityStoreAuditServiceTest.java | 20 ++--
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/EntityStoreAuditService.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/EntityStoreAuditService.java
index eab8798312..097f099d65 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/EntityStoreAuditService.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/EntityStoreAuditService.java
@@ -135,7 +135,8 @@ public class EntityStoreAuditService implements
AuditService, Closeable {
final Map> previousValuesFound = new
LinkedHashMap<>();
final EntityIterable actionEntities =
storeTransaction.find(EntityType.ACTION.getEntityType(),
ActionEntity.SOURCE_ID.getProperty(), componentId);
-for (Entity actionEntity : actionEntities) {
+// Reverse default ordering to return oldest entries before newest
entries
+for (Entity actionEntity : actionEntities.reverse()) {
final Entity configureDetails =
actionEntity.getLink(ActionLink.CONFIGURE_DETAILS.getProperty());
if (configureDetails != null) {
final String name = getProperty(configureDetails,
ConfigureDetailsEntity.NAME);
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/test/java/org/apache/nifi/admin/service/EntityStoreAuditServiceTest.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/test/java/org/apache/nifi/admin/service/EntityStoreAuditServiceTest.java
index 2df1fabe6a..62492b9f34 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/test/java/org/apache/nifi/admin/service/EntityStoreAuditServiceTest.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/test/java/org/apache/nifi/admin/service/EntityStoreAuditServiceTest.java
@@ -95,6 +95,8 @@ class EntityStoreAuditServiceTest {
private static final String SECOND_VALUE = "SecondValue";
+private static final String THIRD_VALUE = "ThirdValue";
+
private static final String DATABASE_FILE_EXTENSION = ".xd";
@TempDir
@@ -331,7 +333,14 @@ class EntityStoreAuditServiceTest {
secondConfigureDetails.setValue(SECOND_VALUE);
secondAction.setActionDetails(secondConfigureDetails);
-final Collection actions = Arrays.asList(firstAction,
secondAction);
+final FlowChangeAction thirdAction = newAction();
+thirdAction.setOperation(Operation.Configure);
+final FlowChangeConfigureDetails thirdConfigureDetails = new
FlowChangeConfigureDetails();
+thirdConfigureDetails.setName(SECOND_PROPERTY_NAME);
+thirdConfigureDetails.setValue(THIRD_VALUE);
+thirdAction.setActionDetails(thirdConfigureDetails);
+
+final Collection actions = Arrays.asList(firstAction,
secondAction, thirdAction);
service.addActions(actions);
final Map> previousValues =
service.getPreviousValues(SOURCE_ID);
@@ -348,7 +357,14 @@ class EntityStoreAuditServiceTest {
final List secondPreviousValues =
previousValues.get(SECOND_PROPERTY_NAME);
assertNotNull(secondPreviousValues);
-final PreviousValue secondPreviousValue = secondPreviousValues.get(0);
+
+final PreviousValue thirdPreviousValue = secondPreviousValues.get(0);
+assertNotNull(thirdPreviousValue);
+assertEquals(THIRD_VALUE, thirdPreviousValue.getPreviousValue());
+assertNotNull(thirdPreviousValue.getTimestamp());
+assertEquals(USER_IDENTITY, thirdPreviousValue.getUserIdentity());
+
+final PreviousValue secondPreviousValue = secondPreviousValues.get(1);
assertNotNull(secondPreviousValue);
assertEquals(SECOND_VALUE, secondPreviousValue.g
(nifi) branch support/nifi-1.x updated: NIFI-12858 Corrected Order of Previous Property Values
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 64e99f0166 NIFI-12858 Corrected Order of Previous Property Values
64e99f0166 is described below
commit 64e99f0166ac3574604e10e3ed4191bfa139091c
Author: exceptionfactory
AuthorDate: Fri Apr 19 10:12:19 2024 -0500
NIFI-12858 Corrected Order of Previous Property Values
- Reversed default order of previous values to return oldest entries before
newest entries
Signed-off-by: Pierre Villard
This closes #8673.
---
.../nifi/admin/service/EntityStoreAuditService.java | 3 ++-
.../admin/service/EntityStoreAuditServiceTest.java | 20 ++--
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/EntityStoreAuditService.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/EntityStoreAuditService.java
index 00658687be..62e2e3dcae 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/EntityStoreAuditService.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/EntityStoreAuditService.java
@@ -136,7 +136,8 @@ public class EntityStoreAuditService implements
AuditService, Closeable {
final Map> previousValuesFound = new
LinkedHashMap<>();
final EntityIterable actionEntities =
storeTransaction.find(EntityType.ACTION.getEntityType(),
ActionEntity.SOURCE_ID.getProperty(), componentId);
-for (Entity actionEntity : actionEntities) {
+// Reverse default ordering to return oldest entries before newest
entries
+for (Entity actionEntity : actionEntities.reverse()) {
final Entity configureDetails =
actionEntity.getLink(ActionLink.CONFIGURE_DETAILS.getProperty());
if (configureDetails != null) {
final String name = getProperty(configureDetails,
ConfigureDetailsEntity.NAME);
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/test/java/org/apache/nifi/admin/service/EntityStoreAuditServiceTest.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/test/java/org/apache/nifi/admin/service/EntityStoreAuditServiceTest.java
index 7844e3ec31..fa2ae8e7ad 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/test/java/org/apache/nifi/admin/service/EntityStoreAuditServiceTest.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/test/java/org/apache/nifi/admin/service/EntityStoreAuditServiceTest.java
@@ -96,6 +96,8 @@ class EntityStoreAuditServiceTest {
private static final String SECOND_VALUE = "SecondValue";
+private static final String THIRD_VALUE = "ThirdValue";
+
private static final String DATABASE_FILE_EXTENSION = ".xd";
@TempDir
@@ -332,7 +334,14 @@ class EntityStoreAuditServiceTest {
secondConfigureDetails.setValue(SECOND_VALUE);
secondAction.setActionDetails(secondConfigureDetails);
-final Collection actions = Arrays.asList(firstAction,
secondAction);
+final FlowChangeAction thirdAction = newAction();
+thirdAction.setOperation(Operation.Configure);
+final FlowChangeConfigureDetails thirdConfigureDetails = new
FlowChangeConfigureDetails();
+thirdConfigureDetails.setName(SECOND_PROPERTY_NAME);
+thirdConfigureDetails.setValue(THIRD_VALUE);
+thirdAction.setActionDetails(thirdConfigureDetails);
+
+final Collection actions = Arrays.asList(firstAction,
secondAction, thirdAction);
service.addActions(actions);
final Map> previousValues =
service.getPreviousValues(SOURCE_ID);
@@ -349,7 +358,14 @@ class EntityStoreAuditServiceTest {
final List secondPreviousValues =
previousValues.get(SECOND_PROPERTY_NAME);
assertNotNull(secondPreviousValues);
-final PreviousValue secondPreviousValue = secondPreviousValues.get(0);
+
+final PreviousValue thirdPreviousValue = secondPreviousValues.get(0);
+assertNotNull(thirdPreviousValue);
+assertEquals(THIRD_VALUE, thirdPreviousValue.getPreviousValue());
+assertNotNull(thirdPreviousValue.getTimestamp());
+assertEquals(USER_IDENTITY, thirdPreviousValue.getUserIdentity());
+
+final PreviousValue secondPreviousValue = secondPreviousValues.get(1);
assertNotNull(secondPreviousValue);
assertEquals(SECOND_V
(nifi) branch support/nifi-1.x updated: NIFI-13070 Upgraded Netty from 4.1.108 to 4.1.109
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new 74e27868e3 NIFI-13070 Upgraded Netty from 4.1.108 to 4.1.109 74e27868e3 is described below commit 74e27868e342c2078b29506faf0ebbd050b25b39 Author: exceptionfactory AuthorDate: Thu Apr 18 17:46:36 2024 -0500 NIFI-13070 Upgraded Netty from 4.1.108 to 4.1.109 Signed-off-by: Pierre Villard This closes #8667. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c0b36082a2..9941881d7a 100644 --- a/pom.xml +++ b/pom.xml @@ -145,7 +145,7 @@ 1.3.14 3.10.6.Final 2.2 -4.1.108.Final +4.1.109.Final 5.3.34 5.8.11 1.6.12
(nifi) branch main updated: NIFI-13070 Upgraded Netty from 4.1.108 to 4.1.109
This is an automated email from the ASF dual-hosted git repository. pvillard 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 b81203aac2 NIFI-13070 Upgraded Netty from 4.1.108 to 4.1.109 b81203aac2 is described below commit b81203aac2d945b449849a368fd601c140a93673 Author: exceptionfactory AuthorDate: Thu Apr 18 17:46:36 2024 -0500 NIFI-13070 Upgraded Netty from 4.1.108 to 4.1.109 Signed-off-by: Pierre Villard This closes #8667. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f8d47e13d1..1425204e9d 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ 5.8.0 3.10.6.Final 2.2 -4.1.108.Final +4.1.109.Final 6.0.0 6.1.6 6.2.4
(nifi) branch main updated: NIFI-13067 Upgraded Spring Security from 6.2.3 to 6.2.4
This is an automated email from the ASF dual-hosted git repository. pvillard 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 6eb5834df7 NIFI-13067 Upgraded Spring Security from 6.2.3 to 6.2.4 6eb5834df7 is described below commit 6eb5834df77a59e72a40442a228592dbe3196154 Author: exceptionfactory AuthorDate: Thu Apr 18 16:09:36 2024 -0500 NIFI-13067 Upgraded Spring Security from 6.2.3 to 6.2.4 - Upgraded Spring Boot from 3.2.4 to 3.2.5 for Registry - Upgraded OpenSAML from 4.3.0 to 4.3.1 - Upgraded AspectJ from 1.9.21 to 1.9.22 Signed-off-by: Pierre Villard This closes #8666. --- nifi-nar-bundles/nifi-framework-bundle/pom.xml | 2 +- nifi-registry/pom.xml | 2 +- pom.xml| 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml index 2bfc2e8b68..5c4ba59c5e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml @@ -26,7 +26,7 @@ 5.6.0 33.1.0-jre 2.9.2 -4.3.0 +4.3.1 nifi-framework diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml index 802ddadab3..5388f9a4ec 100644 --- a/nifi-registry/pom.xml +++ b/nifi-registry/pom.xml @@ -35,7 +35,7 @@ nifi-registry-docker-maven -3.2.4 +3.2.5 9.22.3 9.5.0 3.12.0 diff --git a/pom.xml b/pom.xml index 3caa47680d..f8d47e13d1 100644 --- a/pom.xml +++ b/pom.xml @@ -144,7 +144,7 @@ 3.4.0 1.2.1 2.1.5 -1.9.21 +1.9.22 3.1.4 2.23.0 1.5.5 @@ -154,7 +154,7 @@ 4.1.108.Final 6.0.0 6.1.6 -6.2.3 +6.2.4 2.2.20 2.2.224 3.9.2
(nifi) branch support/nifi-1.x updated: NIFI-13066 Upgraded Bouncy Castle from 1.77 to 1.78.1
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new a8e34fd3f7 NIFI-13066 Upgraded Bouncy Castle from 1.77 to 1.78.1 a8e34fd3f7 is described below commit a8e34fd3f74f594bc840bd0c43d0b6ac109c2ffc Author: exceptionfactory AuthorDate: Thu Apr 18 15:24:53 2024 -0500 NIFI-13066 Upgraded Bouncy Castle from 1.77 to 1.78.1 Signed-off-by: Pierre Villard This closes #8664. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d75896272e..c0b36082a2 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ 1.11.0 4.5.14 4.4.16 -1.77 +1.78.1 1.19.4 2.0.12 2.9.0
(nifi) branch main updated: NIFI-13066 Upgraded Bouncy Castle from 1.77 to 1.78.1
This is an automated email from the ASF dual-hosted git repository. pvillard 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 805ba9a867 NIFI-13066 Upgraded Bouncy Castle from 1.77 to 1.78.1 805ba9a867 is described below commit 805ba9a8673ee669efb99470bd74620a2a0360c4 Author: exceptionfactory AuthorDate: Thu Apr 18 15:24:53 2024 -0500 NIFI-13066 Upgraded Bouncy Castle from 1.77 to 1.78.1 Signed-off-by: Pierre Villard This closes #8664. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9f7836ebc1..3caa47680d 100644 --- a/pom.xml +++ b/pom.xml @@ -126,7 +126,7 @@ 1.11.0 4.5.14 4.4.16 -1.77 +1.78.1 1.19.4 2.0.13 2.9.0
(nifi) branch support/nifi-1.x updated: NIFI-13052 allow CRON driven components to be searchable
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new c3386c8659 NIFI-13052 allow CRON driven components to be searchable
c3386c8659 is described below
commit c3386c865950900ce505d8fe002e734e859a4e4b
Author: Mike Moser
AuthorDate: Tue Apr 16 18:19:59 2024 +
NIFI-13052 allow CRON driven components to be searchable
Signed-off-by: Pierre Villard
This closes #8659.
---
nifi-docs/src/main/asciidoc/user-guide.adoc| 2 ++
.../search/attributematchers/SchedulingMatcher.java| 5 +
.../attributematchers/SchedulingMatcherTest.java | 18 --
3 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/nifi-docs/src/main/asciidoc/user-guide.adoc
b/nifi-docs/src/main/asciidoc/user-guide.adoc
index 0a24aaed8d..c64baf43da 100644
--- a/nifi-docs/src/main/asciidoc/user-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/user-guide.adoc
@@ -1968,6 +1968,8 @@ The supported keywords are the following:
** *timer*: Adds Processors to the result list where the Scheduling Strategy
is "Timer Driven".
+** *cron*: Adds Processors to the result list where the Scheduling Strategy is
"CRON Driven".
+
- *Execution*
** *primary:* Adds Processors to the result list that are set to run on the
primary node only (whether if the Processor is currently running or not).
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/SchedulingMatcher.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/SchedulingMatcher.java
index 326ae64507..8743a87a73 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/SchedulingMatcher.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/SchedulingMatcher.java
@@ -23,6 +23,7 @@ import org.apache.nifi.web.search.query.SearchQuery;
import java.util.List;
+import static org.apache.nifi.scheduling.SchedulingStrategy.CRON_DRIVEN;
import static org.apache.nifi.scheduling.SchedulingStrategy.EVENT_DRIVEN;
import static org.apache.nifi.scheduling.SchedulingStrategy.PRIMARY_NODE_ONLY;
import static org.apache.nifi.scheduling.SchedulingStrategy.TIMER_DRIVEN;
@@ -30,11 +31,13 @@ import static
org.apache.nifi.scheduling.SchedulingStrategy.TIMER_DRIVEN;
public class SchedulingMatcher implements AttributeMatcher {
private static final String SEARCH_TERM_EVENT = "event";
private static final String SEARCH_TERM_TIMER = "timer";
+private static final String SEARCH_TERM_CRON = "cron";
private static final String SEARCH_TERM_PRIMARY = "primary";
private static final String MATCH_PREFIX = "Scheduling strategy: ";
private static final String MATCH_EVENT = "Event driven";
private static final String MATCH_TIMER = "Timer driven";
+private static final String MATCH_CRON = "CRON driven";
private static final String MATCH_PRIMARY = "On primary node";
@Override
@@ -46,6 +49,8 @@ public class SchedulingMatcher implements
AttributeMatcher {
matches.add(MATCH_PREFIX + MATCH_EVENT);
} else if (TIMER_DRIVEN.equals(schedulingStrategy) &&
StringUtils.containsIgnoreCase(SEARCH_TERM_TIMER, searchTerm)) {
matches.add(MATCH_PREFIX + MATCH_TIMER);
+} else if (CRON_DRIVEN.equals(schedulingStrategy) &&
StringUtils.containsIgnoreCase(SEARCH_TERM_CRON, searchTerm)) {
+matches.add(MATCH_PREFIX + MATCH_CRON);
} else if (PRIMARY_NODE_ONLY.equals(schedulingStrategy) &&
StringUtils.containsIgnoreCase(SEARCH_TERM_PRIMARY, searchTerm)) {
// PRIMARY_NODE_ONLY has been deprecated as a SchedulingStrategy
and replaced by PRIMARY as an ExecutionNode.
matches.add(MATCH_PREFIX + MATCH_PRIMARY);
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/search/attributematchers/SchedulingMatcherTest.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/search/attributematchers/SchedulingMatcherTest.java
index 128d16fd8a..4fcaa5a4dc 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/search/attributematchers/SchedulingMatcherTest.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/jav
(nifi) branch main updated: NIFI-13052 allow CRON driven components to be searchable
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 7fdaa5f311 NIFI-13052 allow CRON driven components to be searchable
7fdaa5f311 is described below
commit 7fdaa5f3114e72f69f33708937efe11ed70cef66
Author: Mike Moser
AuthorDate: Mon Apr 15 21:54:09 2024 +
NIFI-13052 allow CRON driven components to be searchable
Signed-off-by: Pierre Villard
This closes #8655.
---
nifi-docs/src/main/asciidoc/user-guide.adoc| 2 ++
.../attributematchers/SchedulingMatcher.java | 5 +
.../attributematchers/SchedulingMatcherTest.java | 24 +-
3 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/nifi-docs/src/main/asciidoc/user-guide.adoc
b/nifi-docs/src/main/asciidoc/user-guide.adoc
index cee1d3b592..1cfdbe6e74 100644
--- a/nifi-docs/src/main/asciidoc/user-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/user-guide.adoc
@@ -2139,6 +2139,8 @@ The supported keywords are the following:
** *timer*: Adds Processors to the result list where the Scheduling Strategy
is "Timer Driven".
+** *cron*: Adds Processors to the result list where the Scheduling Strategy is
"CRON Driven".
+
- *Execution*
** *primary:* Adds Processors to the result list that are set to run on the
primary node only (whether if the Processor is currently running or not).
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/SchedulingMatcher.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/SchedulingMatcher.java
index 115d9a1cf4..634260135d 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/SchedulingMatcher.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/SchedulingMatcher.java
@@ -23,13 +23,16 @@ import org.apache.nifi.web.search.query.SearchQuery;
import java.util.List;
+import static org.apache.nifi.scheduling.SchedulingStrategy.CRON_DRIVEN;
import static org.apache.nifi.scheduling.SchedulingStrategy.TIMER_DRIVEN;
public class SchedulingMatcher implements AttributeMatcher {
private static final String SEARCH_TERM_TIMER = "timer";
+private static final String SEARCH_TERM_CRON = "cron";
private static final String MATCH_PREFIX = "Scheduling strategy: ";
private static final String MATCH_TIMER = "Timer driven";
+private static final String MATCH_CRON = "CRON driven";
@Override
public void match(final ProcessorNode component, final SearchQuery query,
final List matches) {
@@ -38,6 +41,8 @@ public class SchedulingMatcher implements
AttributeMatcher {
if (TIMER_DRIVEN.equals(schedulingStrategy) &&
StringUtils.containsIgnoreCase(SEARCH_TERM_TIMER, searchTerm)) {
matches.add(MATCH_PREFIX + MATCH_TIMER);
+} else if (CRON_DRIVEN.equals(schedulingStrategy) &&
StringUtils.containsIgnoreCase(SEARCH_TERM_CRON, searchTerm)) {
+matches.add(MATCH_PREFIX + MATCH_CRON);
}
}
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/search/attributematchers/SchedulingMatcherTest.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/search/attributematchers/SchedulingMatcherTest.java
index 95325709c9..49ae79850f 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/search/attributematchers/SchedulingMatcherTest.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/search/attributematchers/SchedulingMatcherTest.java
@@ -28,11 +28,11 @@ public class SchedulingMatcherTest extends
AbstractAttributeMatcherTest {
private ProcessorNode component;
@Test
-public void testWhenKeywordAppearsAndNotEvent() {
+public void testWhenKeywordAppearsAndNotTimer() {
// given
final SchedulingMatcher testSubject = new SchedulingMatcher();
-givenSchedulingStrategy(SchedulingStrategy.TIMER_DRIVEN);
-givenSearchTerm("event");
+givenSchedulingStrategy(SchedulingStrategy.CRON_DRIVEN);
+givenSearchTerm("timer");
// when
testSubject.match(component, searchQuery, matches);
@@ -42,11 +42,11 @@ public class SchedulingMatcherTest extends
AbstractAttributeMa
(nifi) branch support/nifi-1.x updated: NIFI-13046: Upgrade Solr dependencies to 8.11.3
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new 4d4a6c281a NIFI-13046: Upgrade Solr dependencies to 8.11.3 4d4a6c281a is described below commit 4d4a6c281a7e971b936bcc752822bd66e2a821e3 Author: Mark Bathori AuthorDate: Mon Apr 15 12:43:35 2024 +0200 NIFI-13046: Upgrade Solr dependencies to 8.11.3 Signed-off-by: Pierre Villard This closes #8647. --- nifi-nar-bundles/nifi-ranger-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml | 2 +- nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nifi-nar-bundles/nifi-ranger-bundle/pom.xml b/nifi-nar-bundles/nifi-ranger-bundle/pom.xml index 573c5dcdd0..8cff2e7801 100644 --- a/nifi-nar-bundles/nifi-ranger-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-ranger-bundle/pom.xml @@ -53,7 +53,7 @@ org.apache.solr solr-solrj -8.11.2 +8.11.3 diff --git a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml index 0456c43fc0..ff828562d4 100755 --- a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml +++ b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml @@ -23,7 +23,7 @@ nifi-solr-processors jar -8.11.2 +8.11.3 diff --git a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml index dc67f700dd..e0e5acec33 100644 --- a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml +++ b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml @@ -52,7 +52,7 @@ org.apache.solr solr-solrj -8.11.2 +8.11.3
(nifi) branch main updated: NIFI-13038 Upgraded Groovy from 4.0.20 to 4.0.21
This is an automated email from the ASF dual-hosted git repository. pvillard 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 28a9026479 NIFI-13038 Upgraded Groovy from 4.0.20 to 4.0.21 28a9026479 is described below commit 28a9026479f7a948eb7ea32457384edae28362db Author: exceptionfactory AuthorDate: Fri Apr 12 14:30:21 2024 -0500 NIFI-13038 Upgraded Groovy from 4.0.20 to 4.0.21 Signed-off-by: Pierre Villard This closes #8640. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 42eb5eeb0c..b56f934e1b 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ 4.0.1 3.1.0 2.5.0 -4.0.20 +4.0.21 3.2.5 3.4.0 1.2.1
(nifi) branch support/nifi-1.x updated: NIFI-13037 Upgraded Spring Framework from 5.3.31 to 5.3.34
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new 02f5801a28 NIFI-13037 Upgraded Spring Framework from 5.3.31 to 5.3.34 02f5801a28 is described below commit 02f5801a28904a5ef2a8a27084e62751759d1ea7 Author: exceptionfactory AuthorDate: Mon Apr 1 11:12:13 2024 -0500 NIFI-13037 Upgraded Spring Framework from 5.3.31 to 5.3.34 - Upgraded Spring Boot from 2.7.16 to 2.7.18 for Registry - Upgraded Spring Security from 5.8.7 to 5.8.11 - Upgraded Jetty from 9.4.53 to 9.4.54 Signed-off-by: Pierre Villard This closes #8638. --- nifi-registry/pom.xml | 2 +- pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml index f3f831c37d..7c2db7c69b 100644 --- a/nifi-registry/pom.xml +++ b/nifi-registry/pom.xml @@ -36,7 +36,7 @@ 2.1.1 -2.7.16 +2.7.18 8.5.13 7.0.0 3.12.0 diff --git a/pom.xml b/pom.xml index e49a12c070..d75896272e 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ 2.0.12 2.9.0 2.4.0 -9.4.53.v20231009 +9.4.54.v20240208 2.17.0 1.11.3 2.3.9 @@ -146,8 +146,8 @@ 3.10.6.Final 2.2 4.1.108.Final -5.3.31 -5.8.7 +5.3.34 +5.8.11 1.6.12 2.2.224 3.9.2
(nifi) branch support/nifi-1.x updated: NIFI-13040 Upgraded Commons IO from 2.15.1 to 2.16.1
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new 1ddbae9207 NIFI-13040 Upgraded Commons IO from 2.15.1 to 2.16.1 1ddbae9207 is described below commit 1ddbae920743fb7e8c65e67bd89934b3246e0a4b Author: exceptionfactory AuthorDate: Fri Apr 12 14:46:19 2024 -0500 NIFI-13040 Upgraded Commons IO from 2.15.1 to 2.16.1 Signed-off-by: Pierre Villard This closes #8642. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dbb3dcdda2..e49a12c070 100644 --- a/pom.xml +++ b/pom.xml @@ -116,7 +116,7 @@ 1.5.6-1 3.14.0 3.10.0 -2.15.1 +2.16.1 1.11.0 4.5.14 4.4.16
(nifi) branch main updated: NIFI-13040 Upgraded Commons IO from 2.15.1 to 2.16.1
This is an automated email from the ASF dual-hosted git repository. pvillard 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 06f0c6c489 NIFI-13040 Upgraded Commons IO from 2.15.1 to 2.16.1 06f0c6c489 is described below commit 06f0c6c489a29884aced93514a3c366cf93abf2f Author: exceptionfactory AuthorDate: Fri Apr 12 14:46:19 2024 -0500 NIFI-13040 Upgraded Commons IO from 2.15.1 to 2.16.1 Signed-off-by: Pierre Villard This closes #8642. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 455b43acde..42eb5eeb0c 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ 2.10.1 3.14.0 3.10.0 -2.15.1 +2.16.1 1.11.0 4.5.14 4.4.16
(nifi) branch main updated: NIFI-13036 Upgraded Logback from 1.4.14 to 1.5.5
This is an automated email from the ASF dual-hosted git repository. pvillard 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 8a0dd3e3d1 NIFI-13036 Upgraded Logback from 1.4.14 to 1.5.5 8a0dd3e3d1 is described below commit 8a0dd3e3d19c494b5c45bfe77c38bf61f38de0c2 Author: exceptionfactory AuthorDate: Fri Apr 12 13:43:58 2024 -0500 NIFI-13036 Upgraded Logback from 1.4.14 to 1.5.5 - Upgraded SLF4J from 2.0.12 to 2.0.13 Signed-off-by: Pierre Villard This closes #8637. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e58314445d..455b43acde 100644 --- a/pom.xml +++ b/pom.xml @@ -128,7 +128,7 @@ 4.4.16 1.77 1.19.4 -2.0.12 +2.0.13 2.9.0 10.17.1.0 12.0.8 @@ -147,7 +147,7 @@ 1.9.21 3.1.4 2.23.0 -1.4.14 +1.5.5 5.8.0 3.10.6.Final 2.2
(nifi) branch main updated: NIFI-13033 Upgraded Jetty from 12.0.7 to 12.0.8
This is an automated email from the ASF dual-hosted git repository. pvillard 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 522e8ad888 NIFI-13033 Upgraded Jetty from 12.0.7 to 12.0.8 522e8ad888 is described below commit 522e8ad888b565030272872c606d8435eaf8eb10 Author: exceptionfactory AuthorDate: Fri Apr 12 11:32:49 2024 -0500 NIFI-13033 Upgraded Jetty from 12.0.7 to 12.0.8 Signed-off-by: Pierre Villard This closes #8636. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6a3c03b036..e58314445d 100644 --- a/pom.xml +++ b/pom.xml @@ -131,7 +131,7 @@ 2.0.12 2.9.0 10.17.1.0 -12.0.7 +12.0.8 2.17.0 1.11.3 4.0.4
(nifi) branch main updated: NIFI-13032 Upgraded Spring Framework from 6.1.5 to 6.1.6
This is an automated email from the ASF dual-hosted git repository. pvillard 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 e1eb30a9ce NIFI-13032 Upgraded Spring Framework from 6.1.5 to 6.1.6 e1eb30a9ce is described below commit e1eb30a9ceef646492ab5fc5edd526e2963027d7 Author: exceptionfactory AuthorDate: Fri Apr 12 11:20:23 2024 -0500 NIFI-13032 Upgraded Spring Framework from 6.1.5 to 6.1.6 - Upgraded Spring Boot from 3.2.3 to 3.2.4 for Registry Signed-off-by: Pierre Villard This closes #8635. --- nifi-registry/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml index 70ffa926b2..802ddadab3 100644 --- a/nifi-registry/pom.xml +++ b/nifi-registry/pom.xml @@ -35,7 +35,7 @@ nifi-registry-docker-maven -3.2.3 +3.2.4 9.22.3 9.5.0 3.12.0 diff --git a/pom.xml b/pom.xml index 9772516bc6..6a3c03b036 100644 --- a/pom.xml +++ b/pom.xml @@ -153,7 +153,7 @@ 2.2 4.1.108.Final 6.0.0 -6.1.5 +6.1.6 6.2.3 2.2.20 2.2.224
(nifi) branch support/nifi-1.x updated: NIFI-12889 - Retry Kerberos login on auth failure in HDFS processors
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new b04b9b2213 NIFI-12889 - Retry Kerberos login on auth failure in HDFS
processors
b04b9b2213 is described below
commit b04b9b2213f902d8fd912ab3ba950875deb7e9e4
Author: Matt Burgess
AuthorDate: Tue Apr 9 13:26:43 2024 -0400
NIFI-12889 - Retry Kerberos login on auth failure in HDFS processors
Signed-off-by: Pierre Villard
This closes #8618.
---
.../processors/hadoop/AbstractHadoopProcessor.java | 46 +++-
.../apache/nifi/processors/hadoop/DeleteHDFS.java | 33 ++-
.../apache/nifi/processors/hadoop/FetchHDFS.java | 100
.../org/apache/nifi/processors/hadoop/GetHDFS.java | 21 +-
.../nifi/processors/hadoop/GetHDFSFileInfo.java| 16 +-
.../processors/hadoop/GetHDFSSequenceFile.java | 19 +-
.../apache/nifi/processors/hadoop/MoveHDFS.java| 180 +++---
.../org/apache/nifi/processors/hadoop/PutHDFS.java | 126 --
.../GSSExceptionRollbackYieldSessionHandler.java | 30 +++
.../processors/hadoop/GetHDFSSequenceFileTest.java | 57 -
.../apache/nifi/processors/hadoop/GetHDFSTest.java | 39 ++-
.../nifi/processors/hadoop/MoveHDFSTest.java | 62 -
.../apache/nifi/processors/hadoop/PutHDFSTest.java | 191 +++---
.../nifi/processors/hadoop/TestDeleteHDFS.java | 20 +-
.../nifi/processors/hadoop/TestFetchHDFS.java | 62 +++--
.../processors/hadoop/TestGetHDFSFileInfo.java | 184 +++---
.../processors/hadoop/util/MockFileSystem.java | 273 +
17 files changed, 854 insertions(+), 605 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
b/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
index 960e7a5b7c..12b9bbc68c 100644
---
a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
+++
b/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.processors.hadoop;
+import com.google.common.base.Throwables;
import org.apache.commons.io.IOUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
@@ -42,11 +43,13 @@ import org.apache.nifi.kerberos.KerberosCredentialsService;
import org.apache.nifi.kerberos.KerberosUserService;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.ProcessorInitializationContext;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.security.krb.KerberosKeytabUser;
import org.apache.nifi.security.krb.KerberosPasswordUser;
import org.apache.nifi.security.krb.KerberosUser;
+import org.ietf.jgss.GSSException;
import javax.net.SocketFactory;
import java.io.File;
@@ -62,7 +65,10 @@ import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiConsumer;
+import java.util.function.Predicate;
import java.util.regex.Pattern;
+import java.util.stream.Stream;
/**
* This is a base class that is helpful when building processors interacting
with HDFS.
@@ -171,7 +177,7 @@ public abstract class AbstractHadoopProcessor extends
AbstractProcessor implemen
// variables shared by all threads of this processor
// Hadoop Configuration, Filesystem, and UserGroupInformation (optional)
-private final AtomicReference hdfsResources = new
AtomicReference<>();
+final AtomicReference hdfsResources = new
AtomicReference<>();
// Holder of cached Configuration information so validation does not
reload the same config over and over
private final AtomicReference
validationResourceHolder = new AtomicReference<>();
@@ -532,12 +538,7 @@ public abstract class AbstractHadoopProcessor extends
AbstractProcessor implemen
protected FileSystem getFileSystemAsUser(final Configuration config,
UserGroupInformation ugi) throws IOException {
try {
-return ugi.doAs(new PrivilegedExceptionAction() {
-@Override
-public FileSystem run() throws Exception {
-return FileSystem.get(config);
-}
-});
+return ugi.doAs((PrivilegedExceptionAction) () ->
FileSystem.get(config));
} catch (InterruptedException e) {
throw new IOException("Un
(nifi) branch support/nifi-1.x updated: NIFI-12837 - Fix checkstyle issue following a manual cherrypick
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new f7cd8752ea NIFI-12837 - Fix checkstyle issue following a manual cherrypick f7cd8752ea is described below commit f7cd8752ea10f92281bf126e60c320e5d449c72a Author: Pierre Villard AuthorDate: Tue Apr 9 20:17:02 2024 +0200 NIFI-12837 - Fix checkstyle issue following a manual cherrypick --- .../test/java/org/apache/nifi/services/smb/SmbjClientServiceTest.java | 4 1 file changed, 4 deletions(-) diff --git a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-smbj-client/src/test/java/org/apache/nifi/services/smb/SmbjClientServiceTest.java b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-smbj-client/src/test/java/org/apache/nifi/services/smb/SmbjClientServiceTest.java index dba330fbc8..7193aad091 100644 --- a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-smbj-client/src/test/java/org/apache/nifi/services/smb/SmbjClientServiceTest.java +++ b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-smbj-client/src/test/java/org/apache/nifi/services/smb/SmbjClientServiceTest.java @@ -16,10 +16,6 @@ */ package org.apache.nifi.services.smb; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import com.hierynomus.smbj.session.Session; import com.hierynomus.smbj.share.DiskShare; import org.junit.jupiter.api.BeforeEach;
(nifi) branch support/nifi-1.x updated: NIFI-13010 Fix UpdateDatabaseTable to work with DBCPConnectionPoolLookup
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 8575bd52f9 NIFI-13010 Fix UpdateDatabaseTable to work with
DBCPConnectionPoolLookup
8575bd52f9 is described below
commit 8575bd52f9d7e47ca1cc6343d6cd17d8acb95c26
Author: Jim Steinebrey
AuthorDate: Tue Apr 9 10:57:45 2024 -0400
NIFI-13010 Fix UpdateDatabaseTable to work with DBCPConnectionPoolLookup
Signed-off-by: Pierre Villard
This closes #8616.
---
.../java/org/apache/nifi/processors/standard/UpdateDatabaseTable.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateDatabaseTable.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateDatabaseTable.java
index 32e73ae4c1..ecca771fd4 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateDatabaseTable.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateDatabaseTable.java
@@ -379,7 +379,7 @@ public class UpdateDatabaseTable extends AbstractProcessor {
}
final DBCPService dbcpService =
context.getProperty(DBCP_SERVICE).asControllerService(DBCPService.class);
final DatabaseAdapter databaseAdapter =
dbAdapters.get(context.getProperty(DB_TYPE).getValue());
-try (final Connection connection = dbcpService.getConnection()) {
+try (final Connection connection =
dbcpService.getConnection(flowFile.getAttributes())) {
final boolean quoteTableName =
context.getProperty(QUOTE_TABLE_IDENTIFIER).asBoolean();
final boolean quoteColumnNames =
context.getProperty(QUOTE_COLUMN_IDENTIFIERS).asBoolean();
final Map attributes = new
HashMap<>(flowFile.getAttributes());
(nifi) branch main updated: NIFI-13010 Fix UpdateDatabaseTable to work with DBCPConnectionPoolLookup
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 f15e6c73ec NIFI-13010 Fix UpdateDatabaseTable to work with
DBCPConnectionPoolLookup
f15e6c73ec is described below
commit f15e6c73ec9ed2b5155f8a29302aa94c48e9ebc9
Author: Jim Steinebrey
AuthorDate: Tue Apr 9 10:57:45 2024 -0400
NIFI-13010 Fix UpdateDatabaseTable to work with DBCPConnectionPoolLookup
Signed-off-by: Pierre Villard
This closes #8616.
---
.../java/org/apache/nifi/processors/standard/UpdateDatabaseTable.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateDatabaseTable.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateDatabaseTable.java
index 32e73ae4c1..ecca771fd4 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateDatabaseTable.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateDatabaseTable.java
@@ -379,7 +379,7 @@ public class UpdateDatabaseTable extends AbstractProcessor {
}
final DBCPService dbcpService =
context.getProperty(DBCP_SERVICE).asControllerService(DBCPService.class);
final DatabaseAdapter databaseAdapter =
dbAdapters.get(context.getProperty(DB_TYPE).getValue());
-try (final Connection connection = dbcpService.getConnection()) {
+try (final Connection connection =
dbcpService.getConnection(flowFile.getAttributes())) {
final boolean quoteTableName =
context.getProperty(QUOTE_TABLE_IDENTIFIER).asBoolean();
final boolean quoteColumnNames =
context.getProperty(QUOTE_COLUMN_IDENTIFIERS).asBoolean();
final Map attributes = new
HashMap<>(flowFile.getAttributes());
(nifi) branch main updated: NIFI-10977 Added documentation on Kubernetes Clustering
This is an automated email from the ASF dual-hosted git repository. pvillard 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 858d0bdf25 NIFI-10977 Added documentation on Kubernetes Clustering 858d0bdf25 is described below commit 858d0bdf2556705279bb3e5c6ceb7c8bd60db21b Author: exceptionfactory AuthorDate: Sat Apr 6 22:34:40 2024 -0500 NIFI-10977 Added documentation on Kubernetes Clustering Signed-off-by: Pierre Villard This closes #8612. --- .../src/main/asciidoc/administration-guide.adoc| 118 - nifi-docs/src/main/asciidoc/images/ncm.png | Bin 89813 -> 0 bytes 2 files changed, 94 insertions(+), 24 deletions(-) diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc b/nifi-docs/src/main/asciidoc/administration-guide.adoc index e8efbb457c..fd5248948f 100644 --- a/nifi-docs/src/main/asciidoc/administration-guide.adoc +++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc @@ -2447,14 +2447,6 @@ configured in the _state-management.xml_ file. See <> for more ** `nifi.cluster.node.protocol.max.threads` - The maximum number of threads that should be used to communicate with other nodes in the cluster. This property defaults to `50`. A thread pool is used for replicating requests to all nodes. The thread pool will increase the number of active threads to the limit set by this property. It is typically recommended that this property be set to 4-8 times the number of nodes in your cluster. There could be up to `n+2` threads for a given request, where `n` = number of nodes in your cluster. As an example, if 4 requests are made, a 5 node cluster will use `4 * 7 = 28` threads. -** `nifi.zookeeper.connect.string` - The Connect String that is needed to connect to Apache ZooKeeper. This is a comma-separated list -of hostname:port pairs. For example, `localhost:2181,localhost:2182,localhost:2183`. This should contain a list of all ZooKeeper -instances in the ZooKeeper quorum. -** `nifi.zookeeper.root.node` - The root ZNode that should be used in ZooKeeper. ZooKeeper provides a directory-like structure -for storing data. Each 'directory' in this structure is referred to as a ZNode. This denotes the root ZNode, or 'directory', -that should be used for storing data. The default value is `/root`. This is important to set correctly, as which cluster -the NiFi instance attempts to join is determined by which ZooKeeper instance it connects to and the ZooKeeper Root Node -that is specified. ** `nifi.cluster.flow.election.max.wait.time` - Specifies the amount of time to wait before electing a Flow as the "correct" Flow. If the number of Nodes that have voted is equal to the number specified by the `nifi.cluster.flow.election.max.candidates` property, the cluster will not wait this long. The default value is `5 mins`. Note that the time starts as soon as the first vote @@ -2463,10 +2455,53 @@ is cast. of Flows. This allows the Nodes in the cluster to avoid having to wait a long time before starting processing if we reach at least this number of nodes in the cluster. -Now, it is possible to start up the cluster. It does not matter which order the instances start up. Navigate to the URL for -one of the nodes, and the User Interface should look similar to the following: +=== ZooKeeper Clustering + +The following application properties support clustering with Apache ZooKeeper: + +* `nifi.cluster.leader.election.implementation` + +The Leader Election Implementation must be set to `CuratorLeaderElectionManager` for clustering with Apache ZooKeeper. +The implementation defaults to ZooKeeper-based clustering when this property is not specified. + +* `nifi.zookeeper.connect.string` + +The Connect String that is needed to connect to Apache ZooKeeper. This is a comma-separated list +of hostname:port pairs. For example, `localhost:2181,localhost:2182,localhost:2183`. This should contain a list of all ZooKeeper +instances in the ZooKeeper quorum. + +* `nifi.zookeeper.root.node` + +The root ZNode that should be used in ZooKeeper. ZooKeeper provides a directory-like structure +for storing data. Each 'directory' in this structure is referred to as a ZNode. This denotes the root ZNode, or 'directory', +that should be used for storing data. The default value is `/root`. This is important to set correctly, as which cluster +the NiFi instance attempts to join is determined by which ZooKeeper instance it connects to and the ZooKeeper Root Node +that is specified. + +=== Kubernetes Clustering + +Kubernetes Clustering requires authorization to interact with Kubernetes Leases using +the following link:https://kubernetes.io/docs/reference/access-authn-authz/authorization/#determine-the-request-verb[API request verbs]: + +- `create` +- `get` +- `update` + +The following application properties
(nifi) branch support/nifi-1.x updated: NIFI-12837 Added DFS support in SMB processors
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 10ce00862d NIFI-12837 Added DFS support in SMB processors
10ce00862d is described below
commit 10ce00862d1479dee1444d0da9cc48bbbd83729f
Author: Peter Turcsanyi
AuthorDate: Mon Mar 18 11:04:32 2024 +0100
NIFI-12837 Added DFS support in SMB processors
Signed-off-by: Pierre Villard
This closes #8527.
---
.../org/apache/nifi/processors/smb/GetSmbFile.java | 2 +
.../org/apache/nifi/processors/smb/PutSmbFile.java | 2 +
.../org/apache/nifi/processors/smb/SmbDfsIT.java | 229 +
.../services/smb/SmbjClientProviderService.java| 83 +++-
...iSmbjClientIT.java => SmbjClientServiceIT.java} | 4 +-
...jClientTest.java => SmbjClientServiceTest.java} | 8 +-
.../java/org/apache/nifi/smb/common/SmbClient.java | 92 +
.../org/apache/nifi/smb/common/SmbProperties.java | 9 +
.../java/org/apache/nifi/smb/common/SmbUtils.java | 7 +-
9 files changed, 376 insertions(+), 60 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
index ed843f9bff..f1649a4faa 100644
---
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
+++
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
@@ -80,6 +80,7 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.regex.Pattern;
+import static org.apache.nifi.smb.common.SmbProperties.ENABLE_DFS;
import static org.apache.nifi.smb.common.SmbProperties.SMB_DIALECT;
import static org.apache.nifi.smb.common.SmbProperties.TIMEOUT;
import static org.apache.nifi.smb.common.SmbProperties.USE_ENCRYPTION;
@@ -257,6 +258,7 @@ public class GetSmbFile extends AbstractProcessor {
descriptors.add(IGNORE_HIDDEN_FILES);
descriptors.add(SMB_DIALECT);
descriptors.add(USE_ENCRYPTION);
+descriptors.add(ENABLE_DFS);
descriptors.add(TIMEOUT);
this.descriptors = Collections.unmodifiableList(descriptors);
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 468828f819..af2eab2ff1 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
@@ -64,6 +64,7 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;
+import static org.apache.nifi.smb.common.SmbProperties.ENABLE_DFS;
import static org.apache.nifi.smb.common.SmbProperties.SMB_DIALECT;
import static org.apache.nifi.smb.common.SmbProperties.TIMEOUT;
import static org.apache.nifi.smb.common.SmbProperties.USE_ENCRYPTION;
@@ -194,6 +195,7 @@ public class PutSmbFile extends AbstractProcessor {
descriptors.add(RENAME_SUFFIX);
descriptors.add(SMB_DIALECT);
descriptors.add(USE_ENCRYPTION);
+descriptors.add(ENABLE_DFS);
descriptors.add(TIMEOUT);
this.descriptors = Collections.unmodifiableList(descriptors);
diff --git
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/test/java/org/apache/nifi/processors/smb/SmbDfsIT.java
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/test/java/org/apache/nifi/processors/smb/SmbDfsIT.java
new file mode 100644
index 00..6fe51b3eb6
--- /dev/null
+++
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/test/java/org/apache/nifi/processors/smb/SmbDfsIT.java
@@ -0,0 +1,229 @@
+/*
+ * 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 permi
(nifi) branch main updated: NIFI-12837 Added DFS support in SMB processors
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 928206d52f NIFI-12837 Added DFS support in SMB processors
928206d52f is described below
commit 928206d52f3a442b24eb5a911507af821c30ea2d
Author: Peter Turcsanyi
AuthorDate: Mon Mar 18 11:04:32 2024 +0100
NIFI-12837 Added DFS support in SMB processors
Signed-off-by: Pierre Villard
This closes #8527.
---
.../org/apache/nifi/processors/smb/GetSmbFile.java | 2 +
.../org/apache/nifi/processors/smb/PutSmbFile.java | 2 +
.../org/apache/nifi/processors/smb/SmbDfsIT.java | 225 +
.../services/smb/SmbjClientProviderService.java| 83 +++-
...iSmbjClientIT.java => SmbjClientServiceIT.java} | 4 +-
...jClientTest.java => SmbjClientServiceTest.java} | 2 +-
.../java/org/apache/nifi/smb/common/SmbClient.java | 92 +
.../org/apache/nifi/smb/common/SmbProperties.java | 9 +
.../java/org/apache/nifi/smb/common/SmbUtils.java | 7 +-
9 files changed, 367 insertions(+), 59 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
index b4089f5287..e1e1d5250d 100644
---
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
+++
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
@@ -80,6 +80,7 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.regex.Pattern;
+import static org.apache.nifi.smb.common.SmbProperties.ENABLE_DFS;
import static org.apache.nifi.smb.common.SmbProperties.SMB_DIALECT;
import static org.apache.nifi.smb.common.SmbProperties.TIMEOUT;
import static org.apache.nifi.smb.common.SmbProperties.USE_ENCRYPTION;
@@ -257,6 +258,7 @@ public class GetSmbFile extends AbstractProcessor {
descriptors.add(IGNORE_HIDDEN_FILES);
descriptors.add(SMB_DIALECT);
descriptors.add(USE_ENCRYPTION);
+descriptors.add(ENABLE_DFS);
descriptors.add(TIMEOUT);
this.descriptors = Collections.unmodifiableList(descriptors);
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 468828f819..af2eab2ff1 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
@@ -64,6 +64,7 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;
+import static org.apache.nifi.smb.common.SmbProperties.ENABLE_DFS;
import static org.apache.nifi.smb.common.SmbProperties.SMB_DIALECT;
import static org.apache.nifi.smb.common.SmbProperties.TIMEOUT;
import static org.apache.nifi.smb.common.SmbProperties.USE_ENCRYPTION;
@@ -194,6 +195,7 @@ public class PutSmbFile extends AbstractProcessor {
descriptors.add(RENAME_SUFFIX);
descriptors.add(SMB_DIALECT);
descriptors.add(USE_ENCRYPTION);
+descriptors.add(ENABLE_DFS);
descriptors.add(TIMEOUT);
this.descriptors = Collections.unmodifiableList(descriptors);
diff --git
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/test/java/org/apache/nifi/processors/smb/SmbDfsIT.java
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/test/java/org/apache/nifi/processors/smb/SmbDfsIT.java
new file mode 100644
index 00..d8076955bc
--- /dev/null
+++
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/test/java/org/apache/nifi/processors/smb/SmbDfsIT.java
@@ -0,0 +1,225 @@
+/*
+ * 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
+ * lim
(nifi) branch main updated: NIFI-12889 - Retry Kerberos login on auth failure in HDFS processors
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 06b0f29cad NIFI-12889 - Retry Kerberos login on auth failure in HDFS
processors
06b0f29cad is described below
commit 06b0f29cad352922fbed16decabe33246a2ddc0b
Author: Matt Burgess
AuthorDate: Fri Mar 22 18:39:48 2024 -0400
NIFI-12889 - Retry Kerberos login on auth failure in HDFS processors
---
.../processors/hadoop/AbstractHadoopProcessor.java | 46 +++-
.../apache/nifi/processors/hadoop/DeleteHDFS.java | 33 ++-
.../apache/nifi/processors/hadoop/FetchHDFS.java | 100
.../org/apache/nifi/processors/hadoop/GetHDFS.java | 21 +-
.../nifi/processors/hadoop/GetHDFSFileInfo.java| 16 +-
.../processors/hadoop/GetHDFSSequenceFile.java | 19 +-
.../apache/nifi/processors/hadoop/MoveHDFS.java| 180 +++---
.../org/apache/nifi/processors/hadoop/PutHDFS.java | 128 --
.../GSSExceptionRollbackYieldSessionHandler.java | 30 +++
.../processors/hadoop/GetHDFSSequenceFileTest.java | 57 -
.../apache/nifi/processors/hadoop/GetHDFSTest.java | 41 +++-
.../nifi/processors/hadoop/MoveHDFSTest.java | 62 -
.../apache/nifi/processors/hadoop/PutHDFSTest.java | 191 +++---
.../nifi/processors/hadoop/TestDeleteHDFS.java | 20 +-
.../nifi/processors/hadoop/TestFetchHDFS.java | 62 +++--
.../processors/hadoop/TestGetHDFSFileInfo.java | 164 ++---
.../processors/hadoop/util/MockFileSystem.java | 273 +
17 files changed, 846 insertions(+), 597 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
b/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
index 447f198226..362c1be7af 100644
---
a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
+++
b/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.processors.hadoop;
+import com.google.common.base.Throwables;
import org.apache.commons.io.IOUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
@@ -42,11 +43,13 @@ import org.apache.nifi.kerberos.KerberosCredentialsService;
import org.apache.nifi.kerberos.KerberosUserService;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.ProcessorInitializationContext;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.security.krb.KerberosKeytabUser;
import org.apache.nifi.security.krb.KerberosPasswordUser;
import org.apache.nifi.security.krb.KerberosUser;
+import org.ietf.jgss.GSSException;
import javax.net.SocketFactory;
import java.io.File;
@@ -62,7 +65,10 @@ import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiConsumer;
+import java.util.function.Predicate;
import java.util.regex.Pattern;
+import java.util.stream.Stream;
/**
* This is a base class that is helpful when building processors interacting
with HDFS.
@@ -171,7 +177,7 @@ public abstract class AbstractHadoopProcessor extends
AbstractProcessor implemen
// variables shared by all threads of this processor
// Hadoop Configuration, Filesystem, and UserGroupInformation (optional)
-private final AtomicReference hdfsResources = new
AtomicReference<>();
+final AtomicReference hdfsResources = new
AtomicReference<>();
// Holder of cached Configuration information so validation does not
reload the same config over and over
private final AtomicReference
validationResourceHolder = new AtomicReference<>();
@@ -532,12 +538,7 @@ public abstract class AbstractHadoopProcessor extends
AbstractProcessor implemen
protected FileSystem getFileSystemAsUser(final Configuration config,
UserGroupInformation ugi) throws IOException {
try {
-return ugi.doAs(new PrivilegedExceptionAction() {
-@Override
-public FileSystem run() throws Exception {
-return FileSystem.get(config);
-}
-});
+return ugi.doAs((PrivilegedExceptionAction) () ->
FileSystem.get(config));
} catch (InterruptedException e) {
throw new IOException("Unable to create file system: " +
e.getMessage());
}
@@ -703,4 +704,35 @@ public abstrac
(nifi) branch main updated: NIFI-12994 Fix potential NPE when requesting Flow Analysis Results for a Process Group
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 3a29d72a7c NIFI-12994 Fix potential NPE when requesting Flow Analysis
Results for a Process Group
3a29d72a7c is described below
commit 3a29d72a7c351a46a8a0550b50a392d97447d05b
Author: tpalfy
AuthorDate: Tue Apr 2 18:28:48 2024 +0200
NIFI-12994 Fix potential NPE when requesting Flow Analysis Results for a
Process Group
Signed-off-by: Pierre Villard
This closes #8595.
---
.../java/org/apache/nifi/validation/StandardRuleViolationsManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/validation/StandardRuleViolationsManager.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/validation/StandardRuleViolationsManager.java
index 5e232dcc1a..ff1a424081 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/validation/StandardRuleViolationsManager.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/validation/StandardRuleViolationsManager.java
@@ -155,7 +155,7 @@ public class StandardRuleViolationsManager implements
RuleViolationsManager {
public Collection getRuleViolationsForGroup(String groupId)
{
Set groupViolations =
subjectIdToRuleViolation.values().stream()
.map(Map::values).flatMap(Collection::stream)
-.filter(violation -> violation.getGroupId().equals(groupId))
+.filter(violation -> groupId.equals(violation.getGroupId()))
.collect(Collectors.toSet());
return groupViolations;
(nifi) branch support/nifi-1.x updated: NIFI-12987 fix unit test after change to make controller service type searchable
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 23dc121e97 NIFI-12987 fix unit test after change to make controller
service type searchable
23dc121e97 is described below
commit 23dc121e97d038b2a717a225f278a9d02d769260
Author: Mike Moser
AuthorDate: Tue Apr 2 14:48:24 2024 +
NIFI-12987 fix unit test after change to make controller service type
searchable
Signed-off-by: Pierre Villard
This closes #8594.
---
.../nifi/web/controller/ControllerSearchServiceRegressionTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/controller/ControllerSearchServiceRegressionTest.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/controller/ControllerSearchServiceRegressionTest.java
index e006185f7e..abf3240e82 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/controller/ControllerSearchServiceRegressionTest.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/controller/ControllerSearchServiceRegressionTest.java
@@ -519,7 +519,7 @@ public class ControllerSearchServiceRegressionTest extends
AbstractControllerSea
.withControllerServiceNode(getControllerServiceNode(id, name,
"foo comment", rawProperties, AUTHORIZED));
// when - search for name
-whenExecuteSearch("controllerserv");
+whenExecuteSearch("servicename");
// then
thenResultConsists()
(nifi) branch support/nifi-1.x updated: NIFI-12987 allow controller service type to be searchable
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new e070753f39 NIFI-12987 allow controller service type to be searchable
e070753f39 is described below
commit e070753f39429ee5db176ced519f3827265d77c6
Author: Mike Moser
AuthorDate: Mon Apr 1 18:09:16 2024 +
NIFI-12987 allow controller service type to be searchable
Signed-off-by: Pierre Villard
This closes #8593.
---
.../ControllerServiceNodeMatcher.java | 3 ++
.../ControllerServiceNodeMatcherTest.java | 43 +-
2 files changed, 45 insertions(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/ControllerServiceNodeMatcher.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/ControllerServiceNodeMatcher.java
index ab20d14aba..7b5111330f 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/ControllerServiceNodeMatcher.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/ControllerServiceNodeMatcher.java
@@ -28,6 +28,7 @@ public class ControllerServiceNodeMatcher implements
AttributeMatcher matches) {
@@ -37,5 +38,7 @@ public class ControllerServiceNodeMatcher implements
AttributeMatcher validate(ValidationContext
context) {
+return null;
+}
+
+@Override
+public PropertyDescriptor getPropertyDescriptor(String name) {
+return null;
+}
+
+@Override
+public void onPropertyModified(PropertyDescriptor descriptor, String
oldValue, String newValue) {
+}
+
+@Override
+public List getPropertyDescriptors() {
+return null;
+}
+
+@Override
+public String getIdentifier() {
+return null;
+}
+
+@Override
+public void initialize(ControllerServiceInitializationContext context)
{
+}
}
}
\ No newline at end of file
(nifi) branch main updated: NIFI-12987 allow controller service type to be searchable
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 b574a7e41a NIFI-12987 allow controller service type to be searchable
b574a7e41a is described below
commit b574a7e41a90617e8befaee560be9d9f35afcfac
Author: Mike Moser
AuthorDate: Mon Apr 1 18:09:16 2024 +
NIFI-12987 allow controller service type to be searchable
Signed-off-by: Pierre Villard
This closes #8593.
---
.../ControllerServiceNodeMatcher.java | 3 ++
.../ControllerServiceNodeMatcherTest.java | 43 +-
2 files changed, 45 insertions(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/ControllerServiceNodeMatcher.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/ControllerServiceNodeMatcher.java
index ab20d14aba..7b5111330f 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/ControllerServiceNodeMatcher.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/ControllerServiceNodeMatcher.java
@@ -28,6 +28,7 @@ public class ControllerServiceNodeMatcher implements
AttributeMatcher matches) {
@@ -37,5 +38,7 @@ public class ControllerServiceNodeMatcher implements
AttributeMatcher validate(ValidationContext
context) {
+return null;
+}
+
+@Override
+public PropertyDescriptor getPropertyDescriptor(String name) {
+return null;
+}
+
+@Override
+public void onPropertyModified(PropertyDescriptor descriptor, String
oldValue, String newValue) {
+}
+
+@Override
+public List getPropertyDescriptors() {
+return null;
+}
+
+@Override
+public String getIdentifier() {
+return null;
+}
+
+@Override
+public void initialize(ControllerServiceInitializationContext context)
{
+}
}
}
\ No newline at end of file
(nifi) branch main updated: NIFI-12988 Streamlined dependencies in nifi-iceberg-test-utils
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 322deaa23e NIFI-12988 Streamlined dependencies in
nifi-iceberg-test-utils
322deaa23e is described below
commit 322deaa23eb5141174bb2c25b97b2a96b2596eac
Author: exceptionfactory
AuthorDate: Mon Apr 1 13:45:52 2024 -0500
NIFI-12988 Streamlined dependencies in nifi-iceberg-test-utils
Signed-off-by: Pierre Villard
This closes #8592.
---
.../nifi-iceberg-processors/pom.xml| 9 ++
.../nifi-iceberg-test-utils/pom.xml| 171 +++--
2 files changed, 27 insertions(+), 153 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/pom.xml
b/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/pom.xml
index fe5381b651..c646cb0a5f 100644
--- a/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/pom.xml
@@ -127,6 +127,10 @@
org.apache.hadoop
hadoop-yarn-registry
+
+org.apache.hadoop
+hadoop-yarn-server-resourcemanager
+
org.bouncycastle
bcprov-jdk15on
@@ -262,6 +266,11 @@
derbytools
${derby.version}
+
+org.apache.derby
+derby
+${derby.version}
+
diff --git
a/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-test-utils/pom.xml
b/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-test-utils/pom.xml
index 49845fd767..c02821fe00 100644
--- a/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-test-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-test-utils/pom.xml
@@ -24,54 +24,6 @@
nifi-iceberg-test-utils
jar
-
-
-
-org.apache.hadoop
-hadoop-yarn-common
-${hadoop.version}
-
-
-org.apache.hadoop
-hadoop-yarn-server-common
-${hadoop.version}
-
-
-org.apache.hadoop
-hadoop-client
-${hadoop.version}
-
-
-log4j
-log4j
-
-
-org.slf4j
-slf4j-log4j12
-
-
-org.slf4j
-slf4j-reload4j
-
-
-commons-logging
-commons-logging
-
-
-
-org.eclipse.jetty.websocket
-websocket-client
-
-
-
-
-
-org.codehaus.jettison
-jettison
-1.5.4
-
-
-
org.apache.hive
@@ -178,119 +130,21 @@
org.eclipse.jetty
jetty-rewrite
-
-
-
-
-org.apache.derby
-derbytools
-${derby.version}
-
-
-org.apache.derby
-derby
-${derby.version}
-
-
-org.apache.hive.hcatalog
-hive-hcatalog-server-extensions
-${hive.version}
-
-
-log4j
-log4j
-
-
-org.slf4j
-slf4j-log4j12
-
-
-commons-logging
-commons-logging
-
-
-org.apache.logging.log4j
-log4j-core
-
-
-com.fasterxml.woodstox
-woodstox-core
-
-
-org.apache.groovy
-groovy-all
-
-
-org.apache.ivy
-ivy
-
-
-org.apache.hadoop
-hadoop-distcp
-
-
-org.apache.hadoop
-hadoop-mapreduce-client-core
-
-
-org.apache.hadoop
-hadoop-hdfs
-
-
-org.apache.hadoop
(nifi) branch support/nifi-1.x updated: NIFI-12980 Deprecated Hive 3 Components for Removal
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new af50fb594d NIFI-12980 Deprecated Hive 3 Components for Removal
af50fb594d is described below
commit af50fb594d4bf3b1327cf61cb83c9a3270935c84
Author: exceptionfactory
AuthorDate: Wed Mar 27 13:03:44 2024 -0500
NIFI-12980 Deprecated Hive 3 Components for Removal
Signed-off-by: Pierre Villard
This closes #8587.
---
.../src/main/java/org/apache/nifi/dbcp/hive/Hive3ConnectionPool.java | 2 ++
.../src/main/java/org/apache/nifi/processors/hive/PutHive3QL.java | 2 ++
.../main/java/org/apache/nifi/processors/hive/PutHive3Streaming.java | 2 ++
.../src/main/java/org/apache/nifi/processors/hive/SelectHive3QL.java | 2 ++
.../org/apache/nifi/processors/hive/TriggerHiveMetaStoreEvent.java | 2 ++
.../main/java/org/apache/nifi/processors/hive/UpdateHive3Table.java| 3 ++-
.../src/main/java/org/apache/nifi/processors/orc/PutORC.java | 2 ++
7 files changed, 14 insertions(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/dbcp/hive/Hive3ConnectionPool.java
b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/dbcp/hive/Hive3ConnectionPool.java
index afbba1f8a9..6a9ac2157f 100644
---
a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/dbcp/hive/Hive3ConnectionPool.java
+++
b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/dbcp/hive/Hive3ConnectionPool.java
@@ -23,6 +23,7 @@ import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hive.jdbc.HiveDriver;
import org.apache.nifi.annotation.behavior.RequiresInstanceClassLoading;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.DeprecationNotice;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnDisabled;
import org.apache.nifi.annotation.lifecycle.OnEnabled;
@@ -69,6 +70,7 @@ import java.util.concurrent.atomic.AtomicReference;
* Implementation for Database Connection Pooling Service used for Apache Hive
* connections. Apache DBCP is used for connection pooling functionality.
*/
+@DeprecationNotice(reason = "Support for Apache Hive 3 is deprecated for
removal in Apache NiFi 2.0")
@RequiresInstanceClassLoading
@Tags({"hive", "dbcp", "jdbc", "database", "connection", "pooling", "store"})
@CapabilityDescription("Provides Database Connection Pooling Service for
Apache Hive 3.x. Connections can be asked from pool and returned after usage.")
diff --git
a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/processors/hive/PutHive3QL.java
b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/processors/hive/PutHive3QL.java
index 6e4b822a61..6d01dba53f 100644
---
a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/processors/hive/PutHive3QL.java
+++
b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/processors/hive/PutHive3QL.java
@@ -24,6 +24,7 @@ import org.apache.nifi.annotation.behavior.ReadsAttributes;
import org.apache.nifi.annotation.behavior.WritesAttribute;
import org.apache.nifi.annotation.behavior.WritesAttributes;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.DeprecationNotice;
import org.apache.nifi.annotation.documentation.SeeAlso;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
@@ -59,6 +60,7 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
+@DeprecationNotice(reason = "Support for Apache Hive 3 is deprecated for
removal in Apache NiFi 2.0")
@SeeAlso(SelectHive3QL.class)
@InputRequirement(Requirement.INPUT_REQUIRED)
@Tags({"sql", "hive", "put", "database", "update", "insert"})
diff --git
a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/processors/hive/PutHive3Streaming.java
b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/processors/hive/PutHive3Streaming.java
index 520e343d22..5e849f2f2e 100644
---
a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/processors/hive/PutHive3Streaming.java
+++
b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/processors/hive/PutHive3Stream
(nifi) branch main updated: NIFI-12924 Flow Analysis no longer done regularly or on-demand, but automatically when a change occurs that could result in the change of violations.
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 c3eff68f92 NIFI-12924 Flow Analysis no longer done regularly or
on-demand, but automatically when a change occurs that could result in the
change of violations.
c3eff68f92 is described below
commit c3eff68f92d34be6404e54c77fc6bcba89c3ad12
Author: tpalfy
AuthorDate: Wed Mar 20 19:21:10 2024 +0100
NIFI-12924 Flow Analysis no longer done regularly or on-demand, but
automatically when a change occurs that could result in the change of
violations.
Signed-off-by: Pierre Villard
This closes #8537.
---
.../java/org/apache/nifi/util/NiFiProperties.java | 3 -
.../web/api/entity/FlowAnalysisResultEntity.java | 13 +
.../apache/nifi/groups/StandardProcessGroup.java | 4 +
.../nifi/controller/flowanalysis/FlowAnalyzer.java | 12 +
.../org/apache/nifi/controller/FlowController.java | 8 +-
.../nifi/flowanalysis/StandardFlowAnalyzer.java| 12 +
.../nifi/flowanalysis/TriggerFlowAnalysisTask.java | 14 +-
.../nifi-framework/nifi-resources/pom.xml | 3 -
.../src/main/resources/conf/nifi.properties| 3 -
.../org/apache/nifi/web/NiFiServiceFacade.java | 8 -
.../apache/nifi/web/StandardNiFiServiceFacade.java | 21 +-
.../apache/nifi/web/api/ProcessGroupResource.java | 261 -
.../web/dao/impl/StandardFlowAnalysisRuleDAO.java | 12 +
.../resources/conf/clustered/node1/nifi.properties | 2 -
.../resources/conf/clustered/node2/nifi.properties | 2 -
.../test/resources/conf/default/nifi.properties| 2 -
.../test/resources/conf/pythonic/nifi.properties | 2 -
17 files changed, 69 insertions(+), 313 deletions(-)
diff --git
a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
index 01dd887190..2ddee1d959 100644
---
a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
+++
b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
@@ -300,9 +300,6 @@ public class NiFiProperties extends ApplicationProperties {
public static final String ANALYTICS_CONNECTION_MODEL_SCORE_NAME =
"nifi.analytics.connection.model.score.name";
public static final String ANALYTICS_CONNECTION_MODEL_SCORE_THRESHOLD =
"nifi.analytics.connection.model.score.threshold";
-// flow analysis properties
-public static final String BACKGROUND_FLOW_ANALYSIS_SCHEDULE =
"nifi.flow.analysis.background.task.schedule";
-
// runtime monitoring properties
public static final String MONITOR_LONG_RUNNING_TASK_SCHEDULE =
"nifi.monitor.long.running.task.schedule";
public static final String MONITOR_LONG_RUNNING_TASK_THRESHOLD =
"nifi.monitor.long.running.task.threshold";
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowAnalysisResultEntity.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowAnalysisResultEntity.java
index c9e7c79e2b..ef7c313763 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowAnalysisResultEntity.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowAnalysisResultEntity.java
@@ -32,9 +32,22 @@ public class FlowAnalysisResultEntity extends Entity {
public FlowAnalysisResultEntity() {
}
+private boolean flowAnalysisPending;
+
private List rules = new ArrayList<>();
private List ruleViolations = new
ArrayList<>();
+/**
+ * @return true if a flow analysis is going to be scheduled due to flow
changes, false otherwise
+ */
+public boolean isFlowAnalysisPending() {
+return flowAnalysisPending;
+}
+
+public void setFlowAnalysisPending(boolean flowAnalysisPending) {
+this.flowAnalysisPending = flowAnalysisPending;
+}
+
/**
* @return set of flow analysis rules that are being serialized
*/
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 8721273373..c7775c99a8 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) branch support/nifi-1.x updated: NIFI-12966 Upgraded Netty from 4.1.106 to 4.1.108
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new 508dea2cbb NIFI-12966 Upgraded Netty from 4.1.106 to 4.1.108 508dea2cbb is described below commit 508dea2cbb005e4ca503a185c6b30dc07f5d606a Author: exceptionfactory AuthorDate: Wed Mar 27 21:22:04 2024 -0500 NIFI-12966 Upgraded Netty from 4.1.106 to 4.1.108 Signed-off-by: Pierre Villard This closes #8578. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8f6049067b..ac1980f7d7 100644 --- a/pom.xml +++ b/pom.xml @@ -145,7 +145,7 @@ 1.3.14 3.10.6.Final 2.2 -4.1.106.Final +4.1.108.Final 5.3.31 5.8.7 1.6.12
(nifi) branch main updated: NIFI-12966 Upgraded Netty from 4.1.106 to 4.1.108
This is an automated email from the ASF dual-hosted git repository. pvillard 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 8ef9528bf9 NIFI-12966 Upgraded Netty from 4.1.106 to 4.1.108 8ef9528bf9 is described below commit 8ef9528bf9685b0cdbfa900eb688741d205db770 Author: exceptionfactory AuthorDate: Wed Mar 27 21:22:04 2024 -0500 NIFI-12966 Upgraded Netty from 4.1.106 to 4.1.108 Signed-off-by: Pierre Villard This closes #8578. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8a90650423..eeecb4e52c 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ 5.8.0 3.10.6.Final 2.2 -4.1.106.Final +4.1.108.Final 6.0.0 6.1.5 6.2.3
(nifi) branch main updated: NIFI-12965 Upgraded Guava from 32.1.2 to 33.1.0
This is an automated email from the ASF dual-hosted git repository. pvillard 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 64db927ca1 NIFI-12965 Upgraded Guava from 32.1.2 to 33.1.0 64db927ca1 is described below commit 64db927ca198dac335a3367686fb73bff5e00064 Author: exceptionfactory AuthorDate: Wed Mar 27 19:11:59 2024 -0500 NIFI-12965 Upgraded Guava from 32.1.2 to 33.1.0 Signed-off-by: Pierre Villard This closes #8577. --- minifi/pom.xml | 2 +- nifi-commons/nifi-property-protection-gcp/pom.xml | 2 +- nifi-nar-bundles/nifi-accumulo-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-azure-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml | 2 +- nifi-nar-bundles/nifi-framework-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-gcp-bundle/pom.xml| 2 +- nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml | 2 +- nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-hive-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-iceberg-bundle/pom.xml| 2 +- nifi-nar-bundles/nifi-opentelemetry-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-standard-bundle/pom.xml | 2 +- .../nifi-standard-services/nifi-hbase_2-client-service-bundle/pom.xml | 2 +- nifi-registry/nifi-registry-core/pom.xml| 2 +- nifi-toolkit/nifi-toolkit-cli/pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/minifi/pom.xml b/minifi/pom.xml index 49951d7cd2..382fb3af03 100644 --- a/minifi/pom.xml +++ b/minifi/pom.xml @@ -458,7 +458,7 @@ limitations under the License. com.google.guava guava -32.1.2-jre +33.1.0-jre diff --git a/nifi-commons/nifi-property-protection-gcp/pom.xml b/nifi-commons/nifi-property-protection-gcp/pom.xml index cde1db53d7..77b04f8c41 100644 --- a/nifi-commons/nifi-property-protection-gcp/pom.xml +++ b/nifi-commons/nifi-property-protection-gcp/pom.xml @@ -23,7 +23,7 @@ nifi-property-protection-gcp 26.25.0 -32.1.2-jre +33.1.0-jre diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml index 5fde3178d7..cfdcf1fa90 100644 --- a/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml @@ -20,7 +20,7 @@ 2.1.2 -32.1.2-jre +33.1.0-jre nifi-accumulo-bundle diff --git a/nifi-nar-bundles/nifi-azure-bundle/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/pom.xml index ddaae43bb5..5103b7829d 100644 --- a/nifi-nar-bundles/nifi-azure-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-azure-bundle/pom.xml @@ -54,7 +54,7 @@ com.google.guava guava -32.1.2-jre +33.1.0-jre diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml index a133cfcbe2..c5a2d32ab2 100644 --- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml +++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml @@ -42,7 +42,7 @@ com.google.guava guava -32.1.2-jre +33.1.0-jre commons-io diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml index 01a5e8d01e..548eed74a4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml @@ -24,7 +24,7 @@ NiFi: Framework Bundle 5.6.0 -32.1.2-jre +33.1.0-jre 2.9.1 4.3.0 diff --git a/nifi-nar-bundles/nifi-gcp-bundle/pom.xml b/nifi-nar-bundles/nifi-gcp-bundle/pom.xml index 64568d562d..1a8e4908a9 100644 --- a/nifi-nar-bundles/nifi-gcp-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-gcp-bundle/pom.xml @@ -43,7 +43,7 @@ com.google.guava guava -32.1.2-jre +33.1.0-jre diff --git a/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml b/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml index 46342bb02a..1c280f6ea1 100644 --- a/nifi-nar
(nifi) branch main updated: NIFI-12945 Moved Commons Configuration 2.10.1 to shared version
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 8e0b83b025 NIFI-12945 Moved Commons Configuration 2.10.1 to shared
version
8e0b83b025 is described below
commit 8e0b83b0256addd25348eff2ab0dcd4d692f1fdb
Author: exceptionfactory
AuthorDate: Mon Mar 25 12:13:43 2024 -0500
NIFI-12945 Moved Commons Configuration 2.10.1 to shared version
- Moved Commons Configuration from nifi-lookup-services to project
configuration
- Moved Google Guava version from nifi-hive-test-utils to nifi-hive-bundle
Signed-off-by: Pierre Villard
This closes #8560.
---
.../nifi-hive-bundle/nifi-hive-test-utils/pom.xml| 6 --
nifi-nar-bundles/nifi-hive-bundle/pom.xml| 6 ++
.../nifi-lookup-services-bundle/nifi-lookup-services/pom.xml | 7 ---
pom.xml | 12
4 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-test-utils/pom.xml
b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-test-utils/pom.xml
index c431e91ff5..8c88904f33 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-test-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-test-utils/pom.xml
@@ -64,12 +64,6 @@
-
-
-com.google.guava
-guava
-32.1.2-jre
-
org.codehaus.jettison
diff --git a/nifi-nar-bundles/nifi-hive-bundle/pom.xml
b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
index 1c7544f072..f2a955b71a 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
@@ -110,6 +110,12 @@
groovy-all
2.4.21
+
+
+com.google.guava
+guava
+32.1.2-jre
+
org.apache.hive
hive-jdbc
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
index afe30e3129..3926ae32a6 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
@@ -51,13 +51,6 @@
org.apache.commons
commons-configuration2
-2.10.1
-
-
-commons-logging
-commons-logging
-
-
org.apache.commons
diff --git a/pom.xml b/pom.xml
index f343a01391..8a90650423 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,6 +118,7 @@
1.6.0
1.16.1
1.26.1
+
2.10.1
3.14.0
3.10.0
2.15.1
@@ -272,6 +273,17 @@
commons-compress
${org.apache.commons.compress.version}
+
+org.apache.commons
+commons-configuration2
+${org.apache.commons.configuration.version}
+
+
+commons-logging
+commons-logging
+
+
+
commons-io
commons-io
(nifi) branch main updated: NIFI-12955 Updated OWASP Dependency Check Suppressions
This is an automated email from the ASF dual-hosted git repository. pvillard 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 358e4cb451 NIFI-12955 Updated OWASP Dependency Check Suppressions 358e4cb451 is described below commit 358e4cb4512ba12f7168e45329e40177897c6669 Author: exceptionfactory AuthorDate: Tue Mar 26 09:04:37 2024 -0500 NIFI-12955 Updated OWASP Dependency Check Suppressions - Removed unused suppressions - Added suppressions for Clojure and Hadoop shaded libraries Signed-off-by: Pierre Villard This closes #8570. --- nifi-dependency-check-maven/suppressions.xml | 161 +++ 1 file changed, 18 insertions(+), 143 deletions(-) diff --git a/nifi-dependency-check-maven/suppressions.xml b/nifi-dependency-check-maven/suppressions.xml index be9ecb301d..16f768e997 100644 --- a/nifi-dependency-check-maven/suppressions.xml +++ b/nifi-dependency-check-maven/suppressions.xml @@ -19,21 +19,6 @@ ^pkg:maven/org\.apache\.nifi.*$ ^cpe:.*$ - -CVE-2022-45868 requires running H2 from a command not applicable to project references -^pkg:maven/com\.h2database/h2@2.*$ -CVE-2022-45868 - - -CVE-2016-127 does not apply to Spring Web 5.3.20 and later -^pkg:maven/org\.springframework/spring\-web@.*$ -CVE-2016-127 - - -CVE-2020-5408 does not apply to Spring Security Crypto 5.7.1 and later -^pkg:maven/org\.springframework\.security/spring\-security\-crypto@.*$ -CVE-2020-5408 - CVE-2017-10355 does not apply to Xerces 2.12.2 ^pkg:maven/xerces/xercesImpl@.*$ @@ -49,36 +34,6 @@ ^pkg:maven/com\.yammer\.metrics/metrics\-ganglia@.*$ CVE-2007-6465 - -CVE-2022-31159 applies to AWS S3 library not the SWF libraries -^pkg:maven/com\.amazonaws/aws\-java\-sdk\-swf\-libraries@.*$ -CVE-2022-31159 - - -Elasticsearch Server vulnerabilities do not apply to Elasticsearch Plugin -^pkg:maven/org\.elasticsearch\.plugin/.*?@7.*$ -^cpe:/a:elastic.*$ - - -Elasticsearch Server vulnerabilities do not apply to elasticsearch-core -^pkg:maven/org\.elasticsearch/elasticsearch\-core@7.*$ -^cpe:/a:elastic.*$ - - -Elasticsearch Server vulnerabilities do not apply to elasticsearch -^pkg:maven/org\.elasticsearch/elasticsearch@7.*$ -^cpe:/a:elastic.*$ - - -CVE-2021-22145 applies to Elasticsearch Server not client libraries -^pkg:maven/org\.elasticsearch/elasticsearch@.*$ -CVE-2021-22145 - - -Elasticsearch Server vulnerabilities do not apply to elasticsearch libraries -^pkg:maven/org\.elasticsearch/elasticsearch\-.*?@7.*$ -^cpe:/a:elastic.*$ - Elasticsearch Server vulnerabilities do not apply to elasticsearch-rest-client ^pkg:maven/org\.elasticsearch\.client/elasticsearch\-.*?\-client@.*$ @@ -94,11 +49,6 @@ ^pkg:maven/com\.azure/azure\-messaging\-eventhubs\-checkpointstore\-blob@.*$ CVE-2022-30187 - -CVE-2022-39135 applies to Apache Calcite core not the Calcite Druid library -^pkg:maven/org\.apache\.calcite/calcite\-druid@.*$ -CVE-2022-39135 - CVE-2010-1151 applies to mod_auth_shadow in Apache HTTP Server not the FTP server library ^pkg:maven/org\.apache\.ftpserver/.*$ @@ -109,11 +59,6 @@ ^pkg:maven/com\.h2database/h2@.*$ CVE-2018-14335 - -CVE-2023-25613 applies to an LDAP backend class for Apache Kerby not the Token Provider library -^pkg:maven/org\.apache\.kerby/token\-provider@.*$ -CVE-2023-25613 - The Jetty Apache JSP library is not subject to Apache Tomcat vulnerabilities ^pkg:maven/org\.mortbay\.jasper/apache\-jsp@.*$ @@ -159,16 +104,6 @@ ^pkg:maven/org\.apache\.kafka/kafka.*?@.*$ CVE-2023-25194 - -CVE-2022-34917 applies to Kafka brokers not client libraries -^pkg:maven/org\.apache\.kafka/kafka.*?@.*$ -CVE-2022-34917 - - -CVE-2023-25613 applies to the LDAP Identity Backend for Kerby Server which is not used in runtime NiFi configurations -^pkg:maven/org\.apache\.kerby/kerb.*?@.*$ -CVE-2023-25613 - CVE-2022-24823 applies to Netty HTTP decoding which is not applicable to Apache Kudu clients ^pkg:maven/io\.netty/netty.*?@.*$ @@ -189,31 +124,11 @@ ^pkg:maven/com\.squareup\.wire/.*$ cpe:/a:wire:wire - -CVE-2023-44487 applies to Solr Server not Solr client libraries -^pkg:maven/org\.apache\.solr/solr\-solrj@.*$ -CVE-2023-44487 - Avro
(nifi) branch main updated: NIFI-12962 Upgraded Spring Framework from 6.0.18 to 6.1.5
This is an automated email from the ASF dual-hosted git repository. pvillard 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 3bed30e9db NIFI-12962 Upgraded Spring Framework from 6.0.18 to 6.1.5 3bed30e9db is described below commit 3bed30e9dba3712b52506430b74db84a8171589e Author: exceptionfactory AuthorDate: Tue Mar 26 23:45:17 2024 -0500 NIFI-12962 Upgraded Spring Framework from 6.0.18 to 6.1.5 - Enabled parameter names for reflection in nifi-web-api to support AspectJ Around expression parsing Signed-off-by: Pierre Villard This closes #8575. --- .../nifi-framework/nifi-web/nifi-web-api/pom.xml | 8 nifi-registry/pom.xml | 1 - pom.xml | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml index 65674d9a9f..2284a93038 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml @@ -35,6 +35,14 @@ + +org.apache.maven.plugins +maven-compiler-plugin + + +true + + org.apache.maven.plugins maven-jar-plugin diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml index 5bdeeb5d3a..70ffa926b2 100644 --- a/nifi-registry/pom.xml +++ b/nifi-registry/pom.xml @@ -35,7 +35,6 @@ nifi-registry-docker-maven -6.1.5 3.2.3 9.22.3 9.5.0 diff --git a/pom.xml b/pom.xml index dc783aa31f..f343a01391 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ 2.2 4.1.106.Final 6.0.0 -6.0.18 +6.1.5 6.2.3 2.2.20 2.2.224
(nifi) branch support/nifi-1.x updated: NIFI-12957 Upgraded Azure SDK BOM from 1.2.19 to 1.2.21
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new ce38c9769e NIFI-12957 Upgraded Azure SDK BOM from 1.2.19 to 1.2.21
ce38c9769e is described below
commit ce38c9769e51e12f10b5e03e02c081a93d8e
Author: exceptionfactory
AuthorDate: Tue Mar 26 12:01:14 2024 -0500
NIFI-12957 Upgraded Azure SDK BOM from 1.2.19 to 1.2.21
- Upgraded MSAL4J from 1.14.2 to 1.14.3
Signed-off-by: Pierre Villard
This closes #8571.
---
nifi-commons/nifi-property-protection-azure/pom.xml | 14 +++---
nifi-nar-bundles/nifi-azure-bundle/pom.xml | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/nifi-commons/nifi-property-protection-azure/pom.xml
b/nifi-commons/nifi-property-protection-azure/pom.xml
index 21f1c5f135..83c0b990d3 100644
--- a/nifi-commons/nifi-property-protection-azure/pom.xml
+++ b/nifi-commons/nifi-property-protection-azure/pom.xml
@@ -26,7 +26,7 @@
com.azure
azure-sdk-bom
-1.2.19
+1.2.21
import
pom
@@ -81,12 +81,6 @@
-
-
-com.nimbusds
-oauth2-oidc-sdk
-9.43.3
-
com.azure
azure-core-http-okhttp
@@ -97,5 +91,11 @@
${mockito.version}
test
+
+
+com.microsoft.azure
+msal4j
+1.14.3
+
diff --git a/nifi-nar-bundles/nifi-azure-bundle/pom.xml
b/nifi-nar-bundles/nifi-azure-bundle/pom.xml
index 068394f25e..5815067f1f 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/pom.xml
@@ -28,8 +28,8 @@
8.6.6
-1.2.19
-1.14.2
+1.2.21
+1.14.3
0.34.1
(nifi) branch main updated: NIFI-12957 Upgraded Azure SDK BOM from 1.2.19 to 1.2.21
This is an automated email from the ASF dual-hosted git repository. pvillard 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 daad0720b1 NIFI-12957 Upgraded Azure SDK BOM from 1.2.19 to 1.2.21 daad0720b1 is described below commit daad0720b1a10cb21dcd5c4f0e9672b5a4bc5b02 Author: exceptionfactory AuthorDate: Tue Mar 26 12:01:14 2024 -0500 NIFI-12957 Upgraded Azure SDK BOM from 1.2.19 to 1.2.21 - Upgraded MSAL4J from 1.14.2 to 1.14.3 Signed-off-by: Pierre Villard This closes #8571. --- nifi-commons/nifi-property-protection-azure/pom.xml | 14 +++--- nifi-nar-bundles/nifi-azure-bundle/pom.xml | 10 ++ 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/nifi-commons/nifi-property-protection-azure/pom.xml b/nifi-commons/nifi-property-protection-azure/pom.xml index c641939d4d..21a4919437 100644 --- a/nifi-commons/nifi-property-protection-azure/pom.xml +++ b/nifi-commons/nifi-property-protection-azure/pom.xml @@ -26,7 +26,7 @@ com.azure azure-sdk-bom -1.2.19 +1.2.21 import pom @@ -85,15 +85,15 @@ - - -com.nimbusds -oauth2-oidc-sdk -9.43.3 - com.azure azure-core-http-okhttp + + +com.microsoft.azure +msal4j +1.14.3 + diff --git a/nifi-nar-bundles/nifi-azure-bundle/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/pom.xml index 1353d479f6..ddaae43bb5 100644 --- a/nifi-nar-bundles/nifi-azure-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-azure-bundle/pom.xml @@ -27,8 +27,8 @@ pom -1.2.19 -1.14.2 +1.2.21 +1.14.3 0.34.1 @@ -68,12 +68,6 @@ nimbus-jose-jwt 9.37.3 - - -io.projectreactor.netty -reactor-netty-http -1.0.39 -
(nifi) branch support/nifi-1.x updated: NIFI-12888 In AbstractEmailProcessor check for expired oauth2 token when determining whether mail receiver needs to be recreated.
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new bb52b839a4 NIFI-12888 In AbstractEmailProcessor check for expired
oauth2 token when determining whether mail receiver needs to be recreated.
bb52b839a4 is described below
commit bb52b839a4ff0425fa0d65c517fc7ce7441e264f
Author: tpalfy
AuthorDate: Mon Mar 11 15:31:11 2024 +0100
NIFI-12888 In AbstractEmailProcessor check for expired oauth2 token when
determining whether mail receiver needs to be recreated.
Signed-off-by: Pierre Villard
This closes #8494.
---
.../nifi/processors/email/AbstractEmailProcessor.java | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java
b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java
index a8b2cf0dbc..4c35ddc5a1 100644
---
a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java
+++
b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java
@@ -22,6 +22,7 @@ import org.apache.nifi.components.AllowableValue;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.oauth2.AccessToken;
import org.apache.nifi.oauth2.OAuth2AccessTokenProvider;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
@@ -199,13 +200,14 @@ abstract class AbstractEmailProcessor extends Ab
private volatile boolean shouldSetDeleteFlag;
protected volatile Optional
oauth2AccessTokenProviderOptional;
+protected volatile AccessToken oauth2AccessDetails;
@OnScheduled
public void onScheduled(final ProcessContext context) {
if (context.getProperty(OAUTH2_ACCESS_TOKEN_PROVIDER).isSet()) {
OAuth2AccessTokenProvider oauth2AccessTokenProvider =
context.getProperty(OAUTH2_ACCESS_TOKEN_PROVIDER).asControllerService(OAuth2AccessTokenProvider.class);
-oauth2AccessTokenProvider.getAccessDetails();
+oauth2AccessDetails = oauth2AccessTokenProvider.getAccessDetails();
oauth2AccessTokenProviderOptional =
Optional.of(oauth2AccessTokenProvider);
} else {
@@ -326,7 +328,7 @@ abstract class AbstractEmailProcessor extends Ab
* and is ready to receive messages.
*/
private synchronized void initializeIfNecessary(ProcessContext context,
ProcessSession processSession) {
-if (this.messageReceiver == null) {
+if (this.messageReceiver == null || isOauth2AccessDetailsRefreshed()) {
this.processSession = processSession;
this.messageReceiver = this.buildMessageReceiver(context);
@@ -343,6 +345,14 @@ abstract class AbstractEmailProcessor extends Ab
}
}
+private boolean isOauth2AccessDetailsRefreshed() {
+boolean oauthDetailsRefreshed =
this.oauth2AccessTokenProviderOptional.isPresent()
+&&
+(this.oauth2AccessDetails == null ||
!oauth2AccessDetails.equals(this.oauth2AccessTokenProviderOptional.get().getAccessDetails()));
+
+return oauthDetailsRefreshed;
+}
+
/**
* Extracts dynamic properties which typically represent the Java Mail
* properties from the {@link ProcessContext} returning them as instance of
(nifi) branch main updated: NIFI-12888 In AbstractEmailProcessor check for expired oauth2 token when determining whether mail receiver needs to be recreated.
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 92830af2e9 NIFI-12888 In AbstractEmailProcessor check for expired
oauth2 token when determining whether mail receiver needs to be recreated.
92830af2e9 is described below
commit 92830af2e986dafe243f770bd672e6d969070746
Author: tpalfy
AuthorDate: Mon Mar 11 15:31:11 2024 +0100
NIFI-12888 In AbstractEmailProcessor check for expired oauth2 token when
determining whether mail receiver needs to be recreated.
Signed-off-by: Pierre Villard
This closes #8494.
---
.../nifi/processors/email/AbstractEmailProcessor.java | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java
b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java
index 593fbcbfe7..3c5efc2bb3 100644
---
a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java
+++
b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java
@@ -22,6 +22,7 @@ import org.apache.nifi.components.AllowableValue;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.oauth2.AccessToken;
import org.apache.nifi.oauth2.OAuth2AccessTokenProvider;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
@@ -198,13 +199,14 @@ abstract class AbstractEmailProcessor extends Ab
private volatile boolean shouldSetDeleteFlag;
protected volatile Optional
oauth2AccessTokenProviderOptional;
+protected volatile AccessToken oauth2AccessDetails;
@OnScheduled
public void onScheduled(final ProcessContext context) {
if (context.getProperty(OAUTH2_ACCESS_TOKEN_PROVIDER).isSet()) {
OAuth2AccessTokenProvider oauth2AccessTokenProvider =
context.getProperty(OAUTH2_ACCESS_TOKEN_PROVIDER).asControllerService(OAuth2AccessTokenProvider.class);
-oauth2AccessTokenProvider.getAccessDetails();
+oauth2AccessDetails = oauth2AccessTokenProvider.getAccessDetails();
oauth2AccessTokenProviderOptional =
Optional.of(oauth2AccessTokenProvider);
} else {
@@ -307,7 +309,7 @@ abstract class AbstractEmailProcessor extends Ab
* and is ready to receive messages.
*/
private synchronized void initializeIfNecessary(ProcessContext context,
ProcessSession processSession) {
-if (this.messageReceiver == null) {
+if (this.messageReceiver == null || isOauth2AccessDetailsRefreshed()) {
this.processSession = processSession;
this.messageReceiver = this.buildMessageReceiver(context);
@@ -324,6 +326,14 @@ abstract class AbstractEmailProcessor extends Ab
}
}
+private boolean isOauth2AccessDetailsRefreshed() {
+boolean oauthDetailsRefreshed =
this.oauth2AccessTokenProviderOptional.isPresent()
+&&
+(this.oauth2AccessDetails == null ||
!oauth2AccessDetails.equals(this.oauth2AccessTokenProviderOptional.get().getAccessDetails()));
+
+return oauthDetailsRefreshed;
+}
+
/**
* Extracts dynamic properties which typically represent the Java Mail
* properties from the {@link ProcessContext} returning them as instance of
(nifi) branch support/nifi-1.x updated: NIFI-12949 Upgraded Box SDK from 4.6.1 to 4.8.0
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new bdbcf30e5d NIFI-12949 Upgraded Box SDK from 4.6.1 to 4.8.0 bdbcf30e5d is described below commit bdbcf30e5dedd8ff89acf726847ecc4b972f596e Author: exceptionfactory AuthorDate: Mon Mar 25 13:36:40 2024 -0500 NIFI-12949 Upgraded Box SDK from 4.6.1 to 4.8.0 Signed-off-by: Pierre Villard This closes #8567. --- .../nifi-box-bundle/nifi-box-services-api/pom.xml| 20 +--- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/nifi-nar-bundles/nifi-box-bundle/nifi-box-services-api/pom.xml b/nifi-nar-bundles/nifi-box-bundle/nifi-box-services-api/pom.xml index 21adffbf82..e3b182a5ea 100644 --- a/nifi-nar-bundles/nifi-box-bundle/nifi-box-services-api/pom.xml +++ b/nifi-nar-bundles/nifi-box-bundle/nifi-box-services-api/pom.xml @@ -29,25 +29,7 @@ com.box box-java-sdk -4.4.0 - - -org.bouncycastle -bcprov-jdk15on - - -org.bouncycastle -bcpkix-jdk15on - - - - -org.bouncycastle -bcprov-jdk18on - - -org.bouncycastle -bcpkix-jdk18on +4.8.0 org.apache.nifi
(nifi) branch main updated: NIFI-12949 Upgraded Box SDK from 4.6.1 to 4.8.0
This is an automated email from the ASF dual-hosted git repository. pvillard 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 ebac490715 NIFI-12949 Upgraded Box SDK from 4.6.1 to 4.8.0 ebac490715 is described below commit ebac490715415763f5a4f704d37e631cd2f6a5b8 Author: exceptionfactory AuthorDate: Mon Mar 25 13:36:40 2024 -0500 NIFI-12949 Upgraded Box SDK from 4.6.1 to 4.8.0 Signed-off-by: Pierre Villard This closes #8567. --- .../nifi-box-bundle/nifi-box-services-api/pom.xml| 20 +--- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/nifi-nar-bundles/nifi-box-bundle/nifi-box-services-api/pom.xml b/nifi-nar-bundles/nifi-box-bundle/nifi-box-services-api/pom.xml index 5bb3c6490e..d6c01f645a 100644 --- a/nifi-nar-bundles/nifi-box-bundle/nifi-box-services-api/pom.xml +++ b/nifi-nar-bundles/nifi-box-bundle/nifi-box-services-api/pom.xml @@ -29,25 +29,7 @@ com.box box-java-sdk -4.6.1 - - -org.bouncycastle -bcprov-jdk15on - - -org.bouncycastle -bcpkix-jdk15on - - - - -org.bouncycastle -bcprov-jdk18on - - -org.bouncycastle -bcpkix-jdk18on +4.8.0 org.apache.nifi
(nifi) branch support/nifi-1.x updated: NIFI-12947 Upgraded MIME4J to 0.8.11
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 65ac492da0 NIFI-12947 Upgraded MIME4J to 0.8.11
65ac492da0 is described below
commit 65ac492da077abce1add9639ebc60e203bbd1448
Author: exceptionfactory
AuthorDate: Mon Mar 25 12:31:24 2024 -0500
NIFI-12947 Upgraded MIME4J to 0.8.11
Signed-off-by: Pierre Villard
This closes #8561.
---
nifi-nar-bundles/nifi-media-bundle/pom.xml | 6 ++
1 file changed, 6 insertions(+)
diff --git a/nifi-nar-bundles/nifi-media-bundle/pom.xml
b/nifi-nar-bundles/nifi-media-bundle/pom.xml
index 07cfa91846..d6f4c4305c 100644
--- a/nifi-nar-bundles/nifi-media-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-media-bundle/pom.xml
@@ -27,6 +27,7 @@
5.2.5
+0.8.11
@@ -58,6 +59,11 @@
poi-ooxml
${poi.version}
+
+org.apache.james
+apache-mime4j-core
+${mime4j.version}
+
(nifi) branch main updated: NIFI-12947 Upgraded MIME4J to 0.8.11
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 407dd4d4bc NIFI-12947 Upgraded MIME4J to 0.8.11
407dd4d4bc is described below
commit 407dd4d4bcb0cbf6fec037ebe2ad99551b4ce067
Author: exceptionfactory
AuthorDate: Mon Mar 25 12:31:24 2024 -0500
NIFI-12947 Upgraded MIME4J to 0.8.11
Signed-off-by: Pierre Villard
This closes #8561.
---
nifi-code-coverage/pom.xml | 7 +++
nifi-nar-bundles/nifi-media-bundle/pom.xml | 6 ++
2 files changed, 13 insertions(+)
diff --git a/nifi-code-coverage/pom.xml b/nifi-code-coverage/pom.xml
index f9cec5b9d1..a74b90f3be 100644
--- a/nifi-code-coverage/pom.xml
+++ b/nifi-code-coverage/pom.xml
@@ -31,6 +31,7 @@
1.6.0
1.24.0
2.12.0
+0.8.11
@@ -125,6 +126,12 @@
sshd-osgi
${org.apache.sshd.version}
+
+
+org.apache.james
+apache-mime4j-core
+${mime4j.version}
+
diff --git a/nifi-nar-bundles/nifi-media-bundle/pom.xml
b/nifi-nar-bundles/nifi-media-bundle/pom.xml
index 6555b16cc4..1c0c6a3cb4 100644
--- a/nifi-nar-bundles/nifi-media-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-media-bundle/pom.xml
@@ -27,6 +27,7 @@
5.2.5
+0.8.11
@@ -58,6 +59,11 @@
poi-ooxml
${poi.version}
+
+org.apache.james
+apache-mime4j-core
+${mime4j.version}
+
(nifi) branch support/nifi-1.x updated: NIFI-12936 ListGCSBucket resets its tracking state after configuration change
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new e97431f060 NIFI-12936 ListGCSBucket resets its tracking state after
configuration change
e97431f060 is described below
commit e97431f0604fccad84c79048758eed567db117e1
Author: Peter Turcsanyi
AuthorDate: Mon Mar 25 19:19:49 2024 +0100
NIFI-12936 ListGCSBucket resets its tracking state after configuration
change
Signed-off-by: Pierre Villard
This closes #8563.
---
.../nifi/processors/gcp/storage/ListGCSBucket.java | 63 +++-
.../processors/gcp/storage/ListGCSBucketTest.java | 409 -
2 files changed, 281 insertions(+), 191 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/storage/ListGCSBucket.java
b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/storage/ListGCSBucket.java
index 627f66654d..be18311356 100644
---
a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/storage/ListGCSBucket.java
+++
b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/storage/ListGCSBucket.java
@@ -69,6 +69,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.sql.Timestamp;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -274,40 +275,64 @@ public class ListGCSBucket extends AbstractGCSProcessor {
return relationships;
}
-// State tracking
+private static final Set TRACKING_RESET_PROPERTIES =
Collections.unmodifiableSet(
+new HashSet<>(Arrays.asList(
+BUCKET,
+PREFIX,
+LISTING_STRATEGY
+))
+);
+
+// used by Tracking Timestamps tracking strategy
public static final String CURRENT_TIMESTAMP = "currentTimestamp";
public static final String CURRENT_KEY_PREFIX = "key-";
private volatile long currentTimestamp = 0L;
private final Set currentKeys = Collections.synchronizedSet(new
HashSet<>());
-private volatile boolean justElectedPrimaryNode = false;
-private volatile boolean resetEntityTrackingState = false;
+// used by Tracking Entities tracking strategy
private volatile ListedEntityTracker listedEntityTracker;
+private volatile boolean justElectedPrimaryNode = false;
+private volatile boolean resetTracking = false;
+
@OnPrimaryNodeStateChange
public void onPrimaryNodeChange(final PrimaryNodeState newState) {
justElectedPrimaryNode = (newState ==
PrimaryNodeState.ELECTED_PRIMARY_NODE);
}
+@Override
+public void onPropertyModified(final PropertyDescriptor descriptor, final
String oldValue, final String newValue) {
+if (isConfigurationRestored() &&
TRACKING_RESET_PROPERTIES.contains(descriptor)) {
+resetTracking = true;
+}
+}
+
@OnScheduled
-public void initListedEntityTracker(ProcessContext context) {
-final boolean isTrackingEntityStrategy =
BY_ENTITIES.getValue().equals(context.getProperty(LISTING_STRATEGY).getValue());
-if (listedEntityTracker != null && (resetEntityTrackingState ||
!isTrackingEntityStrategy)) {
+public void initTrackingStrategy(ProcessContext context) throws
IOException {
+final String listingStrategy =
context.getProperty(LISTING_STRATEGY).getValue();
+final boolean isTrackingTimestampsStrategy =
BY_TIMESTAMPS.getValue().equals(listingStrategy);
+final boolean isTrackingEntityStrategy =
BY_ENTITIES.getValue().equals(listingStrategy);
+
+if (resetTracking || !isTrackingTimestampsStrategy) {
+context.getStateManager().clear(Scope.CLUSTER);
+currentTimestamp = 0L;
+currentKeys.clear();
+}
+
+if (listedEntityTracker != null && (resetTracking ||
!isTrackingEntityStrategy)) {
try {
listedEntityTracker.clearListedEntities();
+listedEntityTracker = null;
} catch (IOException e) {
throw new RuntimeException("Failed to reset previously listed
entities", e);
}
}
-resetEntityTrackingState = false;
-if (isTrackingEntityStrategy) {
-if (listedEntityTracker == null) {
-listedEntityTracker = createListedEntityTracker();
-}
-} else {
-listedEntityTracker = null;
+if (isTrackingEntityStrategy && listedEntityTracker == null) {
+listedEntityTracker
(nifi) branch support/nifi-1.x updated: NIFI-12944 - Add PeerAddress as Attribute into the flowfile
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 3ce2deb706 NIFI-12944 - Add PeerAddress as Attribute into the flowfile
3ce2deb706 is described below
commit 3ce2deb706247bbc17bc65304f0b41f4c2fabb5c
Author: Ricardo Ferreira
AuthorDate: Thu Mar 21 16:34:21 2024 +
NIFI-12944 - Add PeerAddress as Attribute into the flowfile
Signed-off-by: Pierre Villard
This closes #8557.
---
.../nifi/snmp/operations/SNMPTrapReceiver.java | 10 --
.../nifi/snmp/operations/SNMPTrapReceiverTest.java | 23 ++
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/operations/SNMPTrapReceiver.java
b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/operations/SNMPTrapReceiver.java
index d2eaf19528..c93bb83e46 100644
---
a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/operations/SNMPTrapReceiver.java
+++
b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/operations/SNMPTrapReceiver.java
@@ -25,6 +25,7 @@ import org.snmp4j.CommandResponder;
import org.snmp4j.CommandResponderEvent;
import org.snmp4j.PDU;
import org.snmp4j.PDUv1;
+import org.snmp4j.smi.Address;
import java.util.Map;
@@ -46,7 +47,7 @@ public class SNMPTrapReceiver implements CommandResponder {
final PDU pdu = event.getPDU();
if (isValidTrapPdu(pdu)) {
final ProcessSession processSession =
processSessionFactory.createSession();
-final FlowFile flowFile = createFlowFile(processSession, pdu);
+final FlowFile flowFile = createFlowFile(processSession,event);
processSession.getProvenanceReporter().create(flowFile,
event.getPeerAddress() + "/" + pdu.getRequestID());
if (pdu.getErrorStatus() == PDU.noError) {
processSession.transfer(flowFile, REL_SUCCESS);
@@ -59,14 +60,19 @@ public class SNMPTrapReceiver implements CommandResponder {
}
}
-private FlowFile createFlowFile(final ProcessSession processSession, final
PDU pdu) {
+private FlowFile createFlowFile(final ProcessSession processSession, final
CommandResponderEvent event) {
FlowFile flowFile = processSession.create();
final Map attributes;
+final PDU pdu = event.getPDU();
+final Address peerAddress = event.getPeerAddress();
if (pdu instanceof PDUv1) {
attributes = SNMPUtils.getV1TrapPduAttributeMap((PDUv1) pdu);
} else {
attributes = SNMPUtils.getPduAttributeMap(pdu);
}
+if (peerAddress.isValid()) {
+processSession.putAttribute(flowFile, SNMPUtils.SNMP_PROP_PREFIX +
"peerAddress", peerAddress.toString());
+}
flowFile = processSession.putAllAttributes(flowFile, attributes);
return flowFile;
}
diff --git
a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/operations/SNMPTrapReceiverTest.java
b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/operations/SNMPTrapReceiverTest.java
index eeca40eefe..0d273c3921 100644
---
a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/operations/SNMPTrapReceiverTest.java
+++
b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/operations/SNMPTrapReceiverTest.java
@@ -29,6 +29,7 @@ import org.junit.jupiter.api.Test;
import org.snmp4j.CommandResponderEvent;
import org.snmp4j.PDU;
import org.snmp4j.PDUv1;
+import org.snmp4j.smi.Address;
import org.snmp4j.smi.OID;
import org.snmp4j.smi.VariableBinding;
@@ -95,9 +96,15 @@ class SNMPTrapReceiverTest {
when(mockV1Pdu.getType()).thenReturn(PDU.V1TRAP);
when(mockV1Pdu.getEnterprise()).thenReturn(new
OID("1.3.6.1.2.1.1.1.0"));
when(mockV1Pdu.getSpecificTrap()).thenReturn(4);
+
+final Address mockAddress = mock(Address.class);
+when(mockAddress.toString()).thenReturn("127.0.0.1/62");
+when(mockAddress.isValid()).thenReturn(true);
+
final Vector vbs = new Vector<>();
doReturn(vbs).when(mockV1Pdu).getVariableBindings();
when(mockEvent.getPDU()).thenReturn(mockV1Pdu);
+when(mockEvent.getPeerAddress()).thenReturn(mockAddress);
when(mockProcessSessionFactory.createSession()).thenReturn(mockProcessSession);
snmpTrapReceiver.processPdu(mockEvent);
@@ -107,6 +114,8 @@ class SNMPTrapReceiverTest {
assertEquals("1.3.6.1.2.1.1.1.0",
flowFile
(nifi) branch main updated: NIFI-12944 - Add PeerAddress as Attribute into the flowfile
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 258715539e NIFI-12944 - Add PeerAddress as Attribute into the flowfile
258715539e is described below
commit 258715539e7cf136152625aeafee5a2f8673eacd
Author: Ricardo Ferreira
AuthorDate: Thu Mar 21 16:34:21 2024 +
NIFI-12944 - Add PeerAddress as Attribute into the flowfile
Signed-off-by: Pierre Villard
This closes #8557.
---
.../nifi/snmp/operations/SNMPTrapReceiver.java | 10 --
.../nifi/snmp/operations/SNMPTrapReceiverTest.java | 23 ++
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/operations/SNMPTrapReceiver.java
b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/operations/SNMPTrapReceiver.java
index d2eaf19528..c93bb83e46 100644
---
a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/operations/SNMPTrapReceiver.java
+++
b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/operations/SNMPTrapReceiver.java
@@ -25,6 +25,7 @@ import org.snmp4j.CommandResponder;
import org.snmp4j.CommandResponderEvent;
import org.snmp4j.PDU;
import org.snmp4j.PDUv1;
+import org.snmp4j.smi.Address;
import java.util.Map;
@@ -46,7 +47,7 @@ public class SNMPTrapReceiver implements CommandResponder {
final PDU pdu = event.getPDU();
if (isValidTrapPdu(pdu)) {
final ProcessSession processSession =
processSessionFactory.createSession();
-final FlowFile flowFile = createFlowFile(processSession, pdu);
+final FlowFile flowFile = createFlowFile(processSession,event);
processSession.getProvenanceReporter().create(flowFile,
event.getPeerAddress() + "/" + pdu.getRequestID());
if (pdu.getErrorStatus() == PDU.noError) {
processSession.transfer(flowFile, REL_SUCCESS);
@@ -59,14 +60,19 @@ public class SNMPTrapReceiver implements CommandResponder {
}
}
-private FlowFile createFlowFile(final ProcessSession processSession, final
PDU pdu) {
+private FlowFile createFlowFile(final ProcessSession processSession, final
CommandResponderEvent event) {
FlowFile flowFile = processSession.create();
final Map attributes;
+final PDU pdu = event.getPDU();
+final Address peerAddress = event.getPeerAddress();
if (pdu instanceof PDUv1) {
attributes = SNMPUtils.getV1TrapPduAttributeMap((PDUv1) pdu);
} else {
attributes = SNMPUtils.getPduAttributeMap(pdu);
}
+if (peerAddress.isValid()) {
+processSession.putAttribute(flowFile, SNMPUtils.SNMP_PROP_PREFIX +
"peerAddress", peerAddress.toString());
+}
flowFile = processSession.putAllAttributes(flowFile, attributes);
return flowFile;
}
diff --git
a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/operations/SNMPTrapReceiverTest.java
b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/operations/SNMPTrapReceiverTest.java
index eeca40eefe..0d273c3921 100644
---
a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/operations/SNMPTrapReceiverTest.java
+++
b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/operations/SNMPTrapReceiverTest.java
@@ -29,6 +29,7 @@ import org.junit.jupiter.api.Test;
import org.snmp4j.CommandResponderEvent;
import org.snmp4j.PDU;
import org.snmp4j.PDUv1;
+import org.snmp4j.smi.Address;
import org.snmp4j.smi.OID;
import org.snmp4j.smi.VariableBinding;
@@ -95,9 +96,15 @@ class SNMPTrapReceiverTest {
when(mockV1Pdu.getType()).thenReturn(PDU.V1TRAP);
when(mockV1Pdu.getEnterprise()).thenReturn(new
OID("1.3.6.1.2.1.1.1.0"));
when(mockV1Pdu.getSpecificTrap()).thenReturn(4);
+
+final Address mockAddress = mock(Address.class);
+when(mockAddress.toString()).thenReturn("127.0.0.1/62");
+when(mockAddress.isValid()).thenReturn(true);
+
final Vector vbs = new Vector<>();
doReturn(vbs).when(mockV1Pdu).getVariableBindings();
when(mockEvent.getPDU()).thenReturn(mockV1Pdu);
+when(mockEvent.getPeerAddress()).thenReturn(mockAddress);
when(mockProcessSessionFactory.createSession()).thenReturn(mockProcessSession);
snmpTrapReceiver.processPdu(mockEvent);
@@ -107,6 +114,8 @@ class SNMPTrapReceiverTest {
assertEquals("1.3.6.1.2.1.1.1.0",
flowFile.getAttribute(&qu
(nifi) branch support/nifi-1.x updated: NIFI-12928 Added Simple Write strategy in PutAzureDataLakeStorage
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 87196e23d6 NIFI-12928 Added Simple Write strategy in
PutAzureDataLakeStorage
87196e23d6 is described below
commit 87196e23d651fa6edeae364c2189a7779e39060e
Author: Peter Turcsanyi
AuthorDate: Mon Mar 25 17:34:11 2024 +0100
NIFI-12928 Added Simple Write strategy in PutAzureDataLakeStorage
Signed-off-by: Pierre Villard
This closes #8559.
---
.../azure/storage/PutAzureDataLakeStorage.java | 148 ++--
.../azure/storage/utils/WritingStrategy.java | 49 +++
.../additionalDetails.html | 44 --
.../azure/storage/ITPutAzureDataLakeStorage.java | 155 +++--
4 files changed, 296 insertions(+), 100 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/PutAzureDataLakeStorage.java
b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/PutAzureDataLakeStorage.java
index cfd660c289..c15c737f58 100644
---
a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/PutAzureDataLakeStorage.java
+++
b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/PutAzureDataLakeStorage.java
@@ -39,6 +39,7 @@ import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processors.azure.AbstractAzureDataLakeStorageProcessor;
import org.apache.nifi.processors.azure.storage.utils.AzureStorageUtils;
+import org.apache.nifi.processors.azure.storage.utils.WritingStrategy;
import org.apache.nifi.processors.transfer.ResourceTransferSource;
import org.apache.nifi.util.StringUtils;
@@ -93,6 +94,15 @@ public class PutAzureDataLakeStorage extends
AbstractAzureDataLakeStorageProcess
.allowableValues(FAIL_RESOLUTION, REPLACE_RESOLUTION,
IGNORE_RESOLUTION)
.build();
+protected static final PropertyDescriptor WRITING_STRATEGY = new
PropertyDescriptor.Builder()
+.name("writing-strategy")
+.displayName("Writing Strategy")
+.description("Defines the approach for writing the Azure file.")
+.required(true)
+.allowableValues(WritingStrategy.class)
+.defaultValue(WritingStrategy.WRITE_AND_RENAME.getValue())
+.build();
+
public static final PropertyDescriptor BASE_TEMPORARY_PATH = new
PropertyDescriptor.Builder()
.name("base-temporary-path")
.displayName("Base Temporary Path")
@@ -102,6 +112,7 @@ public class PutAzureDataLakeStorage extends
AbstractAzureDataLakeStorageProcess
.defaultValue("")
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
.addValidator(new DirectoryValidator("Base Temporary Path"))
+.dependsOn(WRITING_STRATEGY, WritingStrategy.WRITE_AND_RENAME)
.build();
private static final List PROPERTIES =
Collections.unmodifiableList(Arrays.asList(
@@ -109,6 +120,7 @@ public class PutAzureDataLakeStorage extends
AbstractAzureDataLakeStorageProcess
FILESYSTEM,
DIRECTORY,
FILE,
+WRITING_STRATEGY,
BASE_TEMPORARY_PATH,
CONFLICT_RESOLUTION,
RESOURCE_TRANSFER_SOURCE,
@@ -131,41 +143,44 @@ public class PutAzureDataLakeStorage extends
AbstractAzureDataLakeStorageProcess
final long startNanos = System.nanoTime();
try {
final String fileSystem = evaluateFileSystemProperty(context,
flowFile);
-final String originalDirectory =
evaluateDirectoryProperty(context, flowFile);
-final String tempPath = evaluateDirectoryProperty(context,
flowFile, BASE_TEMPORARY_PATH);
-final String tempDirectory = createPath(tempPath,
TEMP_FILE_DIRECTORY);
+final String directory = evaluateDirectoryProperty(context,
flowFile);
final String fileName = evaluateFileNameProperty(context,
flowFile);
final DataLakeFileSystemClient fileSystemClient =
getFileSystemClient(context, flowFile, fileSystem);
-final DataLakeDirectoryClient directoryClient =
fileSystemClient.getDirectoryClient(originalDirectory);
+final DataLakeDirectoryClient directoryClient =
fileSystemClient.getDirectoryClient(directory);
-final String tempFilePrefix = UUID.randomUUID().toString();
-final DataLakeDirectoryClient tempDirectoryClient =
(nifi) branch main updated: NIFI-12936 ListGCSBucket resets its tracking state after configuration change
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 a9e246956c NIFI-12936 ListGCSBucket resets its tracking state after
configuration change
a9e246956c is described below
commit a9e246956cee822e407b20e45930e05c3fd72de6
Author: Peter Turcsanyi
AuthorDate: Fri Mar 22 22:32:27 2024 +0100
NIFI-12936 ListGCSBucket resets its tracking state after configuration
change
Signed-off-by: Pierre Villard
This closes #8550.
---
.../nifi/processors/gcp/storage/ListGCSBucket.java | 60 ++-
.../processors/gcp/storage/ListGCSBucketTest.java | 451 -
2 files changed, 298 insertions(+), 213 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/storage/ListGCSBucket.java
b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/storage/ListGCSBucket.java
index aed69ba1ee..97c6783a07 100644
---
a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/storage/ListGCSBucket.java
+++
b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/storage/ListGCSBucket.java
@@ -278,40 +278,62 @@ public class ListGCSBucket extends AbstractGCSProcessor {
return RELATIONSHIPS;
}
-// State tracking
+private static final Set TRACKING_RESET_PROPERTIES =
Set.of(
+BUCKET,
+PREFIX,
+LISTING_STRATEGY
+);
+
+// used by Tracking Timestamps tracking strategy
public static final String CURRENT_TIMESTAMP = "currentTimestamp";
public static final String CURRENT_KEY_PREFIX = "key-";
private volatile long currentTimestamp = 0L;
private final Set currentKeys = Collections.synchronizedSet(new
HashSet<>());
-private volatile boolean justElectedPrimaryNode = false;
-private volatile boolean resetEntityTrackingState = false;
+// used by Tracking Entities tracking strategy
private volatile ListedEntityTracker listedEntityTracker;
+private volatile boolean justElectedPrimaryNode = false;
+private volatile boolean resetTracking = false;
+
@OnPrimaryNodeStateChange
public void onPrimaryNodeChange(final PrimaryNodeState newState) {
justElectedPrimaryNode = (newState ==
PrimaryNodeState.ELECTED_PRIMARY_NODE);
}
+@Override
+public void onPropertyModified(final PropertyDescriptor descriptor, final
String oldValue, final String newValue) {
+if (isConfigurationRestored() &&
TRACKING_RESET_PROPERTIES.contains(descriptor)) {
+resetTracking = true;
+}
+}
+
@OnScheduled
-public void initListedEntityTracker(ProcessContext context) {
-final boolean isTrackingEntityStrategy =
BY_ENTITIES.getValue().equals(context.getProperty(LISTING_STRATEGY).getValue());
-if (listedEntityTracker != null && (resetEntityTrackingState ||
!isTrackingEntityStrategy)) {
+public void initTrackingStrategy(ProcessContext context) throws
IOException {
+final String listingStrategy =
context.getProperty(LISTING_STRATEGY).getValue();
+final boolean isTrackingTimestampsStrategy =
BY_TIMESTAMPS.getValue().equals(listingStrategy);
+final boolean isTrackingEntityStrategy =
BY_ENTITIES.getValue().equals(listingStrategy);
+
+if (resetTracking || !isTrackingTimestampsStrategy) {
+context.getStateManager().clear(Scope.CLUSTER);
+currentTimestamp = 0L;
+currentKeys.clear();
+}
+
+if (listedEntityTracker != null && (resetTracking ||
!isTrackingEntityStrategy)) {
try {
listedEntityTracker.clearListedEntities();
+listedEntityTracker = null;
} catch (IOException e) {
throw new RuntimeException("Failed to reset previously listed
entities", e);
}
}
-resetEntityTrackingState = false;
-if (isTrackingEntityStrategy) {
-if (listedEntityTracker == null) {
-listedEntityTracker = createListedEntityTracker();
-}
-} else {
-listedEntityTracker = null;
+if (isTrackingEntityStrategy && listedEntityTracker == null) {
+listedEntityTracker = createListedEntityTracker();
}
+
+resetTracking = false;
}
protected ListedEntityTracker createListedEntityTracker() {
@@ -1027,4 +1049,16 @@ public class ListGCSBucket extends AbstractGCSProcessor {
return count;
}
}
+
+long getCurrentTimestamp() {
+return currentTimestamp;
+}
+
+ListedEntityTracker getListedEntityTr
(nifi) branch main updated: NIFI-12942 Upgraded Jetty from 12.0.6 to 12.0.7
This is an automated email from the ASF dual-hosted git repository. pvillard 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 15d2b49e77 NIFI-12942 Upgraded Jetty from 12.0.6 to 12.0.7 15d2b49e77 is described below commit 15d2b49e774bce5ffeb0d976e9101e3f4170504f Author: exceptionfactory AuthorDate: Mon Mar 25 08:39:55 2024 -0500 NIFI-12942 Upgraded Jetty from 12.0.6 to 12.0.7 Signed-off-by: Pierre Villard This closes #8554. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c91980d907..9004ee27d3 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ 2.0.12 2.9.0 10.17.1.0 -12.0.6 +12.0.7 2.17.0 1.11.3 4.0.4
(nifi) branch main updated: NIFI-12928 Added Simple Write strategy in PutAzureDataLakeStorage
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 bffc342521 NIFI-12928 Added Simple Write strategy in
PutAzureDataLakeStorage
bffc342521 is described below
commit bffc34252158103d0de727783c85c1cac727e5f4
Author: Peter Turcsanyi
AuthorDate: Thu Mar 21 08:47:28 2024 +0100
NIFI-12928 Added Simple Write strategy in PutAzureDataLakeStorage
Signed-off-by: Pierre Villard
This closes #8540.
---
.../azure/storage/PutAzureDataLakeStorage.java | 148 ++--
.../azure/storage/utils/WritingStrategy.java | 49 +++
.../additionalDetails.html | 44 --
.../storage/AbstractAzureDataLakeStorageIT.java| 2 +
.../azure/storage/ITPutAzureDataLakeStorage.java | 155 +++--
5 files changed, 298 insertions(+), 100 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/PutAzureDataLakeStorage.java
b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/PutAzureDataLakeStorage.java
index 7651ad6a99..d385eeb27d 100644
---
a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/PutAzureDataLakeStorage.java
+++
b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/PutAzureDataLakeStorage.java
@@ -40,6 +40,7 @@ import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processors.azure.AbstractAzureDataLakeStorageProcessor;
import org.apache.nifi.processors.azure.storage.utils.AzureStorageUtils;
import
org.apache.nifi.processors.azure.storage.utils.AzureStorageUtils.DirectoryValidator;
+import org.apache.nifi.processors.azure.storage.utils.WritingStrategy;
import org.apache.nifi.processors.transfer.ResourceTransferSource;
import org.apache.nifi.util.StringUtils;
@@ -99,6 +100,15 @@ public class PutAzureDataLakeStorage extends
AbstractAzureDataLakeStorageProcess
.allowableValues(FAIL_RESOLUTION, REPLACE_RESOLUTION,
IGNORE_RESOLUTION)
.build();
+protected static final PropertyDescriptor WRITING_STRATEGY = new
PropertyDescriptor.Builder()
+.name("writing-strategy")
+.displayName("Writing Strategy")
+.description("Defines the approach for writing the Azure file.")
+.required(true)
+.allowableValues(WritingStrategy.class)
+.defaultValue(WritingStrategy.WRITE_AND_RENAME)
+.build();
+
public static final PropertyDescriptor BASE_TEMPORARY_PATH = new
PropertyDescriptor.Builder()
.name("base-temporary-path")
.displayName("Base Temporary Path")
@@ -108,6 +118,7 @@ public class PutAzureDataLakeStorage extends
AbstractAzureDataLakeStorageProcess
.defaultValue("")
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
.addValidator(new DirectoryValidator("Base Temporary Path"))
+.dependsOn(WRITING_STRATEGY, WritingStrategy.WRITE_AND_RENAME)
.build();
private static final List PROPERTIES = List.of(
@@ -115,6 +126,7 @@ public class PutAzureDataLakeStorage extends
AbstractAzureDataLakeStorageProcess
FILESYSTEM,
DIRECTORY,
FILE,
+WRITING_STRATEGY,
BASE_TEMPORARY_PATH,
CONFLICT_RESOLUTION,
RESOURCE_TRANSFER_SOURCE,
@@ -137,41 +149,44 @@ public class PutAzureDataLakeStorage extends
AbstractAzureDataLakeStorageProcess
final long startNanos = System.nanoTime();
try {
final String fileSystem = evaluateFileSystemProperty(FILESYSTEM,
context, flowFile);
-final String originalDirectory =
evaluateDirectoryProperty(DIRECTORY, context, flowFile);
-final String tempPath =
evaluateDirectoryProperty(BASE_TEMPORARY_PATH, context, flowFile);
-final String tempDirectory = createPath(tempPath,
TEMP_FILE_DIRECTORY);
+final String directory = evaluateDirectoryProperty(DIRECTORY,
context, flowFile);
final String fileName = evaluateFileProperty(context, flowFile);
final DataLakeFileSystemClient fileSystemClient =
getFileSystemClient(context, flowFile, fileSystem);
-final DataLakeDirectoryClient directoryClient =
fileSystemClient.getDirectoryClient(originalDirectory);
+final DataLakeDirectoryClient directoryClient =
fileSystemClient.getDirectoryClient(directory);
-final String tempFilePrefix = UUID.randomUUID().toSt
(nifi) branch support/nifi-1.x updated: NIFI-12929: Fix logout infinite redirect loop in case of knox
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 711a646197 NIFI-12929: Fix logout infinite redirect loop in case of
knox
711a646197 is described below
commit 711a64619798a1d79ed5e3629d2b2d0196a98417
Author: Zoltan Kornel Torok
AuthorDate: Fri Mar 22 13:02:35 2024 +0100
NIFI-12929: Fix logout infinite redirect loop in case of knox
Signed-off-by: Pierre Villard
This closes #8546.
---
.../src/main/java/org/apache/nifi/web/filter/LogoutFilter.java | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/java/org/apache/nifi/web/filter/LogoutFilter.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/java/org/apache/nifi/web/filter/LogoutFilter.java
index 832c2566df..c2f8905dbd 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/java/org/apache/nifi/web/filter/LogoutFilter.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/java/org/apache/nifi/web/filter/LogoutFilter.java
@@ -41,6 +41,10 @@ public class LogoutFilter implements Filter {
private static final String SAML_SINGLE_LOGOUT_URL =
"/nifi-api/access/saml/single-logout/request";
+private static final String KNOX_LOGOUT_URL =
"/nifi-api/access/knox/logout";
+
+private static final String LOGOUT_COMPLETE_URL =
"/nifi-api/access/logout/complete";
+
private ServletContext servletContext;
@Override
@@ -65,14 +69,12 @@ public class LogoutFilter implements Filter {
if (supportsOidc) {
sendRedirect(OIDC_LOGOUT_URL, request, response);
} else if (supportsKnoxSso) {
-final ServletContext apiContext =
servletContext.getContext("/nifi-api");
-
apiContext.getRequestDispatcher("/access/knox/logout").forward(request,
response);
+sendRedirect(KNOX_LOGOUT_URL, request, response);
} else if (supportsSaml) {
final String logoutUrl = supportsSamlSingleLogout ?
SAML_SINGLE_LOGOUT_URL : SAML_LOCAL_LOGOUT_URL;
sendRedirect(logoutUrl, request, response);
} else {
-final ServletContext apiContext =
servletContext.getContext("/nifi-api");
-
apiContext.getRequestDispatcher("/access/logout/complete").forward(request,
response);
+sendRedirect(LOGOUT_COMPLETE_URL, request, response);
}
}
(nifi) branch main updated: NIFI-12933 Rearranged properties on GCP processors
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 8eb013a813 NIFI-12933 Rearranged properties on GCP processors
8eb013a813 is described below
commit 8eb013a813ad5e8452a3eacd9774068a7bb4d3b3
Author: Peter Turcsanyi
AuthorDate: Fri Mar 22 13:13:29 2024 +0100
NIFI-12933 Rearranged properties on GCP processors
Also used current API methods for relationships/properties collections
Signed-off-by: Pierre Villard
This closes #8545.
---
.../nifi/processors/gcp/AbstractGCPProcessor.java | 9 --
.../gcp/bigquery/AbstractBigQueryProcessor.java| 17 ++
.../nifi/processors/gcp/bigquery/PutBigQuery.java | 12 ++-
.../pubsub/AbstractGCPubSubWithProxyProcessor.java | 10 --
.../processors/gcp/pubsub/ConsumeGCPubSub.java | 35
.../processors/gcp/pubsub/PublishGCPubSub.java | 37 --
.../gcp/pubsub/lite/ConsumeGCPubSubLite.java | 34 +++-
.../gcp/pubsub/lite/PublishGCPubSubLite.java | 25 ---
.../gcp/storage/AbstractGCSProcessor.java | 15 ++---
.../processors/gcp/storage/DeleteGCSObject.java| 19 +++
.../processors/gcp/storage/FetchGCSObject.java | 26 +--
.../nifi/processors/gcp/storage/ListGCSBucket.java | 31 ++
.../nifi/processors/gcp/storage/PutGCSObject.java | 33 +++
13 files changed, 146 insertions(+), 157 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/AbstractGCPProcessor.java
b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/AbstractGCPProcessor.java
index 0650451a5b..db6fc1e722 100644
---
a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/AbstractGCPProcessor.java
+++
b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/AbstractGCPProcessor.java
@@ -85,15 +85,6 @@ public abstract class AbstractGCPProcessor<
return cloudService;
}
-@Override
-public List getSupportedPropertyDescriptors() {
-return List.of(PROJECT_ID,
-GCP_CREDENTIALS_PROVIDER_SERVICE,
-RETRY_COUNT,
-PROXY_CONFIGURATION_SERVICE
-);
-}
-
@Override
public void migrateProperties(final PropertyConfiguration config) {
diff --git
a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/bigquery/AbstractBigQueryProcessor.java
b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/bigquery/AbstractBigQueryProcessor.java
index c2652b29f2..2012c4c474 100644
---
a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/bigquery/AbstractBigQueryProcessor.java
+++
b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/bigquery/AbstractBigQueryProcessor.java
@@ -39,10 +39,8 @@ import org.apache.nifi.proxy.ProxyConfiguration;
import org.apache.nifi.util.StringUtils;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -63,8 +61,7 @@ public abstract class AbstractBigQueryProcessor extends
AbstractGCPProcessor relationships =
Collections.unmodifiableSet(
-new HashSet<>(Arrays.asList(REL_SUCCESS, REL_FAILURE)));
+public static final Set RELATIONSHIPS = Set.of(REL_SUCCESS,
REL_FAILURE);
public static final PropertyDescriptor DATASET = new
PropertyDescriptor.Builder()
.name(BigQueryAttributes.DATASET_ATTR)
@@ -98,17 +95,7 @@ public abstract class AbstractBigQueryProcessor extends
AbstractGCPProcessor getRelationships() {
-return relationships;
-}
-
-@Override
-public List getSupportedPropertyDescriptors() {
-final List descriptors = new ArrayList<>();
-descriptors.addAll(super.getSupportedPropertyDescriptors());
-descriptors.add(DATASET);
-descriptors.add(TABLE_NAME);
-descriptors.add(IGNORE_UNKNOWN);
-return Collections.unmodifiableList(descriptors);
+return RELATIONSHIPS;
}
@Override
diff --git
a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/bigquery/PutBigQuery.java
b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/bigquery/PutBigQuery.java
index 8536f232c7..cb51362a08 100644
---
a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/sr
(nifi) branch support/nifi-1.x updated: NIFI-12895 Added Timeout property to GetSmbFile and PutSmbFile
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new cc81eeffb2 NIFI-12895 Added Timeout property to GetSmbFile and
PutSmbFile
cc81eeffb2 is described below
commit cc81eeffb21604059b32a0cb80992d3b5d6fe941
Author: Peter Turcsanyi
AuthorDate: Sat Mar 23 18:58:52 2024 +0100
NIFI-12895 Added Timeout property to GetSmbFile and PutSmbFile
Signed-off-by: Pierre Villard
This closes #8551.
---
.../src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java| 2 ++
.../src/main/java/org/apache/nifi/processors/smb/PutSmbFile.java| 2 ++
2 files changed, 4 insertions(+)
diff --git
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
index 244ae4639f..ed843f9bff 100644
---
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
+++
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
@@ -81,6 +81,7 @@ import java.util.concurrent.locks.ReentrantLock;
import java.util.regex.Pattern;
import static org.apache.nifi.smb.common.SmbProperties.SMB_DIALECT;
+import static org.apache.nifi.smb.common.SmbProperties.TIMEOUT;
import static org.apache.nifi.smb.common.SmbProperties.USE_ENCRYPTION;
import static org.apache.nifi.smb.common.SmbUtils.buildSmbClient;
@@ -256,6 +257,7 @@ public class GetSmbFile extends AbstractProcessor {
descriptors.add(IGNORE_HIDDEN_FILES);
descriptors.add(SMB_DIALECT);
descriptors.add(USE_ENCRYPTION);
+descriptors.add(TIMEOUT);
this.descriptors = Collections.unmodifiableList(descriptors);
final Set relationships = new HashSet();
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 b7ee444ab9..468828f819 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
@@ -65,6 +65,7 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import static org.apache.nifi.smb.common.SmbProperties.SMB_DIALECT;
+import static org.apache.nifi.smb.common.SmbProperties.TIMEOUT;
import static org.apache.nifi.smb.common.SmbProperties.USE_ENCRYPTION;
import static org.apache.nifi.smb.common.SmbUtils.buildSmbClient;
@@ -193,6 +194,7 @@ public class PutSmbFile extends AbstractProcessor {
descriptors.add(RENAME_SUFFIX);
descriptors.add(SMB_DIALECT);
descriptors.add(USE_ENCRYPTION);
+descriptors.add(TIMEOUT);
this.descriptors = Collections.unmodifiableList(descriptors);
final Set relationships = new HashSet();
(nifi) branch main updated: NIFI-12895 Added Timeout property to GetSmbFile and PutSmbFile
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 635eb9ed2a NIFI-12895 Added Timeout property to GetSmbFile and
PutSmbFile
635eb9ed2a is described below
commit 635eb9ed2a7f5b74e3b0914eda75c0d3ae302563
Author: Peter Turcsanyi
AuthorDate: Sat Mar 23 18:58:52 2024 +0100
NIFI-12895 Added Timeout property to GetSmbFile and PutSmbFile
Signed-off-by: Pierre Villard
This closes #8551.
---
.../src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java| 2 ++
.../src/main/java/org/apache/nifi/processors/smb/PutSmbFile.java| 2 ++
2 files changed, 4 insertions(+)
diff --git
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
index c938ce83f3..b4089f5287 100644
---
a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
+++
b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java
@@ -81,6 +81,7 @@ import java.util.concurrent.locks.ReentrantLock;
import java.util.regex.Pattern;
import static org.apache.nifi.smb.common.SmbProperties.SMB_DIALECT;
+import static org.apache.nifi.smb.common.SmbProperties.TIMEOUT;
import static org.apache.nifi.smb.common.SmbProperties.USE_ENCRYPTION;
import static org.apache.nifi.smb.common.SmbUtils.buildSmbClient;
@@ -256,6 +257,7 @@ public class GetSmbFile extends AbstractProcessor {
descriptors.add(IGNORE_HIDDEN_FILES);
descriptors.add(SMB_DIALECT);
descriptors.add(USE_ENCRYPTION);
+descriptors.add(TIMEOUT);
this.descriptors = Collections.unmodifiableList(descriptors);
final Set relationships = new HashSet();
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 b7ee444ab9..468828f819 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
@@ -65,6 +65,7 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import static org.apache.nifi.smb.common.SmbProperties.SMB_DIALECT;
+import static org.apache.nifi.smb.common.SmbProperties.TIMEOUT;
import static org.apache.nifi.smb.common.SmbProperties.USE_ENCRYPTION;
import static org.apache.nifi.smb.common.SmbUtils.buildSmbClient;
@@ -193,6 +194,7 @@ public class PutSmbFile extends AbstractProcessor {
descriptors.add(RENAME_SUFFIX);
descriptors.add(SMB_DIALECT);
descriptors.add(USE_ENCRYPTION);
+descriptors.add(TIMEOUT);
this.descriptors = Collections.unmodifiableList(descriptors);
final Set relationships = new HashSet();
(nifi) branch main updated: NIFI-12938: Upgrade Iceberg from 1.4.3 to 1.5.0
This is an automated email from the ASF dual-hosted git repository. pvillard 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 8c0829d711 NIFI-12938: Upgrade Iceberg from 1.4.3 to 1.5.0 8c0829d711 is described below commit 8c0829d711da9d38ef87302c4d2f12ced9e7167f Author: Mark Bathori AuthorDate: Sun Mar 24 20:31:13 2024 +0100 NIFI-12938: Upgrade Iceberg from 1.4.3 to 1.5.0 Signed-off-by: Pierre Villard This closes #8552. --- nifi-nar-bundles/nifi-iceberg-bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml b/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml index 313daffe3c..f6c96fb45b 100644 --- a/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml @@ -25,7 +25,7 @@ pom -1.4.3 +1.5.0 3.1.3
(nifi) branch support/nifi-1.x updated: NIFI-12938: Upgrade Iceberg from 1.4.3 to 1.5.0
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new c4a2738606 NIFI-12938: Upgrade Iceberg from 1.4.3 to 1.5.0 c4a2738606 is described below commit c4a27386069de8c6174f63c6f61532c092725f97 Author: Mark Bathori AuthorDate: Sun Mar 24 20:31:13 2024 +0100 NIFI-12938: Upgrade Iceberg from 1.4.3 to 1.5.0 Signed-off-by: Pierre Villard This closes #8552. --- nifi-nar-bundles/nifi-iceberg-bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml b/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml index 13c9096f17..44c3e85dba 100644 --- a/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml @@ -25,7 +25,7 @@ pom -1.4.3 +1.5.0 3.1.3
(nifi) branch main updated: NIFI-12782 Migrated GCS processors' Proxy properties to ProxyConfigurationService
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 d370b470b8 NIFI-12782 Migrated GCS processors' Proxy properties to
ProxyConfigurationService
d370b470b8 is described below
commit d370b470b8953ce6f5c1edb6a0623d21c08512ed
Author: Peter Turcsanyi
AuthorDate: Mon Feb 12 23:38:46 2024 +0100
NIFI-12782 Migrated GCS processors' Proxy properties to
ProxyConfigurationService
Extracted proxy service migration code into a common util module because
the same logic was already used in AWS module,
and it is also reusable in other components for proxy property migration.
Signed-off-by: Pierre Villard
This closes #8400.
---
.../nifi-aws-abstract-processors/pom.xml | 5 ++
.../AbstractAWSCredentialsProviderProcessor.java | 32 +
.../processors/aws/v2/AbstractAwsProcessor.java| 32 +
.../nifi-migration-utils/pom.xml | 39 ++
.../nifi/migration/ProxyServiceMigration.java | 69 ++
.../nifi/migration/ProxyServiceMigrationTest.java | 84 ++
nifi-nar-bundles/nifi-extension-utils/pom.xml | 5 +-
.../nifi-gcp-bundle/nifi-gcp-processors/pom.xml| 5 ++
.../nifi/processors/gcp/AbstractGCPProcessor.java | 84 +-
.../pubsub/AbstractGCPubSubWithProxyProcessor.java | 20 +-
10 files changed, 229 insertions(+), 146 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml
index fcfc8e7096..34cd7e9c0f 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml
@@ -142,6 +142,11 @@
org.apache.nifi
nifi-proxy-configuration-api
+
+org.apache.nifi
+nifi-migration-utils
+2.0.0-SNAPSHOT
+
com.github.ben-manes.caffeine
caffeine
diff --git
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSCredentialsProviderProcessor.java
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSCredentialsProviderProcessor.java
index 5215186e36..e3fdefde9f 100644
---
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSCredentialsProviderProcessor.java
+++
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSCredentialsProviderProcessor.java
@@ -37,6 +37,7 @@ import org.apache.nifi.context.PropertyContext;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.migration.PropertyConfiguration;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.Relationship;
@@ -49,9 +50,7 @@ import org.apache.nifi.ssl.SSLContextService;
import javax.net.ssl.SSLContext;
import java.net.Proxy;
-import java.net.Proxy.Type;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -69,7 +68,6 @@ import static
org.apache.nifi.processors.aws.util.RegionUtilV1.REGION;
public abstract class AbstractAWSCredentialsProviderProcessor extends AbstractProcessor implements
VerifiableProcessor {
private static final String CREDENTIALS_SERVICE_CLASSNAME =
"org.apache.nifi.processors.aws.credentials.provider.service.AWSCredentialsProviderControllerService";
-private static final String PROXY_SERVICE_CLASSNAME =
"org.apache.nifi.proxy.StandardProxyConfigurationService";
// Obsolete property names
private static final String OBSOLETE_ACCESS_KEY = "Access Key";
@@ -85,11 +83,6 @@ public abstract class
AbstractAWSCredentialsProviderProcessor proxyProperties = new HashMap<>();
-proxyProperties.put(PROXY_SERVICE_TYPE, Type.HTTP.name());
-proxyProperties.put(PROXY_SERVICE_HOST,
config.getRawPropertyValue(OBSOLETE_PROXY_HOST).get());
-
-// Map any optional proxy configs
-config.getRawPropertyValue(OBSOLETE_PROXY_PORT).ifPresent(value ->
proxyProperties.put(PROXY_SERVICE_PORT, value));
-
config.getRawPropertyValue(OBSOLETE_PROXY_USERNAME).ifPresent(value ->
proxyProperties.put(PROXY_SERVICE_USERNAME, value));
-
config.getRawPropertyValue(OBSOLETE_PROXY_PASSWORD).ifPresent(value ->
prox
(nifi) branch support/nifi-1.x updated: NIFI-12503 Render from-data in swagger.json and RestAPI docs correctly
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new 4e1e2612c3 NIFI-12503 Render from-data in swagger.json and RestAPI docs correctly 4e1e2612c3 is described below commit 4e1e2612c3379f672cfd8fb9352c6bd230f6789a Author: EndzeitBegins <1115+endzeitbeg...@users.noreply.github.com> AuthorDate: Fri Mar 8 11:06:39 2024 +0100 NIFI-12503 Render from-data in swagger.json and RestAPI docs correctly Signed-off-by: Pierre Villard This closes #8485. --- .../apache/nifi/web/api/ProcessGroupResource.java | 72 ++ 1 file changed, 48 insertions(+), 24 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java index a783087e60..04a626b7fd 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java @@ -3824,6 +3824,13 @@ public class ProcessGroupResource extends FlowUpdateResource
(nifi) branch support/nifi-1.x updated: NIFI-12919 Deprecated Cassandra 3 Components for Removal
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 7f78f45f66 NIFI-12919 Deprecated Cassandra 3 Components for Removal
7f78f45f66 is described below
commit 7f78f45f66413f3543784897b41a71901c2996e8
Author: exceptionfactory
AuthorDate: Mon Mar 18 16:12:17 2024 -0500
NIFI-12919 Deprecated Cassandra 3 Components for Removal
Signed-off-by: Pierre Villard
This closes #8530.
---
.../apache/nifi/controller/cassandra/CassandraDistributedMapCache.java | 2 ++
.../main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java | 2 ++
.../java/org/apache/nifi/processors/cassandra/PutCassandraRecord.java | 2 ++
.../main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java | 2 ++
.../src/main/java/org/apache/nifi/service/CassandraSessionProvider.java | 2 ++
5 files changed, 10 insertions(+)
diff --git
a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-distributedmapcache-service/src/main/java/org/apache/nifi/controller/cassandra/CassandraDistributedMapCache.java
b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-distributedmapcache-service/src/main/java/org/apache/nifi/controller/cassandra/CassandraDistributedMapCache.java
index 64bc38b079..3db9a5267c 100644
---
a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-distributedmapcache-service/src/main/java/org/apache/nifi/controller/cassandra/CassandraDistributedMapCache.java
+++
b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-distributedmapcache-service/src/main/java/org/apache/nifi/controller/cassandra/CassandraDistributedMapCache.java
@@ -23,6 +23,7 @@ import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.Row;
import com.datastax.driver.core.Session;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.DeprecationNotice;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnDisabled;
import org.apache.nifi.annotation.lifecycle.OnEnabled;
@@ -52,6 +53,7 @@ import static
org.apache.nifi.controller.cassandra.QueryUtils.createInsertStatem
@Tags({"map", "cache", "distributed", "cassandra"})
@CapabilityDescription("Provides a DistributedMapCache client that is based on
Apache Cassandra.")
+@DeprecationNotice(reason = "DataStax 3 driver for Cassandra is no longer the
current version and requires new components.")
public class CassandraDistributedMapCache extends AbstractControllerService
implements DistributedMapCacheClient {
public static final PropertyDescriptor SESSION_PROVIDER = new
PropertyDescriptor.Builder()
.name("cassandra-dmc-session-provider")
diff --git
a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java
b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java
index 12b79963a0..6dfa7888b5 100644
---
a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java
+++
b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java
@@ -36,6 +36,7 @@ import org.apache.nifi.annotation.behavior.ReadsAttributes;
import org.apache.nifi.annotation.behavior.SupportsBatching;
import org.apache.nifi.annotation.behavior.SystemResource;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.DeprecationNotice;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.annotation.lifecycle.OnStopped;
@@ -92,6 +93,7 @@ import java.util.regex.Pattern;
+ " type of the cql.args.1.value parameter is
specified by the cql.args.1.type attribute.")
})
@SystemResourceConsideration(resource = SystemResource.MEMORY)
+@DeprecationNotice(reason = "DataStax 3 driver for Cassandra is no longer the
current version and requires new components.")
public class PutCassandraQL extends AbstractCassandraProcessor {
public static final PropertyDescriptor STATEMENT_TIMEOUT = new
PropertyDescriptor.Builder()
diff --git
a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraRecord.java
b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraRecord.java
index b068f5ad81..ebca264354 100644
---
a/nifi-nar-bundles/nifi-cas
(nifi) branch main updated: NIFI-12862 When building FlowAnalysisRuleViolationDTO objects (in StandardNiFiServiceFacade), violating component details will be left blank when user has no read permissio
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 c093ea54b7 NIFI-12862 When building FlowAnalysisRuleViolationDTO
objects (in StandardNiFiServiceFacade), violating component details will be
left blank when user has no read permission for that component.
c093ea54b7 is described below
commit c093ea54b77c816d94a23c7af19f97f96baa7d2f
Author: tpalfy
AuthorDate: Tue Mar 5 17:48:08 2024 +0100
NIFI-12862 When building FlowAnalysisRuleViolationDTO objects (in
StandardNiFiServiceFacade), violating component details will be left blank when
user has no read permission for that component.
NIFI-12862 Expose subjectComponentType to frontend.
Signed-off-by: Pierre Villard
This closes #8475.
---
.../web/api/dto/FlowAnalysisRuleViolationDTO.java | 13
.../apache/nifi/web/StandardNiFiServiceFacade.java | 24 ++
2 files changed, 28 insertions(+), 9 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowAnalysisRuleViolationDTO.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowAnalysisRuleViolationDTO.java
index 4e1762f42a..0201a0dc24 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowAnalysisRuleViolationDTO.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowAnalysisRuleViolationDTO.java
@@ -35,6 +35,8 @@ public class FlowAnalysisRuleViolationDTO {
private String issueId;
private String violationMessage;
+private String subjectComponentType;
+
private PermissionsDTO subjectPermissionDto;
private boolean enabled;
@@ -129,6 +131,17 @@ public class FlowAnalysisRuleViolationDTO {
}
+/**
+ * @return the type of the subject that violated the rule
+ */
+public String getSubjectComponentType() {
+return subjectComponentType;
+}
+
+public void setSubjectComponentType(String subjectComponentType) {
+this.subjectComponentType = subjectComponentType;
+}
+
/**
* @return true if this result should be in effect, false otherwise
*/
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
index 78dbc4caa3..96ec627f61 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
@@ -6478,23 +6478,29 @@ public class StandardNiFiServiceFacade implements
NiFiServiceFacade {
.map(ruleViolation -> {
FlowAnalysisRuleViolationDTO ruleViolationDto = new
FlowAnalysisRuleViolationDTO();
-
ruleViolationDto.setEnforcementPolicy(ruleViolation.getEnforcementPolicy().toString());
+String subjectId = ruleViolation.getSubjectId();
+String groupId = ruleViolation.getGroupId();
+
ruleViolationDto.setScope(ruleViolation.getScope());
+ruleViolationDto.setSubjectId(subjectId);
ruleViolationDto.setRuleId(ruleViolation.getRuleId());
ruleViolationDto.setIssueId(ruleViolation.getIssueId());
-
ruleViolationDto.setViolationMessage(ruleViolation.getViolationMessage());
-String subjectId = ruleViolation.getSubjectId();
-String groupId = ruleViolation.getGroupId();
+
ruleViolationDto.setSubjectComponentType(ruleViolation.getSubjectComponentType().name());
+
ruleViolationDto.setEnforcementPolicy(ruleViolation.getEnforcementPolicy().toString());
-ruleViolationDto.setSubjectId(subjectId);
-ruleViolationDto.setGroupId(groupId);
-
ruleViolationDto.setSubjectDisplayName(ruleViolation.getSubjectDisplayName());
-ruleViolationDto.setSubjectPermissionDto(createPermissionDto(
+PermissionsDTO subjectPermissionDto = createPermissionDto(
subjectId,
ruleViolation.getSubjectComponentType(),
groupId
-));
+);
+ruleViolationDto.setSubjectPermissionDto(subjectPermission
(nifi) branch main updated: NIFI-10707 Added proxy support in PutBigQuery
This is an automated email from the ASF dual-hosted git repository. pvillard 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 f8d3fcd66c NIFI-10707 Added proxy support in PutBigQuery f8d3fcd66c is described below commit f8d3fcd66cd53668d339ccbcb6d2175defb63393 Author: Peter Turcsanyi AuthorDate: Mon Mar 11 16:45:17 2024 +0100 NIFI-10707 Added proxy support in PutBigQuery Bumped GCP client library version Added grpc-* jars in service api nar in order to avoid CNFE warning in io.grpc.LoadBalancerRegistry Dependency clean-up in GCP modules Signed-off-by: Pierre Villard This closes #8491. --- .../nifi-gcp-bundle/nifi-gcp-nar/pom.xml | 196 + .../nifi-gcp-parameter-providers/pom.xml | 24 --- .../nifi-gcp-bundle/nifi-gcp-processors/pom.xml| 32 .../nifi/processors/gcp/bigquery/PutBigQuery.java | 41 - .../processors/gcp/bigquery/PutBigQueryTest.java | 9 +- .../nifi-gcp-bundle/nifi-gcp-services-api/pom.xml | 29 ++- nifi-nar-bundles/nifi-gcp-bundle/pom.xml | 2 +- 7 files changed, 249 insertions(+), 84 deletions(-) diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-nar/pom.xml b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-nar/pom.xml index b4a71b996e..d4a17e5b2c 100644 --- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-nar/pom.xml +++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-nar/pom.xml @@ -36,11 +36,207 @@ org.apache.nifi nifi-gcp-processors 2.0.0-SNAPSHOT + + +org.codehaus.mojo +animal-sniffer-annotations + + +com.google.android +annotations + + +com.google.auto.value +auto-value-annotations + + +org.checkerframework +checker-qual + + +com.google.errorprone +error_prone_annotations + + +com.google.guava +failureaccess + + +com.google.auth +google-auth-library-credentials + + +com.google.auth +google-auth-library-oauth2-http + + +com.google.http-client +google-http-client + + +com.google.http-client +google-http-client-gson + + +io.grpc +grpc-api + + +io.grpc +grpc-context + + +io.grpc +grpc-core + + +io.grpc +grpc-util + + +com.google.code.gson +gson + + +com.google.guava +guava + + +org.apache.httpcomponents +httpclient + + +org.apache.httpcomponents +httpcore + + +com.google.j2objc +j2objc-annotations + + +com.google.code.findbugs +jsr305 + + +com.google.guava +listenablefuture + + +io.opencensus +opencensus-api + + +io.opencensus +opencensus-contrib-http-util + + +io.perfmark +perfmark-api + + org.apache.nifi nifi-gcp-parameter-providers 2.0.0-SNAPSHOT + + +org.codehaus.mojo +animal-sniffer-annotations + + +com.google.android +annotations + + +com.google.auto.value +auto-value-annotations + + +org.checkerframework +checker-qual
(nifi) branch support/nifi-1.x updated: NIFI-12886 Upgraded Jackson JSON from 2.16.1 to 2.16.2
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new 62df84b43f NIFI-12886 Upgraded Jackson JSON from 2.16.1 to 2.16.2 62df84b43f is described below commit 62df84b43f31e7aa7a242cb99da0fc058f0c3e94 Author: exceptionfactory AuthorDate: Mon Mar 11 19:30:23 2024 -0500 NIFI-12886 Upgraded Jackson JSON from 2.16.1 to 2.16.2 Signed-off-by: Pierre Villard This closes #8492. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d7deb096d3..729de67f18 100644 --- a/pom.xml +++ b/pom.xml @@ -126,7 +126,7 @@ 2.9.0 2.4.0 9.4.53.v20231009 -2.16.1 +2.16.2 1.11.3 2.3.9 1.3.2
(nifi) branch main updated: NIFI-12886 Upgraded Jackson JSON from 2.16.1 to 2.16.2
This is an automated email from the ASF dual-hosted git repository. pvillard 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 7db1664a7e NIFI-12886 Upgraded Jackson JSON from 2.16.1 to 2.16.2 7db1664a7e is described below commit 7db1664a7e2d473a5e30633bea547004e22487c6 Author: exceptionfactory AuthorDate: Mon Mar 11 19:30:23 2024 -0500 NIFI-12886 Upgraded Jackson JSON from 2.16.1 to 2.16.2 Signed-off-by: Pierre Villard This closes #8492. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1fadf4fcad..774b435007 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ 2.9.0 10.17.1.0 12.0.6 -2.16.1 +2.16.2 1.11.3 4.0.4 1.3.2
(nifi) branch support/nifi-1.x updated: NIFI-12840 Expose REMOTE_POLL_BATCH_SIZE property for ListSFTP
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new a51641f37c NIFI-12840 Expose REMOTE_POLL_BATCH_SIZE property for
ListSFTP
a51641f37c is described below
commit a51641f37c03eb6cf1a50b9b6987d2d2b7edd220
Author: EndzeitBegins <1115+endzeitbeg...@users.noreply.github.com>
AuthorDate: Sat Feb 24 13:45:15 2024 +0100
NIFI-12840 Expose REMOTE_POLL_BATCH_SIZE property for ListSFTP
Signed-off-by: Pierre Villard
This closes #8448.
---
.../java/org/apache/nifi/processors/standard/ListSFTP.java | 1 +
.../org/apache/nifi/processors/standard/TestListSFTP.java | 14 ++
2 files changed, 15 insertions(+)
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 3caa99c13c..a554291d49 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
@@ -99,6 +99,7 @@ public class ListSFTP extends ListFileTransfer {
properties.add(SFTPTransfer.FILE_FILTER_REGEX);
properties.add(SFTPTransfer.PATH_FILTER_REGEX);
properties.add(SFTPTransfer.IGNORE_DOTTED_FILES);
+properties.add(SFTPTransfer.REMOTE_POLL_BATCH_SIZE);
properties.add(SFTPTransfer.STRICT_HOST_KEY_CHECKING);
properties.add(SFTPTransfer.HOST_KEY_FILE);
properties.add(SFTPTransfer.CONNECTION_TIMEOUT);
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListSFTP.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListSFTP.java
index f2340238c1..2483b22f48 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListSFTP.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListSFTP.java
@@ -177,6 +177,20 @@ public class TestListSFTP {
runner.assertTransferCount(ListSFTP.REL_SUCCESS, 0);
}
+@Test
+public void testRemotePollBatchSizeEnforced() {
+runner.setProperty(AbstractListProcessor.LISTING_STRATEGY,
AbstractListProcessor.NO_TRACKING);
+runner.setProperty(SFTPTransfer.REMOTE_POLL_BATCH_SIZE, "1");
+
+runner.run();
+// Of 3 items only 1 returned due to batch size
+runner.assertTransferCount(ListSFTP.REL_SUCCESS, 1);
+
+runner.setProperty(SFTPTransfer.REMOTE_POLL_BATCH_SIZE, "2");
+
+runner.run();
+runner.assertTransferCount(ListSFTP.REL_SUCCESS, 3);
+}
@Test
public void testVerificationSuccessful() {
(nifi) branch support/nifi-1.x updated: NIFI-12871 Upgraded Commons Compress from 1.25.0 to 1.26.1
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new e21fb6a6be NIFI-12871 Upgraded Commons Compress from 1.25.0 to 1.26.1
e21fb6a6be is described below
commit e21fb6a6bea107e961012a77d1c11b9c3b37e7c4
Author: exceptionfactory
AuthorDate: Fri Mar 8 20:37:12 2024 -0600
NIFI-12871 Upgraded Commons Compress from 1.25.0 to 1.26.1
- Adjusted Excel Record Reader test failure to use OpenXML Exception
instead of message matching
Signed-off-by: Pierre Villard
This closes #8488.
---
.../src/test/java/org/apache/nifi/excel/TestExcelRecordReader.java| 4 +++-
pom.xml | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/test/java/org/apache/nifi/excel/TestExcelRecordReader.java
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/test/java/org/apache/nifi/excel/TestExcelRecordReader.java
index b83bb52968..6fde3d07f1 100644
---
a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/test/java/org/apache/nifi/excel/TestExcelRecordReader.java
+++
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/test/java/org/apache/nifi/excel/TestExcelRecordReader.java
@@ -25,6 +25,7 @@ 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.RecordSchema;
+import org.apache.poi.openxml4j.exceptions.OpenXML4JRuntimeException;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
@@ -59,7 +60,8 @@ public class TestExcelRecordReader {
.build();
MalformedRecordException mre =
assertThrows(MalformedRecordException.class, () -> new
ExcelRecordReader(configuration, getInputStream("notExcel.txt"), logger));
-assertTrue(ExceptionUtils.getStackTrace(mre).contains("this is not a
valid OOXML"));
+final Throwable cause = mre.getCause();
+assertInstanceOf(OpenXML4JRuntimeException.class, cause);
}
@Test
diff --git a/pom.xml b/pom.xml
index 9e305362ae..d7deb096d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,7 +113,7 @@
3.8.0
1.6.0
1.16.1
-
1.25.0
+
1.26.1
3.14.0
3.10.0
2.15.1
(nifi) branch main updated: NIFI-12871 Upgraded Commons Compress from 1.25.0 to 1.26.1
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 90c7dba34f NIFI-12871 Upgraded Commons Compress from 1.25.0 to 1.26.1
90c7dba34f is described below
commit 90c7dba34f08921b0b3b528c6a9fc20bf298a288
Author: exceptionfactory
AuthorDate: Fri Mar 8 20:37:12 2024 -0600
NIFI-12871 Upgraded Commons Compress from 1.25.0 to 1.26.1
- Adjusted Excel Record Reader test failure to use OpenXML Exception
instead of message matching
Signed-off-by: Pierre Villard
This closes #8488.
---
.../src/test/java/org/apache/nifi/excel/TestExcelRecordReader.java| 4 +++-
pom.xml | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/test/java/org/apache/nifi/excel/TestExcelRecordReader.java
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/test/java/org/apache/nifi/excel/TestExcelRecordReader.java
index b83bb52968..6fde3d07f1 100644
---
a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/test/java/org/apache/nifi/excel/TestExcelRecordReader.java
+++
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/test/java/org/apache/nifi/excel/TestExcelRecordReader.java
@@ -25,6 +25,7 @@ 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.RecordSchema;
+import org.apache.poi.openxml4j.exceptions.OpenXML4JRuntimeException;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
@@ -59,7 +60,8 @@ public class TestExcelRecordReader {
.build();
MalformedRecordException mre =
assertThrows(MalformedRecordException.class, () -> new
ExcelRecordReader(configuration, getInputStream("notExcel.txt"), logger));
-assertTrue(ExceptionUtils.getStackTrace(mre).contains("this is not a
valid OOXML"));
+final Throwable cause = mre.getCause();
+assertInstanceOf(OpenXML4JRuntimeException.class, cause);
}
@Test
diff --git a/pom.xml b/pom.xml
index 711916f202..1fadf4fcad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
3.8.0
1.6.0
1.16.1
-
1.25.0
+
1.26.1
3.14.0
3.10.0
2.15.1
