(nifi) branch support/nifi-1.x updated: NIFI-13538 Do not include exception details in FlowFile attributes in DeleteFile

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 5493fde3c0 NIFI-13538 Do not include exception details in FlowFile 
attributes in DeleteFile
5493fde3c0 is described below

commit 5493fde3c041d03398ff1c8a50cec2cb6717499d
Author: EndzeitBegins <1115+endzeitbeg...@users.noreply.github.com>
AuthorDate: Wed Jul 10 22:23:55 2024 +0200

NIFI-13538 Do not include exception details in FlowFile attributes in 
DeleteFile

This closes #9070

Signed-off-by: Mike Thomsen 
---
 .../nifi/processors/standard/DeleteFile.java   | 22 --
 .../nifi/processors/standard/TestDeleteFile.java   |  8 
 2 files changed, 30 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DeleteFile.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DeleteFile.java
index ae40269759..70050b3348 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DeleteFile.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DeleteFile.java
@@ -21,8 +21,6 @@ import org.apache.nifi.annotation.behavior.InputRequirement;
 import org.apache.nifi.annotation.behavior.Restricted;
 import org.apache.nifi.annotation.behavior.Restriction;
 import org.apache.nifi.annotation.behavior.SupportsBatching;
-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.Tags;
 import org.apache.nifi.components.PropertyDescriptor;
@@ -53,17 +51,6 @@ import java.util.concurrent.TimeUnit;
 @InputRequirement(InputRequirement.Requirement.INPUT_REQUIRED)
 @Tags({"file", "remove", "delete", "local", "files", "filesystem"})
 @CapabilityDescription("Deletes a file from the filesystem.")
-@WritesAttributes({
-@WritesAttribute(
-attribute = DeleteFile.ATTRIBUTE_FAILURE_REASON,
-description = "Human-readable reason of failure. Only 
available if FlowFile is routed to relationship 'failure'."),
-@WritesAttribute(
-attribute = DeleteFile.ATTRIBUTE_EXCEPTION_CLASS,
-description = "The class name of the exception thrown during 
processor execution. Only available if an exception caused the FlowFile to be 
routed to relationship 'failure'."),
-@WritesAttribute(
-attribute = DeleteFile.ATTRIBUTE_EXCEPTION_MESSAGE,
-description = "The message of the exception thrown during 
processor execution. Only available if an exception caused the FlowFile to be 
routed to relationship 'failure'.")
-})
 @Restricted(
 restrictions = {
 @Restriction(
@@ -76,10 +63,6 @@ import java.util.concurrent.TimeUnit;
 )
 public class DeleteFile extends AbstractProcessor {
 
-public static final String ATTRIBUTE_FAILURE_REASON = 
"DeleteFile.failure.reason";
-public static final String ATTRIBUTE_EXCEPTION_CLASS = 
"DeleteFile.failure.exception.class";
-public static final String ATTRIBUTE_EXCEPTION_MESSAGE = 
"DeleteFile.failure.exception.message";
-
 public static final Relationship REL_SUCCESS = new Relationship.Builder()
 .name("success")
 .description("All FlowFiles, for which an existing file has been 
deleted, are routed to this relationship")
@@ -172,11 +155,6 @@ public class DeleteFile extends AbstractProcessor {
 private void handleFailure(ProcessSession session, FlowFile flowFile, 
String errorMessage, Throwable throwable) {
 getLogger().error(errorMessage, throwable);
 
-session.putAttribute(flowFile, ATTRIBUTE_FAILURE_REASON, errorMessage);
-if (throwable != null) {
-session.putAttribute(flowFile, ATTRIBUTE_EXCEPTION_CLASS, 
throwable.getClass().toString());
-session.putAttribute(flowFile, ATTRIBUTE_EXCEPTION_MESSAGE, 
throwable.getMessage());
-}
 session.penalize(flowFile);
 session.transfer(flowFile, REL_FAILURE);
 }
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDeleteFile.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDeleteFile.java
index 91e44e4543..369628c3e2 100644
--- 
a/nifi-

(nifi) branch main updated: NIFI-13537 Do not include exception details in FlowFile attributes in DeleteFile

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 3b2120e6c6 NIFI-13537 Do not include exception details in FlowFile 
attributes in DeleteFile
3b2120e6c6 is described below

commit 3b2120e6c6ae2a50d4f1257e49ced1fc1992b349
Author: EndzeitBegins <1115+endzeitbeg...@users.noreply.github.com>
AuthorDate: Wed Jul 10 22:11:12 2024 +0200

NIFI-13537 Do not include exception details in FlowFile attributes in 
DeleteFile

This closes #9069

Signed-off-by: Mike Thomsen 
---
 .../nifi/processors/standard/DeleteFile.java   | 22 --
 .../nifi/processors/standard/TestDeleteFile.java   |  8 
 2 files changed, 30 deletions(-)

diff --git 
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DeleteFile.java
 
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DeleteFile.java
index 4980e291d2..ae885ea2e4 100644
--- 
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DeleteFile.java
+++ 
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DeleteFile.java
@@ -21,8 +21,6 @@ import org.apache.nifi.annotation.behavior.InputRequirement;
 import org.apache.nifi.annotation.behavior.Restricted;
 import org.apache.nifi.annotation.behavior.Restriction;
 import org.apache.nifi.annotation.behavior.SupportsBatching;
-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.Tags;
 import org.apache.nifi.annotation.documentation.UseCase;
@@ -60,17 +58,6 @@ import java.util.concurrent.TimeUnit;
 Using 'DeleteFile', delete the file from the filesystem only 
after the result has been stored.
 """
 )
-@WritesAttributes({
-@WritesAttribute(
-attribute = DeleteFile.ATTRIBUTE_FAILURE_REASON,
-description = "Human-readable reason of failure. Only 
available if FlowFile is routed to relationship 'failure'."),
-@WritesAttribute(
-attribute = DeleteFile.ATTRIBUTE_EXCEPTION_CLASS,
-description = "The class name of the exception thrown during 
processor execution. Only available if an exception caused the FlowFile to be 
routed to relationship 'failure'."),
-@WritesAttribute(
-attribute = DeleteFile.ATTRIBUTE_EXCEPTION_MESSAGE,
-description = "The message of the exception thrown during 
processor execution. Only available if an exception caused the FlowFile to be 
routed to relationship 'failure'.")
-})
 @Restricted(
 restrictions = {
 @Restriction(
@@ -83,10 +70,6 @@ import java.util.concurrent.TimeUnit;
 )
 public class DeleteFile extends AbstractProcessor {
 
-public static final String ATTRIBUTE_FAILURE_REASON = 
"DeleteFile.failure.reason";
-public static final String ATTRIBUTE_EXCEPTION_CLASS = 
"DeleteFile.failure.exception.class";
-public static final String ATTRIBUTE_EXCEPTION_MESSAGE = 
"DeleteFile.failure.exception.message";
-
 public static final Relationship REL_SUCCESS = new Relationship.Builder()
 .name("success")
 .description("All FlowFiles, for which an existing file has been 
deleted, are routed to this relationship")
@@ -177,11 +160,6 @@ public class DeleteFile extends AbstractProcessor {
 private void handleFailure(ProcessSession session, FlowFile flowFile, 
String errorMessage, Throwable throwable) {
 getLogger().error(errorMessage, throwable);
 
-session.putAttribute(flowFile, ATTRIBUTE_FAILURE_REASON, errorMessage);
-if (throwable != null) {
-session.putAttribute(flowFile, ATTRIBUTE_EXCEPTION_CLASS, 
throwable.getClass().toString());
-session.putAttribute(flowFile, ATTRIBUTE_EXCEPTION_MESSAGE, 
throwable.getMessage());
-}
 session.penalize(flowFile);
 session.transfer(flowFile, REL_FAILURE);
 }
diff --git 
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDeleteFile.java
 
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDeleteFile.java
index 461d359b51..bbe10dd404 100644
--- 
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/pro

(nifi) branch main updated: NIFI-13421 Replaced String.format in logging statements where only formatting strings (%s) with the use of logging parameters ({})

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 957510e65a NIFI-13421 Replaced String.format in logging statements 
where only formatting strings (%s) with the use of logging parameters ({})
957510e65a is described below

commit 957510e65a052bbb7a69718f84363443fe2d1eee
Author: dan-s1 
AuthorDate: Fri Jun 21 18:33:26 2024 +

NIFI-13421 Replaced String.format in logging statements where only 
formatting strings (%s) with the use of logging parameters ({})

This closes #8994

Signed-off-by: Mike Thomsen 
---
 .../java/org/apache/nifi/amqp/processors/PublishAMQP.java |  2 +-
 .../org/apache/nifi/processors/aws/s3/FetchS3Object.java  |  2 +-
 .../azure/cosmos/document/PutAzureCosmosDBRecord.java |  2 +-
 .../elasticsearch/ElasticSearchClientServiceImpl.java | 15 +--
 .../nifi/processors/gcp/storage/FetchGCSObject.java   |  2 +-
 .../cachemanager/EmbeddedHazelcastCacheManager.java   | 12 ++--
 .../src/main/java/org/apache/nifi/ldap/LdapProvider.java  |  4 ++--
 .../apache/nifi/ldap/tenants/LdapUserGroupProvider.java   |  4 ++--
 .../org/apache/nifi/processors/mongodb/DeleteMongo.java   |  2 +-
 .../nifi/processors/mongodb/gridfs/DeleteGridFS.java  |  4 ++--
 .../nifi/processors/script/InvokeScriptedProcessor.java   |  3 +--
 .../org/apache/nifi/script/ScriptingComponentUtils.java   |  2 +-
 .../nifi/processors/standard/PutDatabaseRecord.java   |  5 ++---
 .../nifi/processors/standard/util/SFTPTransfer.java   |  2 +-
 .../nifi/processors/attributes/UpdateAttribute.java   |  8 
 .../apache/nifi/authorization/AuthorizerFactoryBean.java  |  2 +-
 .../apache/nifi/authorization/user/NiFiUserUtilsTest.java |  6 +++---
 .../cluster/coordination/node/NodeClusterCoordinator.java |  2 +-
 .../controller/reporting/AbstractReportingTaskNode.java   |  4 ++--
 .../state/manager/StandardStateManagerProvider.java   |  2 +-
 .../apache/nifi/remote/StandardRemoteProcessGroup.java|  2 +-
 .../bootstrap/shell/command/AbstractShellCommand.java |  2 +-
 .../nifi/nar/StandardExtensionDiscoveringManager.java |  2 +-
 .../main/java/org/apache/nifi/nar/NarClassLoaders.java| 14 ++
 .../main/java/org/apache/nifi/web/server/JettyServer.java |  2 +-
 .../org/apache/nifi/web/StandardNiFiServiceFacade.java|  6 +++---
 .../nifi/web/api/config/AccessDeniedExceptionMapper.java  |  2 +-
 .../web/api/config/AdministrationExceptionMapper.java |  2 +-
 .../AuthenticationCredentialsNotFoundExceptionMapper.java |  2 +-
 .../api/config/AuthorizationAccessExceptionMapper.java|  2 +-
 .../nifi/web/api/config/ClusterExceptionMapper.java   |  2 +-
 .../IllegalClusterResourceRequestExceptionMapper.java |  2 +-
 .../api/config/IllegalClusterStateExceptionMapper.java|  2 +-
 .../api/config/IllegalNodeDeletionExceptionMapper.java|  2 +-
 .../config/IllegalNodeDisconnectionExceptionMapper.java   |  2 +-
 .../web/api/config/IllegalNodeOffloadExceptionMapper.java |  2 +-
 .../config/IllegalNodeReconnectionExceptionMapper.java|  2 +-
 .../nifi/web/api/config/InterruptedExceptionMapper.java   |  2 +-
 .../web/api/config/InvalidRevisionExceptionMapper.java|  2 +-
 .../api/config/JsonContentConversionExceptionMapper.java  |  2 +-
 .../nifi/web/api/config/JsonMappingExceptionMapper.java   |  2 +-
 .../nifi/web/api/config/JsonParseExceptionMapper.java |  2 +-
 .../web/api/config/MutableRequestExceptionMapper.java |  2 +-
 .../api/config/NoClusterCoordinatorExceptionMapper.java   |  2 +-
 .../web/api/config/NoConnectedNodesExceptionMapper.java   |  2 +-
 .../api/config/NoResponseFromNodesExceptionMapper.java|  2 +-
 .../web/api/config/NodeDisconnectionExceptionMapper.java  |  2 +-
 .../web/api/config/NodeReconnectionExceptionMapper.java   |  2 +-
 .../nifi/web/api/config/NotFoundExceptionMapper.java  |  2 +-
 .../web/api/config/ResourceNotFoundExceptionMapper.java   |  2 +-
 .../org/apache/nifi/web/api/config/ThrowableMapper.java   |  2 +-
 .../nifi/web/api/config/UnknownNodeExceptionMapper.java   |  2 +-
 .../nifi/web/api/config/ValidationExceptionMapper.java|  2 +-
 .../org/apache/nifi/web/controller/ControllerFacade.java  |  2 +-
 .../apache/nifi/web/dao/impl/StandardConnectionDAO.java   |  4 ++--
 .../main/java/org/apache/nifi/web/util/SnippetUtils.java  |  2 +-
 .../web/security/x509/ocsp/OcspCertificateValidator.java  | 12 ++--
 .../security/authorization/AuthorizerFactory.java |  2 +-
 .../authorization/file/FileAccessPolicyProvider.java  |  2 +-
 .../authorization/file/FileUserGroupProvider.java |  2 +-
 .../nifi/registry/security/ldap/LdapIdentityProvider.java |  4 ++--
 .../security/ldap/tenants/LdapUserGroupProvider.java  | 10 +-
 .../nifi/registry

(nifi) branch support/nifi-1.x updated: NIFI-13379 Replaced use of deprecated com.nimbusds.oauth2.sdk.http.HTTPResponse method getContentAsJSONObject with API suggested replacement getBodyAsJSONObject

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 627fa06866 NIFI-13379 Replaced use of deprecated 
com.nimbusds.oauth2.sdk.http.HTTPResponse method getContentAsJSONObject with 
API suggested replacement getBodyAsJSONObject.
627fa06866 is described below

commit 627fa06866e7f8bca8e2504a8e4027ee6568392d
Author: dan-s1 
AuthorDate: Mon Jun 10 15:56:32 2024 +

NIFI-13379 Replaced use of deprecated 
com.nimbusds.oauth2.sdk.http.HTTPResponse method getContentAsJSONObject with 
API suggested replacement getBodyAsJSONObject.

This closes #8944

Signed-off-by: Mike Thomsen 
---
 .../web/security/authentication/oidc/StandardOidcIdentityProvider.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authentication/oidc/StandardOidcIdentityProvider.java
 
b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authentication/oidc/StandardOidcIdentityProvider.java
index e70f696604..e83cba3daf 100644
--- 
a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authentication/oidc/StandardOidcIdentityProvider.java
+++ 
b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authentication/oidc/StandardOidcIdentityProvider.java
@@ -255,7 +255,7 @@ public class StandardOidcIdentityProvider implements 
OidcIdentityProvider {
 throw new IOException("Unable to download OpenId Connect Provider 
metadata from " + url + ": Status code " + httpResponse.getStatusCode());
 }
 
-final JSONObject jsonObject = httpResponse.getContentAsJSONObject();
+final JSONObject jsonObject = httpResponse.getBodyAsJSONObject();
 return OIDCProviderMetadata.parse(jsonObject);
 }
 

(nifi) branch main updated: NIFI-13379 Replaced use of deprecated com.nimbusds.oauth2.sdk.http.HTTPResponse method getContentAsJSONObject with API suggested replacement getBodyAsJSONObject.

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 a8e8b6a86b NIFI-13379 Replaced use of deprecated 
com.nimbusds.oauth2.sdk.http.HTTPResponse method getContentAsJSONObject with 
API suggested replacement getBodyAsJSONObject.
a8e8b6a86b is described below

commit a8e8b6a86b5293858423fa068db65dc8b0d44975
Author: dan-s1 
AuthorDate: Mon Jun 10 15:56:32 2024 +

NIFI-13379 Replaced use of deprecated 
com.nimbusds.oauth2.sdk.http.HTTPResponse method getContentAsJSONObject with 
API suggested replacement getBodyAsJSONObject.

This closes #8944

Signed-off-by: Mike Thomsen 
---
 .../web/security/authentication/oidc/StandardOidcIdentityProvider.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authentication/oidc/StandardOidcIdentityProvider.java
 
b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authentication/oidc/StandardOidcIdentityProvider.java
index 1726f23b37..8adeb00ae5 100644
--- 
a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authentication/oidc/StandardOidcIdentityProvider.java
+++ 
b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authentication/oidc/StandardOidcIdentityProvider.java
@@ -255,7 +255,7 @@ public class StandardOidcIdentityProvider implements 
OidcIdentityProvider {
 throw new IOException("Unable to download OpenId Connect Provider 
metadata from " + url + ": Status code " + httpResponse.getStatusCode());
 }
 
-final JSONObject jsonObject = httpResponse.getContentAsJSONObject();
+final JSONObject jsonObject = httpResponse.getBodyAsJSONObject();
 return OIDCProviderMetadata.parse(jsonObject);
 }
 

(nifi) branch support/nifi-1.x updated: NIFI-12839: Explicitly set nifiVersion for processor bundle archetype dependencies

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 ee00fc2d04 NIFI-12839: Explicitly set nifiVersion for processor bundle 
archetype dependencies
ee00fc2d04 is described below

commit ee00fc2d04eef148b37fecf901b20814429d06da
Author: Matt Burgess 
AuthorDate: Fri Feb 23 14:31:24 2024 -0500

NIFI-12839: Explicitly set nifiVersion for processor bundle archetype 
dependencies

This closes #8447

Signed-off-by: Mike Thomsen 
---
 .../archetype-resources/nifi-__artifactBaseName__-nar/pom.xml   | 6 ++
 1 file changed, 6 insertions(+)

diff --git 
a/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-nar/pom.xml
 
b/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-nar/pom.xml
index c5c63998fe..517778e2b2 100644
--- 
a/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-nar/pom.xml
+++ 
b/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-nar/pom.xml
@@ -32,6 +32,12 @@
 nifi-${artifactBaseName}-processors
 ${version}
 
+
+org.apache.nifi
+nifi-standard-services-api-nar
+${nifiVersion}
+nar
+
 
 
 

(nifi) branch main updated: NIFI-12839: Explicitly set nifiVersion for processor bundle archetype dependencies

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 0884b627b2 NIFI-12839: Explicitly set nifiVersion for processor bundle 
archetype dependencies
0884b627b2 is described below

commit 0884b627b271218c0f70d790f0821fa72ed2ba57
Author: Matt Burgess 
AuthorDate: Fri Feb 23 14:31:24 2024 -0500

NIFI-12839: Explicitly set nifiVersion for processor bundle archetype 
dependencies

This closes #8447

Signed-off-by: Mike Thomsen 
---
 .../resources/archetype-resources/nifi-__artifactBaseName__-nar/pom.xml  | 1 +
 1 file changed, 1 insertion(+)

diff --git 
a/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-nar/pom.xml
 
b/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-nar/pom.xml
index 4474300e05..517778e2b2 100644
--- 
a/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-nar/pom.xml
+++ 
b/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-nar/pom.xml
@@ -35,6 +35,7 @@
 
 org.apache.nifi
 nifi-standard-services-api-nar
+${nifiVersion}
 nar
 
 

(nifi) branch main updated: NIFI-12518 Upgraded Calcite Avatica from 1.23.0 to 1.24.0

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 6f456ebbd4 NIFI-12518 Upgraded Calcite Avatica from 1.23.0 to 1.24.0
6f456ebbd4 is described below

commit 6f456ebbd4c72b3ebb6c18afbea43b5a18f7de88
Author: exceptionfactory 
AuthorDate: Fri Dec 15 13:37:21 2023 -0600

NIFI-12518 Upgraded Calcite Avatica from 1.23.0 to 1.24.0

This closes #8164

Signed-off-by: Mike Thomsen 
---
 nifi-code-coverage/pom.xml| 2 +-
 nifi-nar-bundles/nifi-hive-bundle/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nifi-code-coverage/pom.xml b/nifi-code-coverage/pom.xml
index 6f3d72d0ce..0c8b891d5d 100644
--- a/nifi-code-coverage/pom.xml
+++ b/nifi-code-coverage/pom.xml
@@ -29,7 +29,7 @@
 
 1.10.14
 1.6.0
-1.23.0
+1.24.0
 
 
 
diff --git a/nifi-nar-bundles/nifi-hive-bundle/pom.xml 
b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
index c5c85d232a..24e6bad26a 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
@@ -116,7 +116,7 @@
 
 3.1.3
 ${hive3.version}
-1.23.0
+1.24.0
 1.36.0
 1.6.0
 

[nifi] 01/02: NIFI-12154 Upgraded Apache Avro from 1.11.2 to 1.11.3

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 6ee132f851e01ce6f6dd1b8a7f553046fdcd5962
Author: exceptionfactory 
AuthorDate: Sat Sep 30 14:16:52 2023 -0500

NIFI-12154 Upgraded Apache Avro from 1.11.2 to 1.11.3

This closes #7824

Signed-off-by: Mike Thomsen 
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 253801eec5..3087c24690 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
 2.4.0
 9.4.52.v20230823
 2.15.2
-1.11.2
+1.11.3
 2.3.8
 1.3.2
 2.3.3

[nifi] 02/02: NIFI-12155 Upgraded Apache Commons IO from 2.13.0 to 2.14.0

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit acb9dd10b7f0e0070f8a5f418d4f15036b45d7d0
Author: exceptionfactory 
AuthorDate: Sat Sep 30 14:20:26 2023 -0500

NIFI-12155 Upgraded Apache Commons IO from 2.13.0 to 2.14.0

- Upgraded Apache POI from 5.2.3 to 5.2.4

This closes #7825

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml | 2 +-
 nifi-nar-bundles/nifi-media-bundle/pom.xml   | 2 +-
 nifi-nar-bundles/nifi-poi-bundle/pom.xml | 2 +-
 pom.xml  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml 
b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
index e6d0b91180..2fa7a28953 100644
--- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
@@ -26,7 +26,7 @@
 jar
 
 5.5.18
-5.2.3
+5.2.4
 
 
 
diff --git a/nifi-nar-bundles/nifi-media-bundle/pom.xml 
b/nifi-nar-bundles/nifi-media-bundle/pom.xml
index 1f947c958e..98c36b9026 100644
--- a/nifi-nar-bundles/nifi-media-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-media-bundle/pom.xml
@@ -26,7 +26,7 @@
 pom
 
 
-5.2.3
+5.2.4
 
 
 
diff --git a/nifi-nar-bundles/nifi-poi-bundle/pom.xml 
b/nifi-nar-bundles/nifi-poi-bundle/pom.xml
index 3257c2754e..32f83f56c1 100644
--- a/nifi-nar-bundles/nifi-poi-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-poi-bundle/pom.xml
@@ -25,7 +25,7 @@
 nifi-poi-bundle
 pom
 
-5.2.3
+5.2.4
 
 
 nifi-poi-processors
diff --git a/pom.xml b/pom.xml
index 3087c24690..7c5507c4ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
 
1.24.0
 
3.13.0
 3.9.0
-2.13.0
+2.14.0
 
1.10.0
 
4.5.14
 
4.4.16

[nifi] branch support/nifi-1.x updated (39d65161ef -> acb9dd10b7)

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a change to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


from 39d65161ef NIFI-12151 Fixed StandardPrivateKeyService fails due to 
missing BouncyCastleProvider
 new 6ee132f851 NIFI-12154 Upgraded Apache Avro from 1.11.2 to 1.11.3
 new acb9dd10b7 NIFI-12155 Upgraded Apache Commons IO from 2.13.0 to 2.14.0

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml | 2 +-
 nifi-nar-bundles/nifi-media-bundle/pom.xml   | 2 +-
 nifi-nar-bundles/nifi-poi-bundle/pom.xml | 2 +-
 pom.xml  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

[nifi] 01/02: NIFI-12154 Upgraded Apache Avro from 1.11.2 to 1.11.3

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit a84c103a0b6df6db1db60f0525b24333fdec9feb
Author: exceptionfactory 
AuthorDate: Sat Sep 30 14:16:52 2023 -0500

NIFI-12154 Upgraded Apache Avro from 1.11.2 to 1.11.3

This closes #7824

Signed-off-by: Mike Thomsen 
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6ba9b08714..8baac65057 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
 2.4.0
 10.0.16
 2.15.2
-1.11.2
+1.11.3
 2.3.8
 1.3.2
 2.3.3

[nifi] branch main updated (a8c1bb1d9c -> 1561eb2506)

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


from a8c1bb1d9c NIFI-10425 Corrected auto-reloading KeyStore files with 
symlinks
 new a84c103a0b NIFI-12154 Upgraded Apache Avro from 1.11.2 to 1.11.3
 new 1561eb2506 NIFI-12155 Upgraded Apache Commons IO from 2.13.0 to 2.14.0

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml | 2 +-
 nifi-nar-bundles/nifi-media-bundle/pom.xml   | 2 +-
 nifi-nar-bundles/nifi-poi-bundle/pom.xml | 2 +-
 pom.xml  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

[nifi] 02/02: NIFI-12155 Upgraded Apache Commons IO from 2.13.0 to 2.14.0

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 1561eb25061e721d5f9a78b7d5725b1ee0c3d973
Author: exceptionfactory 
AuthorDate: Sat Sep 30 14:20:26 2023 -0500

NIFI-12155 Upgraded Apache Commons IO from 2.13.0 to 2.14.0

- Upgraded Apache POI from 5.2.3 to 5.2.4

This closes #7825

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml | 2 +-
 nifi-nar-bundles/nifi-media-bundle/pom.xml   | 2 +-
 nifi-nar-bundles/nifi-poi-bundle/pom.xml | 2 +-
 pom.xml  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml 
b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
index c525d282f8..9ba5299b1d 100644
--- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
@@ -26,7 +26,7 @@
 jar
 
 5.5.18
-5.2.3
+5.2.4
 
 
 
diff --git a/nifi-nar-bundles/nifi-media-bundle/pom.xml 
b/nifi-nar-bundles/nifi-media-bundle/pom.xml
index 2b107e5e66..a7c361d161 100644
--- a/nifi-nar-bundles/nifi-media-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-media-bundle/pom.xml
@@ -26,7 +26,7 @@
 pom
 
 
-5.2.3
+5.2.4
 
 
 
diff --git a/nifi-nar-bundles/nifi-poi-bundle/pom.xml 
b/nifi-nar-bundles/nifi-poi-bundle/pom.xml
index 8b187fd9c4..d783398ea9 100644
--- a/nifi-nar-bundles/nifi-poi-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-poi-bundle/pom.xml
@@ -25,7 +25,7 @@
 nifi-poi-bundle
 pom
 
-5.2.3
+5.2.4
 
 
 nifi-poi-nar
diff --git a/pom.xml b/pom.xml
index 8baac65057..3cce6d87fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@
 
1.24.0
 
3.13.0
 3.9.0
-2.13.0
+2.14.0
 
1.10.0
 
4.5.14
 
4.4.16

[nifi] branch main updated: NIFI-12147 Cleaned poms, updated Dockerfile, fixed Jersey version to get appropriate bundled ASM

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 9ba81c9564 NIFI-12147 Cleaned poms, updated Dockerfile, fixed Jersey 
version to get appropriate bundled ASM
9ba81c9564 is described below

commit 9ba81c956407804e0677155d66f543e58b7bd2e0
Author: Joseph Witt 
AuthorDate: Thu Sep 28 16:16:59 2023 -0700

NIFI-12147 Cleaned poms, updated Dockerfile, fixed Jersey version to get 
appropriate bundled ASM

This closes #7819

Signed-off-by: Mike Thomsen 
---
 nifi-docker/dockerhub/Dockerfile   |  6 ++--
 nifi-docker/dockerhub/pom.xml  | 36 +-
 nifi-docker/dockermaven/pom.xml|  8 ++---
 nifi-docker/pom.xml|  6 
 .../dockermaven/Dockerfile |  9 +++---
 .../nifi-registry-docker-maven/dockermaven/pom.xml |  2 --
 pom.xml| 20 +---
 7 files changed, 33 insertions(+), 54 deletions(-)

diff --git a/nifi-docker/dockerhub/Dockerfile b/nifi-docker/dockerhub/Dockerfile
index b99f389242..70442f8854 100644
--- a/nifi-docker/dockerhub/Dockerfile
+++ b/nifi-docker/dockerhub/Dockerfile
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-ARG IMAGE_NAME=bellsoft/liberica-openjdk-alpine
+ARG IMAGE_NAME=bellsoft/liberica-openjdk-debian
 ARG IMAGE_TAG=21
 FROM ${IMAGE_NAME}:${IMAGE_TAG}
 ARG MAINTAINER="Apache NiFi "
@@ -40,7 +40,9 @@ ENV NIFI_PID_DIR=${NIFI_HOME}/run
 ENV NIFI_LOG_DIR=${NIFI_HOME}/logs
 
 ADD sh/ ${NIFI_BASE_DIR}/scripts/
-RUN chmod -R +x ${NIFI_BASE_DIR}/scripts/*.sh
+RUN chmod -R +x ${NIFI_BASE_DIR}/scripts/*.sh \
+   && apt-get update \
+   && apt-get install -y unzip
 
 # Setup NiFi user and create necessary directories
 RUN groupadd -g ${GID} nifi || groupmod -n nifi `getent group ${GID} | cut -d: 
-f1` \
diff --git a/nifi-docker/dockerhub/pom.xml b/nifi-docker/dockerhub/pom.xml
index dda41ff450..9881e7c972 100644
--- a/nifi-docker/dockerhub/pom.xml
+++ b/nifi-docker/dockerhub/pom.xml
@@ -39,26 +39,34 @@
 
 
 
-com.spotify
-dockerfile-maven-plugin
+io.fabric8
+docker-maven-plugin
 
 
-default
+build-docker-image
 
 build
 
 
-
-
${docker.image.name}
-
${docker.image.tag}
-
${docker.maintainer}
-1000
-1000
-
${docker.nifi.version}
-
-apache/nifi
-
-${project.version}-dockerhub
+
+
+apache/nifi
+
+
+
${project.version}-dockerhub
+
+
Dockerfile
+
${project.basedir}
+true
+
+
${project.version}
+
target/nifi-${project.version}-bin.zip
+
target/nifi-toolkit-${project.version}-bin.zip
+
target/sh
+
+
+
+
 
 
 
diff --git a/nifi-docker/dockermaven/pom.xml b/nifi-docker/dockermaven/pom.xml
index 2ef9a99f63..2e0b6b669c 100644
--- a/nifi-docker/dockermaven/pom.xml
+++ b/nifi-docker/dockermaven/pom.xml
@@ -54,13 +54,9 @@
 
${project.basedir}
 true
 
-  

[nifi] branch support/nifi-1.x updated: NIFI-12100_deprecate Annotated the ConvertExcelToCSVProcessor with the DeprecationNotice annotation and fixed the Checkstyle violation in SplitJson.

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 6288470504 NIFI-12100_deprecate Annotated the 
ConvertExcelToCSVProcessor with the DeprecationNotice annotation and fixed the 
Checkstyle violation in SplitJson.
6288470504 is described below

commit 6288470504aa46d9328d4c97e07212f238151503
Author: dan-s1 
AuthorDate: Fri Sep 29 14:08:19 2023 +

NIFI-12100_deprecate Annotated the ConvertExcelToCSVProcessor with the 
DeprecationNotice annotation and fixed the Checkstyle violation in SplitJson.

This closes #7814

Signed-off-by: Mike Thomsen 
---
 .../org/apache/nifi/processors/poi/ConvertExcelToCSVProcessor.java| 4 
 .../src/main/java/org/apache/nifi/processors/standard/SplitJson.java  | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/src/main/java/org/apache/nifi/processors/poi/ConvertExcelToCSVProcessor.java
 
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/src/main/java/org/apache/nifi/processors/poi/ConvertExcelToCSVProcessor.java
index bf78d58b67..1ce9cfecd1 100644
--- 
a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/src/main/java/org/apache/nifi/processors/poi/ConvertExcelToCSVProcessor.java
+++ 
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/src/main/java/org/apache/nifi/processors/poi/ConvertExcelToCSVProcessor.java
@@ -27,6 +27,7 @@ import org.apache.commons.lang3.StringUtils;
 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.Tags;
 import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.csv.CSVUtils;
@@ -73,6 +74,9 @@ import java.util.stream.Collectors;
 @WritesAttribute(attribute = "convertexceltocsvprocessor.error", 
description = "Error message that was encountered on a per Excel sheet basis. 
This attribute is" +
 " only populated if an error was occured while processing the 
particular sheet. Having the error present at the sheet level will allow for 
the end" +
 " user to better understand what syntax errors in their excel 
doc on a larger scale caused the error.")})
+@DeprecationNotice(reason = "ConvertExcelToCSVProcessor is no longer needed 
since there is now the ExcelReader which along with CSVRecordSetWriter" +
+" can be used in ConvertRecord to achieve the same thing.",
+classNames = {"org.apache.nifi.excel.ExcelReader", 
"org.apache.nifi.csv.CSVRecordSetWriter", 
"org.apache.nifi.processors.standard.ConvertRecord"})
 public class ConvertExcelToCSVProcessor
 extends AbstractProcessor {
 
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java
index e2b1f1b11a..f76ffc2bfd 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java
@@ -23,7 +23,6 @@ import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.PathNotFoundException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.nifi.annotation.behavior.EventDriven;
-import org.apache.nifi.annotation.behavior.SystemResourceConsideration;
 import org.apache.nifi.annotation.behavior.InputRequirement;
 import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
 import org.apache.nifi.annotation.behavior.SideEffectFree;

[nifi] branch main updated: NIFI-12100 Removed the ConvertExcelToCSVProcessor

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 e9b532bd32 NIFI-12100 Removed the ConvertExcelToCSVProcessor
e9b532bd32 is described below

commit e9b532bd3237fb23b351471586d0f8aebab16d6b
Author: dan-s1 
AuthorDate: Wed Sep 27 18:13:46 2023 +

NIFI-12100 Removed the ConvertExcelToCSVProcessor

This closes #7802

Signed-off-by: Mike Thomsen 
---
 .../nifi-poi-bundle/nifi-poi-nar/pom.xml   |   5 -
 .../nifi-poi-bundle/nifi-poi-processors/pom.xml|  76 ---
 .../processors/poi/ConvertExcelToCSVProcessor.java | 534 ---
 .../services/org.apache.nifi.processor.Processor   |  15 -
 .../additionalDetails.html |  97 
 .../poi/ConvertExcelToCSVProcessorTest.java| 578 -
 .../src/test/resources/CollegeScorecard.xlsx   | Bin 16553 -> 0 bytes
 .../src/test/resources/TwoSheets.xlsx  | Bin 8987 -> 0 bytes
 .../src/test/resources/Unsupported.xls | Bin 26112 -> 0 bytes
 .../src/test/resources/dataformatting.xlsx | Bin 10765 -> 0 bytes
 .../src/test/resources/logback-test.xml|  32 --
 .../src/test/resources/with-blank-cells.csv|   8 -
 .../src/test/resources/with-blank-cells.xlsx   | Bin 8489 -> 0 bytes
 nifi-nar-bundles/nifi-poi-bundle/pom.xml   |   1 -
 14 files changed, 1346 deletions(-)

diff --git a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-nar/pom.xml 
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-nar/pom.xml
index e61cd4cc10..e082a25af5 100644
--- a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-nar/pom.xml
@@ -30,11 +30,6 @@
 
 
 
-
-org.apache.nifi
-nifi-poi-processors
-2.0.0-SNAPSHOT
-
 
 org.apache.nifi
 nifi-poi-services
diff --git a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/pom.xml 
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/pom.xml
deleted file mode 100644
index 8669c93cc6..00
--- a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/pom.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
https://maven.apache.org/xsd/maven-4.0.0.xsd;>
-4.0.0
-
-org.apache.nifi
-nifi-poi-bundle
-2.0.0-SNAPSHOT
-
-
-nifi-poi-processors
-jar
-
-
-
-
-org.apache.rat
-apache-rat-plugin
-
-
-
src/test/resources/with-blank-cells.csv
-
-
-
-
-
-
-
-org.apache.poi
-poi
-
-
-org.apache.poi
-poi-ooxml
-
-
-com.github.pjfanning
-excel-streaming-reader
-
-
-org.apache.logging.log4j
-log4j-to-slf4j
-
-
-org.apache.nifi
-nifi-api
-
-
-org.apache.nifi
-nifi-utils
-2.0.0-SNAPSHOT
-
-
-org.apache.nifi
-nifi-standard-record-utils
-2.0.0-SNAPSHOT
-
-
-org.apache.nifi
-nifi-mock
-
-
-
diff --git 
a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/src/main/java/org/apache/nifi/processors/poi/ConvertExcelToCSVProcessor.java
 
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/src/main/java/org/apache/nifi/processors/poi/ConvertExcelToCSVProcessor.java
deleted file mode 100644
index 362c30b90a..00
--- 
a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/src/main/java/org/apache/nifi/processors/poi/ConvertExcelToCSVProcessor.java
+++ /dev/null
@@ -1,534 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and

[nifi] branch main updated: NIFI-12104 Separate a non-atomic Redis DMC implementation from the existing one for use in Put/Fetch DMC when Redis is clustered

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 a74c411079 NIFI-12104 Separate a non-atomic Redis DMC implementation 
from the existing one for use in Put/Fetch DMC when Redis is clustered
a74c411079 is described below

commit a74c411079efe7d886ddae58314d1f2cee74f58e
Author: Bryan Bende 
AuthorDate: Tue Sep 26 11:37:02 2023 -0400

NIFI-12104 Separate a non-atomic Redis DMC implementation from the existing 
one for use in Put/Fetch DMC when Redis is clustered

This closes #7796

Signed-off-by: Mike Thomsen 
---
 .../RedisDistributedMapCacheClientService.java | 248 +
 ...mpleRedisDistributedMapCacheClientService.java} | 134 ++-
 .../org.apache.nifi.controller.ControllerService   |   3 +-
 3 files changed, 25 insertions(+), 360 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-extensions/src/main/java/org/apache/nifi/redis/service/RedisDistributedMapCacheClientService.java
 
b/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-extensions/src/main/java/org/apache/nifi/redis/service/RedisDistributedMapCacheClientService.java
index 6a36d485c5..722ca63649 100644
--- 
a/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-extensions/src/main/java/org/apache/nifi/redis/service/RedisDistributedMapCacheClientService.java
+++ 
b/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-extensions/src/main/java/org/apache/nifi/redis/service/RedisDistributedMapCacheClientService.java
@@ -18,63 +18,30 @@ package org.apache.nifi.redis.service;
 
 import org.apache.nifi.annotation.documentation.CapabilityDescription;
 import org.apache.nifi.annotation.documentation.Tags;
-import org.apache.nifi.annotation.lifecycle.OnDisabled;
-import org.apache.nifi.annotation.lifecycle.OnEnabled;
-import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.components.ValidationContext;
 import org.apache.nifi.components.ValidationResult;
-import org.apache.nifi.controller.AbstractControllerService;
-import org.apache.nifi.controller.ConfigurationContext;
 import org.apache.nifi.distributed.cache.client.AtomicCacheEntry;
 import 
org.apache.nifi.distributed.cache.client.AtomicDistributedMapCacheClient;
 import org.apache.nifi.distributed.cache.client.Deserializer;
 import org.apache.nifi.distributed.cache.client.Serializer;
 import org.apache.nifi.redis.RedisConnectionPool;
 import org.apache.nifi.redis.RedisType;
-import org.apache.nifi.redis.util.RedisAction;
-import org.apache.nifi.util.Tuple;
-import org.springframework.data.redis.connection.RedisConnection;
-import org.springframework.data.redis.core.Cursor;
-import org.springframework.data.redis.core.ScanOptions;
-import org.springframework.data.redis.core.types.Expiration;
-import org.springframework.data.redis.connection.RedisStringCommands.SetOption;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
 
 import static org.apache.nifi.redis.util.RedisUtils.REDIS_CONNECTION_POOL;
-import static org.apache.nifi.redis.util.RedisUtils.TTL;
 
 @Tags({ "redis", "distributed", "cache", "map" })
 @CapabilityDescription("An implementation of DistributedMapCacheClient that 
uses Redis as the backing cache. This service relies on " +
 "the WATCH, MULTI, and EXEC commands in Redis, which are not fully 
supported when Redis is clustered. As a result, this service " +
 "can only be used with a Redis Connection Pool that is configured for 
standalone or sentinel mode. Sentinel mode can be used to " +
 "provide high-availability configurations.")
-public class RedisDistributedMapCacheClientService extends 
AbstractControllerService implements AtomicDistributedMapCacheClient {
-
-static final List PROPERTY_DESCRIPTORS;
-static {
-final List props = new ArrayList<>();
-props.add(REDIS_CONNECTION_POOL);
-props.add(TTL);
-PROPERTY_DESCRIPTORS = Collections.unmodifiableList(props);
-}
-
-private volatile RedisConnectionPool redisConnectionPool;
-private Long ttl;
-
-@Override
-protected List getSupportedPropertyDescriptors() {
-return PROPERTY_DESCRIPTORS;
-}
+public class RedisDistributedMapCacheClientService extends 
SimpleRedisDistributedMapCacheClientService implements 
AtomicDistributedMapCacheClient {
 
 @Override
 protected Collection customValidate(ValidationContext 
validationContext) {
@@ -96,179 +63,6 @@ public class RedisDistributedMapCacheClientService extends 
AbstractController

[nifi] branch support/nifi-1.x updated: NIFI-12127 Allow Jackson's max string length to be configured on SplitJson and EvaluateJsonPath

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 850959dd17 NIFI-12127 Allow Jackson's max string length to be 
configured on SplitJson and EvaluateJsonPath
850959dd17 is described below

commit 850959dd17b275cbaf1191bbdcbcfb4e0f6e9355
Author: Bryan Bende 
AuthorDate: Tue Sep 26 09:46:22 2023 -0400

NIFI-12127 Allow Jackson's max string length to be configured on SplitJson 
and EvaluateJsonPath

This closes #7794

Signed-off-by: Mike Thomsen 
---
 .../standard/AbstractJsonPathProcessor.java| 51 +++---
 .../nifi/processors/standard/EvaluateJsonPath.java | 11 -
 .../apache/nifi/processors/standard/SplitJson.java | 43 ++
 3 files changed, 69 insertions(+), 36 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractJsonPathProcessor.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractJsonPathProcessor.java
index 81c7aa8ec6..aa72654b99 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractJsonPathProcessor.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractJsonPathProcessor.java
@@ -16,20 +16,14 @@
  */
 package org.apache.nifi.processors.standard;
 
+import com.fasterxml.jackson.core.StreamReadConstraints;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.DocumentContext;
 import com.jayway.jsonpath.InvalidJsonException;
 import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.spi.json.JacksonJsonProvider;
 import com.jayway.jsonpath.spi.json.JsonProvider;
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicReference;
 import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.components.ValidationContext;
 import org.apache.nifi.components.ValidationResult;
@@ -38,8 +32,18 @@ import org.apache.nifi.flowfile.FlowFile;
 import org.apache.nifi.processor.AbstractProcessor;
 import org.apache.nifi.processor.ProcessSession;
 import org.apache.nifi.processor.io.InputStreamCallback;
+import org.apache.nifi.processor.util.StandardValidators;
 import org.apache.nifi.util.StringUtils;
 
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
+
 /**
  * Provides common functionality used for processors interacting and 
manipulating JSON data via JsonPath.
  *
@@ -49,10 +53,6 @@ import org.apache.nifi.util.StringUtils;
  */
 public abstract class AbstractJsonPathProcessor extends AbstractProcessor {
 
-private static final Configuration STRICT_PROVIDER_CONFIGURATION = 
Configuration.builder().jsonProvider(new JacksonJsonProvider()).build();
-
-private static final JsonProvider JSON_PROVIDER = 
STRICT_PROVIDER_CONFIGURATION.jsonProvider();
-
 static final Map NULL_REPRESENTATION_MAP = new HashMap<>();
 
 static final String EMPTY_STRING_OPTION = "empty string";
@@ -71,14 +71,33 @@ public abstract class AbstractJsonPathProcessor extends 
AbstractProcessor {
 .defaultValue(EMPTY_STRING_OPTION)
 .build();
 
-static DocumentContext validateAndEstablishJsonContext(ProcessSession 
processSession, FlowFile flowFile) {
+public static final PropertyDescriptor MAX_STRING_LENGTH = new 
PropertyDescriptor.Builder()
+.name("max-string-length")
+.displayName("Max String Length")
+.description("The maximum allowed length of a string value when 
parsing the JSON document")
+.required(true)
+.defaultValue("20 MB")
+.addValidator(StandardValidators.DATA_SIZE_VALIDATOR)
+.build();
+
+static Configuration createConfiguration(final int maxStringLength) {
+final StreamReadConstraints streamReadConstraints = 
StreamReadConstraints.builder().maxStringLength(maxStringLength).build();
+
+final ObjectMapper objectMapper = new ObjectMapper();
+
objectMapper.getFactory().setStreamReadConstraints(streamReadConstraints);
+
+final JsonProvider jsonProvider = new 
JacksonJsonProvider(objectMapper);
+return Configuration.builder().jsonProvider(jso

[nifi] branch main updated: NIFI-12127 Allow Jackson's max string length to be configured on SplitJson and EvaluateJsonPath

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 1ac833654b NIFI-12127 Allow Jackson's max string length to be 
configured on SplitJson and EvaluateJsonPath
1ac833654b is described below

commit 1ac833654b826e1366353c964ee1e4023d512f13
Author: Bryan Bende 
AuthorDate: Tue Sep 26 09:46:22 2023 -0400

NIFI-12127 Allow Jackson's max string length to be configured on SplitJson 
and EvaluateJsonPath

This closes #7794

Signed-off-by: Mike Thomsen 
---
 .../standard/AbstractJsonPathProcessor.java| 51 +++---
 .../nifi/processors/standard/EvaluateJsonPath.java | 11 -
 .../apache/nifi/processors/standard/SplitJson.java | 44 +++
 3 files changed, 69 insertions(+), 37 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractJsonPathProcessor.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractJsonPathProcessor.java
index 81c7aa8ec6..aa72654b99 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractJsonPathProcessor.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractJsonPathProcessor.java
@@ -16,20 +16,14 @@
  */
 package org.apache.nifi.processors.standard;
 
+import com.fasterxml.jackson.core.StreamReadConstraints;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.DocumentContext;
 import com.jayway.jsonpath.InvalidJsonException;
 import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.spi.json.JacksonJsonProvider;
 import com.jayway.jsonpath.spi.json.JsonProvider;
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicReference;
 import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.components.ValidationContext;
 import org.apache.nifi.components.ValidationResult;
@@ -38,8 +32,18 @@ import org.apache.nifi.flowfile.FlowFile;
 import org.apache.nifi.processor.AbstractProcessor;
 import org.apache.nifi.processor.ProcessSession;
 import org.apache.nifi.processor.io.InputStreamCallback;
+import org.apache.nifi.processor.util.StandardValidators;
 import org.apache.nifi.util.StringUtils;
 
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
+
 /**
  * Provides common functionality used for processors interacting and 
manipulating JSON data via JsonPath.
  *
@@ -49,10 +53,6 @@ import org.apache.nifi.util.StringUtils;
  */
 public abstract class AbstractJsonPathProcessor extends AbstractProcessor {
 
-private static final Configuration STRICT_PROVIDER_CONFIGURATION = 
Configuration.builder().jsonProvider(new JacksonJsonProvider()).build();
-
-private static final JsonProvider JSON_PROVIDER = 
STRICT_PROVIDER_CONFIGURATION.jsonProvider();
-
 static final Map NULL_REPRESENTATION_MAP = new HashMap<>();
 
 static final String EMPTY_STRING_OPTION = "empty string";
@@ -71,14 +71,33 @@ public abstract class AbstractJsonPathProcessor extends 
AbstractProcessor {
 .defaultValue(EMPTY_STRING_OPTION)
 .build();
 
-static DocumentContext validateAndEstablishJsonContext(ProcessSession 
processSession, FlowFile flowFile) {
+public static final PropertyDescriptor MAX_STRING_LENGTH = new 
PropertyDescriptor.Builder()
+.name("max-string-length")
+.displayName("Max String Length")
+.description("The maximum allowed length of a string value when 
parsing the JSON document")
+.required(true)
+.defaultValue("20 MB")
+.addValidator(StandardValidators.DATA_SIZE_VALIDATOR)
+.build();
+
+static Configuration createConfiguration(final int maxStringLength) {
+final StreamReadConstraints streamReadConstraints = 
StreamReadConstraints.builder().maxStringLength(maxStringLength).build();
+
+final ObjectMapper objectMapper = new ObjectMapper();
+
objectMapper.getFactory().setStreamReadConstraints(streamReadConstraints);
+
+final JsonProvider jsonProvider = new 
JacksonJsonProvider(objectMapper);
+return Configuration.builder().jsonProvider(jso

[nifi] branch support/nifi-1.x updated: NIFI-12028 - Add s3.region attribute to ListS3 generated flow files

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 5be76cddde NIFI-12028 - Add s3.region attribute to ListS3 generated 
flow files
5be76cddde is described below

commit 5be76cdddef928744ee2c41f90955d4c372961f6
Author: Pierre Villard 
AuthorDate: Fri Sep 8 13:01:33 2023 +0200

NIFI-12028 - Add s3.region attribute to ListS3 generated flow files

This closes #7672

Signed-off-by: Mike Thomsen 
---
 .../org/apache/nifi/processors/aws/s3/ListS3.java   | 21 +
 .../apache/nifi/processors/aws/s3/TestListS3.java   |  2 ++
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/ListS3.java
 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/ListS3.java
index 954bfa0856..b90ad3babf 100644
--- 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/ListS3.java
+++ 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/ListS3.java
@@ -116,6 +116,7 @@ import java.util.stream.Collectors;
 + "Node is selected, the new node can pick up where the previous node 
left off, without duplicating the data.")
 @WritesAttributes({
 @WritesAttribute(attribute = "s3.bucket", description = "The name of 
the S3 bucket"),
+@WritesAttribute(attribute = "s3.region", description = "The region of 
the S3 bucket"),
 @WritesAttribute(attribute = "filename", description = "The name of 
the file"),
 @WritesAttribute(attribute = "s3.etag", description = "The ETag that 
can be used to see if the file has changed"),
 @WritesAttribute(attribute = "s3.isLatest", description = "A boolean 
indicating if this is the latest version of the object"),
@@ -499,7 +500,7 @@ public class ListS3 extends AbstractS3Processor implements 
VerifiableProcessor {
 if (writerFactory == null) {
 writer = new AttributeObjectWriter(session);
 } else {
-writer = new RecordObjectWriter(session, writerFactory, 
getLogger());
+writer = new RecordObjectWriter(session, writerFactory, 
getLogger(), context.getProperty(S3_REGION).getValue());
 }
 
 try {
@@ -523,7 +524,7 @@ public class ListS3 extends AbstractS3Processor implements 
VerifiableProcessor {
 ObjectMetadata objectMetadata = getObjectMetadata(context, 
client, versionSummary);
 
 // Write the entity to the listing
-writer.addToListing(versionSummary, taggingResult, 
objectMetadata);
+writer.addToListing(versionSummary, taggingResult, 
objectMetadata, context.getProperty(S3_REGION).getValue());
 
 // Track the latest lastModified timestamp and keys having 
that timestamp.
 // NOTE: Amazon S3 lists objects in UTF-8 character 
encoding in lexicographical order. Not ordered by timestamps.
@@ -633,7 +634,7 @@ public class ListS3 extends AbstractS3Processor implements 
VerifiableProcessor {
 if (writerFactory == null) {
 writer = new AttributeObjectWriter(session);
 } else {
-writer = new RecordObjectWriter(session, writerFactory, 
getLogger());
+writer = new RecordObjectWriter(session, writerFactory, 
getLogger(), context.getProperty(S3_REGION).getValue());
 }
 
 try {
@@ -648,7 +649,7 @@ public class ListS3 extends AbstractS3Processor implements 
VerifiableProcessor {
 GetObjectTaggingResult taggingResult = 
getTaggingResult(context, s3Client, s3VersionSummary);
 ObjectMetadata objectMetadata = getObjectMetadata(context, 
s3Client, s3VersionSummary);
 
-writer.addToListing(s3VersionSummary, taggingResult, 
objectMetadata);
+writer.addToListing(s3VersionSummary, taggingResult, 
objectMetadata, context.getProperty(S3_REGION).getValue());
 
 listCount++;
 
@@ -910,7 +911,7 @@ public class ListS3 extends AbstractS3Processor implements 
VerifiableProcessor {
 interface S3ObjectWriter {
 void beginListing() throws IOException, SchemaNotFoundException;
 
-void addToListing(S3VersionSummary summary, GetObjectTaggingResult 
taggingResult, ObjectMetadata objectMetadata) throws IOException;
+void addToListing(S3VersionSummary summary, GetObjectTaggingResult 
taggingResult, ObjectMetadata objectMetadata, String region) throws IOException;
 
 vo

[nifi] branch main updated: NIFI-12028 - Add s3.region attribute to ListS3 generated flow files

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 47f4c8ce2e NIFI-12028 - Add s3.region attribute to ListS3 generated 
flow files
47f4c8ce2e is described below

commit 47f4c8ce2e0b1ec5fa176cb44a94e64dce354fa0
Author: Pierre Villard 
AuthorDate: Fri Sep 8 13:01:33 2023 +0200

NIFI-12028 - Add s3.region attribute to ListS3 generated flow files

This closes #7672

Signed-off-by: Mike Thomsen 
---
 .../org/apache/nifi/processors/aws/s3/ListS3.java   | 21 +
 .../apache/nifi/processors/aws/s3/TestListS3.java   |  2 ++
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/ListS3.java
 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/ListS3.java
index 0f51b73317..5a1649814e 100644
--- 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/ListS3.java
+++ 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/ListS3.java
@@ -116,6 +116,7 @@ import java.util.stream.Collectors;
 + "Node is selected, the new node can pick up where the previous node 
left off, without duplicating the data.")
 @WritesAttributes({
 @WritesAttribute(attribute = "s3.bucket", description = "The name of 
the S3 bucket"),
+@WritesAttribute(attribute = "s3.region", description = "The region of 
the S3 bucket"),
 @WritesAttribute(attribute = "filename", description = "The name of 
the file"),
 @WritesAttribute(attribute = "s3.etag", description = "The ETag that 
can be used to see if the file has changed"),
 @WritesAttribute(attribute = "s3.isLatest", description = "A boolean 
indicating if this is the latest version of the object"),
@@ -499,7 +500,7 @@ public class ListS3 extends AbstractS3Processor implements 
VerifiableProcessor {
 if (writerFactory == null) {
 writer = new AttributeObjectWriter(session);
 } else {
-writer = new RecordObjectWriter(session, writerFactory, 
getLogger());
+writer = new RecordObjectWriter(session, writerFactory, 
getLogger(), context.getProperty(S3_REGION).getValue());
 }
 
 try {
@@ -523,7 +524,7 @@ public class ListS3 extends AbstractS3Processor implements 
VerifiableProcessor {
 ObjectMetadata objectMetadata = getObjectMetadata(context, 
client, versionSummary);
 
 // Write the entity to the listing
-writer.addToListing(versionSummary, taggingResult, 
objectMetadata);
+writer.addToListing(versionSummary, taggingResult, 
objectMetadata, context.getProperty(S3_REGION).getValue());
 
 // Track the latest lastModified timestamp and keys having 
that timestamp.
 // NOTE: Amazon S3 lists objects in UTF-8 character 
encoding in lexicographical order. Not ordered by timestamps.
@@ -633,7 +634,7 @@ public class ListS3 extends AbstractS3Processor implements 
VerifiableProcessor {
 if (writerFactory == null) {
 writer = new AttributeObjectWriter(session);
 } else {
-writer = new RecordObjectWriter(session, writerFactory, 
getLogger());
+writer = new RecordObjectWriter(session, writerFactory, 
getLogger(), context.getProperty(S3_REGION).getValue());
 }
 
 try {
@@ -648,7 +649,7 @@ public class ListS3 extends AbstractS3Processor implements 
VerifiableProcessor {
 GetObjectTaggingResult taggingResult = 
getTaggingResult(context, s3Client, s3VersionSummary);
 ObjectMetadata objectMetadata = getObjectMetadata(context, 
s3Client, s3VersionSummary);
 
-writer.addToListing(s3VersionSummary, taggingResult, 
objectMetadata);
+writer.addToListing(s3VersionSummary, taggingResult, 
objectMetadata, context.getProperty(S3_REGION).getValue());
 
 listCount++;
 
@@ -910,7 +911,7 @@ public class ListS3 extends AbstractS3Processor implements 
VerifiableProcessor {
 interface S3ObjectWriter {
 void beginListing() throws IOException, SchemaNotFoundException;
 
-void addToListing(S3VersionSummary summary, GetObjectTaggingResult 
taggingResult, ObjectMetadata objectMetadata) throws IOException;
+void addToListing(S3VersionSummary summary, GetObjectTaggingResult 
taggingResult, ObjectMetadata objectMetadata, String region) throws IOException;
 
 void finishListing() throws IOExce

[nifi] branch main updated: NIFI-11966 Update POM.xml Maven Dependencies

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 cef29be718 NIFI-11966 Update POM.xml Maven Dependencies
cef29be718 is described below

commit cef29be7185e51b3d2b98d8af232443a9129ef79
Author: mr1716 
AuthorDate: Fri Aug 18 19:51:31 2023 -0400

NIFI-11966 Update POM.xml Maven Dependencies

This closes #7625

Signed-off-by: Mike Thomsen 
---
 pom.xml | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index f8e6b6cb90..887ff5a059 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,7 +132,7 @@
 3.0.18
 
3.9.0
 3.0.9-03
-3.0.0
+3.1.2
 3.3.6
 1.2.1
 2.1.5
@@ -822,7 +822,7 @@
 
 org.apache.maven.plugins
 maven-assembly-plugin
-3.5.0
+3.6.0
 
 gnu
 
@@ -863,7 +863,7 @@
 
 org.apache.maven.plugins
 maven-release-plugin
-3.0.0
+3.0.1
 
 true
 apache-release
@@ -889,7 +889,7 @@
 
 io.fabric8
 docker-maven-plugin
-0.42.0
+0.43.3
 
 
 org.codehaus.mojo
@@ -921,7 +921,7 @@
 
 org.apache.maven.plugins
 maven-dependency-plugin
-3.5.0
+3.6.0
 
 
 org.apache.rat
@@ -995,7 +995,7 @@
 
 org.apache.maven.plugins
 maven-enforcer-plugin
-3.2.1
+3.3.0
 
 
 enforce-maven-version

[nifi] branch support/nifi-1.x updated: NIFI-11966 Update POM.xml Maven Dependencies

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 0799ec3573 NIFI-11966 Update POM.xml Maven Dependencies
0799ec3573 is described below

commit 0799ec357373dfe4ee81f4569d0cc8754172b08e
Author: mr1716 
AuthorDate: Fri Aug 18 19:51:31 2023 -0400

NIFI-11966 Update POM.xml Maven Dependencies

This closes #7625

Signed-off-by: Mike Thomsen 
---
 pom.xml | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 68be03a0a7..211e5c3f0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,8 +130,9 @@
 2.3.3
 2.4.11
 3.0.18
-3.0.8-01
-3.0.0
+
3.9.0
+3.0.9-03
+3.1.2
 3.3.6
 1.2.1
 2.1.5
@@ -781,7 +782,7 @@
 
 org.apache.maven.plugins
 maven-assembly-plugin
-3.5.0
+3.6.0
 
 gnu
 
@@ -821,7 +822,7 @@
 
 org.apache.maven.plugins
 maven-release-plugin
-3.0.0
+3.0.1
 
 true
 apache-release
@@ -847,7 +848,7 @@
 
 io.fabric8
 docker-maven-plugin
-0.42.0
+0.43.3
 
 
 org.codehaus.mojo
@@ -879,7 +880,7 @@
 
 org.apache.maven.plugins
 maven-dependency-plugin
-3.5.0
+3.6.0
 
 
 org.apache.rat
@@ -945,7 +946,7 @@
 
 org.apache.maven.plugins
 maven-enforcer-plugin
-3.2.1
+3.3.0
 
 
 enforce-maven-version

[nifi] branch support/nifi-1.x updated: NIFI-11928 Update gremlin.version to 3.7.0

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 ac07f0dc00 NIFI-11928 Update gremlin.version to 3.7.0
ac07f0dc00 is described below

commit ac07f0dc00bd83e77940d26b13cef9d05d8605b5
Author: mr1716 
AuthorDate: Thu Aug 10 08:25:16 2023 -0400

NIFI-11928 Update gremlin.version to 3.7.0

This closes #7592

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml   | 2 +-
 nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 5a945504b8..a4d7f75147 100644
--- 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
@@ -25,7 +25,7 @@
 nifi-graph-test-clients
 jar
 
-3.6.4
+3.7.0
 0.6.3
 32.0.1-jre
 
diff --git 
a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml 
b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
index 95cadb108d..5d6e42a17e 100644
--- a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
+++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
@@ -19,7 +19,7 @@
 jar
 
 
-3.6.4
+3.7.0
 
 
 

[nifi] branch main updated: NIFI-11928 Update gremlin.version to 3.7.0

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 a9f29f209e NIFI-11928 Update gremlin.version to 3.7.0
a9f29f209e is described below

commit a9f29f209e30a698323ecab97357966bb868bea2
Author: mr1716 
AuthorDate: Thu Aug 10 08:25:16 2023 -0400

NIFI-11928 Update gremlin.version to 3.7.0

This closes #7592

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml   | 2 +-
 nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 bd6aaf02bc..16e1cf09fd 100644
--- 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
@@ -25,7 +25,7 @@
 nifi-graph-test-clients
 jar
 
-3.6.4
+3.7.0
 0.6.3
 32.0.1-jre
 
diff --git 
a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml 
b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
index c7ffe31ff4..d2d9c07c41 100644
--- a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
+++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
@@ -19,7 +19,7 @@
 jar
 
 
-3.6.4
+3.7.0
 
 
 

[nifi] branch support/nifi-1.x updated: NIFI-11943 Update activemq-client and broker to 5.18.2

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 72c6c5708e NIFI-11943 Update activemq-client and broker to 5.18.2
72c6c5708e is described below

commit 72c6c5708eb3efae23b9c330874a7d248d08
Author: mr1716 
AuthorDate: Fri Aug 11 08:49:34 2023 -0400

NIFI-11943 Update activemq-client and broker to 5.18.2

This closes #7602

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml 
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml
index ee4c814398..1e916312ea 100644
--- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml
@@ -69,7 +69,7 @@
 
 org.apache.activemq
 activemq-client
-5.15.15
+5.18.2
 
 
 
@@ -82,7 +82,7 @@
 
 org.apache.activemq
 activemq-broker
-5.15.15
+5.18.2
 test
 
 

[nifi] branch main updated: NIFI-11943 Update activemq-client and broker to 5.18.2

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 12f736a6b0 NIFI-11943 Update activemq-client and broker to 5.18.2
12f736a6b0 is described below

commit 12f736a6b088a484f02adb4fddad92e6f548d7dc
Author: mr1716 
AuthorDate: Fri Aug 11 08:49:34 2023 -0400

NIFI-11943 Update activemq-client and broker to 5.18.2

This closes #7602

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml 
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml
index 5147ea5c4c..2209a4db6e 100644
--- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml
@@ -69,13 +69,13 @@
 
 org.apache.activemq
 activemq-client
-5.18.0
+5.18.2
 test
 
 
 org.apache.activemq
 activemq-broker
-5.18.0
+5.18.2
 test
 
 

[nifi] 06/08: NIFI-11935 Update Redis spring.data.redis.version to 2.7.14

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 99a590ec0c73e1cd0eec154033f29b025f59c6d3
Author: mr1716 
AuthorDate: Thu Aug 10 10:10:10 2023 -0400

NIFI-11935 Update Redis spring.data.redis.version to 2.7.14

This closes #7598

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-redis-bundle/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nifi-nar-bundles/nifi-redis-bundle/pom.xml 
b/nifi-nar-bundles/nifi-redis-bundle/pom.xml
index 405f9c8631..6e0c19728c 100644
--- a/nifi-nar-bundles/nifi-redis-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-redis-bundle/pom.xml
@@ -26,7 +26,7 @@
 pom
 
 
-2.7.10
+2.7.14
 3.10.0
 
 

[nifi] 05/08: NIFI-11933 Update spring.integration.version For Email Bundle To 5.5.18

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 0c03521676ce4ce00d806c689f9d01a762485eca
Author: mr1716 
AuthorDate: Thu Aug 10 09:35:33 2023 -0400

NIFI-11933 Update spring.integration.version For Email Bundle To 5.5.18

This closes #7597

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml 
b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
index d422396d01..c525d282f8 100644
--- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
@@ -25,7 +25,7 @@
 nifi-email-processors
 jar
 
-5.5.7
+5.5.18
 5.2.3
 
 

[nifi] 02/08: NIFI-11930 Update aws-kinesis-client-library-version to 1.15.0

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit c878310e36324f78ac5feb123bab3f430917645d
Author: mr1716 
AuthorDate: Thu Aug 10 08:48:13 2023 -0400

NIFI-11930 Update aws-kinesis-client-library-version to 1.15.0

This closes #7594

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-aws-bundle/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nifi-nar-bundles/nifi-aws-bundle/pom.xml 
b/nifi-nar-bundles/nifi-aws-bundle/pom.xml
index 019b3f449e..93fe4a52c9 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-aws-bundle/pom.xml
@@ -27,7 +27,7 @@
 
 
 
-
1.14.10
+
1.15.0
 
 
 

[nifi] 01/08: NIFI-11929 Update snappy-java to 1.1.10.3

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 75dde8198e5947561e7da15710b55819ecf86a1b
Author: mr1716 
AuthorDate: Thu Aug 10 08:29:50 2023 -0400

NIFI-11929 Update snappy-java to 1.1.10.3

This closes #7592

Signed-off-by: Mike Thomsen 
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 767f8e3d07..0be532d943 100644
--- a/pom.xml
+++ b/pom.xml
@@ -648,7 +648,7 @@
 
 org.xerial.snappy
 snappy-java
-1.1.10.2
+1.1.10.3
 
 
 

[nifi] branch main updated (02653143d8 -> b78dc5ca57)

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


from 02653143d8 NIFI-11914 Support Expression Language for SegmentContent 
Size
 new 75dde8198e NIFI-11929 Update snappy-java to 1.1.10.3
 new c878310e36 NIFI-11930 Update aws-kinesis-client-library-version to 
1.15.0
 new 53f64badbf NIFI-11931 Update iotdb.sdk.version to 1.1.2
 new d800098070 NIFI-11932 Update snakeyaml to 2.1
 new 0c03521676 NIFI-11933 Update spring.integration.version For Email 
Bundle To 5.5.18
 new 99a590ec0c NIFI-11935 Update Redis spring.data.redis.version to 2.7.14
 new c0156e3429 NIFI-11936 Update msal4j.version to 1.13.10
 new b78dc5ca57 NIFI-11942 Update zstd-jni to 1.5.5-5

The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 nifi-nar-bundles/nifi-aws-bundle/pom.xml | 2 +-
 nifi-nar-bundles/nifi-azure-bundle/pom.xml   | 2 +-
 nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml | 2 +-
 nifi-nar-bundles/nifi-iotdb-bundle/pom.xml   | 2 +-
 nifi-nar-bundles/nifi-redis-bundle/pom.xml   | 2 +-
 nifi-nar-bundles/nifi-standard-bundle/pom.xml| 2 +-
 pom.xml  | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

[nifi] 04/08: NIFI-11932 Update snakeyaml to 2.1

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit ac1fd6232dd4d6e9a928e6c8cdf2d1dc4c4acb04
Author: mr1716 
AuthorDate: Thu Aug 10 09:04:31 2023 -0400

NIFI-11932 Update snakeyaml to 2.1

This closes #7596

Signed-off-by: Mike Thomsen 
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 99aae2896d..32962181bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
 1.3.8
 4.11.0
 3.10.6.Final
-2.0
+2.1
 4.1.96.Final
 5.3.29
 5.8.5

[nifi] 05/08: NIFI-11933 Update spring.integration.version For Email Bundle To 5.5.18

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit af54b568b96fb47068a0895206c8d170a8f6c0b8
Author: mr1716 
AuthorDate: Thu Aug 10 09:35:33 2023 -0400

NIFI-11933 Update spring.integration.version For Email Bundle To 5.5.18

This closes #7597

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml 
b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
index e7513fe028..e3d65640e7 100644
--- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
@@ -25,7 +25,7 @@
 nifi-email-processors
 jar
 
-5.5.7
+5.5.18
 5.2.3
 
 

[nifi] 03/08: NIFI-11931 Update iotdb.sdk.version to 1.1.2

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit bbc18b050a08244bd04462df3c0d4db9644f95a0
Author: mr1716 
AuthorDate: Thu Aug 10 08:55:18 2023 -0400

NIFI-11931 Update iotdb.sdk.version to 1.1.2

This closes #7595

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-iotdb-bundle/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nifi-nar-bundles/nifi-iotdb-bundle/pom.xml 
b/nifi-nar-bundles/nifi-iotdb-bundle/pom.xml
index 3a841824ae..5236d86fe5 100644
--- a/nifi-nar-bundles/nifi-iotdb-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-iotdb-bundle/pom.xml
@@ -31,7 +31,7 @@
 
 
 
-1.1.1
+1.1.2
 
 
 

[nifi] branch support/nifi-1.x updated (da0d2614bd -> 2a88aab626)

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a change to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


from da0d2614bd NIFI-11914 Support Expression Language for SegmentContent 
Size
 new 0a00933129 NIFI-11929 Update snappy-java to 1.1.10.3
 new b6df16f2b7 NIFI-11930 Update aws-kinesis-client-library-version to 
1.15.0
 new bbc18b050a NIFI-11931 Update iotdb.sdk.version to 1.1.2
 new ac1fd6232d NIFI-11932 Update snakeyaml to 2.1
 new af54b568b9 NIFI-11933 Update spring.integration.version For Email 
Bundle To 5.5.18
 new 19d5bd44a1 NIFI-11935 Update Redis spring.data.redis.version to 2.7.14
 new da429c2431 NIFI-11936 Update msal4j.version to 1.13.10
 new 2a88aab626 NIFI-11942 Update zstd-jni to 1.5.5-5

The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 nifi-nar-bundles/nifi-aws-bundle/pom.xml | 2 +-
 nifi-nar-bundles/nifi-azure-bundle/pom.xml   | 2 +-
 nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml | 2 +-
 nifi-nar-bundles/nifi-iotdb-bundle/pom.xml   | 2 +-
 nifi-nar-bundles/nifi-redis-bundle/pom.xml   | 2 +-
 nifi-nar-bundles/nifi-standard-bundle/pom.xml| 2 +-
 pom.xml  | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

[nifi] 07/08: NIFI-11936 Update msal4j.version to 1.13.10

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit c0156e34298bf6e4a4d1f521b7dca48736d7940f
Author: mr1716 
AuthorDate: Thu Aug 10 10:14:28 2023 -0400

NIFI-11936 Update msal4j.version to 1.13.10

This closes #7599

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-azure-bundle/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nifi-nar-bundles/nifi-azure-bundle/pom.xml 
b/nifi-nar-bundles/nifi-azure-bundle/pom.xml
index 8a4b85a4a9..b12d481574 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/pom.xml
@@ -27,7 +27,7 @@
 
 
 1.2.13
-1.13.8
+1.13.10
 0.34.1
 
 

[nifi] 03/08: NIFI-11931 Update iotdb.sdk.version to 1.1.2

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 53f64badbf044fb2fb262a5ecf52e2e89ef57524
Author: mr1716 
AuthorDate: Thu Aug 10 08:55:18 2023 -0400

NIFI-11931 Update iotdb.sdk.version to 1.1.2

This closes #7595

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-iotdb-bundle/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nifi-nar-bundles/nifi-iotdb-bundle/pom.xml 
b/nifi-nar-bundles/nifi-iotdb-bundle/pom.xml
index 1c07e7a9d8..a6714baab4 100644
--- a/nifi-nar-bundles/nifi-iotdb-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-iotdb-bundle/pom.xml
@@ -31,7 +31,7 @@
 
 
 
-1.1.1
+1.1.2
 
 
 

[nifi] 04/08: NIFI-11932 Update snakeyaml to 2.1

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit d8000980709097a09c04dce91b608c9ccd99673b
Author: mr1716 
AuthorDate: Thu Aug 10 09:04:31 2023 -0400

NIFI-11932 Update snakeyaml to 2.1

This closes #7596

Signed-off-by: Mike Thomsen 
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0be532d943..e3b12cf9fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@
 1.3.8
 4.11.0
 3.10.6.Final
-2.0
+2.1
 4.1.96.Final
 5.3.29
 5.8.5

[nifi] 08/08: NIFI-11942 Update zstd-jni to 1.5.5-5

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit b78dc5ca575b4f1cdfa9c46bf4a3ec1108e67753
Author: mr1716 
AuthorDate: Fri Aug 11 08:28:11 2023 -0400

NIFI-11942 Update zstd-jni to 1.5.5-5

This closes #7601

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-standard-bundle/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml 
b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
index 31d2681330..ce3de82dea 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
@@ -144,7 +144,7 @@
 
 com.github.luben
 zstd-jni
-1.5.5-4
+1.5.5-5
 
 
 com.aayushatharva.brotli4j

[nifi] 06/08: NIFI-11935 Update Redis spring.data.redis.version to 2.7.14

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 19d5bd44a19bc0546df8fa3ba30caffb83074635
Author: mr1716 
AuthorDate: Thu Aug 10 10:10:10 2023 -0400

NIFI-11935 Update Redis spring.data.redis.version to 2.7.14

This closes #7598

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-redis-bundle/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nifi-nar-bundles/nifi-redis-bundle/pom.xml 
b/nifi-nar-bundles/nifi-redis-bundle/pom.xml
index d0467f5d83..15527d28fd 100644
--- a/nifi-nar-bundles/nifi-redis-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-redis-bundle/pom.xml
@@ -26,7 +26,7 @@
 pom
 
 
-2.7.10
+2.7.14
 3.10.0
 
 

[nifi] 02/08: NIFI-11930 Update aws-kinesis-client-library-version to 1.15.0

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit b6df16f2b7e09f3e04c8b3627fcb7542f93ea7ad
Author: mr1716 
AuthorDate: Thu Aug 10 08:48:13 2023 -0400

NIFI-11930 Update aws-kinesis-client-library-version to 1.15.0

This closes #7594

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-aws-bundle/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nifi-nar-bundles/nifi-aws-bundle/pom.xml 
b/nifi-nar-bundles/nifi-aws-bundle/pom.xml
index a63e733646..fce6d70c1d 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-aws-bundle/pom.xml
@@ -27,7 +27,7 @@
 
 
 
-
1.14.10
+
1.15.0
 
 
 

[nifi] 07/08: NIFI-11936 Update msal4j.version to 1.13.10

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit da429c2431ab0ff904f38cc9e245d369f1248c9f
Author: mr1716 
AuthorDate: Thu Aug 10 10:14:28 2023 -0400

NIFI-11936 Update msal4j.version to 1.13.10

This closes #7599

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-azure-bundle/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nifi-nar-bundles/nifi-azure-bundle/pom.xml 
b/nifi-nar-bundles/nifi-azure-bundle/pom.xml
index b8e3742907..51f9009d8f 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/pom.xml
@@ -28,7 +28,7 @@
 
 1.2.13
 
8.6.6
-1.13.8
+1.13.10
 0.34.1
 
 

[nifi] 08/08: NIFI-11942 Update zstd-jni to 1.5.5-5

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 2a88aab62667c3485f2c2deb0c85a238420d0460
Author: mr1716 
AuthorDate: Fri Aug 11 08:28:11 2023 -0400

NIFI-11942 Update zstd-jni to 1.5.5-5

This closes #7601

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-standard-bundle/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml 
b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
index 5f2e7e12cb..968f30332c 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
@@ -144,7 +144,7 @@
 
 com.github.luben
 zstd-jni
-1.5.5-4
+1.5.5-5
 
 
 com.aayushatharva.brotli4j

[nifi] 01/08: NIFI-11929 Update snappy-java to 1.1.10.3

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 0a009331293f54406f1fd0c673624c97e7824786
Author: mr1716 
AuthorDate: Thu Aug 10 08:29:50 2023 -0400

NIFI-11929 Update snappy-java to 1.1.10.3

This closes #7592

Signed-off-by: Mike Thomsen 
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4e3c4e0891..99aae2896d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -626,7 +626,7 @@
 
 org.xerial.snappy
 snappy-java
-1.1.10.2
+1.1.10.3
 
 
 

[nifi] branch support/nifi-1.x updated: NIFI-11915 Upgraded gRPC from 1.57.0 to 1.57.1

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 7e3f378808 NIFI-11915 Upgraded gRPC from 1.57.0 to 1.57.1
7e3f378808 is described below

commit 7e3f37880886773da8cb23da76d23cc43cad13b0
Author: exceptionfactory 
AuthorDate: Mon Aug 7 11:07:00 2023 -0500

NIFI-11915 Upgraded gRPC from 1.57.0 to 1.57.1

This closes #7577

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-grpc-bundle/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nifi-nar-bundles/nifi-grpc-bundle/pom.xml 
b/nifi-nar-bundles/nifi-grpc-bundle/pom.xml
index 2d7610a4fd..a753e8d48e 100644
--- a/nifi-nar-bundles/nifi-grpc-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-grpc-bundle/pom.xml
@@ -33,7 +33,7 @@
 
 
 
-1.57.0
+1.57.1
 3.22.5
 
 

[nifi] branch main updated: NIFI-11915 Upgraded gRPC from 1.57.0 to 1.57.1

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 ff87060b16 NIFI-11915 Upgraded gRPC from 1.57.0 to 1.57.1
ff87060b16 is described below

commit ff87060b16948006e534d69c2b33d679bb3da427
Author: exceptionfactory 
AuthorDate: Mon Aug 7 11:07:00 2023 -0500

NIFI-11915 Upgraded gRPC from 1.57.0 to 1.57.1

This closes #7577

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-grpc-bundle/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nifi-nar-bundles/nifi-grpc-bundle/pom.xml 
b/nifi-nar-bundles/nifi-grpc-bundle/pom.xml
index 41f19b628b..247b026d78 100644
--- a/nifi-nar-bundles/nifi-grpc-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-grpc-bundle/pom.xml
@@ -33,7 +33,7 @@
 
 
 
-1.57.0
+1.57.1
 3.22.5
 
 

[nifi] branch main updated: NIFI-11759: Remove Distributed Map Cache Client property from ListHDFS

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 7b5853363f NIFI-11759: Remove Distributed Map Cache Client property 
from ListHDFS
7b5853363f is described below

commit 7b5853363f2951d5c23583219370cb1df9e830a0
Author: Matt Burgess 
AuthorDate: Tue Jun 27 15:29:01 2023 -0400

NIFI-11759: Remove Distributed Map Cache Client property from ListHDFS

This closes #7443

Signed-off-by: Mike Thomsen 
---
 .../apache/nifi/processors/hadoop/ListHDFS.java| 17 -
 .../nifi/processors/hadoop/TestListHDFS.java   | 82 --
 2 files changed, 99 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ListHDFS.java
 
b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ListHDFS.java
index 57fe584255..40abeb16f9 100644
--- 
a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ListHDFS.java
+++ 
b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ListHDFS.java
@@ -44,7 +44,6 @@ import org.apache.nifi.components.state.Scope;
 import org.apache.nifi.components.state.StateMap;
 import org.apache.nifi.deprecation.log.DeprecationLogger;
 import org.apache.nifi.deprecation.log.DeprecationLoggerFactory;
-import org.apache.nifi.distributed.cache.client.DistributedMapCacheClient;
 import org.apache.nifi.flowfile.FlowFile;
 import org.apache.nifi.flowfile.attributes.CoreAttributes;
 import org.apache.nifi.processor.ProcessContext;
@@ -146,14 +145,6 @@ public class ListHDFS extends AbstractHadoopProcessor {
 RECORD_SCHEMA = new SimpleRecordSchema(recordFields);
 }
 
-@Deprecated
-public static final PropertyDescriptor DISTRIBUTED_CACHE_SERVICE = new 
PropertyDescriptor.Builder()
-.name("Distributed Cache Service")
-.description("This property is ignored.  State will be stored in the " 
+ Scope.LOCAL + " or " + Scope.CLUSTER + " scope by the State Manager based on 
NiFi's configuration.")
-.required(false)
-.identifiesControllerService(DistributedMapCacheClient.class)
-.build();
-
 public static final PropertyDescriptor RECURSE_SUBDIRS = new 
PropertyDescriptor.Builder()
 .name("Recurse Subdirectories")
 .description("Indicates whether to list files from subdirectories of 
the HDFS directory")
@@ -264,7 +255,6 @@ public class ListHDFS extends AbstractHadoopProcessor {
 @Override
 protected List getSupportedPropertyDescriptors() {
 final List props = new ArrayList<>(properties);
-props.add(DISTRIBUTED_CACHE_SERVICE);
 props.add(DIRECTORY);
 props.add(RECURSE_SUBDIRS);
 props.add(RECORD_WRITER);
@@ -284,13 +274,6 @@ public class ListHDFS extends AbstractHadoopProcessor {
 
 @Override
 protected Collection customValidate(ValidationContext 
context) {
-if (context.getProperty(DISTRIBUTED_CACHE_SERVICE).isSet()) {
-deprecationLogger.warn("{}[id={}] [{}] Property is not used",
-getClass().getSimpleName(),
-getIdentifier(),
-DISTRIBUTED_CACHE_SERVICE.getDisplayName()
-);
-}
 
 final List problems = new 
ArrayList<>(super.customValidate(context));
 
diff --git 
a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/TestListHDFS.java
 
b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/TestListHDFS.java
index 83798f5d0c..6f3ca245de 100644
--- 
a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/TestListHDFS.java
+++ 
b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/TestListHDFS.java
@@ -25,10 +25,6 @@ import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.util.Progressable;
 import org.apache.nifi.components.state.Scope;
-import org.apache.nifi.controller.AbstractControllerService;
-import org.apache.nifi.distributed.cache.client.Deserializer;
-import org.apache.nifi.distributed.cache.client.DistributedMapCacheClient;
-import org.apache.nifi.distributed.cache.client.Serializer;
 import org.apache.nifi.hadoop.KerberosProperties;
 import org.apache.nifi.reporting.InitializationException;
 import org.apache.nifi.util.MockComponentLog;
@@ -44,7 +40,6 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URI;
-impo

[nifi] branch support/nifi-1.x updated: NIFI-11755 Upgraded AWS SDK to 1.12.495 and 2.20.92

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 ac5b4e9ca6 NIFI-11755 Upgraded AWS SDK to 1.12.495 and 2.20.92
ac5b4e9ca6 is described below

commit ac5b4e9ca665bd5b85c6a1d8c10b60c52dac2770
Author: exceptionfactory 
AuthorDate: Mon Jun 26 14:17:37 2023 -0500

NIFI-11755 Upgraded AWS SDK to 1.12.495 and 2.20.92

This closes #7437

Signed-off-by: Mike Thomsen 
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 39cbe0ed90..a0c9a47379 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,8 +104,8 @@
 UTF-8
 
UTF-8
 2014
-1.12.478
-
2.20.75
+1.12.495
+
2.20.92
 2.10.1
 1.8.20
 4.11.0

[nifi] branch main updated: NIFI-11755 Upgraded AWS SDK to 1.12.495 and 2.20.92

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 b681d5e98d NIFI-11755 Upgraded AWS SDK to 1.12.495 and 2.20.92
b681d5e98d is described below

commit b681d5e98d0bd916295e3e69993893099ef9714f
Author: exceptionfactory 
AuthorDate: Mon Jun 26 14:17:37 2023 -0500

NIFI-11755 Upgraded AWS SDK to 1.12.495 and 2.20.92

This closes #7437

Signed-off-by: Mike Thomsen 
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ad66d5f2bc..32e9335e0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,8 +102,8 @@
 UTF-8
 
UTF-8
 2014
-1.12.478
-
2.20.75
+1.12.495
+
2.20.92
 2.10.1
 
6.5.1
 1.8.20

[nifi] branch main updated: NIFI-11734 Upgraded Apache Accumulo from 2.1.0 to 2.1.1

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 3ddac48c6d NIFI-11734 Upgraded Apache Accumulo from 2.1.0 to 2.1.1
3ddac48c6d is described below

commit 3ddac48c6dceb9b5543a90e7dec5be998188873d
Author: exceptionfactory 
AuthorDate: Wed Jun 21 09:43:34 2023 -0500

NIFI-11734 Upgraded Apache Accumulo from 2.1.0 to 2.1.1

This closes #7418

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-accumulo-bundle/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml 
b/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml
index 15b3f237b3..ba4618b006 100644
--- a/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml
@@ -19,7 +19,7 @@
 
 
 
-2.1.0
+2.1.1
 32.0.1-jre
 
 

[nifi] branch support/nifi-1.x updated: NIFI-7016: Fix Groovy File functions available for FlowFile in ExecuteGroovyScript

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 b00fd9bc57 NIFI-7016: Fix Groovy File functions available for FlowFile 
in ExecuteGroovyScript
b00fd9bc57 is described below

commit b00fd9bc57dbf01f5b0193a766b3ae574deefbdb
Author: Matt Burgess 
AuthorDate: Tue Jun 20 16:56:59 2023 -0400

NIFI-7016: Fix Groovy File functions available for FlowFile in 
ExecuteGroovyScript

This closes #7016

Signed-off-by: Mike Thomsen 
---
 .../processors/groovyx/flow/GroovySessionFile.java | 39 +++---
 .../groovyx/ExecuteGroovyScriptTest.java   | 17 ++
 2 files changed, 36 insertions(+), 20 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/flow/GroovySessionFile.java
 
b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/flow/GroovySessionFile.java
index 831b0a4287..6afcec6ef7 100644
--- 
a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/flow/GroovySessionFile.java
+++ 
b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/flow/GroovySessionFile.java
@@ -109,7 +109,7 @@ public class GroovySessionFile extends SessionFile 
implements GroovyObject {
  * @param c   Closure that will receive writer as a parameter to write 
file content
  * @return reference to self
  */
-public GroovySessionFile write(String charset, Closure c) {
+public GroovySessionFile write(String charset, Closure c) {
 this.write(new OutputStreamCallback() {
 public void process(OutputStream out) throws IOException {
 Writer w = new OutputStreamWriter(out, charset);
@@ -166,7 +166,7 @@ public class GroovySessionFile extends SessionFile 
implements GroovyObject {
  *  or two parameters InputStream and OutputStream to perform read 
and write.
  * @return reference to self
  */
-public GroovySessionFile write(Closure c) {
+public GroovySessionFile write(Closure c) {
 if (c.getMaximumNumberOfParameters() == 1) {
 this.write(new OutputStreamCallback() {
 public void process(OutputStream out) throws IOException {
@@ -189,7 +189,7 @@ public class GroovySessionFile extends SessionFile 
implements GroovyObject {
  * @param c Closure that receives one parameter OutputStream to perform 
append.
  * @return reference to self
  */
-public GroovySessionFile append(Closure c) {
+public GroovySessionFile append(Closure c) {
 this.append(new OutputStreamCallback() {
 public void process(OutputStream out) throws IOException {
 c.call(out);
@@ -224,7 +224,7 @@ public class GroovySessionFile extends SessionFile 
implements GroovyObject {
  * @param c   Closure with one parameter - Writer.
  * @return reference to self
  */
-public GroovySessionFile append(String charset, Closure c) {
+public GroovySessionFile append(String charset, Closure c) {
 this.append(new OutputStreamCallback() {
 public void process(OutputStream out) throws IOException {
 Writer w = new OutputStreamWriter(out, charset);
@@ -260,9 +260,9 @@ public class GroovySessionFile extends SessionFile 
implements GroovyObject {
  *
  * @param c Closure with one parameter InputStream.
  */
-public void read(Closure c) {
+public void read(Closure c) {
 this.read(new InputStreamCallback() {
-public void process(InputStream in) throws IOException {
+public void process(InputStream in) {
 c.call(in);
 }
 });
@@ -274,7 +274,7 @@ public class GroovySessionFile extends SessionFile 
implements GroovyObject {
  * @param charset charset to use for Reader
  * @param c   Closure with one parameter Reader.
  */
-public void read(String charset, Closure c) {
+public void read(String charset, Closure c) {
 this.read(new InputStreamCallback() {
 public void process(InputStream in) throws IOException {
 InputStreamReader r = new InputStreamReader(in, charset);
@@ -284,34 +284,33 @@ public class GroovySessionFile extends SessionFile 
implements GroovyObject {
 });
 }
 
-public GroovySessionFile withInputStream(Closure c) throws IOException {
+public Object withInputStream(Closure c) throws IOException {
 InputStream inStream = session.read(this);
-c.call(inStream);
+final Object returnObject = c.call(inStream);
 inStream.close();
-return this;
+return

[nifi] branch main updated: NIFI-7016: Fix Groovy File functions available for FlowFile in ExecuteGroovyScript

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 84fdb5e32f NIFI-7016: Fix Groovy File functions available for FlowFile 
in ExecuteGroovyScript
84fdb5e32f is described below

commit 84fdb5e32ff1a96e36b36a314006d33e1f0aa913
Author: Matt Burgess 
AuthorDate: Tue Jun 20 16:56:59 2023 -0400

NIFI-7016: Fix Groovy File functions available for FlowFile in 
ExecuteGroovyScript

This closes #7016

Signed-off-by: Mike Thomsen 
---
 .../processors/groovyx/flow/GroovySessionFile.java | 39 +++---
 .../groovyx/ExecuteGroovyScriptTest.java   | 17 ++
 2 files changed, 36 insertions(+), 20 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/flow/GroovySessionFile.java
 
b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/flow/GroovySessionFile.java
index 831b0a4287..6afcec6ef7 100644
--- 
a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/flow/GroovySessionFile.java
+++ 
b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/flow/GroovySessionFile.java
@@ -109,7 +109,7 @@ public class GroovySessionFile extends SessionFile 
implements GroovyObject {
  * @param c   Closure that will receive writer as a parameter to write 
file content
  * @return reference to self
  */
-public GroovySessionFile write(String charset, Closure c) {
+public GroovySessionFile write(String charset, Closure c) {
 this.write(new OutputStreamCallback() {
 public void process(OutputStream out) throws IOException {
 Writer w = new OutputStreamWriter(out, charset);
@@ -166,7 +166,7 @@ public class GroovySessionFile extends SessionFile 
implements GroovyObject {
  *  or two parameters InputStream and OutputStream to perform read 
and write.
  * @return reference to self
  */
-public GroovySessionFile write(Closure c) {
+public GroovySessionFile write(Closure c) {
 if (c.getMaximumNumberOfParameters() == 1) {
 this.write(new OutputStreamCallback() {
 public void process(OutputStream out) throws IOException {
@@ -189,7 +189,7 @@ public class GroovySessionFile extends SessionFile 
implements GroovyObject {
  * @param c Closure that receives one parameter OutputStream to perform 
append.
  * @return reference to self
  */
-public GroovySessionFile append(Closure c) {
+public GroovySessionFile append(Closure c) {
 this.append(new OutputStreamCallback() {
 public void process(OutputStream out) throws IOException {
 c.call(out);
@@ -224,7 +224,7 @@ public class GroovySessionFile extends SessionFile 
implements GroovyObject {
  * @param c   Closure with one parameter - Writer.
  * @return reference to self
  */
-public GroovySessionFile append(String charset, Closure c) {
+public GroovySessionFile append(String charset, Closure c) {
 this.append(new OutputStreamCallback() {
 public void process(OutputStream out) throws IOException {
 Writer w = new OutputStreamWriter(out, charset);
@@ -260,9 +260,9 @@ public class GroovySessionFile extends SessionFile 
implements GroovyObject {
  *
  * @param c Closure with one parameter InputStream.
  */
-public void read(Closure c) {
+public void read(Closure c) {
 this.read(new InputStreamCallback() {
-public void process(InputStream in) throws IOException {
+public void process(InputStream in) {
 c.call(in);
 }
 });
@@ -274,7 +274,7 @@ public class GroovySessionFile extends SessionFile 
implements GroovyObject {
  * @param charset charset to use for Reader
  * @param c   Closure with one parameter Reader.
  */
-public void read(String charset, Closure c) {
+public void read(String charset, Closure c) {
 this.read(new InputStreamCallback() {
 public void process(InputStream in) throws IOException {
 InputStreamReader r = new InputStreamReader(in, charset);
@@ -284,34 +284,33 @@ public class GroovySessionFile extends SessionFile 
implements GroovyObject {
 });
 }
 
-public GroovySessionFile withInputStream(Closure c) throws IOException {
+public Object withInputStream(Closure c) throws IOException {
 InputStream inStream = session.read(this);
-c.call(inStream);
+final Object returnObject = c.call(inStream);
 inStream.close();
-return this;
+return returnObject

[nifi] branch support/nifi-1.x updated: NIFI-11729 Upgraded OWASP Dependency Check from 8.2.1 to 8.3.1

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 2d57625249 NIFI-11729 Upgraded OWASP Dependency Check from 8.2.1 to 
8.3.1
2d57625249 is described below

commit 2d57625249cd5e944b5ff22f10f73e92e437334b
Author: exceptionfactory 
AuthorDate: Mon Jun 19 20:52:44 2023 -0500

NIFI-11729 Upgraded OWASP Dependency Check from 8.2.1 to 8.3.1

- Updated OWASP suppressions to exclude several JSON and Kafka false 
positives
- Excluded JUnit dependency from Hive 3 JDBC

This closes #7411

Signed-off-by: Mike Thomsen 
---
 nifi-dependency-check-maven/suppressions.xml   | 75 ++
 .../nifi-hive-bundle/nifi-hive3-processors/pom.xml |  4 ++
 pom.xml|  2 +-
 3 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/nifi-dependency-check-maven/suppressions.xml 
b/nifi-dependency-check-maven/suppressions.xml
index 5d36569eaa..e4e0cdac1d 100644
--- a/nifi-dependency-check-maven/suppressions.xml
+++ b/nifi-dependency-check-maven/suppressions.xml
@@ -19,16 +19,6 @@
 ^pkg:maven/org\.apache\.nifi.*$
 ^cpe:.*$
 
-
-Jetty SSLEngine is incorrectly identified with Jetty 
Server
-^pkg:maven/org\.mortbay\.jetty/jetty\-sslengine@.*$
-^cpe:.*$
-
-
-H2 1.4.200 is shaded and repackaged without vulnerable 
components in nifi-h2-database for migration
-pkg:maven/com.h2database/h2@1.4.200
-^CVE.*$
-
 
 CVE-2022-45868 requires running H2 from a command not 
applicable to project references
 ^pkg:maven/com\.h2database/h2@2.*$
@@ -154,11 +144,6 @@
 ^pkg:maven/org\.elasticsearch\.client/elasticsearch\-.*?\-client-sniffer@.*$
 ^cpe:/a:elastic.*$
 
-
-CVE-2022-34271 applies to Atlas Server not the Atlas client 
library
-^pkg:maven/org\.apache\.atlas/.*$
-CVE-2022-34271
-
 
 CVE-2022-30187 applies to Azure Blob not the EventHubs 
Checkpoint Store Blob library
 ^pkg:maven/com\.azure/azure\-messaging\-eventhubs\-checkpointstore\-blob@.*$
@@ -169,21 +154,11 @@
 ^pkg:maven/org\.apache\.calcite/calcite\-druid@.*$
 CVE-2022-39135
 
-
-CVE-2018-8016 applies to Apache Cassandra server not the client 
library
-^pkg:maven/com\.datastax\.cassandra/cassandra\-driver\-extras@.*$
-CVE-2018-8016
-
 
 CVE-2018-1000873 applies to Jackson Java 8 Time modules not 
Jackson Annotations
 ^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-annotations@.*$
 CVE-2018-1000873
 
-
-CVE-2021-34371 applies to Neo4j server not the driver 
library
-^pkg:maven/org\.opencypher\.gremlin/cypher\-gremlin\-neo4j\-driver@.*$
-CVE-2021-34371
-
 
 CVE-2010-1151 applies to mod_auth_shadow in Apache HTTP Server 
not the FTP server library
 ^pkg:maven/org\.apache\.ftpserver/.*$
@@ -194,21 +169,6 @@
 ^pkg:maven/com\.h2database/h2@.*$
 CVE-2018-14335
 
-
-CVE-2022-31160 included in hadoop-client-api is not used
-^pkg:javascript/jquery\-ui@.*$
-CVE-2022-31160
-
-
-CVE-2021-37533 applies to the Commons Net FTP Client which is 
not used in the version bundled with hadoop-client-runtime for Accumulo
-^pkg:maven/commons\-net/commons\-net@.*$
-CVE-2021-37533
-
-
-CVE-2021-0341 applies to Android not OkHttp
-^pkg:maven/com\.squareup\.okhttp/okhttp@.*$
-CVE-2021-0341
-
 
 CVE-2023-25613 applies to an LDAP backend class for Apache 
Kerby not the Token Provider library
 ^pkg:maven/org\.apache\.kerby/token\-provider@.*$
@@ -264,4 +224,39 @@
 ^pkg:maven/org\.apache\.hbase/hbase\-hadoop2\-compat@.*$
 cpe:/a:apache:hadoop
 
+
+CVE-2022-45688 applies to hutools-json not org.json
+^pkg:maven/org\.json/json@.*$
+CVE-2022-45688
+
+
+The Jackson maintainers dispute the applicability of 
CVE-2023-35116 based on cyclic nature of reported concern
+^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$
+CVE-2023-35116
+
+
+CVE-2023-25194 applies to Kafka Connect workers not client 
libraries
+^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

[nifi] branch main updated: NIFI-11729 Upgraded OWASP Dependency Check from 8.2.1 to 8.3.1

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 26d02fff49 NIFI-11729 Upgraded OWASP Dependency Check from 8.2.1 to 
8.3.1
26d02fff49 is described below

commit 26d02fff490805fb71047afa034d5597c02382d8
Author: exceptionfactory 
AuthorDate: Mon Jun 19 20:52:44 2023 -0500

NIFI-11729 Upgraded OWASP Dependency Check from 8.2.1 to 8.3.1

- Updated OWASP suppressions to exclude several JSON and Kafka false 
positives
- Excluded JUnit dependency from Hive 3 JDBC

This closes #7411

Signed-off-by: Mike Thomsen 
---
 nifi-dependency-check-maven/suppressions.xml   | 70 +++---
 .../nifi-hive-bundle/nifi-hive3-processors/pom.xml |  4 ++
 pom.xml|  2 +-
 3 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/nifi-dependency-check-maven/suppressions.xml 
b/nifi-dependency-check-maven/suppressions.xml
index 83c36fae39..e4e0cdac1d 100644
--- a/nifi-dependency-check-maven/suppressions.xml
+++ b/nifi-dependency-check-maven/suppressions.xml
@@ -19,11 +19,6 @@
 ^pkg:maven/org\.apache\.nifi.*$
 ^cpe:.*$
 
-
-Jetty SSLEngine is incorrectly identified with Jetty 
Server
-^pkg:maven/org\.mortbay\.jetty/jetty\-sslengine@.*$
-^cpe:.*$
-
 
 CVE-2022-45868 requires running H2 from a command not 
applicable to project references
 ^pkg:maven/com\.h2database/h2@2.*$
@@ -149,11 +144,6 @@
 ^pkg:maven/org\.elasticsearch\.client/elasticsearch\-.*?\-client-sniffer@.*$
 ^cpe:/a:elastic.*$
 
-
-CVE-2022-34271 applies to Atlas Server not the Atlas client 
library
-^pkg:maven/org\.apache\.atlas/.*$
-CVE-2022-34271
-
 
 CVE-2022-30187 applies to Azure Blob not the EventHubs 
Checkpoint Store Blob library
 ^pkg:maven/com\.azure/azure\-messaging\-eventhubs\-checkpointstore\-blob@.*$
@@ -164,21 +154,11 @@
 ^pkg:maven/org\.apache\.calcite/calcite\-druid@.*$
 CVE-2022-39135
 
-
-CVE-2018-8016 applies to Apache Cassandra server not the client 
library
-^pkg:maven/com\.datastax\.cassandra/cassandra\-driver\-extras@.*$
-CVE-2018-8016
-
 
 CVE-2018-1000873 applies to Jackson Java 8 Time modules not 
Jackson Annotations
 ^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-annotations@.*$
 CVE-2018-1000873
 
-
-CVE-2021-34371 applies to Neo4j server not the driver 
library
-^pkg:maven/org\.opencypher\.gremlin/cypher\-gremlin\-neo4j\-driver@.*$
-CVE-2021-34371
-
 
 CVE-2010-1151 applies to mod_auth_shadow in Apache HTTP Server 
not the FTP server library
 ^pkg:maven/org\.apache\.ftpserver/.*$
@@ -189,21 +169,6 @@
 ^pkg:maven/com\.h2database/h2@.*$
 CVE-2018-14335
 
-
-CVE-2022-31160 included in hadoop-client-api is not used
-^pkg:javascript/jquery\-ui@.*$
-CVE-2022-31160
-
-
-CVE-2021-37533 applies to the Commons Net FTP Client which is 
not used in the version bundled with hadoop-client-runtime for Accumulo
-^pkg:maven/commons\-net/commons\-net@.*$
-CVE-2021-37533
-
-
-CVE-2021-0341 applies to Android not OkHttp
-^pkg:maven/com\.squareup\.okhttp/okhttp@.*$
-CVE-2021-0341
-
 
 CVE-2023-25613 applies to an LDAP backend class for Apache 
Kerby not the Token Provider library
 ^pkg:maven/org\.apache\.kerby/token\-provider@.*$
@@ -259,4 +224,39 @@
 ^pkg:maven/org\.apache\.hbase/hbase\-hadoop2\-compat@.*$
 cpe:/a:apache:hadoop
 
+
+CVE-2022-45688 applies to hutools-json not org.json
+^pkg:maven/org\.json/json@.*$
+CVE-2022-45688
+
+
+The Jackson maintainers dispute the applicability of 
CVE-2023-35116 based on cyclic nature of reported concern
+^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$
+CVE-2023-35116
+
+
+CVE-2023-25194 applies to Kafka Connect workers not client 
libraries
+^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.*?@.*$
+CVE-2022-24823
+
+
+CVE-2022-41915 applies

[nifi] branch main updated: NIFI-11647: Support UUID type in DataTypeUtils.getSQLTypeValue

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 f3e8651522 NIFI-11647: Support UUID type in 
DataTypeUtils.getSQLTypeValue
f3e8651522 is described below

commit f3e8651522a474e6b8022976b8b375b0722aeb4e
Author: Matt Burgess 
AuthorDate: Wed Jun 7 16:07:37 2023 -0400

NIFI-11647: Support UUID type in DataTypeUtils.getSQLTypeValue

This closes #7355

Signed-off-by: Mike Thomsen 
---
 .../serialization/record/util/DataTypeUtils.java   |  1 +
 .../processors/standard/PutDatabaseRecordTest.java | 42 ++
 2 files changed, 43 insertions(+)

diff --git 
a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
 
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
index 53eb8a68f9..8752d85b19 100644
--- 
a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
+++ 
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
@@ -2150,6 +2150,7 @@ public class DataTypeUtils {
 case SHORT:
 return Types.SMALLINT;
 case STRING:
+case UUID:
 return Types.VARCHAR;
 case ENUM:
 return Types.OTHER;
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/PutDatabaseRecordTest.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/PutDatabaseRecordTest.java
index 182e86eaf5..8de18420b1 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/PutDatabaseRecordTest.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/PutDatabaseRecordTest.java
@@ -93,6 +93,8 @@ public class PutDatabaseRecordTest {
 private static final String createPersonsSchema2 = "CREATE TABLE 
SCHEMA2.PERSONS (id2 integer primary key, name varchar(100)," +
 " code integer CONSTRAINT CODE_RANGE CHECK (code >= 0 AND code < 
1000), dt date)";
 
+private static final String createUUIDSchema = "CREATE TABLE UUID_TEST (id 
integer primary key, name VARCHAR(100))";
+
 private final static String DB_LOCATION = "target/db_pdr";
 
 TestRunner runner;
@@ -1802,6 +1804,46 @@ public class PutDatabaseRecordTest {
 conn.close();
 }
 
+@Test
+void testInsertUUIDColumn() throws InitializationException, 
ProcessException, SQLException {
+// Manually create and drop the tables and schemas
+final Connection conn = dbcp.getConnection();
+final Statement stmt = conn.createStatement();
+stmt.execute(createUUIDSchema);
+
+final MockRecordParser parser = new MockRecordParser();
+runner.addControllerService("parser", parser);
+runner.enableControllerService(parser);
+
+parser.addSchemaField("id", RecordFieldType.INT);
+parser.addSchemaField("name", RecordFieldType.UUID);
+
+parser.addRecord(1, "425085a0-03ef-11ee-be56-0242ac120002");
+parser.addRecord(2, "56a000e4-03ef-11ee-be56-0242ac120002");
+
+runner.setProperty(PutDatabaseRecord.RECORD_READER_FACTORY, "parser");
+runner.setProperty(PutDatabaseRecord.STATEMENT_TYPE, 
PutDatabaseRecord.INSERT_TYPE);
+runner.setProperty(PutDatabaseRecord.TABLE_NAME, "UUID_TEST");
+
+runner.enqueue(new byte[0]);
+runner.run();
+
+runner.assertTransferCount(PutDatabaseRecord.REL_SUCCESS, 1);
+ResultSet rs = stmt.executeQuery("SELECT * FROM UUID_TEST");
+assertTrue(rs.next());
+assertEquals(1, rs.getInt(1));
+assertEquals("425085a0-03ef-11ee-be56-0242ac120002", rs.getString(2));
+assertTrue(rs.next());
+assertEquals(2, rs.getInt(1));
+assertEquals("56a000e4-03ef-11ee-be56-0242ac120002", rs.getString(2));
+assertFalse(rs.next());
+
+// Drop the schemas here so as not to interfere with other tests
+stmt.execute("drop table UUID_TEST");
+stmt.close();
+conn.close();
+}
+
 private void recreateTable() throws ProcessException {
 try (final Connection conn = dbcp.getConnection();
 final Statement stmt = conn.createStatement()) {

[nifi] branch support/nifi-1.x updated: NIFI-11647: Support UUID type in DataTypeUtils.getSQLTypeValue

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 e872c26178 NIFI-11647: Support UUID type in 
DataTypeUtils.getSQLTypeValue
e872c26178 is described below

commit e872c2617824514aee0d1fc33d3de952e398d901
Author: Matt Burgess 
AuthorDate: Wed Jun 7 16:07:37 2023 -0400

NIFI-11647: Support UUID type in DataTypeUtils.getSQLTypeValue

This closes #7355

Signed-off-by: Mike Thomsen 
---
 .../serialization/record/util/DataTypeUtils.java   |  1 +
 .../processors/standard/PutDatabaseRecordTest.java | 42 ++
 2 files changed, 43 insertions(+)

diff --git 
a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
 
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
index 53eb8a68f9..8752d85b19 100644
--- 
a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
+++ 
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
@@ -2150,6 +2150,7 @@ public class DataTypeUtils {
 case SHORT:
 return Types.SMALLINT;
 case STRING:
+case UUID:
 return Types.VARCHAR;
 case ENUM:
 return Types.OTHER;
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/PutDatabaseRecordTest.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/PutDatabaseRecordTest.java
index 182e86eaf5..8de18420b1 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/PutDatabaseRecordTest.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/PutDatabaseRecordTest.java
@@ -93,6 +93,8 @@ public class PutDatabaseRecordTest {
 private static final String createPersonsSchema2 = "CREATE TABLE 
SCHEMA2.PERSONS (id2 integer primary key, name varchar(100)," +
 " code integer CONSTRAINT CODE_RANGE CHECK (code >= 0 AND code < 
1000), dt date)";
 
+private static final String createUUIDSchema = "CREATE TABLE UUID_TEST (id 
integer primary key, name VARCHAR(100))";
+
 private final static String DB_LOCATION = "target/db_pdr";
 
 TestRunner runner;
@@ -1802,6 +1804,46 @@ public class PutDatabaseRecordTest {
 conn.close();
 }
 
+@Test
+void testInsertUUIDColumn() throws InitializationException, 
ProcessException, SQLException {
+// Manually create and drop the tables and schemas
+final Connection conn = dbcp.getConnection();
+final Statement stmt = conn.createStatement();
+stmt.execute(createUUIDSchema);
+
+final MockRecordParser parser = new MockRecordParser();
+runner.addControllerService("parser", parser);
+runner.enableControllerService(parser);
+
+parser.addSchemaField("id", RecordFieldType.INT);
+parser.addSchemaField("name", RecordFieldType.UUID);
+
+parser.addRecord(1, "425085a0-03ef-11ee-be56-0242ac120002");
+parser.addRecord(2, "56a000e4-03ef-11ee-be56-0242ac120002");
+
+runner.setProperty(PutDatabaseRecord.RECORD_READER_FACTORY, "parser");
+runner.setProperty(PutDatabaseRecord.STATEMENT_TYPE, 
PutDatabaseRecord.INSERT_TYPE);
+runner.setProperty(PutDatabaseRecord.TABLE_NAME, "UUID_TEST");
+
+runner.enqueue(new byte[0]);
+runner.run();
+
+runner.assertTransferCount(PutDatabaseRecord.REL_SUCCESS, 1);
+ResultSet rs = stmt.executeQuery("SELECT * FROM UUID_TEST");
+assertTrue(rs.next());
+assertEquals(1, rs.getInt(1));
+assertEquals("425085a0-03ef-11ee-be56-0242ac120002", rs.getString(2));
+assertTrue(rs.next());
+assertEquals(2, rs.getInt(1));
+assertEquals("56a000e4-03ef-11ee-be56-0242ac120002", rs.getString(2));
+assertFalse(rs.next());
+
+// Drop the schemas here so as not to interfere with other tests
+stmt.execute("drop table UUID_TEST");
+stmt.close();
+conn.close();
+}
+
 private void recreateTable() throws ProcessException {
 try (final Connection conn = dbcp.getConnection();
 final Statement stmt = conn.createStatement()) {

[nifi] 04/04: NIFI-11605 Update spark-streaming_2.13 to to 3.3.2

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 27a2b421f2067f8302a2031c0400c92f02809270
Author: mr1716 
AuthorDate: Fri May 26 10:02:40 2023 -0400

NIFI-11605 Update spark-streaming_2.13 to to 3.3.2

This closes #7306

Signed-off-by: Mike Thomsen 
---
 nifi-external/nifi-spark-receiver/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nifi-external/nifi-spark-receiver/pom.xml 
b/nifi-external/nifi-spark-receiver/pom.xml
index ce84120c6b..c60d39e60b 100644
--- a/nifi-external/nifi-spark-receiver/pom.xml
+++ b/nifi-external/nifi-spark-receiver/pom.xml
@@ -27,7 +27,7 @@
 org.apache.spark
 spark-streaming_2.13
 provided
-3.3.1
+3.3.2
 
 
 commons-logging

[nifi] 03/04: NIFI-11606 Update aws-kinesis-client-library-version to 1.14.10

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 6a74c161efdc2dd4caa1c95b85bcf044c02da7fb
Author: mr1716 
AuthorDate: Fri May 26 10:22:05 2023 -0400

NIFI-11606 Update aws-kinesis-client-library-version to 1.14.10

This closes #7307

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-aws-bundle/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nifi-nar-bundles/nifi-aws-bundle/pom.xml 
b/nifi-nar-bundles/nifi-aws-bundle/pom.xml
index 7b448778e9..cfdfb8151b 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-aws-bundle/pom.xml
@@ -27,7 +27,7 @@
 
 
 
-
1.14.9
+
1.14.10
 
 
 

[nifi] 02/04: NIFI-11607 Update spring.boot.version to 2.7.12

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 0dcdf139b5a27e1268647dcc89d06c76a46db7d0
Author: mr1716 
AuthorDate: Fri May 26 10:26:03 2023 -0400

NIFI-11607 Update spring.boot.version to 2.7.12

This closes #7308

Signed-off-by: Mike Thomsen 
---
 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 81c8942394..d3db4de246 100644
--- a/nifi-registry/pom.xml
+++ b/nifi-registry/pom.xml
@@ -36,7 +36,7 @@
 
 
 2.1
-2.7.11
+2.7.12
 8.5.13
 7.0.0
 3.12.0

[nifi] 01/04: NIFI-11601 Update mysql-connector-java to 8.0.33

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 0d774874d960b960a3b241d60bebe8c2b294585b
Author: mr1716 
AuthorDate: Fri May 26 07:31:35 2023 -0400

NIFI-11601 Update mysql-connector-java to 8.0.33

This closes #7303

Signed-off-by: Mike Thomsen 
---
 nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml 
b/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml
index fbacce6b92..6ebd9ea6eb 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml
@@ -63,9 +63,9 @@
 postgresql
 
 
-mysql
-mysql-connector-java
-8.0.32
+com.mysql
+mysql-connector-j
+8.0.33
 
 
 org.mariadb.jdbc

[nifi] branch support/nifi-1.x updated (7e705b6372 -> 27a2b421f2)

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a change to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


from 7e705b6372 NIFI-11590: Missing Enum data type handling in FlowFileTable
 new 0d774874d9 NIFI-11601 Update mysql-connector-java to 8.0.33
 new 0dcdf139b5 NIFI-11607 Update spring.boot.version to 2.7.12
 new 6a74c161ef NIFI-11606 Update aws-kinesis-client-library-version to 
1.14.10
 new 27a2b421f2 NIFI-11605 Update spark-streaming_2.13 to to 3.3.2

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 nifi-external/nifi-spark-receiver/pom.xml   | 2 +-
 nifi-nar-bundles/nifi-aws-bundle/pom.xml| 2 +-
 nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml | 6 +++---
 nifi-registry/pom.xml   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

[nifi] branch main updated: NIFI-11605 Update spark-streaming_2.13 to to 3.3.2

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 f6b0bd30df NIFI-11605 Update spark-streaming_2.13 to to 3.3.2
f6b0bd30df is described below

commit f6b0bd30dfd063716c529b41128a6fe152f29a89
Author: mr1716 
AuthorDate: Fri May 26 10:02:40 2023 -0400

NIFI-11605 Update spark-streaming_2.13 to to 3.3.2

This closes #7306

Signed-off-by: Mike Thomsen 
---
 nifi-external/nifi-spark-receiver/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nifi-external/nifi-spark-receiver/pom.xml 
b/nifi-external/nifi-spark-receiver/pom.xml
index 1e384c2365..3917a109c8 100644
--- a/nifi-external/nifi-spark-receiver/pom.xml
+++ b/nifi-external/nifi-spark-receiver/pom.xml
@@ -27,7 +27,7 @@
 org.apache.spark
 spark-streaming_2.13
 provided
-3.3.1
+3.3.2
 
 
 commons-logging

[nifi] branch main updated: NIFI-11606 Update aws-kinesis-client-library-version to 1.14.10

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 bfa4b178ee NIFI-11606 Update aws-kinesis-client-library-version to 
1.14.10
bfa4b178ee is described below

commit bfa4b178ee2611f55619a4fdb8ea58345fd849d3
Author: mr1716 
AuthorDate: Fri May 26 10:22:05 2023 -0400

NIFI-11606 Update aws-kinesis-client-library-version to 1.14.10

This closes #7307

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-aws-bundle/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nifi-nar-bundles/nifi-aws-bundle/pom.xml 
b/nifi-nar-bundles/nifi-aws-bundle/pom.xml
index 34768cbca9..bb14cf5970 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-aws-bundle/pom.xml
@@ -27,7 +27,7 @@
 
 
 
-
1.14.9
+
1.14.10
 
 
 

[nifi] 01/02: NIFI-11601 Update mysql-connector-java to 8.0.33

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit d96f28b17ad9c74c2d4d3ea104dcd250eb3a6d01
Author: mr1716 
AuthorDate: Fri May 26 07:31:35 2023 -0400

NIFI-11601 Update mysql-connector-java to 8.0.33

This closes #7303

Signed-off-by: Mike Thomsen 
---
 nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml 
b/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml
index e4f72cdf2f..1f0d9a78fe 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml
@@ -63,9 +63,9 @@
 postgresql
 
 
-mysql
-mysql-connector-java
-8.0.32
+com.mysql
+mysql-connector-j
+8.0.33
 
 
 org.mariadb.jdbc

[nifi] 02/02: NIFI-11607 Update spring.boot.version to 2.7.12

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 6cd75aa7c4d111b8870b8fcccf7726edb64affa0
Author: mr1716 
AuthorDate: Fri May 26 10:26:03 2023 -0400

NIFI-11607 Update spring.boot.version to 2.7.12

This closes #7308

Signed-off-by: Mike Thomsen 
---
 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 2c937b30a4..79c7e361b0 100644
--- a/nifi-registry/pom.xml
+++ b/nifi-registry/pom.xml
@@ -36,7 +36,7 @@
 
 
 2.1
-2.7.11
+2.7.12
 8.5.13
 7.0.0
 3.12.0

[nifi] branch main updated (cfd62c9511 -> 6cd75aa7c4)

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


from cfd62c9511 NIFI-11590: Missing Enum data type handling in FlowFileTable
 new d96f28b17a NIFI-11601 Update mysql-connector-java to 8.0.33
 new 6cd75aa7c4 NIFI-11607 Update spring.boot.version to 2.7.12

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml | 6 +++---
 nifi-registry/pom.xml   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

[nifi] branch main updated (436fd91a25 -> 4e9675475c)

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


from 436fd91a25 NIFI-11230 Added Runtime Configuration validation to 
nifi-bootstrap
 new d754d952c2 NIFI-11522 Upgrade cassandra.sdk.version to 3.11.3
 new 4e9675475c NIFI-11523 Refining schema handling for 
ScriptedTransfromRecord

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 nifi-nar-bundles/nifi-cassandra-bundle/pom.xml |  2 +-
 .../processors/script/ScriptedTransformRecord.java |  5 ++--
 .../script/TestScriptedTransformRecord.java| 30 +++---
 3 files changed, 24 insertions(+), 13 deletions(-)

[nifi] 01/02: NIFI-11522 Upgrade cassandra.sdk.version to 3.11.3

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit d754d952c2833b6724cc55426fdba2d2a37f7bda
Author: mr1716 
AuthorDate: Wed May 3 08:04:31 2023 -0400

NIFI-11522 Upgrade cassandra.sdk.version to 3.11.3

This closes #7225

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-cassandra-bundle/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml 
b/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml
index 80e89ca17c..e5950dfe03 100644
--- a/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml
@@ -23,7 +23,7 @@
 
 
 
-3.10.2
+3.11.3
 19.0
 
 

[nifi] 02/02: NIFI-11523 Refining schema handling for ScriptedTransfromRecord

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 4e9675475c7bd33df653939fa475a2ca1df9203d
Author: Bence Simon 
AuthorDate: Wed May 3 14:12:59 2023 +0200

NIFI-11523 Refining schema handling for ScriptedTransfromRecord

This closes #7226

Signed-off-by: Mike Thomsen 
---
 .../processors/script/ScriptedTransformRecord.java |  5 ++--
 .../script/TestScriptedTransformRecord.java| 30 +++---
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedTransformRecord.java
 
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedTransformRecord.java
index 2a9637ad63..b67431cd6e 100644
--- 
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedTransformRecord.java
+++ 
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedTransformRecord.java
@@ -137,6 +137,7 @@ public class ScriptedTransformRecord extends 
ScriptedRecordProcessor {
 
 final RecordReaderFactory readerFactory = 
context.getProperty(RECORD_READER).asControllerService(RecordReaderFactory.class);
 final RecordSetWriterFactory writerFactory = 
context.getProperty(RECORD_WRITER).asControllerService(RecordSetWriterFactory.class);
+final Map originalAttributes = 
flowFile.getAttributes();
 
 final RecordCounts counts = new RecordCounts();
 try {
@@ -165,10 +166,8 @@ public class ScriptedTransformRecord extends 
ScriptedRecordProcessor {
 record.incorporateInactiveFields();
 
 if (writer == null) {
-final RecordSchema writerSchema;
-writerSchema = record.getSchema();
-
 try {
+final RecordSchema writerSchema = 
writerFactory.getSchema(originalAttributes, record.getSchema());
 writer = 
writerFactory.createWriter(getLogger(), writerSchema, out, flowFile);
 } catch (SchemaNotFoundException e) {
 throw new IOException(e);
diff --git 
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptedTransformRecord.java
 
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptedTransformRecord.java
index 6f6e522cd9..82e9751f2a 100644
--- 
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptedTransformRecord.java
+++ 
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptedTransformRecord.java
@@ -33,6 +33,7 @@ import org.apache.nifi.util.TestRunners;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -96,16 +97,17 @@ public class TestScriptedTransformRecord {
 }
 
 @Test
-public void testAddFieldToSchema() throws InitializationException {
-final RecordSchema schema = createSimpleNumberSchema();
-setup(schema);
+public void testAddFieldToSchemaWhenWriterSchemaIsDefined() throws 
InitializationException {
+final RecordSchema readSchema = createSimpleNumberSchema();
+final RecordSchema writeSchema = createSchemaWithAddedValue();
+setupWithDifferentSchemas(readSchema, writeSchema);
 
 testRunner.removeProperty(ScriptingComponentUtils.SCRIPT_BODY);
 testRunner.setProperty(ScriptingComponentUtils.SCRIPT_FILE, 
"src/test/resources/groovy/AddNewField.groovy");
 
-recordReader.addRecord(new MapRecord(schema, new 
HashMap<>(Collections.singletonMap("num", 1;
-recordReader.addRecord(new MapRecord(schema, new 
HashMap<>(Collections.singletonMap("num", 2;
-recordReader.addRecord(new MapRecord(schema, new 
HashMap<>(Collections.singletonMap("num", 3;
+recordReader.addRecord(new MapRecord(readSchema, new 
HashMap<>(Collections.singletonMap("num", 1;
+recordReader.addRecord(new MapRecord(readSchema, new 
HashMap<>(Collections.singletonMap("num", 2;
+recordReader.addRecord(new MapRecord(readSchema, new 
HashMap<>(Collections.singletonMap("num", 3;
 
 testRunner.enqueue(new byte[0]);
 
@@ -127

[nifi] branch support/nifi-1.x updated (9bc05c098c -> 01e72d6b51)

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a change to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


from 9bc05c098c NIFI-10067: enable use of script when updating documents in 
Elasticsearch via PutElasticsearchJson or PutElasticsearchRecord NIFI-3262: 
enable use of dynamic_templates in Elasticsearch _bulk operations
 new 7570f1c783 NIFI-11522 Upgrade cassandra.sdk.version to 3.11.3
 new 01e72d6b51 NIFI-11523 Refining schema handling for 
ScriptedTransfromRecord

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 nifi-nar-bundles/nifi-cassandra-bundle/pom.xml |  2 +-
 .../processors/script/ScriptedTransformRecord.java |  5 ++--
 .../script/TestScriptedTransformRecord.java| 30 +++---
 3 files changed, 24 insertions(+), 13 deletions(-)

[nifi] 02/02: NIFI-11523 Refining schema handling for ScriptedTransfromRecord

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 01e72d6b51485f0ac6304448e4dee14b717e0671
Author: Bence Simon 
AuthorDate: Wed May 3 14:12:59 2023 +0200

NIFI-11523 Refining schema handling for ScriptedTransfromRecord

This closes #7226

Signed-off-by: Mike Thomsen 
---
 .../processors/script/ScriptedTransformRecord.java |  5 ++--
 .../script/TestScriptedTransformRecord.java| 30 +++---
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedTransformRecord.java
 
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedTransformRecord.java
index 2a9637ad63..b67431cd6e 100644
--- 
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedTransformRecord.java
+++ 
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedTransformRecord.java
@@ -137,6 +137,7 @@ public class ScriptedTransformRecord extends 
ScriptedRecordProcessor {
 
 final RecordReaderFactory readerFactory = 
context.getProperty(RECORD_READER).asControllerService(RecordReaderFactory.class);
 final RecordSetWriterFactory writerFactory = 
context.getProperty(RECORD_WRITER).asControllerService(RecordSetWriterFactory.class);
+final Map originalAttributes = 
flowFile.getAttributes();
 
 final RecordCounts counts = new RecordCounts();
 try {
@@ -165,10 +166,8 @@ public class ScriptedTransformRecord extends 
ScriptedRecordProcessor {
 record.incorporateInactiveFields();
 
 if (writer == null) {
-final RecordSchema writerSchema;
-writerSchema = record.getSchema();
-
 try {
+final RecordSchema writerSchema = 
writerFactory.getSchema(originalAttributes, record.getSchema());
 writer = 
writerFactory.createWriter(getLogger(), writerSchema, out, flowFile);
 } catch (SchemaNotFoundException e) {
 throw new IOException(e);
diff --git 
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptedTransformRecord.java
 
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptedTransformRecord.java
index 6f6e522cd9..82e9751f2a 100644
--- 
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptedTransformRecord.java
+++ 
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptedTransformRecord.java
@@ -33,6 +33,7 @@ import org.apache.nifi.util.TestRunners;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -96,16 +97,17 @@ public class TestScriptedTransformRecord {
 }
 
 @Test
-public void testAddFieldToSchema() throws InitializationException {
-final RecordSchema schema = createSimpleNumberSchema();
-setup(schema);
+public void testAddFieldToSchemaWhenWriterSchemaIsDefined() throws 
InitializationException {
+final RecordSchema readSchema = createSimpleNumberSchema();
+final RecordSchema writeSchema = createSchemaWithAddedValue();
+setupWithDifferentSchemas(readSchema, writeSchema);
 
 testRunner.removeProperty(ScriptingComponentUtils.SCRIPT_BODY);
 testRunner.setProperty(ScriptingComponentUtils.SCRIPT_FILE, 
"src/test/resources/groovy/AddNewField.groovy");
 
-recordReader.addRecord(new MapRecord(schema, new 
HashMap<>(Collections.singletonMap("num", 1;
-recordReader.addRecord(new MapRecord(schema, new 
HashMap<>(Collections.singletonMap("num", 2;
-recordReader.addRecord(new MapRecord(schema, new 
HashMap<>(Collections.singletonMap("num", 3;
+recordReader.addRecord(new MapRecord(readSchema, new 
HashMap<>(Collections.singletonMap("num", 1;
+recordReader.addRecord(new MapRecord(readSchema, new 
HashMap<>(Collections.singletonMap("num", 2;
+recordReader.addRecord(new MapRecord(readSchema, new 
HashMap<>(Collections.singletonMap("num", 3;
 
 testRunner.enqueue(new byte[0]);
 
@@ -127

[nifi] 01/02: NIFI-11522 Upgrade cassandra.sdk.version to 3.11.3

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 7570f1c78345aeb9898e7e7205df0f7319271e5a
Author: mr1716 
AuthorDate: Wed May 3 08:04:31 2023 -0400

NIFI-11522 Upgrade cassandra.sdk.version to 3.11.3

This closes #7225

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-cassandra-bundle/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml 
b/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml
index b46ef8fdff..bba986b35d 100644
--- a/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml
@@ -23,7 +23,7 @@
 
 
 
-3.10.2
+3.11.3
 19.0
 
 

[nifi] branch main updated: [NIFI-11509] Added configuration to allow for parsing comments in JSON.

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 e4cdb90a75 [NIFI-11509] Added configuration to allow for parsing 
comments in JSON.
e4cdb90a75 is described below

commit e4cdb90a7516f06d43f767c674716d2ef6525aa0
Author: dan-s1 
AuthorDate: Mon May 1 17:12:09 2023 +

[NIFI-11509] Added configuration to allow for parsing comments in JSON.

This closes #7220

Signed-off-by: Mike Thomsen 
---
 .../nifi-standard-processors/pom.xml |  1 +
 .../apache/nifi/processors/standard/ValidateJson.java|  7 ++-
 .../nifi/processors/standard/TestValidateJson.java   | 16 
 .../TestValidateJson/simple-example-with-comments.json   | 12 
 4 files changed, 35 insertions(+), 1 deletion(-)

diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
index d9aab6ce25..780b45dbf1 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
@@ -722,6 +722,7 @@
 
src/test/resources/TestValidateJson/schema-simple-example-unmatched-pattern.json
 
src/test/resources/TestValidateJson/schema-simple-example.json
 
src/test/resources/TestValidateJson/simple-example.json
+
src/test/resources/TestValidateJson/simple-example-with-comments.json
 
 
 
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java
index b28a40d007..5120b36700 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java
@@ -16,6 +16,7 @@
  */
 package org.apache.nifi.processors.standard;
 
+import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.networknt.schema.JsonSchema;
@@ -151,7 +152,11 @@ public class ValidateJson extends AbstractProcessor {
 ))
 );
 
-private static final ObjectMapper MAPPER = new ObjectMapper();
+private static final ObjectMapper MAPPER;
+static {
+MAPPER = new ObjectMapper();
+MAPPER.configure(JsonParser.Feature.ALLOW_COMMENTS, true);
+}
 
 private JsonSchema schema;
 
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateJson.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateJson.java
index 37b4f89408..14688ce706 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateJson.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateJson.java
@@ -175,6 +175,22 @@ class TestValidateJson {
 assertThrows(AssertionFailedError.class, () -> runner.run());
 }
 
+@Test
+void testJsonWithComments() {
+final String schemaPath = getFilePath("schema-simple-example.json");
+runner.setProperty(ValidateJson.SCHEMA_CONTENT, schemaPath);
+runner.setProperty(ValidateJson.SCHEMA_VERSION, SCHEMA_VERSION);
+
+runner.enqueue(getFileContent("simple-example-with-comments.json"));
+
+runner.run();
+
+runner.assertTransferCount(ValidateJson.REL_FAILURE, 0);
+runner.assertTransferCount(ValidateJson.REL_INVALID, 0);
+runner.assertTransferCount(ValidateJson.REL_VALID, 1);
+
+assertValidationErrors(ValidateJson.REL_VALID, false);
+}
 private void assertValidationErrors(Relationship relationship, boolean 
expected) {
 final Map attributes = 
runner.getFlowFilesForRelationship(relationship).get(0).getAttributes();
 
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestValidateJson/simple-example-with-comments.json
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestValidateJson/simple-example-with-comments.json
new file mode 100644
index 00..c1bda16f51
--- /dev/null
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-proces

[nifi] branch support/nifi-1.x updated: [NIFI-11509] Added configuration to allow for parsing comments in JSON.

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 2e2604a901 [NIFI-11509] Added configuration to allow for parsing 
comments in JSON.
2e2604a901 is described below

commit 2e2604a9019893888ea7cb893c1b08c4b3402b91
Author: dan-s1 
AuthorDate: Mon May 1 17:12:09 2023 +

[NIFI-11509] Added configuration to allow for parsing comments in JSON.

This closes #7220

Signed-off-by: Mike Thomsen 
---
 .../nifi-standard-processors/pom.xml |  1 +
 .../apache/nifi/processors/standard/ValidateJson.java|  7 ++-
 .../nifi/processors/standard/TestValidateJson.java   | 16 
 .../TestValidateJson/simple-example-with-comments.json   | 12 
 4 files changed, 35 insertions(+), 1 deletion(-)

diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
index d9ab2bb669..4822d9696e 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
@@ -732,6 +732,7 @@
 
src/test/resources/TestValidateJson/schema-simple-example-unmatched-pattern.json
 
src/test/resources/TestValidateJson/schema-simple-example.json
 
src/test/resources/TestValidateJson/simple-example.json
+
src/test/resources/TestValidateJson/simple-example-with-comments.json
 
 
 
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java
index b28a40d007..5120b36700 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java
@@ -16,6 +16,7 @@
  */
 package org.apache.nifi.processors.standard;
 
+import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.networknt.schema.JsonSchema;
@@ -151,7 +152,11 @@ public class ValidateJson extends AbstractProcessor {
 ))
 );
 
-private static final ObjectMapper MAPPER = new ObjectMapper();
+private static final ObjectMapper MAPPER;
+static {
+MAPPER = new ObjectMapper();
+MAPPER.configure(JsonParser.Feature.ALLOW_COMMENTS, true);
+}
 
 private JsonSchema schema;
 
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateJson.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateJson.java
index 37b4f89408..14688ce706 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateJson.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateJson.java
@@ -175,6 +175,22 @@ class TestValidateJson {
 assertThrows(AssertionFailedError.class, () -> runner.run());
 }
 
+@Test
+void testJsonWithComments() {
+final String schemaPath = getFilePath("schema-simple-example.json");
+runner.setProperty(ValidateJson.SCHEMA_CONTENT, schemaPath);
+runner.setProperty(ValidateJson.SCHEMA_VERSION, SCHEMA_VERSION);
+
+runner.enqueue(getFileContent("simple-example-with-comments.json"));
+
+runner.run();
+
+runner.assertTransferCount(ValidateJson.REL_FAILURE, 0);
+runner.assertTransferCount(ValidateJson.REL_INVALID, 0);
+runner.assertTransferCount(ValidateJson.REL_VALID, 1);
+
+assertValidationErrors(ValidateJson.REL_VALID, false);
+}
 private void assertValidationErrors(Relationship relationship, boolean 
expected) {
 final Map attributes = 
runner.getFlowFilesForRelationship(relationship).get(0).getAttributes();
 
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestValidateJson/simple-example-with-comments.json
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestValidateJson/simple-example-with-comments.json
new file mode 100644
index 00..c1bda16f51
--- /dev/null
+++ 
b/nifi-nar-bundles/nifi-standa

[nifi] branch support/nifi-1.x updated: [NIFI-11511] Added Provenance route events for all the relationships.

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 dfff80d3c5 [NIFI-11511] Added Provenance route events for all the 
relationships.
dfff80d3c5 is described below

commit dfff80d3c5d37be1dfeec34f82357a47fd08ad5b
Author: dan-s1 
AuthorDate: Mon May 1 21:34:14 2023 +

[NIFI-11511] Added Provenance route events for all the relationships.

This closes #7221

Signed-off-by: Mike Thomsen 
---
 .../org/apache/nifi/processors/standard/ValidateJson.java  |  3 +++
 .../apache/nifi/processors/standard/TestValidateJson.java  | 14 ++
 2 files changed, 17 insertions(+)

diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java
index 2c9b1e7b05..b28a40d007 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java
@@ -187,15 +187,18 @@ public class ValidateJson extends AbstractProcessor {
 
 if (errors.isEmpty()) {
 getLogger().debug("JSON {} valid", flowFile);
+session.getProvenanceReporter().route(flowFile, REL_VALID);
 session.transfer(flowFile, REL_VALID);
 } else {
 final String validationMessages = errors.toString();
 flowFile = session.putAttribute(flowFile, ERROR_ATTRIBUTE_KEY, 
validationMessages);
 getLogger().warn("JSON {} invalid: Validation Errors {}", 
flowFile, validationMessages);
+session.getProvenanceReporter().route(flowFile, REL_INVALID);
 session.transfer(flowFile, REL_INVALID);
 }
 } catch (final Exception e) {
 getLogger().error("JSON processing failed {}", flowFile, e);
+session.getProvenanceReporter().route(flowFile, REL_FAILURE);
 session.transfer(flowFile, REL_FAILURE);
 }
 }
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateJson.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateJson.java
index 49c39838c1..37b4f89408 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateJson.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateJson.java
@@ -18,6 +18,7 @@ package org.apache.nifi.processors.standard;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.nifi.processor.Relationship;
+import org.apache.nifi.provenance.ProvenanceEventType;
 import org.apache.nifi.util.TestRunner;
 import org.apache.nifi.util.TestRunners;
 import org.junit.jupiter.api.BeforeEach;
@@ -32,6 +33,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.Objects;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -62,6 +64,8 @@ class TestValidateJson {
 runner.assertTransferCount(ValidateJson.REL_VALID, 1);
 
 assertValidationErrors(ValidateJson.REL_VALID, false);
+assertEquals(1, runner.getProvenanceEvents().size());
+assertEquals(ProvenanceEventType.ROUTE, 
runner.getProvenanceEvents().get(0).getEventType());
 }
 
 @Test
@@ -77,6 +81,8 @@ class TestValidateJson {
 runner.assertTransferCount(ValidateJson.REL_VALID, 1);
 
 assertValidationErrors(ValidateJson.REL_VALID, false);
+assertEquals(1, runner.getProvenanceEvents().size());
+assertEquals(ProvenanceEventType.ROUTE, 
runner.getProvenanceEvents().get(0).getEventType());
 }
 
 @Test
@@ -93,6 +99,8 @@ class TestValidateJson {
 runner.assertTransferCount(ValidateJson.REL_VALID, 1);
 
 assertValidationErrors(ValidateJson.REL_VALID, false);
+assertEquals(1, runner.getProvenanceEvents().size());
+assertEquals(ProvenanceEventType.ROUTE, 
runner.getProvenanceEvents().get(0).getEventType());
 }
 
 @Test
@@ -109,6 +117,8 @@ class TestValidateJson {
 runner.assertTransferCount(ValidateJson.REL_VALID, 0);
 
 assertValidationErrors(

[nifi] branch main updated: [NIFI-11511] Added Provenance route events for all the relationships.

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 71c7d38c75 [NIFI-11511] Added Provenance route events for all the 
relationships.
71c7d38c75 is described below

commit 71c7d38c75891f265a07fa883b906e47cf339fb7
Author: dan-s1 
AuthorDate: Mon May 1 21:34:14 2023 +

[NIFI-11511] Added Provenance route events for all the relationships.

This closes #7221

Signed-off-by: Mike Thomsen 
---
 .../org/apache/nifi/processors/standard/ValidateJson.java  |  3 +++
 .../apache/nifi/processors/standard/TestValidateJson.java  | 14 ++
 2 files changed, 17 insertions(+)

diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java
index 2c9b1e7b05..b28a40d007 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java
@@ -187,15 +187,18 @@ public class ValidateJson extends AbstractProcessor {
 
 if (errors.isEmpty()) {
 getLogger().debug("JSON {} valid", flowFile);
+session.getProvenanceReporter().route(flowFile, REL_VALID);
 session.transfer(flowFile, REL_VALID);
 } else {
 final String validationMessages = errors.toString();
 flowFile = session.putAttribute(flowFile, ERROR_ATTRIBUTE_KEY, 
validationMessages);
 getLogger().warn("JSON {} invalid: Validation Errors {}", 
flowFile, validationMessages);
+session.getProvenanceReporter().route(flowFile, REL_INVALID);
 session.transfer(flowFile, REL_INVALID);
 }
 } catch (final Exception e) {
 getLogger().error("JSON processing failed {}", flowFile, e);
+session.getProvenanceReporter().route(flowFile, REL_FAILURE);
 session.transfer(flowFile, REL_FAILURE);
 }
 }
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateJson.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateJson.java
index 49c39838c1..37b4f89408 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateJson.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateJson.java
@@ -18,6 +18,7 @@ package org.apache.nifi.processors.standard;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.nifi.processor.Relationship;
+import org.apache.nifi.provenance.ProvenanceEventType;
 import org.apache.nifi.util.TestRunner;
 import org.apache.nifi.util.TestRunners;
 import org.junit.jupiter.api.BeforeEach;
@@ -32,6 +33,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.Objects;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -62,6 +64,8 @@ class TestValidateJson {
 runner.assertTransferCount(ValidateJson.REL_VALID, 1);
 
 assertValidationErrors(ValidateJson.REL_VALID, false);
+assertEquals(1, runner.getProvenanceEvents().size());
+assertEquals(ProvenanceEventType.ROUTE, 
runner.getProvenanceEvents().get(0).getEventType());
 }
 
 @Test
@@ -77,6 +81,8 @@ class TestValidateJson {
 runner.assertTransferCount(ValidateJson.REL_VALID, 1);
 
 assertValidationErrors(ValidateJson.REL_VALID, false);
+assertEquals(1, runner.getProvenanceEvents().size());
+assertEquals(ProvenanceEventType.ROUTE, 
runner.getProvenanceEvents().get(0).getEventType());
 }
 
 @Test
@@ -93,6 +99,8 @@ class TestValidateJson {
 runner.assertTransferCount(ValidateJson.REL_VALID, 1);
 
 assertValidationErrors(ValidateJson.REL_VALID, false);
+assertEquals(1, runner.getProvenanceEvents().size());
+assertEquals(ProvenanceEventType.ROUTE, 
runner.getProvenanceEvents().get(0).getEventType());
 }
 
 @Test
@@ -109,6 +117,8 @@ class TestValidateJson {
 runner.assertTransferCount(ValidateJson.REL_VALID, 0);
 
 assertValidationErrors(ValidateJson.REL_INVALID, 

[nifi] branch main updated: NIFI-11510 - Upgrade Box SDK to 4.1.0

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 9f3284393a NIFI-11510 - Upgrade Box SDK to 4.1.0
9f3284393a is described below

commit 9f3284393a9ef445830007e3c7cd3097044468e2
Author: Pierre Villard 
AuthorDate: Mon May 1 18:47:19 2023 +0300

NIFI-11510 - Upgrade Box SDK to 4.1.0

This closes #7219

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-box-bundle/nifi-box-services-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 57342a105e..3ca2b7aeec 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,7 +29,7 @@
 
 com.box
 box-java-sdk
-4.0.1
+4.1.0
 
 
 org.bouncycastle

[nifi] branch support/nifi-1.x updated: NIFI-11510 - Upgrade Box SDK to 4.1.0

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 f4850bec90 NIFI-11510 - Upgrade Box SDK to 4.1.0
f4850bec90 is described below

commit f4850bec90d4c092097a63dbcb6cec6bb6c8885a
Author: Pierre Villard 
AuthorDate: Mon May 1 18:47:19 2023 +0300

NIFI-11510 - Upgrade Box SDK to 4.1.0

This closes #7219

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-box-bundle/nifi-box-services-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 f670fca70f..0da89bc6fa 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,7 +29,7 @@
 
 com.box
 box-java-sdk
-4.0.1
+4.1.0
 
 
 org.bouncycastle

[nifi] branch support/nifi-1.x updated: NIFI-11034: Restore image viewer to nifi-assembly

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 15b3687a25 NIFI-11034: Restore image viewer to nifi-assembly
15b3687a25 is described below

commit 15b3687a25fd01c293db46674537055e6a09ee4f
Author: Matthew Burgess 
AuthorDate: Sat Apr 29 11:53:00 2023 -0400

NIFI-11034: Restore image viewer to nifi-assembly

This closes #7209

Signed-off-by: Mike Thomsen 
---
 nifi-assembly/pom.xml  |   6 +
 .../pom.xml|   7 +-
 .../src/main/resources/META-INF/LICENSE| 209 +
 .../nifi-media-bundle/nifi-media-nar/pom.xml   |   6 -
 nifi-nar-bundles/nifi-media-bundle/pom.xml |   1 +
 5 files changed, 217 insertions(+), 12 deletions(-)

diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index f6fec1868a..11d47455e2 100644
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -983,6 +983,12 @@ language governing permissions and limitations under the 
License. -->
 javax.annotation-api
 ${javax.annotation-api.version}
 
+
+org.apache.nifi
+nifi-image-viewer-nar
+1.22.0-SNAPSHOT
+nar
+
 
 
 org.aspectj
diff --git a/nifi-nar-bundles/nifi-media-bundle/nifi-media-nar/pom.xml 
b/nifi-nar-bundles/nifi-media-bundle/nifi-image-viewer-nar/pom.xml
similarity index 87%
copy from nifi-nar-bundles/nifi-media-bundle/nifi-media-nar/pom.xml
copy to nifi-nar-bundles/nifi-media-bundle/nifi-image-viewer-nar/pom.xml
index 6b28c74841..8eb7ad6e93 100644
--- a/nifi-nar-bundles/nifi-media-bundle/nifi-media-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-media-bundle/nifi-image-viewer-nar/pom.xml
@@ -22,7 +22,7 @@
 1.22.0-SNAPSHOT
 
 
-nifi-media-nar
+nifi-image-viewer-nar
 nar
 
 true
@@ -30,11 +30,6 @@
 
 
 
-
-org.apache.nifi
-nifi-media-processors
-1.22.0-SNAPSHOT
-
 
 org.apache.nifi
 nifi-image-viewer
diff --git 
a/nifi-nar-bundles/nifi-media-bundle/nifi-image-viewer-nar/src/main/resources/META-INF/LICENSE
 
b/nifi-nar-bundles/nifi-media-bundle/nifi-image-viewer-nar/src/main/resources/META-INF/LICENSE
new file mode 100644
index 00..44893cdb29
--- /dev/null
+++ 
b/nifi-nar-bundles/nifi-media-bundle/nifi-image-viewer-nar/src/main/resources/META-INF/LICENSE
@@ -0,0 +1,209 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this Licen

[nifi] branch main updated: NIFI-11034: Restore image viewer to nifi-assembly

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 3d60e4a4f6 NIFI-11034: Restore image viewer to nifi-assembly
3d60e4a4f6 is described below

commit 3d60e4a4f602b88686806ee84d1da816c9c398a2
Author: Matthew Burgess 
AuthorDate: Sat Apr 29 11:53:00 2023 -0400

NIFI-11034: Restore image viewer to nifi-assembly

This closes #7209

Signed-off-by: Mike Thomsen 
---
 nifi-assembly/pom.xml  |   6 +
 .../pom.xml|   7 +-
 .../src/main/resources/META-INF/LICENSE| 209 +
 .../nifi-media-bundle/nifi-media-nar/pom.xml   |   6 -
 nifi-nar-bundles/nifi-media-bundle/pom.xml |   1 +
 5 files changed, 217 insertions(+), 12 deletions(-)

diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index 3ead9ec4ee..d38fa91c19 100644
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -948,6 +948,12 @@ language governing permissions and limitations under the 
License. -->
 2.0.0-SNAPSHOT
 nar
 
+
+org.apache.nifi
+nifi-image-viewer-nar
+2.0.0-SNAPSHOT
+nar
+
 
 
 org.aspectj
diff --git a/nifi-nar-bundles/nifi-media-bundle/nifi-media-nar/pom.xml 
b/nifi-nar-bundles/nifi-media-bundle/nifi-image-viewer-nar/pom.xml
similarity index 87%
copy from nifi-nar-bundles/nifi-media-bundle/nifi-media-nar/pom.xml
copy to nifi-nar-bundles/nifi-media-bundle/nifi-image-viewer-nar/pom.xml
index f735027c45..c43dcd7931 100644
--- a/nifi-nar-bundles/nifi-media-bundle/nifi-media-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-media-bundle/nifi-image-viewer-nar/pom.xml
@@ -22,7 +22,7 @@
 2.0.0-SNAPSHOT
 
 
-nifi-media-nar
+nifi-image-viewer-nar
 nar
 
 true
@@ -30,11 +30,6 @@
 
 
 
-
-org.apache.nifi
-nifi-media-processors
-2.0.0-SNAPSHOT
-
 
 org.apache.nifi
 nifi-image-viewer
diff --git 
a/nifi-nar-bundles/nifi-media-bundle/nifi-image-viewer-nar/src/main/resources/META-INF/LICENSE
 
b/nifi-nar-bundles/nifi-media-bundle/nifi-image-viewer-nar/src/main/resources/META-INF/LICENSE
new file mode 100644
index 00..44893cdb29
--- /dev/null
+++ 
b/nifi-nar-bundles/nifi-media-bundle/nifi-image-viewer-nar/src/main/resources/META-INF/LICENSE
@@ -0,0 +1,209 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+

[nifi] branch main updated: NIFI-11502 - Upgrade json-path to 2.8.0 NIFI-11502 fixing unit tests NIFI-11502 review

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 7fb2468f4b NIFI-11502 - Upgrade json-path to 2.8.0 NIFI-11502 fixing 
unit tests NIFI-11502 review
7fb2468f4b is described below

commit 7fb2468f4b7cef34fe9a8f6fee46eec0a362e18a
Author: Pierre Villard 
AuthorDate: Fri Apr 28 20:11:06 2023 +0300

NIFI-11502 - Upgrade json-path to 2.8.0
NIFI-11502 fixing unit tests
NIFI-11502 review

This closes #7208

Signed-off-by: Mike Thomsen 
---
 nifi-commons/nifi-expression-language/pom.xml  |  2 +-
 .../language/evaluation/functions/JsonPathDeleteEvaluator.java | 10 ++
 .../language/evaluation/functions/JsonPathUpdateEvaluator.java |  7 +++
 .../nifi-elasticsearch-client-service/pom.xml  |  2 +-
 .../nifi-elasticsearch-restapi-processors/pom.xml  |  2 +-
 .../nifi-record-utils/nifi-json-record-utils/pom.xml   |  2 +-
 nifi-nar-bundles/nifi-standard-bundle/pom.xml  |  2 +-
 7 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/nifi-commons/nifi-expression-language/pom.xml 
b/nifi-commons/nifi-expression-language/pom.xml
index 96fe0316cc..4c773d1ad3 100644
--- a/nifi-commons/nifi-expression-language/pom.xml
+++ b/nifi-commons/nifi-expression-language/pom.xml
@@ -116,7 +116,7 @@
 
 com.jayway.jsonpath
 json-path
-2.6.0
+2.8.0
 
 
 com.fasterxml.jackson.core
diff --git 
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/JsonPathDeleteEvaluator.java
 
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/JsonPathDeleteEvaluator.java
index 9ecb77c5f4..960a11273a 100644
--- 
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/JsonPathDeleteEvaluator.java
+++ 
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/JsonPathDeleteEvaluator.java
@@ -20,15 +20,20 @@ import 
org.apache.nifi.attribute.expression.language.EvaluationContext;
 import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
 import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
 import 
org.apache.nifi.attribute.expression.language.evaluation.StringQueryResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.jayway.jsonpath.DocumentContext;
 import com.jayway.jsonpath.JsonPath;
+import com.jayway.jsonpath.PathNotFoundException;
 
 /**
  * JsonPathDeleteEvaluator allows delete elements at the specified path
  */
 public class JsonPathDeleteEvaluator extends JsonPathBaseEvaluator {
 
+private static final Logger LOGGER = 
LoggerFactory.getLogger(JsonPathDeleteEvaluator.class);
+
 public JsonPathDeleteEvaluator(final Evaluator subject, final 
Evaluator jsonPathExp) {
 super(subject, jsonPathExp);
 }
@@ -42,6 +47,11 @@ public class JsonPathDeleteEvaluator extends 
JsonPathBaseEvaluator {
 String result = null;
 try {
 result = documentContext.delete(compiledJsonPath).jsonString();
+} catch (PathNotFoundException pnf) {
+// it is valid for a path not to be found, keys may not be there
+// do not spam the error log for this, instead we can log debug if 
enabled
+LOGGER.debug("JSON Path not found: {}", 
compiledJsonPath.getPath(), pnf);
+result = documentContext.jsonString();
 } catch (Exception e) {
 // assume the path did not match anything in the document
 return EMPTY_RESULT;
diff --git 
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/JsonPathUpdateEvaluator.java
 
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/JsonPathUpdateEvaluator.java
index 34310ddb91..6ea8d7d79a 100644
--- 
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/JsonPathUpdateEvaluator.java
+++ 
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/JsonPathUpdateEvaluator.java
@@ -18,6 +18,8 @@ package 
org.apache.nifi.attribute.expression.language.evaluation.functions;
 
 import com.jayway.jsonpath.DocumentContext;
 import com.jayway.jsonpath.JsonPath;
+import com.jayway.jsonpath.PathNotFoundException;
+
 import org.apache.commons.lang3.NotImplementedException;
 import org.apache.nifi.attribute.expression.language.EvaluationContex

[nifi] branch support/nifi-1.x updated: NIFI-11502 - Upgrade json-path to 2.8.0 NIFI-11502 fixing unit tests NIFI-11502 review

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 c9cd18f6d5 NIFI-11502 - Upgrade json-path to 2.8.0 NIFI-11502 fixing 
unit tests NIFI-11502 review
c9cd18f6d5 is described below

commit c9cd18f6d5128033d1b62881942a621a114b9875
Author: Pierre Villard 
AuthorDate: Fri Apr 28 20:11:06 2023 +0300

NIFI-11502 - Upgrade json-path to 2.8.0
NIFI-11502 fixing unit tests
NIFI-11502 review

This closes #7208

Signed-off-by: Mike Thomsen 
---
 nifi-commons/nifi-expression-language/pom.xml  |  2 +-
 .../language/evaluation/functions/JsonPathDeleteEvaluator.java | 10 ++
 .../language/evaluation/functions/JsonPathUpdateEvaluator.java |  7 +++
 .../nifi-elasticsearch-client-service/pom.xml  |  2 +-
 .../nifi-elasticsearch-restapi-processors/pom.xml  |  2 +-
 .../nifi-record-utils/nifi-json-record-utils/pom.xml   |  2 +-
 nifi-nar-bundles/nifi-standard-bundle/pom.xml  |  2 +-
 7 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/nifi-commons/nifi-expression-language/pom.xml 
b/nifi-commons/nifi-expression-language/pom.xml
index 9396a7c7d4..2ec0b60b28 100644
--- a/nifi-commons/nifi-expression-language/pom.xml
+++ b/nifi-commons/nifi-expression-language/pom.xml
@@ -116,7 +116,7 @@
 
 com.jayway.jsonpath
 json-path
-2.6.0
+2.8.0
 
 
 com.fasterxml.jackson.core
diff --git 
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/JsonPathDeleteEvaluator.java
 
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/JsonPathDeleteEvaluator.java
index 9ecb77c5f4..960a11273a 100644
--- 
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/JsonPathDeleteEvaluator.java
+++ 
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/JsonPathDeleteEvaluator.java
@@ -20,15 +20,20 @@ import 
org.apache.nifi.attribute.expression.language.EvaluationContext;
 import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
 import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
 import 
org.apache.nifi.attribute.expression.language.evaluation.StringQueryResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.jayway.jsonpath.DocumentContext;
 import com.jayway.jsonpath.JsonPath;
+import com.jayway.jsonpath.PathNotFoundException;
 
 /**
  * JsonPathDeleteEvaluator allows delete elements at the specified path
  */
 public class JsonPathDeleteEvaluator extends JsonPathBaseEvaluator {
 
+private static final Logger LOGGER = 
LoggerFactory.getLogger(JsonPathDeleteEvaluator.class);
+
 public JsonPathDeleteEvaluator(final Evaluator subject, final 
Evaluator jsonPathExp) {
 super(subject, jsonPathExp);
 }
@@ -42,6 +47,11 @@ public class JsonPathDeleteEvaluator extends 
JsonPathBaseEvaluator {
 String result = null;
 try {
 result = documentContext.delete(compiledJsonPath).jsonString();
+} catch (PathNotFoundException pnf) {
+// it is valid for a path not to be found, keys may not be there
+// do not spam the error log for this, instead we can log debug if 
enabled
+LOGGER.debug("JSON Path not found: {}", 
compiledJsonPath.getPath(), pnf);
+result = documentContext.jsonString();
 } catch (Exception e) {
 // assume the path did not match anything in the document
 return EMPTY_RESULT;
diff --git 
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/JsonPathUpdateEvaluator.java
 
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/JsonPathUpdateEvaluator.java
index 34310ddb91..6ea8d7d79a 100644
--- 
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/JsonPathUpdateEvaluator.java
+++ 
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/JsonPathUpdateEvaluator.java
@@ -18,6 +18,8 @@ package 
org.apache.nifi.attribute.expression.language.evaluation.functions;
 
 import com.jayway.jsonpath.DocumentContext;
 import com.jayway.jsonpath.JsonPath;
+import com.jayway.jsonpath.PathNotFoundException;
+
 import org.apache.commons.lang3.NotImplementedException;
 import org.apache.nifi.attribute.expression.language.Evaluat

[nifi] branch main updated: NIFI-10865 allow RecordPath's unescapeJson to convert de-serialised JSON Objects into Records

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 9274d0c9b0 NIFI-10865 allow RecordPath's unescapeJson to convert 
de-serialised JSON Objects into Records
9274d0c9b0 is described below

commit 9274d0c9b099354d4610e27ac4fe4ddb47c7503d
Author: Chris Sampson 
AuthorDate: Tue Nov 22 11:44:53 2022 +

NIFI-10865 allow RecordPath's unescapeJson to convert de-serialised JSON 
Objects into Records

NIFI-10865 allow UpdateRecord to replace the Record root for relative 
paths, e.g. when a RecordPath function is used to modify selected field(s)

This closes #6708

Signed-off-by: Mike Thomsen 
---
 .../nifi/record/path/functions/UnescapeJson.java   | 35 +++-
 .../nifi/record/path/paths/RecordPathCompiler.java | 11 ++-
 .../apache/nifi/record/path/TestRecordPath.java| 96 +++---
 nifi-docs/src/main/asciidoc/record-path-guide.adoc | 22 -
 .../nifi-standard-processors/pom.xml   |  6 ++
 .../nifi/processors/standard/UpdateRecord.java | 29 +--
 .../nifi/processors/standard/TestUpdateRecord.java | 88 
 .../TestUpdateRecord/input/embedded-string.json|  4 +
 .../input/person-stringified-name.json |  4 +
 .../TestUpdateRecord/output/embedded-record.json   |  9 ++
 .../TestUpdateRecord/output/person-with-name.json  |  7 ++
 .../TestUpdateRecord/schema/embedded-record.avsc   | 39 +
 .../schema/person-with-stringified-name.avsc   |  9 ++
 13 files changed, 316 insertions(+), 43 deletions(-)

diff --git 
a/nifi-commons/nifi-record-path/src/main/java/org/apache/nifi/record/path/functions/UnescapeJson.java
 
b/nifi-commons/nifi-record-path/src/main/java/org/apache/nifi/record/path/functions/UnescapeJson.java
index 6a18320fe8..35f7d93d3f 100644
--- 
a/nifi-commons/nifi-record-path/src/main/java/org/apache/nifi/record/path/functions/UnescapeJson.java
+++ 
b/nifi-commons/nifi-record-path/src/main/java/org/apache/nifi/record/path/functions/UnescapeJson.java
@@ -23,7 +23,10 @@ import 
org.apache.nifi.record.path.RecordPathEvaluationContext;
 import org.apache.nifi.record.path.StandardFieldValue;
 import org.apache.nifi.record.path.exception.RecordPathException;
 import org.apache.nifi.record.path.paths.RecordPathSegment;
+import org.apache.nifi.record.path.util.RecordPathUtils;
 import org.apache.nifi.serialization.record.DataType;
+import org.apache.nifi.serialization.record.Record;
+import org.apache.nifi.serialization.record.RecordFieldType;
 import org.apache.nifi.serialization.record.type.ArrayDataType;
 import org.apache.nifi.serialization.record.type.ChoiceDataType;
 import org.apache.nifi.serialization.record.type.RecordDataType;
@@ -31,21 +34,29 @@ import 
org.apache.nifi.serialization.record.util.DataTypeUtils;
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Map;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public class UnescapeJson extends RecordPathSegment {
 private final RecordPathSegment recordPath;
 
+private final RecordPathSegment convertToRecordRecordPath;
+
 private final ObjectMapper objectMapper = new ObjectMapper();
 
-public UnescapeJson(final RecordPathSegment recordPath, final boolean 
absolute) {
+public UnescapeJson(final RecordPathSegment recordPath, final 
RecordPathSegment convertToRecordRecordPath, final boolean absolute) {
 super("unescapeJson", null, absolute);
 this.recordPath = recordPath;
+this.convertToRecordRecordPath = convertToRecordRecordPath;
 }
 
 @Override
 public Stream evaluate(final RecordPathEvaluationContext 
context) {
+final boolean convertMapToRecord = convertToRecordRecordPath != null
+&& 
Boolean.parseBoolean(RecordPathUtils.getFirstStringValue(convertToRecordRecordPath,
 context));
+
 final Stream fieldValues = recordPath.evaluate(context);
 return fieldValues.filter(fv -> fv.getValue() != null)
 .map(fv -> {
@@ -58,7 +69,10 @@ public class UnescapeJson extends RecordPathSegment {
 dataType = DataTypeUtils.chooseDataType(value, 
(ChoiceDataType) fv.getField().getDataType());
 }
 
-return new 
StandardFieldValue(convertFieldValue(value, fv.getField().getFieldName(), 
dataType), fv.getField(), fv.getParent().orElse(null));
+return new StandardFieldValue(
+convertFieldValue(value, 
fv.getField().getFieldName(), dataType, convertMapToRecord),
+fv.getField(), fv.getParent().orElse(null)
+);
   

[nifi] branch support/nifi-1.x updated: NIFI-10865 allow RecordPath's unescapeJson to convert de-serialised JSON Objects into Records

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 e2067c4ea1 NIFI-10865 allow RecordPath's unescapeJson to convert 
de-serialised JSON Objects into Records
e2067c4ea1 is described below

commit e2067c4ea19f0b1b30ddb89717a190fe09f8b87f
Author: Chris Sampson 
AuthorDate: Tue Nov 22 11:44:53 2022 +

NIFI-10865 allow RecordPath's unescapeJson to convert de-serialised JSON 
Objects into Records

NIFI-10865 allow UpdateRecord to replace the Record root for relative 
paths, e.g. when a RecordPath function is used to modify selected field(s)

This closes #6708

Signed-off-by: Mike Thomsen 
---
 .../nifi/record/path/functions/UnescapeJson.java   | 35 +++-
 .../nifi/record/path/paths/RecordPathCompiler.java | 11 ++-
 .../apache/nifi/record/path/TestRecordPath.java| 96 +++---
 nifi-docs/src/main/asciidoc/record-path-guide.adoc | 22 -
 .../nifi-standard-processors/pom.xml   |  6 ++
 .../nifi/processors/standard/UpdateRecord.java | 29 +--
 .../nifi/processors/standard/TestUpdateRecord.java | 88 
 .../TestUpdateRecord/input/embedded-string.json|  4 +
 .../input/person-stringified-name.json |  4 +
 .../TestUpdateRecord/output/embedded-record.json   |  9 ++
 .../TestUpdateRecord/output/person-with-name.json  |  7 ++
 .../TestUpdateRecord/schema/embedded-record.avsc   | 39 +
 .../schema/person-with-stringified-name.avsc   |  9 ++
 13 files changed, 316 insertions(+), 43 deletions(-)

diff --git 
a/nifi-commons/nifi-record-path/src/main/java/org/apache/nifi/record/path/functions/UnescapeJson.java
 
b/nifi-commons/nifi-record-path/src/main/java/org/apache/nifi/record/path/functions/UnescapeJson.java
index 6a18320fe8..35f7d93d3f 100644
--- 
a/nifi-commons/nifi-record-path/src/main/java/org/apache/nifi/record/path/functions/UnescapeJson.java
+++ 
b/nifi-commons/nifi-record-path/src/main/java/org/apache/nifi/record/path/functions/UnescapeJson.java
@@ -23,7 +23,10 @@ import 
org.apache.nifi.record.path.RecordPathEvaluationContext;
 import org.apache.nifi.record.path.StandardFieldValue;
 import org.apache.nifi.record.path.exception.RecordPathException;
 import org.apache.nifi.record.path.paths.RecordPathSegment;
+import org.apache.nifi.record.path.util.RecordPathUtils;
 import org.apache.nifi.serialization.record.DataType;
+import org.apache.nifi.serialization.record.Record;
+import org.apache.nifi.serialization.record.RecordFieldType;
 import org.apache.nifi.serialization.record.type.ArrayDataType;
 import org.apache.nifi.serialization.record.type.ChoiceDataType;
 import org.apache.nifi.serialization.record.type.RecordDataType;
@@ -31,21 +34,29 @@ import 
org.apache.nifi.serialization.record.util.DataTypeUtils;
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Map;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public class UnescapeJson extends RecordPathSegment {
 private final RecordPathSegment recordPath;
 
+private final RecordPathSegment convertToRecordRecordPath;
+
 private final ObjectMapper objectMapper = new ObjectMapper();
 
-public UnescapeJson(final RecordPathSegment recordPath, final boolean 
absolute) {
+public UnescapeJson(final RecordPathSegment recordPath, final 
RecordPathSegment convertToRecordRecordPath, final boolean absolute) {
 super("unescapeJson", null, absolute);
 this.recordPath = recordPath;
+this.convertToRecordRecordPath = convertToRecordRecordPath;
 }
 
 @Override
 public Stream evaluate(final RecordPathEvaluationContext 
context) {
+final boolean convertMapToRecord = convertToRecordRecordPath != null
+&& 
Boolean.parseBoolean(RecordPathUtils.getFirstStringValue(convertToRecordRecordPath,
 context));
+
 final Stream fieldValues = recordPath.evaluate(context);
 return fieldValues.filter(fv -> fv.getValue() != null)
 .map(fv -> {
@@ -58,7 +69,10 @@ public class UnescapeJson extends RecordPathSegment {
 dataType = DataTypeUtils.chooseDataType(value, 
(ChoiceDataType) fv.getField().getDataType());
 }
 
-return new 
StandardFieldValue(convertFieldValue(value, fv.getField().getFieldName(), 
dataType), fv.getField(), fv.getParent().orElse(null));
+return new StandardFieldValue(
+convertFieldValue(value, 
fv.getField().getFieldName(), dataType, convertMapToRecord),
+fv.getField(), fv.getParent().orElse(null)
+);
   

[nifi] branch support/nifi-1.x updated: NIFI-11111 add option to output Elasticsearch error responses as FlowFile to PutElasticsearchJson and PutElasticsearchRecord NIFI-11111 clarify error_responses

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 c45b841392 NIFI-1 add option to output Elasticsearch error 
responses as FlowFile to PutElasticsearchJson and PutElasticsearchRecord 
NIFI-1 clarify error_responses relationships in PutElasticsearchJson/Record 
processors NIFI-1 Refactor exception handling for error response flowfile 
transfer NIFI-1 Add elasticsearch.bulk.error attributes containing the 
Elasticsearch _bulk response for error documents in PutElasticsearchJson
c45b841392 is described below

commit c45b841392cc8671fe504374540eb5cca23903ff
Author: Chris Sampson 
AuthorDate: Sun Jan 29 19:32:27 2023 +

NIFI-1 add option to output Elasticsearch error responses as FlowFile 
to PutElasticsearchJson and PutElasticsearchRecord
NIFI-1 clarify error_responses relationships in 
PutElasticsearchJson/Record processors
NIFI-1 Refactor exception handling for error response flowfile transfer
NIFI-1 Add elasticsearch.bulk.error attributes containing the 
Elasticsearch _bulk response for error documents in PutElasticsearchJson

This closes #6903

Signed-off-by: Mike Thomsen 
---
 .../elasticsearch/AbstractPutElasticsearch.java| 104 +
 .../elasticsearch/PutElasticsearchJson.java|  67 +++--
 .../elasticsearch/PutElasticsearchRecord.java  |  41 
 .../AbstractPutElasticsearchTest.groovy|  50 ++
 .../elasticsearch/PutElasticsearchJsonTest.groovy  |  51 --
 .../PutElasticsearchRecordTest.groovy  |  42 +++--
 .../integration/AbstractElasticsearchITBase.java   |   2 +-
 nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml |   2 +-
 8 files changed, 273 insertions(+), 86 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractPutElasticsearch.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractPutElasticsearch.java
index af12d18102..0ab0a504f7 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractPutElasticsearch.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractPutElasticsearch.java
@@ -17,7 +17,6 @@
 
 package org.apache.nifi.processors.elasticsearch;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import org.apache.nifi.annotation.lifecycle.OnScheduled;
@@ -37,12 +36,17 @@ import org.apache.nifi.processor.ProcessSession;
 import org.apache.nifi.processor.Relationship;
 import org.apache.nifi.processor.util.StandardValidators;
 
+import java.io.IOException;
+import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Predicate;
 
@@ -67,6 +71,16 @@ public abstract class AbstractPutElasticsearch extends 
AbstractProcessor impleme
 .required(true)
 .build();
 
+static final PropertyDescriptor OUTPUT_ERROR_RESPONSES = new 
PropertyDescriptor.Builder()
+.name("put-es-output-error-responses")
+.displayName("Output Error Responses")
+.description("If this is enabled, response messages from 
Elasticsearch marked as \"error\" will be output to the \"error_responses\" 
relationship." +
+"This does not impact the output of flowfiles to the 
\"success\" or \"errors\" relationships")
+.allowableValues("true", "false")
+.defaultValue("false")
+.addValidator(StandardValidators.BOOLEAN_VALIDATOR)
+.build();
+
 static final Relationship REL_SUCCESS = new Relationship.Builder()
 .name("success")
 .description("All flowfiles that succeed in being transferred into 
Elasticsearch go here. " +
@@ -74,6 +88,12 @@ public abstract class AbstractPutElasticsearch extends 
AbstractProcessor impleme
 "The Elasticsearch response will need to be examined to 
determine whether any Document(s)/Record(s) resulted in errors.")

[nifi] branch main updated: NIFI-11111 add option to output Elasticsearch error responses as FlowFile to PutElasticsearchJson and PutElasticsearchRecord NIFI-11111 clarify error_responses relationship

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 05418d94f0 NIFI-1 add option to output Elasticsearch error 
responses as FlowFile to PutElasticsearchJson and PutElasticsearchRecord 
NIFI-1 clarify error_responses relationships in PutElasticsearchJson/Record 
processors NIFI-1 Refactor exception handling for error response flowfile 
transfer NIFI-1 Add elasticsearch.bulk.error attributes containing the 
Elasticsearch _bulk response for error documents in PutElasticsearchJson
05418d94f0 is described below

commit 05418d94f0d75513e3471032d872fd417242329f
Author: Chris Sampson 
AuthorDate: Sun Jan 29 19:32:27 2023 +

NIFI-1 add option to output Elasticsearch error responses as FlowFile 
to PutElasticsearchJson and PutElasticsearchRecord
NIFI-1 clarify error_responses relationships in 
PutElasticsearchJson/Record processors
NIFI-1 Refactor exception handling for error response flowfile transfer
NIFI-1 Add elasticsearch.bulk.error attributes containing the 
Elasticsearch _bulk response for error documents in PutElasticsearchJson

This closes #6903

Signed-off-by: Mike Thomsen 
---
 .../elasticsearch/AbstractPutElasticsearch.java| 104 +
 .../elasticsearch/PutElasticsearchJson.java|  67 +++--
 .../elasticsearch/PutElasticsearchRecord.java  |  41 
 .../AbstractPutElasticsearchTest.groovy|  50 ++
 .../elasticsearch/PutElasticsearchJsonTest.groovy  |  51 --
 .../PutElasticsearchRecordTest.groovy  |  42 +++--
 .../integration/AbstractElasticsearchITBase.java   |   2 +-
 nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml |   2 +-
 8 files changed, 273 insertions(+), 86 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractPutElasticsearch.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractPutElasticsearch.java
index af12d18102..0ab0a504f7 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractPutElasticsearch.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractPutElasticsearch.java
@@ -17,7 +17,6 @@
 
 package org.apache.nifi.processors.elasticsearch;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import org.apache.nifi.annotation.lifecycle.OnScheduled;
@@ -37,12 +36,17 @@ import org.apache.nifi.processor.ProcessSession;
 import org.apache.nifi.processor.Relationship;
 import org.apache.nifi.processor.util.StandardValidators;
 
+import java.io.IOException;
+import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Predicate;
 
@@ -67,6 +71,16 @@ public abstract class AbstractPutElasticsearch extends 
AbstractProcessor impleme
 .required(true)
 .build();
 
+static final PropertyDescriptor OUTPUT_ERROR_RESPONSES = new 
PropertyDescriptor.Builder()
+.name("put-es-output-error-responses")
+.displayName("Output Error Responses")
+.description("If this is enabled, response messages from 
Elasticsearch marked as \"error\" will be output to the \"error_responses\" 
relationship." +
+"This does not impact the output of flowfiles to the 
\"success\" or \"errors\" relationships")
+.allowableValues("true", "false")
+.defaultValue("false")
+.addValidator(StandardValidators.BOOLEAN_VALIDATOR)
+.build();
+
 static final Relationship REL_SUCCESS = new Relationship.Builder()
 .name("success")
 .description("All flowfiles that succeed in being transferred into 
Elasticsearch go here. " +
@@ -74,6 +88,12 @@ public abstract class AbstractPutElasticsearch extends 
AbstractProcessor impleme
 "The Elasticsearch response will need to be examined to 
determine whether any Document(s)/Record(s) resulted in errors.")
 .build();
 
+  

[nifi] branch main updated: NIFI-11429 - Upgrade Gremlin to 3.6.2

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 061f3a1380 NIFI-11429 - Upgrade Gremlin to 3.6.2
061f3a1380 is described below

commit 061f3a13805375666550d1ef5e0e62c2e237aa1b
Author: Pierre Villard 
AuthorDate: Mon Apr 10 22:54:21 2023 +0300

NIFI-11429 - Upgrade Gremlin to 3.6.2

This closes #7160

Signed-off-by: Mike Thomsen 
---
 .../nifi-graph-bundle/nifi-graph-test-clients/pom.xml | 8 +++-
 .../nifi-graph-bundle/nifi-other-graph-services/pom.xml   | 8 +++-
 2 files changed, 14 insertions(+), 2 deletions(-)

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 5d8a3392fd..65d1059d84 100644
--- 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
@@ -25,7 +25,7 @@
 nifi-graph-test-clients
 jar
 
-3.4.13
+3.6.2
 
 
 
@@ -34,6 +34,12 @@
 org.apache.tinkerpop
 gremlin-core
 ${gremlin.version}
+
+
+commons-logging
+commons-logging
+
+
 
 
 org.apache.tinkerpop
diff --git 
a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml 
b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
index 883bf18035..82670b0e22 100644
--- a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
+++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
@@ -19,7 +19,7 @@
 jar
 
 
-3.4.13
+3.6.2
 
 
 
@@ -103,6 +103,12 @@
 org.apache.tinkerpop
 gremlin-core
 ${gremlin.version}
+
+
+commons-logging
+commons-logging
+
+
 
 
 org.apache.tinkerpop

[nifi] branch support/nifi-1.x updated: NIFI-11429 - Upgrade Gremlin to 3.6.2

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 420a698062 NIFI-11429 - Upgrade Gremlin to 3.6.2
420a698062 is described below

commit 420a69806239bf842c556176c566baf664c724f8
Author: Pierre Villard 
AuthorDate: Mon Apr 10 22:54:21 2023 +0300

NIFI-11429 - Upgrade Gremlin to 3.6.2

This closes #7160

Signed-off-by: Mike Thomsen 
---
 .../nifi-graph-bundle/nifi-graph-test-clients/pom.xml | 8 +++-
 .../nifi-graph-bundle/nifi-other-graph-services/pom.xml   | 8 +++-
 2 files changed, 14 insertions(+), 2 deletions(-)

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 7975eea1b8..7162838124 100644
--- 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
@@ -25,7 +25,7 @@
 nifi-graph-test-clients
 jar
 
-3.4.13
+3.6.2
 
 
 
@@ -34,6 +34,12 @@
 org.apache.tinkerpop
 gremlin-core
 ${gremlin.version}
+
+
+commons-logging
+commons-logging
+
+
 
 
 org.apache.tinkerpop
diff --git 
a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml 
b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
index bb69a10c2a..d7eab90e5c 100644
--- a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
+++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
@@ -19,7 +19,7 @@
 jar
 
 
-3.4.13
+3.6.2
 
 
 
@@ -103,6 +103,12 @@
 org.apache.tinkerpop
 gremlin-core
 ${gremlin.version}
+
+
+commons-logging
+commons-logging
+
+
 
 
 org.apache.tinkerpop

[nifi] branch support/nifi-1.x updated: NIFI-5642: QueryCassandra processor : output FlowFiles as soon fetch_size is reached NIFI-5642: QueryCassandra processor : output FlowFiles as soon fetch_size i

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 4f22f0985a NIFI-5642: QueryCassandra processor : output FlowFiles as 
soon fetch_size is reached NIFI-5642: QueryCassandra processor : output 
FlowFiles as soon fetch_size is reached Fixed checkstyle error Delete build.sh 
Delete local build file NIFI-5642 : letting fetch_size to control the Cassandra 
data flow creating a new MAX_ROWS_PER_FLOW_FILE parameter Fixed checkstyle 
error: no more import java.util.* Fixed missing imports NIFI-5642: added 
REL_ORIGINAL relationship in order t [...]
4f22f0985a is described below

commit 4f22f0985a58f6e8a36edea9f6c907f758945357
Author: aglotero 
AuthorDate: Mon Oct 8 18:22:19 2018 -0300

NIFI-5642: QueryCassandra processor : output FlowFiles as soon fetch_size 
is reached
NIFI-5642: QueryCassandra processor : output FlowFiles as soon fetch_size 
is reached
Fixed checkstyle error
Delete build.sh
Delete local build file
NIFI-5642 : letting fetch_size to control the Cassandra data flow creating 
a new MAX_ROWS_PER_FLOW_FILE parameter
Fixed checkstyle error: no more import java.util.*
Fixed missing imports
NIFI-5642: added REL_ORIGINAL relationship in order to allow incremental 
commit
Addressing comments from code review
Adjustments on timestamp datatype formatting
Created the OUTPUT_BATCH_SIZE property
Code review adjustments
NIFI-5642: update after rebase
NIFI-5642: addressing PR comments
NIFI-5642: adding in integration test, fixing race condition
NIFI-5642: remove log4j2

This closes #6848

Signed-off-by: Mike Thomsen 
---
 .../cassandra/AbstractCassandraProcessor.java  |  24 +-
 .../nifi/processors/cassandra/QueryCassandra.java  | 444 ++---
 .../cassandra/CassandraQueryTestUtil.java  |  31 +-
 .../processors/cassandra/QueryCassandraIT.java | 163 
 .../processors/cassandra/QueryCassandraTest.java   | 124 +-
 5 files changed, 601 insertions(+), 185 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/AbstractCassandraProcessor.java
 
b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/AbstractCassandraProcessor.java
index 0c53a35a80..002ec27baf 100644
--- 
a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/AbstractCassandraProcessor.java
+++ 
b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/AbstractCassandraProcessor.java
@@ -28,14 +28,6 @@ import com.datastax.driver.core.Session;
 import com.datastax.driver.core.TypeCodec;
 import com.datastax.driver.core.exceptions.AuthenticationException;
 import com.datastax.driver.core.exceptions.NoHostAvailableException;
-import java.net.InetSocketAddress;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
-import javax.net.ssl.SSLContext;
 import com.datastax.driver.extras.codecs.arrays.ObjectArrayCodec;
 import org.apache.avro.Schema;
 import org.apache.avro.SchemaBuilder;
@@ -56,6 +48,15 @@ import org.apache.nifi.processor.util.StandardValidators;
 import org.apache.nifi.security.util.ClientAuth;
 import org.apache.nifi.ssl.SSLContextService;
 
+import javax.net.ssl.SSLContext;
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
+
 /**
  * AbstractCassandraProcessor is a base class for Cassandra processors and 
contains logic and variables common to most
  * processors integrating with Apache Cassandra.
@@ -181,7 +182,6 @@ public abstract class AbstractCassandraProcessor extends 
AbstractProcessor {
 descriptors.add(USERNAME);
 descriptors.add(PASSWORD);
 descriptors.add(CONSISTENCY_LEVEL);
-descriptors.add(COMPRESSION_TYPE);
 descriptors.add(CHARSET);
 }
 
@@ -209,12 +209,12 @@ public abstract class AbstractCassandraProcessor extends 
AbstractProcessor {
 
 if (connectionProviderIsSet && contactPointsIsSet) {
 results.add(new ValidationResult.Builder().subject("Cassandra 
configuration").valid(false).explanation("both " + 
CONNECTION_PROVIDER_SERVICE.getDisplayName() +
-" and processor level Cassandra configuration cannot 
be provided at the same time.").build());
+" and processor level 

[nifi] branch main updated: NIFI-5642: QueryCassandra processor : output FlowFiles as soon fetch_size is reached NIFI-5642: QueryCassandra processor : output FlowFiles as soon fetch_size is reached Fi

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 d80a19e230 NIFI-5642: QueryCassandra processor : output FlowFiles as 
soon fetch_size is reached NIFI-5642: QueryCassandra processor : output 
FlowFiles as soon fetch_size is reached Fixed checkstyle error Delete build.sh 
Delete local build file NIFI-5642 : letting fetch_size to control the Cassandra 
data flow creating a new MAX_ROWS_PER_FLOW_FILE parameter Fixed checkstyle 
error: no more import java.util.* Fixed missing imports NIFI-5642: added 
REL_ORIGINAL relationship in order t [...]
d80a19e230 is described below

commit d80a19e2308ce630b079b440c7f8452363ee9939
Author: aglotero 
AuthorDate: Mon Oct 8 18:22:19 2018 -0300

NIFI-5642: QueryCassandra processor : output FlowFiles as soon fetch_size 
is reached
NIFI-5642: QueryCassandra processor : output FlowFiles as soon fetch_size 
is reached
Fixed checkstyle error
Delete build.sh
Delete local build file
NIFI-5642 : letting fetch_size to control the Cassandra data flow creating 
a new MAX_ROWS_PER_FLOW_FILE parameter
Fixed checkstyle error: no more import java.util.*
Fixed missing imports
NIFI-5642: added REL_ORIGINAL relationship in order to allow incremental 
commit
Addressing comments from code review
Adjustments on timestamp datatype formatting
Created the OUTPUT_BATCH_SIZE property
Code review adjustments
NIFI-5642: update after rebase
NIFI-5642: addressing PR comments
NIFI-5642: adding in integration test, fixing race condition
NIFI-5642: remove log4j2

This closes #6848

Signed-off-by: Mike Thomsen 
---
 .../cassandra/AbstractCassandraProcessor.java  |  24 +-
 .../nifi/processors/cassandra/QueryCassandra.java  | 444 ++---
 .../cassandra/CassandraQueryTestUtil.java  |  31 +-
 .../processors/cassandra/QueryCassandraIT.java | 163 
 .../processors/cassandra/QueryCassandraTest.java   | 124 +-
 5 files changed, 601 insertions(+), 185 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/AbstractCassandraProcessor.java
 
b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/AbstractCassandraProcessor.java
index 0c53a35a80..002ec27baf 100644
--- 
a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/AbstractCassandraProcessor.java
+++ 
b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/AbstractCassandraProcessor.java
@@ -28,14 +28,6 @@ import com.datastax.driver.core.Session;
 import com.datastax.driver.core.TypeCodec;
 import com.datastax.driver.core.exceptions.AuthenticationException;
 import com.datastax.driver.core.exceptions.NoHostAvailableException;
-import java.net.InetSocketAddress;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
-import javax.net.ssl.SSLContext;
 import com.datastax.driver.extras.codecs.arrays.ObjectArrayCodec;
 import org.apache.avro.Schema;
 import org.apache.avro.SchemaBuilder;
@@ -56,6 +48,15 @@ import org.apache.nifi.processor.util.StandardValidators;
 import org.apache.nifi.security.util.ClientAuth;
 import org.apache.nifi.ssl.SSLContextService;
 
+import javax.net.ssl.SSLContext;
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
+
 /**
  * AbstractCassandraProcessor is a base class for Cassandra processors and 
contains logic and variables common to most
  * processors integrating with Apache Cassandra.
@@ -181,7 +182,6 @@ public abstract class AbstractCassandraProcessor extends 
AbstractProcessor {
 descriptors.add(USERNAME);
 descriptors.add(PASSWORD);
 descriptors.add(CONSISTENCY_LEVEL);
-descriptors.add(COMPRESSION_TYPE);
 descriptors.add(CHARSET);
 }
 
@@ -209,12 +209,12 @@ public abstract class AbstractCassandraProcessor extends 
AbstractProcessor {
 
 if (connectionProviderIsSet && contactPointsIsSet) {
 results.add(new ValidationResult.Builder().subject("Cassandra 
configuration").valid(false).explanation("both " + 
CONNECTION_PROVIDER_SERVICE.getDisplayName() +
-" and processor level Cassandra configuration cannot 
be provided at the same time.").build());
+" and processor level Cassandra configuration ca

[nifi] branch main updated: NIFI-11354 Removed Neo4j 3 Service and modules

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 8952f7c0cf NIFI-11354 Removed Neo4j 3 Service and modules
8952f7c0cf is described below

commit 8952f7c0cf75e1d2bd875b3ea195566195d7637c
Author: exceptionfactory 
AuthorDate: Tue Mar 28 10:42:04 2023 -0500

NIFI-11354 Removed Neo4j 3 Service and modules

This closes #7093

Signed-off-by: Mike Thomsen 
---
 .../nifi-neo4j-3-cypher-service-nar/pom.xml|  37 ---
 .../src/main/resources/META-INF/LICENSE| 246 
 .../src/main/resources/META-INF/NOTICE | 152 --
 .../nifi-neo4j-3-cypher-service/pom.xml| 108 ---
 .../nifi/graph/Neo4JCypher3ClientService.java  | 317 -
 .../org.apache.nifi.controller.ControllerService   |  16 --
 .../apache/nifi/graph/ITNeo4JCypher3Executor.java  | 163 ---
 nifi-nar-bundles/nifi-graph-bundle/pom.xml |   2 -
 8 files changed, 1041 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-graph-bundle/nifi-neo4j-3-cypher-service-nar/pom.xml 
b/nifi-nar-bundles/nifi-graph-bundle/nifi-neo4j-3-cypher-service-nar/pom.xml
deleted file mode 100644
index 1e50cf4b06..00
--- a/nifi-nar-bundles/nifi-graph-bundle/nifi-neo4j-3-cypher-service-nar/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
https://maven.apache.org/xsd/maven-4.0.0.xsd;>
-
-4.0.0
-
-org.apache.nifi
-nifi-graph-bundle
-2.0.0-SNAPSHOT
-
-nifi-neo4j-3-cypher-service-nar
-nar
-
-
-org.apache.nifi
-nifi-graph-client-service-api-nar
-2.0.0-SNAPSHOT
-nar
-
-
-org.apache.nifi
-nifi-neo4j-3-cypher-service
-2.0.0-SNAPSHOT
-
-
-
diff --git 
a/nifi-nar-bundles/nifi-graph-bundle/nifi-neo4j-3-cypher-service-nar/src/main/resources/META-INF/LICENSE
 
b/nifi-nar-bundles/nifi-graph-bundle/nifi-neo4j-3-cypher-service-nar/src/main/resources/META-INF/LICENSE
deleted file mode 100644
index 2d2db982bb..00
--- 
a/nifi-nar-bundles/nifi-graph-bundle/nifi-neo4j-3-cypher-service-nar/src/main/resources/META-INF/LICENSE
+++ /dev/null
@@ -1,246 +0,0 @@
-
- Apache License
-   Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-  "License" shall mean the terms and conditions for use, reproduction,
-  and distribution as defined by Sections 1 through 9 of this document.
-
-  "Licensor" shall mean the copyright owner or entity authorized by
-  the copyright owner that is granting the License.
-
-  "Legal Entity" shall mean the union of the acting entity and all
-  other entities that control, are controlled by, or are under common
-  control with that entity. For the purposes of this definition,
-  "control" means (i) the power, direct or indirect, to cause the
-  direction or management of such entity, whether by contract or
-  otherwise, or (ii) ownership of fifty percent (50%) or more of the
-  outstanding shares, or (iii) beneficial ownership of such entity.
-
-  "You" (or "Your") shall mean an individual or Legal Entity
-  exercising permissions granted by this License.
-
-  "Source" form shall mean the preferred form for making modifications,
-  including but not limited to software source code, documentation
-  source, and configuration files.
-
-  "Object" form shall mean any form resulting from mechanical
-  transformation or translation of a Source form, including but
-  not limited to compiled object code, generated documentation,
-  and conversions to other media types.
-
-  "Work" shall mean the work of authorship, whether in Source or
-  Object form, made available under the License, as indicated by a
-  copyright notice that is included in or attached to the work
-  (an example is provided in the Appendix below).
-
-  "Derivative Works" shall mean any work, whether in Source or Object
-  form, that is based on (or derived from) the Work and for which the
-  editorial revisions, annotations, elaborations, or other modifications
-  represent, as a whole, an original work of authorship. For the purposes
-  of this License, Derivative Works shall not include works that remain
-  separable from, or merely link (or bind by name) to the interfaces of,
-

[nifi] branch support/nifi-1.x updated: NIFI-11201 Backported include-iotdb build profile

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 a37fa559f7 NIFI-11201 Backported include-iotdb build profile
a37fa559f7 is described below

commit a37fa559f769789016dd68d918011e7511481413
Author: exceptionfactory 
AuthorDate: Tue Feb 21 21:10:06 2023 -0600

NIFI-11201 Backported include-iotdb build profile

- Disabled parallel thread in ci-workflow build to avoid Windows failures

This closes #6982

Signed-off-by: Mike Thomsen 
---
 .github/workflows/ci-workflow.yml|  1 -
 nifi-assembly/pom.xml| 17 ++
 nifi-docs/src/main/asciidoc/developer-guide.adoc | 29 
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci-workflow.yml 
b/.github/workflows/ci-workflow.yml
index a07b1fc3f4..ade6566a85 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -31,7 +31,6 @@ env:
 -Dmaven.wagon.http.pool=false
   MAVEN_COMPILE_COMMAND: >-
 mvn test-compile
---threads 2C
 --show-version
 --no-snapshot-updates
 --no-transfer-progress
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index af803aa051..e3e79661cc 100644
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -1140,6 +1140,23 @@ language governing permissions and limitations under the 
License. -->
 
 
 
+
+include-iotdb
+
+false
+
+allProfiles
+
+
+
+
+org.apache.nifi
+nifi-iotdb-nar
+1.21.0-SNAPSHOT
+nar
+
+
+
 
 include-media
 

[nifi] branch support/nifi-1.x updated: NIFI-11184 Deprecated HashAttribute and CryptographicHashAttribute

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen 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 8c65b78ff3 NIFI-11184 Deprecated HashAttribute and 
CryptographicHashAttribute
8c65b78ff3 is described below

commit 8c65b78ff3da9c57735162175620a4743232decb
Author: exceptionfactory 
AuthorDate: Tue Feb 14 16:57:52 2023 -0600

NIFI-11184 Deprecated HashAttribute and CryptographicHashAttribute

This closes #6956

Signed-off-by: Mike Thomsen 
---
 .../apache/nifi/processors/standard/CryptographicHashAttribute.java  | 5 +
 .../main/java/org/apache/nifi/processors/standard/HashAttribute.java | 5 +
 2 files changed, 10 insertions(+)

diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CryptographicHashAttribute.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CryptographicHashAttribute.java
index 053dab3916..cbc24c63af 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CryptographicHashAttribute.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CryptographicHashAttribute.java
@@ -35,6 +35,7 @@ import org.apache.nifi.annotation.behavior.SideEffectFree;
 import org.apache.nifi.annotation.behavior.SupportsBatching;
 import org.apache.nifi.annotation.behavior.WritesAttribute;
 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.components.AllowableValue;
 import org.apache.nifi.components.PropertyDescriptor;
@@ -60,6 +61,10 @@ import org.apache.nifi.security.util.crypto.HashService;
 description = "The property name defines the attribute to look for and 
hash in the incoming flowfile. "
 + "The property value defines the name to give the generated 
attribute. "
 + "Attribute names must be unique.")
+@DeprecationNotice(
+classNames = "org.apache.nifi.processors.attributes.UpdateAttribute",
+reason = "UpdateAttribute can be configured using the hash Expression 
Language function to digest one or more attributes"
+)
 public class CryptographicHashAttribute extends AbstractProcessor {
 public enum PartialAttributePolicy {
 ALLOW,
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java
index dab0260cb6..b8519fde6d 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java
@@ -39,6 +39,7 @@ import org.apache.nifi.annotation.behavior.SideEffectFree;
 import org.apache.nifi.annotation.behavior.SupportsBatching;
 import org.apache.nifi.annotation.behavior.WritesAttribute;
 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.components.PropertyDescriptor;
 import org.apache.nifi.flowfile.FlowFile;
@@ -115,6 +116,10 @@ import org.apache.nifi.processor.util.StandardValidators;
 + "group, the value of that group will be used when comparing flow 
file "
 + "attributes. Otherwise, the original flow file attribute's value 
will be used "
 + "if and only if the value matches the given regular expression.")
+@DeprecationNotice(
+classNames = "org.apache.nifi.processors.attributes.UpdateAttribute",
+reason = "UpdateAttribute can be configured using the hash Expression 
Language function to digest one or more attributes"
+)
 public class HashAttribute extends AbstractProcessor {
 
 public static final PropertyDescriptor HASH_VALUE_ATTRIBUTE = new 
PropertyDescriptor.Builder()

[nifi] branch main updated (57a1144f34 -> 85f2162021)

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


from 57a1144f34 NIFI-11187 Removed ActiveMQ from Standard Processors
 new a0ef378a42 NIFI-11207 Removed HBase 1.1.2 Services
 new 85f2162021 NIFI-11201 Added include-iotdb Maven build profile

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 nifi-assembly/pom.xml  |  23 +-
 nifi-docs/src/main/asciidoc/developer-guide.adoc   |  28 +-
 .../apache/nifi/processors/QueryIoTDBRecord.java   |   2 +-
 .../nifi-hbase_1_1_2-client-service-nar/pom.xml|  45 -
 .../src/main/resources/META-INF/LICENSE| 357 
 .../src/main/resources/META-INF/NOTICE | 322 ---
 .../nifi-hbase_1_1_2-client-service/pom.xml| 142 
 .../nifi/hbase/AbstractHBaseLookupService.java | 157 
 .../hbase/HBase_1_1_2_ClientMapCacheService.java   | 316 ---
 .../nifi/hbase/HBase_1_1_2_ClientService.java  | 946 -
 .../nifi/hbase/HBase_1_1_2_ListLookupService.java  | 115 ---
 .../hbase/HBase_1_1_2_RecordLookupService.java |  85 --
 .../apache/nifi/hbase/VisibilityLabelUtils.java|  50 --
 .../org.apache.nifi.controller.ControllerService   |  18 -
 .../apache/nifi/hbase/MockHBaseClientService.java  | 235 -
 .../TestHBase_1_1_2_ClientMapCacheService.java | 453 --
 .../nifi/hbase/TestHBase_1_1_2_ClientService.java  | 529 
 .../hbase/TestHBase_1_1_2_ListLookupService.java   | 128 ---
 .../hbase/TestHBase_1_1_2_RecordLookupService.java | 124 ---
 .../java/org/apache/nifi/hbase/TestProcessor.java  |  56 --
 .../nifi/hbase/TestRecordLookupProcessor.java  | 112 ---
 .../src/test/resources/core-site-security.xml  |  30 -
 .../src/test/resources/core-site.xml   |  22 -
 .../src/test/resources/fake.keytab |   0
 .../src/test/resources/hbase-site-security.xml |  30 -
 .../src/test/resources/hbase-site.xml  |  22 -
 .../src/test/resources/krb5.conf   |   0
 .../nifi-hbase_1_1_2-client-service-bundle/pom.xml | 114 ---
 nifi-nar-bundles/nifi-standard-services/pom.xml|   1 -
 29 files changed, 32 insertions(+), 4430 deletions(-)
 delete mode 100644 
nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service-nar/pom.xml
 delete mode 100644 
nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service-nar/src/main/resources/META-INF/LICENSE
 delete mode 100644 
nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service-nar/src/main/resources/META-INF/NOTICE
 delete mode 100644 
nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/pom.xml
 delete mode 100644 
nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/main/java/org/apache/nifi/hbase/AbstractHBaseLookupService.java
 delete mode 100644 
nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/main/java/org/apache/nifi/hbase/HBase_1_1_2_ClientMapCacheService.java
 delete mode 100644 
nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/main/java/org/apache/nifi/hbase/HBase_1_1_2_ClientService.java
 delete mode 100644 
nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/main/java/org/apache/nifi/hbase/HBase_1_1_2_ListLookupService.java
 delete mode 100644 
nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/main/java/org/apache/nifi/hbase/HBase_1_1_2_RecordLookupService.java
 delete mode 100644 
nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/main/java/org/apache/nifi/hbase/VisibilityLabelUtils.java
 delete mode 100644 
nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService
 delete mode 100644 
nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/test/java/org/apache/nifi/hbase/MockHBaseClientService.java
 delete mode 100644 
nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/test/java/org/apache/nifi/hbase/TestHBase_1_1_2_ClientMapCacheService.java
 delete mode 1006

[nifi] 02/02: NIFI-11201 Added include-iotdb Maven build profile

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 85f2162021d8f8c0049915c96a1d2b236086f65f
Author: exceptionfactory 
AuthorDate: Sat Feb 18 20:38:51 2023 -0600

NIFI-11201 Added include-iotdb Maven build profile

This closes #6975

- Corrected Fetch Size property evaluation in QueryIoTDBRecord for FlowFile 
attributes

Signed-off-by: Mike Thomsen 
---
 nifi-assembly/pom.xml  | 17 +
 nifi-docs/src/main/asciidoc/developer-guide.adoc   | 28 +++---
 .../apache/nifi/processors/QueryIoTDBRecord.java   |  2 +-
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index 5a6f523f0e..1c3e6d9ad5 100644
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -1044,6 +1044,23 @@ language governing permissions and limitations under the 
License. -->
 
 
 
+
+include-iotdb
+
+false
+
+allProfiles
+
+
+
+
+org.apache.nifi
+nifi-iotdb-nar
+2.0.0-SNAPSHOT
+nar
+
+
+
 
 include-media
 

[nifi] 02/03: NIFI-11199 - Upgrade kotlin to 1.8.10

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit f7116f4a2534dc5706b037671491f7fb9ebe321e
Author: Pierre Villard 
AuthorDate: Sat Feb 18 18:52:50 2023 -0500

NIFI-11199 - Upgrade kotlin to 1.8.10

This closes #6973

Signed-off-by: Mike Thomsen 
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ca4151d928..ce9abb9b2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,7 @@
 1.12.371
 
2.17.295
 2.10.1
-1.7.20
+1.8.10
 4.10.0
 1.5.0
 
3.12.0

[nifi] 01/03: NIFI-11200 - Upgrade aspectj to 1.9.19

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit a98fb9d81a7ac31ef4f503b51f96e5b31935d085
Author: Pierre Villard 
AuthorDate: Sat Feb 18 19:01:03 2023 -0500

NIFI-11200 - Upgrade aspectj to 1.9.19

This closes #6974

Signed-off-by: Mike Thomsen 
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d748e9e0f9..ca4151d928 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
 3.3.4
 1.2.1
 2.1.5
-1.9.6
+1.9.19
 2.36
 2.18.0
 1.3.5

[nifi] 03/03: NIFI-11198 - Upgrade snowflake-ingest-sdk to 1.0.3

[mthomsen]

This is an automated email from the ASF dual-hosted git repository.

mthomsen pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 4fd8dd0bd40b6dcc6d2265eeb5b1ee0e5d006a5f
Author: Pierre Villard 
AuthorDate: Sat Feb 18 18:40:22 2023 -0500

NIFI-11198 - Upgrade snowflake-ingest-sdk to 1.0.3

This closes #6972

Signed-off-by: Mike Thomsen 
---
 nifi-nar-bundles/nifi-snowflake-bundle/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nifi-nar-bundles/nifi-snowflake-bundle/pom.xml 
b/nifi-nar-bundles/nifi-snowflake-bundle/pom.xml
index eee3f1d934..1ec01487a2 100644
--- a/nifi-nar-bundles/nifi-snowflake-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-snowflake-bundle/pom.xml
@@ -36,7 +36,7 @@
 
 net.snowflake
 snowflake-ingest-sdk
-1.0.2-beta.7
+1.0.3-beta