[nifi] branch support/nifi-1.x updated: NIFI-12063 Clarified Elasticsearch Query Documentation
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 36288bcbe1 NIFI-12063 Clarified Elasticsearch Query Documentation
36288bcbe1 is described below
commit 36288bcbe1c594c974d600c958bb35990e43ac91
Author: Chris Sampson
AuthorDate: Thu Sep 14 20:34:15 2023 +0100
NIFI-12063 Clarified Elasticsearch Query Documentation
Clarify paginated Elasticsearch with SCROLL does not use query parameters
from dynamic properties
This closes #7695
Signed-off-by: David Handermann
(cherry picked from commit 94bb8aec97e83607f5c084a6261923e224dadc58)
---
.../processors/elasticsearch/PaginatedJsonQueryElasticsearch.java | 4 +++-
.../apache/nifi/processors/elasticsearch/SearchElasticsearch.java | 4 +++-
.../apache/nifi/processors/elasticsearch/api/PaginationType.java| 6 +++---
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PaginatedJsonQueryElasticsearch.java
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PaginatedJsonQueryElasticsearch.java
index 5a8f137a48..04869e771f 100644
---
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PaginatedJsonQueryElasticsearch.java
+++
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PaginatedJsonQueryElasticsearch.java
@@ -56,7 +56,9 @@ import java.util.List;
value = "The value of the URL query parameter",
expressionLanguageScope = ExpressionLanguageScope.FLOWFILE_ATTRIBUTES,
description = "Adds the specified property name/value as a query
parameter in the Elasticsearch URL used for processing. " +
-"These parameters will override any matching parameters in the
query request body")
+"These parameters will override any matching parameters in the
query request body. " +
+"For SCROLL type queries, these parameters are only used in
the initial (first page) query as the " +
+"Elasticsearch Scroll API does not support the same query
parameters for subsequent pages of data.")
@SystemResourceConsideration(resource = SystemResource.MEMORY, description =
"Care should be taken on the size of each page because each response " +
"from Elasticsearch will be loaded into memory all at once and
converted into the resulting flowfiles.")
public class PaginatedJsonQueryElasticsearch extends
AbstractPaginatedJsonQueryElasticsearch {
diff --git
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/SearchElasticsearch.java
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/SearchElasticsearch.java
index a7d39a1576..23a7fa3fe5 100644
---
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/SearchElasticsearch.java
+++
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/SearchElasticsearch.java
@@ -73,7 +73,9 @@ import java.util.Set;
value = "The value of the URL query parameter",
expressionLanguageScope = ExpressionLanguageScope.FLOWFILE_ATTRIBUTES,
description = "Adds the specified property name/value as a query
parameter in the Elasticsearch URL used for processing. " +
-"These parameters will override any matching parameters in the
query request body")
+"These parameters will override any matching parameters in the
query request body. " +
+"For SCROLL type queries, these parameters are only used in
the initial (first page) query as the " +
+"Elasticsearch Scroll API does not support the same query
parameters for subsequent pages of data.")
@Stateful(scopes = Scope.LOCAL, description = "The pagination state (scrollId,
searchAfter, pitId, hitCount, pageCount, pageExpirationTimestamp) " +
"is retained in between invocations of this processor until the
Scroll/PiT has expired " +
"(when the current time is later than the last query execution plus
the Pagination Keep Alive interval).")
diff --git
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/api/PaginationType.java
[nifi] branch main updated: NIFI-12063 Clarified Elasticsearch Query Documentation
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 94bb8aec97 NIFI-12063 Clarified Elasticsearch Query Documentation
94bb8aec97 is described below
commit 94bb8aec97e83607f5c084a6261923e224dadc58
Author: Chris Sampson
AuthorDate: Thu Sep 14 20:34:15 2023 +0100
NIFI-12063 Clarified Elasticsearch Query Documentation
Clarify paginated Elasticsearch with SCROLL does not use query parameters
from dynamic properties
This closes #7695
Signed-off-by: David Handermann
---
.../processors/elasticsearch/PaginatedJsonQueryElasticsearch.java | 4 +++-
.../apache/nifi/processors/elasticsearch/SearchElasticsearch.java | 4 +++-
.../apache/nifi/processors/elasticsearch/api/PaginationType.java| 6 +++---
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PaginatedJsonQueryElasticsearch.java
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PaginatedJsonQueryElasticsearch.java
index 111053841f..553d338dbe 100644
---
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PaginatedJsonQueryElasticsearch.java
+++
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PaginatedJsonQueryElasticsearch.java
@@ -54,7 +54,9 @@ import java.util.List;
value = "The value of the URL query parameter",
expressionLanguageScope = ExpressionLanguageScope.FLOWFILE_ATTRIBUTES,
description = "Adds the specified property name/value as a query
parameter in the Elasticsearch URL used for processing. " +
-"These parameters will override any matching parameters in the
query request body")
+"These parameters will override any matching parameters in the
query request body. " +
+"For SCROLL type queries, these parameters are only used in
the initial (first page) query as the " +
+"Elasticsearch Scroll API does not support the same query
parameters for subsequent pages of data.")
@SystemResourceConsideration(resource = SystemResource.MEMORY, description =
"Care should be taken on the size of each page because each response " +
"from Elasticsearch will be loaded into memory all at once and
converted into the resulting flowfiles.")
public class PaginatedJsonQueryElasticsearch extends
AbstractPaginatedJsonQueryElasticsearch {
diff --git
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/SearchElasticsearch.java
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/SearchElasticsearch.java
index a7d39a1576..23a7fa3fe5 100644
---
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/SearchElasticsearch.java
+++
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/SearchElasticsearch.java
@@ -73,7 +73,9 @@ import java.util.Set;
value = "The value of the URL query parameter",
expressionLanguageScope = ExpressionLanguageScope.FLOWFILE_ATTRIBUTES,
description = "Adds the specified property name/value as a query
parameter in the Elasticsearch URL used for processing. " +
-"These parameters will override any matching parameters in the
query request body")
+"These parameters will override any matching parameters in the
query request body. " +
+"For SCROLL type queries, these parameters are only used in
the initial (first page) query as the " +
+"Elasticsearch Scroll API does not support the same query
parameters for subsequent pages of data.")
@Stateful(scopes = Scope.LOCAL, description = "The pagination state (scrollId,
searchAfter, pitId, hitCount, pageCount, pageExpirationTimestamp) " +
"is retained in between invocations of this processor until the
Scroll/PiT has expired " +
"(when the current time is later than the last query execution plus
the Pagination Keep Alive interval).")
diff --git
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/api/PaginationType.java
[nifi] branch main updated: NIFI-12065 Removed nifi-spark-receiver module
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 71dd5576db NIFI-12065 Removed nifi-spark-receiver module
71dd5576db is described below
commit 71dd5576dbc66b669a6840d03d48992a6263210a
Author: Joseph Witt
AuthorDate: Thu Sep 14 15:12:04 2023 -0700
NIFI-12065 Removed nifi-spark-receiver module
This closes #7732
Signed-off-by: David Handermann
---
nifi-external/nifi-spark-receiver/pom.xml | 71
.../java/org/apache/nifi/spark/NiFiDataPacket.java | 39
.../java/org/apache/nifi/spark/NiFiReceiver.java | 197 -
.../apache/nifi/spark/StandardNiFiDataPacket.java | 43 -
nifi-external/pom.xml | 1 -
5 files changed, 351 deletions(-)
diff --git a/nifi-external/nifi-spark-receiver/pom.xml
b/nifi-external/nifi-spark-receiver/pom.xml
deleted file mode 100644
index 3917a109c8..00
--- a/nifi-external/nifi-spark-receiver/pom.xml
+++ /dev/null
@@ -1,71 +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-external
-2.0.0-SNAPSHOT
-
-org.apache.nifi
-nifi-spark-receiver
-
-
-org.apache.spark
-spark-streaming_2.13
-provided
-3.3.2
-
-
-commons-logging
-commons-logging
-
-
-org.apache.logging.log4j
-log4j-core
-
-
-
-
-org.slf4j
-log4j-over-slf4j
-
-
-org.slf4j
-jcl-over-slf4j
-
-
-org.apache.nifi
-nifi-site-to-site-client
-2.0.0-SNAPSHOT
-
-
-
-
-
-
-org.apache.hadoop
-hadoop-client-api
-${hadoop.version}
-
-
-org.apache.hadoop
-hadoop-client-runtime
-${hadoop.version}
-
-
-
-
diff --git
a/nifi-external/nifi-spark-receiver/src/main/java/org/apache/nifi/spark/NiFiDataPacket.java
b/nifi-external/nifi-spark-receiver/src/main/java/org/apache/nifi/spark/NiFiDataPacket.java
deleted file mode 100644
index 608aa2c2fe..00
---
a/nifi-external/nifi-spark-receiver/src/main/java/org/apache/nifi/spark/NiFiDataPacket.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.spark;
-
-import java.util.Map;
-
-/**
- *
- * The NiFiDataPacket provides a packaging around a NiFi FlowFile. It wraps
both
- * a FlowFile's content and its attributes so that they can be processed by
- * Spark
- *
- */
-public interface NiFiDataPacket {
-
-/**
- * @return the contents of a NiFi FlowFile
- */
-byte[] getContent();
-
-/**
- * @return a Map of attributes that are associated with the NiFi FlowFile
- */
-Map getAttributes();
-}
diff --git
a/nifi-external/nifi-spark-receiver/src/main/java/org/apache/nifi/spark/NiFiReceiver.java
b/nifi-external/nifi-spark-receiver/src/main/java/org/apache/nifi/spark/NiFiReceiver.java
deleted file mode 100644
index 83a7e42ed7..00
---
a/nifi-external/nifi-spark-receiver/src/main/java/org/apache/nifi/spark/NiFiReceiver.java
+++ /dev/null
@@ -1,197 +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
- *
[nifi] branch support/nifi-1.x updated: NIFI-12064 Upgraded Maven Plugin versions
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 1f149988c6 NIFI-12064 Upgraded Maven Plugin versions
1f149988c6 is described below
commit 1f149988c656df8cc60b3aa1706764ba074f20c0
Author: Joseph Witt
AuthorDate: Thu Sep 14 16:26:22 2023 -0500
NIFI-12064 Upgraded Maven Plugin versions
This closes #7731
Signed-off-by: David Handermann
(cherry picked from commit a1fca9b44edb387c3673251d37f268264122d3eb)
---
nifi-commons/nifi-xml-processing/pom.xml| 2 +-
nifi-docs/pom.xml | 2 +-
nifi-manifest/nifi-runtime-manifest/pom.xml | 7 ++-
.../nifi-asn1-bundle/nifi-asn1-services/pom.xml | 4 ++--
.../nifi-framework/nifi-web/nifi-web-api/pom.xml| 3 ++-
.../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 2 +-
nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-common/pom.xml | 2 +-
nifi-registry/nifi-registry-core/nifi-registry-docs/pom.xml | 2 +-
.../nifi-registry-core/nifi-registry-framework/pom.xml | 5 +++--
.../nifi-registry-core/nifi-registry-web-api/pom.xml| 5 +++--
.../nifi-registry-core/nifi-registry-web-ui/pom.xml | 2 +-
nifi-registry/pom.xml | 4 ++--
nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml| 2 +-
pom.xml | 13 ++---
14 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/nifi-commons/nifi-xml-processing/pom.xml
b/nifi-commons/nifi-xml-processing/pom.xml
index 1e13e0a048..65d8c76a88 100644
--- a/nifi-commons/nifi-xml-processing/pom.xml
+++ b/nifi-commons/nifi-xml-processing/pom.xml
@@ -27,7 +27,7 @@
com.github.spotbugs
spotbugs-maven-plugin
-4.7.3.0
+4.7.3.5
package
diff --git a/nifi-docs/pom.xml b/nifi-docs/pom.xml
index 46514fe8a6..3e4bd887d1 100644
--- a/nifi-docs/pom.xml
+++ b/nifi-docs/pom.xml
@@ -48,7 +48,7 @@
org.asciidoctor
asciidoctor-maven-plugin
-1.5.8
+2.2.4
output-html
diff --git a/nifi-manifest/nifi-runtime-manifest/pom.xml
b/nifi-manifest/nifi-runtime-manifest/pom.xml
index 50f139ad2b..7629e7ab19 100644
--- a/nifi-manifest/nifi-runtime-manifest/pom.xml
+++ b/nifi-manifest/nifi-runtime-manifest/pom.xml
@@ -103,7 +103,7 @@
org.codehaus.mojo
exec-maven-plugin
-1.6.0
+3.1.0
generate-runtime-manifest
@@ -129,6 +129,11 @@
nifi-runtime-manifest-core
1.24.0-SNAPSHOT
+
+org.slf4j
+slf4j-api
+${org.slf4j.version}
+
diff --git a/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/pom.xml
b/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/pom.xml
index 50bbaaca04..c56f187604 100644
--- a/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/pom.xml
+++ b/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/pom.xml
@@ -81,7 +81,7 @@
org.codehaus.mojo
exec-maven-plugin
-1.6.0
+3.1.0
compile-asn
@@ -108,7 +108,7 @@
org.codehaus.mojo
build-helper-maven-plugin
-3.0.0
+3.4.0
add-test-sources
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
index a1ce0720d3..bd4d00e83b 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
@@ -58,7 +58,7 @@
com.github.kongchen
swagger-maven-plugin
-3.1.7
+3.1.8
compile
@@ -75,6 +75,7 @@
http
https
+json
[nifi] branch main updated: NIFI-12064 Upgraded Maven Plugin versions
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 a1fca9b44e NIFI-12064 Upgraded Maven Plugin versions
a1fca9b44e is described below
commit a1fca9b44edb387c3673251d37f268264122d3eb
Author: Joseph Witt
AuthorDate: Thu Sep 14 14:26:22 2023 -0700
NIFI-12064 Upgraded Maven Plugin versions
This closes #7731
Signed-off-by: David Handermann
---
nifi-commons/nifi-xml-processing/pom.xml | 2 +-
nifi-docs/pom.xml | 2 +-
nifi-manifest/nifi-runtime-manifest/pom.xml | 7 ++-
.../nifi-asn1-bundle/nifi-asn1-services/pom.xml | 4 ++--
.../nifi-framework/nifi-web/nifi-web-api/pom.xml | 3 ++-
.../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 2 +-
.../nifi-grpc-bundle/nifi-grpc-common/pom.xml | 2 +-
.../nifi-py4j-bundle/nifi-python-extension-api/pom.xml| 2 +-
.../nifi-registry-core/nifi-registry-docs/pom.xml | 2 +-
.../nifi-registry-core/nifi-registry-framework/pom.xml| 5 +++--
.../nifi-registry-core/nifi-registry-web-api/pom.xml | 5 +++--
.../nifi-registry-core/nifi-registry-web-ui/pom.xml | 2 +-
nifi-registry/pom.xml | 4 ++--
nifi-toolkit/nifi-toolkit-api/pom.xml | 2 +-
nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml | 2 +-
pom.xml | 15 +++
16 files changed, 34 insertions(+), 27 deletions(-)
diff --git a/nifi-commons/nifi-xml-processing/pom.xml
b/nifi-commons/nifi-xml-processing/pom.xml
index b5f5adaf25..381f33a4a4 100644
--- a/nifi-commons/nifi-xml-processing/pom.xml
+++ b/nifi-commons/nifi-xml-processing/pom.xml
@@ -27,7 +27,7 @@
com.github.spotbugs
spotbugs-maven-plugin
-4.7.3.0
+4.7.3.5
package
diff --git a/nifi-docs/pom.xml b/nifi-docs/pom.xml
index e787286f2a..f2adf5118f 100644
--- a/nifi-docs/pom.xml
+++ b/nifi-docs/pom.xml
@@ -48,7 +48,7 @@
org.asciidoctor
asciidoctor-maven-plugin
-1.5.8
+2.2.4
output-html
diff --git a/nifi-manifest/nifi-runtime-manifest/pom.xml
b/nifi-manifest/nifi-runtime-manifest/pom.xml
index 6fcf61546c..cd13088d35 100644
--- a/nifi-manifest/nifi-runtime-manifest/pom.xml
+++ b/nifi-manifest/nifi-runtime-manifest/pom.xml
@@ -103,7 +103,7 @@
org.codehaus.mojo
exec-maven-plugin
-1.6.0
+3.1.0
generate-runtime-manifest
@@ -129,6 +129,11 @@
nifi-runtime-manifest-core
2.0.0-SNAPSHOT
+
+org.slf4j
+slf4j-api
+${org.slf4j.version}
+
diff --git a/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/pom.xml
b/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/pom.xml
index 71aef1617d..4f183265bc 100644
--- a/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/pom.xml
+++ b/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/pom.xml
@@ -81,7 +81,7 @@
org.codehaus.mojo
exec-maven-plugin
-1.6.0
+3.1.0
compile-asn
@@ -108,7 +108,7 @@
org.codehaus.mojo
build-helper-maven-plugin
-3.0.0
+3.4.0
add-test-sources
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
index dca5711fff..6750d87ea0 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
@@ -58,7 +58,7 @@
com.github.kongchen
swagger-maven-plugin
-3.1.7
+3.1.8
compile
@@ -75,6 +75,7 @@
http
https
+json
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/org.apache.commons-commons-compress-1.24.0 deleted (was 284fa4b51f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was 284fa4b51f Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-ranger-bundle/org.apache.commons-commons-compress-1.24.0 deleted (was 8225cd6ddb)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-ranger-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was 8225cd6ddb Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-sql-reporting-bundle/org.apache.commons-commons-compress-1.24.0 deleted (was 27bedb91fe)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-sql-reporting-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was 27bedb91fe Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-parquet-bundle/org.apache.commons-commons-compress-1.24.0 deleted (was d2cbdceac7)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-parquet-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was d2cbdceac7 Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-standard-bundle/org.apache.commons-commons-compress-1.24.0 deleted (was b0339c45fa)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-standard-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was b0339c45fa Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/org.apache.commons-commons-compress-1.24.0 deleted (was 33cfc65f79)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was 33cfc65f79 Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/org.apache.commons-commons-compress-1.24.0 deleted (was 411ce43739)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was 411ce43739 Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-registry/nifi-registry-core/nifi-registry-test/org.apache.commons-commons-compress-1.24.0 deleted (was f56df4112d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-registry/nifi-registry-core/nifi-registry-test/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was f56df4112d Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/org.apache.commons-commons-compress-1.24.0 deleted (was 5061109ceb)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was 5061109ceb Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-commons/nifi-flowfile-packager/org.apache.commons-commons-compress-1.24.0 deleted (was 4fe2b0172f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-commons/nifi-flowfile-packager/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was 4fe2b0172f Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-hadoop-libraries-bundle/org.apache.commons-commons-compress-1.24.0 deleted (was 3fcecc875e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-hadoop-libraries-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was 3fcecc875e Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-atlas-bundle/org.apache.commons-commons-compress-1.24.0 deleted (was a25897ab05)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-atlas-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was a25897ab05 Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-mongodb-bundle/org.apache.commons-commons-compress-1.24.0 deleted (was cebd81f3dd)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-mongodb-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was cebd81f3dd Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-avro-bundle/org.apache.commons-commons-compress-1.24.0 deleted (was 772f7e82f5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-avro-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was 772f7e82f5 Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-framework-bundle/org.apache.commons-commons-compress-1.24.0 deleted (was 25105c2969)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-framework-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was 25105c2969 Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch support/nifi-1.x updated: NIFI-12034 This closes #7729. Upgraded Apache Commons Compress from 1.23.0 to 1.24.0
This is an automated email from the ASF dual-hosted git repository. joewitt 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 ab67daf891 NIFI-12034 This closes #7729. Upgraded Apache Commons Compress from 1.23.0 to 1.24.0 ab67daf891 is described below commit ab67daf8912e8938dcb6405e6d15e4957b4da920 Author: exceptionfactory AuthorDate: Thu Sep 14 15:10:40 2023 -0500 NIFI-12034 This closes #7729. Upgraded Apache Commons Compress from 1.23.0 to 1.24.0 Signed-off-by: Joseph Witt --- c2/c2-client-bundle/c2-client-service/pom.xml | 1 - nifi-commons/nifi-flowfile-packager/pom.xml | 1 - nifi-nar-bundles/nifi-atlas-bundle/pom.xml| 6 -- nifi-nar-bundles/nifi-avro-bundle/pom.xml | 11 --- nifi-nar-bundles/nifi-cassandra-bundle/pom.xml| 6 -- .../nifi-compress-bundle/nifi-compress-processors/pom.xml | 1 - nifi-nar-bundles/nifi-confluent-platform-bundle/pom.xml | 11 --- nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml| 7 --- .../nifi-extension-utils/nifi-database-utils/pom.xml | 11 --- .../nifi-extension-utils/nifi-hadoop-utils/pom.xml| 10 -- .../nifi-record-utils/nifi-hadoop-record-utils/pom.xml| 10 -- .../nifi-extension-utils/nifi-record-utils/pom.xml| 6 -- nifi-nar-bundles/nifi-framework-bundle/pom.xml| 5 - nifi-nar-bundles/nifi-graph-bundle/pom.xml| 6 -- nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-hbase-bundle/pom.xml| 6 -- nifi-nar-bundles/nifi-hive-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-iceberg-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-media-bundle/pom.xml| 6 -- nifi-nar-bundles/nifi-mongodb-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-parquet-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-poi-bundle/pom.xml | 5 - nifi-nar-bundles/nifi-ranger-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-registry-bundle/pom.xml | 11 --- nifi-nar-bundles/nifi-site-to-site-reporting-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml| 6 -- nifi-nar-bundles/nifi-standard-bundle/pom.xml | 9 - .../nifi-hadoop-dbcp-service-bundle/pom.xml | 10 -- .../nifi-hbase_2-client-service-bundle/pom.xml| 6 -- .../nifi-lookup-services-bundle/pom.xml | 10 -- .../nifi-record-serialization-services-bundle/pom.xml | 11 --- nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml | 11 --- .../nifi-registry-extensions/nifi-registry-ranger/pom.xml | 6 -- pom.xml | 6 ++ 34 files changed, 6 insertions(+), 231 deletions(-) diff --git a/c2/c2-client-bundle/c2-client-service/pom.xml b/c2/c2-client-bundle/c2-client-service/pom.xml index 8fc6d9b9bb..e8114f4301 100644 --- a/c2/c2-client-bundle/c2-client-service/pom.xml +++ b/c2/c2-client-bundle/c2-client-service/pom.xml @@ -46,7 +46,6 @@ limitations under the License. org.apache.commons commons-compress -1.23.0 \ No newline at end of file diff --git a/nifi-commons/nifi-flowfile-packager/pom.xml b/nifi-commons/nifi-flowfile-packager/pom.xml index c91934e1d5..90fb83415a 100644 --- a/nifi-commons/nifi-flowfile-packager/pom.xml +++ b/nifi-commons/nifi-flowfile-packager/pom.xml @@ -25,7 +25,6 @@ org.apache.commons commons-compress -1.23.0 org.apache.commons diff --git a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml index 4772325560..17e9c8ae04 100644 --- a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml @@ -81,12 +81,6 @@ - - -org.apache.commons -commons-compress -1.23.0 - com.nimbusds diff --git a/nifi-nar-bundles/nifi-avro-bundle/pom.xml b/nifi-nar-bundles/nifi-avro-bundle/pom.xml index 352a754bc0..36c70fd0ba 100644 --- a/nifi-nar-bundles/nifi-avro-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-avro-bundle/pom.xml @@ -29,15 +29,4 @@ nifi-avro-processors nifi-avro-nar - - - - - -
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-registry-bundle/org.apache.commons-commons-compress-1.24.0 deleted (was f8a09f4096)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-registry-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was f8a09f4096 Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/c2/c2-client-bundle/c2-client-service/org.apache.commons-commons-compress-1.24.0 deleted (was f147ea47ac)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/c2/c2-client-bundle/c2-client-service/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was f147ea47ac Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/org.apache.commons-commons-compress-1.24.0 deleted (was fe3e31d3d3)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was fe3e31d3d3 Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/org.apache.commons-commons-compress-1.24.0 deleted (was b44fa9f465)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was b44fa9f465 Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/org.apache.commons-commons-compress-1.24.0 deleted (was bcfb99f7d6)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was bcfb99f7d6 Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-graph-bundle/org.apache.commons-commons-compress-1.24.0 deleted (was a24cd85823)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-graph-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was a24cd85823 Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/org.apache.commons-commons-compress-1.24.0 deleted (was 4704cd20af)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was 4704cd20af Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-cassandra-bundle/org.apache.commons-commons-compress-1.24.0 deleted (was a202d325ce)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-cassandra-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was a202d325ce Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-iceberg-bundle/org.apache.commons-commons-compress-1.24.0 deleted (was 6d463d4316)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-iceberg-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was 6d463d4316 Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-hbase-bundle/org.apache.commons-commons-compress-1.24.0 deleted (was 5d91978166)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-hbase-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was 5d91978166 Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-hive-bundle/org.apache.commons-commons-compress-1.24.0 deleted (was 73708da342)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-hive-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was 73708da342 Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/org.apache.commons-commons-compress-1.24.0 deleted (was 4089811e6e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was 4089811e6e Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-elasticsearch-bundle/org.apache.commons-commons-compress-1.24.0 deleted (was b8d46ff67f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-elasticsearch-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was b8d46ff67f Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/org.apache.commons-commons-compress-1.24.0 deleted (was b1ace3b031)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was b1ace3b031 Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-compress-bundle/nifi-compress-processors/org.apache.commons-commons-compress-1.24.0 deleted (was e11833926c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-compress-bundle/nifi-compress-processors/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was e11833926c Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-media-bundle/org.apache.commons-commons-compress-1.24.0 deleted (was 776bf45f43)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-media-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was 776bf45f43 Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-poi-bundle/org.apache.commons-commons-compress-1.24.0 deleted (was 21f9fd94c0)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-poi-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was 21f9fd94c0 Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-confluent-platform-bundle/org.apache.commons-commons-compress-1.24.0 deleted (was d9e091312c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-confluent-platform-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git was d9e091312c Bump org.apache.commons:commons-compress The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[nifi] branch main updated: NIFI-12034 This closes #7729. Upgraded Apache Commons Compress from 1.23.0 to 1.24.0
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/main by this push: new aee9f2c65d NIFI-12034 This closes #7729. Upgraded Apache Commons Compress from 1.23.0 to 1.24.0 aee9f2c65d is described below commit aee9f2c65d6d7aeaa278f1a962b2ba070e14ea87 Author: exceptionfactory AuthorDate: Thu Sep 14 15:10:40 2023 -0500 NIFI-12034 This closes #7729. Upgraded Apache Commons Compress from 1.23.0 to 1.24.0 Signed-off-by: Joseph Witt --- c2/c2-client-bundle/c2-client-service/pom.xml | 1 - nifi-commons/nifi-flowfile-packager/pom.xml | 1 - nifi-nar-bundles/nifi-atlas-bundle/pom.xml| 6 -- nifi-nar-bundles/nifi-avro-bundle/pom.xml | 11 --- nifi-nar-bundles/nifi-cassandra-bundle/pom.xml| 6 -- .../nifi-compress-bundle/nifi-compress-processors/pom.xml | 1 - nifi-nar-bundles/nifi-confluent-platform-bundle/pom.xml | 11 --- nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml| 7 --- .../nifi-extension-utils/nifi-database-utils/pom.xml | 11 --- .../nifi-extension-utils/nifi-hadoop-utils/pom.xml| 10 -- .../nifi-record-utils/nifi-hadoop-record-utils/pom.xml| 10 -- .../nifi-extension-utils/nifi-record-utils/pom.xml| 6 -- nifi-nar-bundles/nifi-framework-bundle/pom.xml| 5 - nifi-nar-bundles/nifi-graph-bundle/pom.xml| 6 -- nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-hbase-bundle/pom.xml| 6 -- nifi-nar-bundles/nifi-hive-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-iceberg-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-media-bundle/pom.xml| 6 -- nifi-nar-bundles/nifi-mongodb-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-parquet-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-poi-bundle/pom.xml | 5 - nifi-nar-bundles/nifi-ranger-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-registry-bundle/pom.xml | 11 --- nifi-nar-bundles/nifi-site-to-site-reporting-bundle/pom.xml | 6 -- nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml| 6 -- nifi-nar-bundles/nifi-standard-bundle/pom.xml | 9 - .../nifi-hadoop-dbcp-service-bundle/pom.xml | 10 -- .../nifi-hbase_2-client-service-bundle/pom.xml| 6 -- .../nifi-lookup-services-bundle/pom.xml | 10 -- .../nifi-record-serialization-services-bundle/pom.xml | 11 --- nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml | 11 --- .../nifi-registry-extensions/nifi-registry-ranger/pom.xml | 6 -- pom.xml | 6 ++ 34 files changed, 6 insertions(+), 231 deletions(-) diff --git a/c2/c2-client-bundle/c2-client-service/pom.xml b/c2/c2-client-bundle/c2-client-service/pom.xml index e7bb1f6828..4b527b6019 100644 --- a/c2/c2-client-bundle/c2-client-service/pom.xml +++ b/c2/c2-client-bundle/c2-client-service/pom.xml @@ -46,7 +46,6 @@ limitations under the License. org.apache.commons commons-compress -1.23.0 \ No newline at end of file diff --git a/nifi-commons/nifi-flowfile-packager/pom.xml b/nifi-commons/nifi-flowfile-packager/pom.xml index 8ec1f83c1b..700a7f8d47 100644 --- a/nifi-commons/nifi-flowfile-packager/pom.xml +++ b/nifi-commons/nifi-flowfile-packager/pom.xml @@ -25,7 +25,6 @@ org.apache.commons commons-compress -1.23.0 org.apache.commons diff --git a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml index 6dda4fc694..eb2ceb2d63 100644 --- a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml @@ -81,12 +81,6 @@ - - -org.apache.commons -commons-compress -1.23.0 - com.nimbusds diff --git a/nifi-nar-bundles/nifi-avro-bundle/pom.xml b/nifi-nar-bundles/nifi-avro-bundle/pom.xml index 0b6565dfa5..d1026843da 100644 --- a/nifi-nar-bundles/nifi-avro-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-avro-bundle/pom.xml @@ -29,15 +29,4 @@ nifi-avro-processors nifi-avro-nar - - - - - -org.apache.commons -
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/org.apache.commons-commons-compress-1.24.0 created (now 284fa4b51f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at 284fa4b51f Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-sql-reporting-bundle/org.apache.commons-commons-compress-1.24.0 created (now 27bedb91fe)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-sql-reporting-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at 27bedb91fe Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/org.apache.commons-commons-compress-1.24.0 created (now 4704cd20af)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at 4704cd20af Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-poi-bundle/org.apache.commons-commons-compress-1.24.0 created (now 21f9fd94c0)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-poi-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at 21f9fd94c0 Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-graph-bundle/org.apache.commons-commons-compress-1.24.0 created (now a24cd85823)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-graph-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at a24cd85823 Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/org.apache.commons-commons-compress-1.24.0 created (now 4089811e6e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at 4089811e6e Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/org.apache.commons-commons-compress-1.24.0 created (now fe3e31d3d3)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at fe3e31d3d3 Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-hbase-bundle/org.apache.commons-commons-compress-1.24.0 created (now 5d91978166)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-hbase-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at 5d91978166 Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-registry/nifi-registry-core/nifi-registry-test/org.apache.commons-commons-compress-1.24.0 created (now f56df4112d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-registry/nifi-registry-core/nifi-registry-test/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at f56df4112d Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/org.apache.commons-commons-compress-1.24.0 created (now b1ace3b031)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at b1ace3b031 Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-parquet-bundle/org.apache.commons-commons-compress-1.24.0 created (now d2cbdceac7)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-parquet-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at d2cbdceac7 Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-framework-bundle/org.apache.commons-commons-compress-1.24.0 created (now 25105c2969)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-framework-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at 25105c2969 Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-compress-bundle/nifi-compress-processors/org.apache.commons-commons-compress-1.24.0 created (now e11833926c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-compress-bundle/nifi-compress-processors/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at e11833926c Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/org.apache.commons-commons-compress-1.24.0 created (now 33cfc65f79)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at 33cfc65f79 Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-registry-bundle/org.apache.commons-commons-compress-1.24.0 created (now f8a09f4096)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-registry-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at f8a09f4096 Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-atlas-bundle/org.apache.commons-commons-compress-1.24.0 created (now a25897ab05)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-atlas-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at a25897ab05 Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-standard-bundle/org.apache.commons-commons-compress-1.24.0 created (now b0339c45fa)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-standard-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at b0339c45fa Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-avro-bundle/org.apache.commons-commons-compress-1.24.0 created (now 772f7e82f5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-avro-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at 772f7e82f5 Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/org.apache.commons-commons-compress-1.24.0 created (now 5061109ceb)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at 5061109ceb Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-hadoop-libraries-bundle/org.apache.commons-commons-compress-1.24.0 created (now 3fcecc875e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-hadoop-libraries-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at 3fcecc875e Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-iceberg-bundle/org.apache.commons-commons-compress-1.24.0 created (now 6d463d4316)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-iceberg-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at 6d463d4316 Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-mongodb-bundle/org.apache.commons-commons-compress-1.24.0 created (now cebd81f3dd)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-mongodb-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at cebd81f3dd Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-elasticsearch-bundle/org.apache.commons-commons-compress-1.24.0 created (now b8d46ff67f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-elasticsearch-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at b8d46ff67f Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/org.apache.commons-commons-compress-1.24.0 created (now bcfb99f7d6)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at bcfb99f7d6 Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/c2/c2-client-bundle/c2-client-service/org.apache.commons-commons-compress-1.24.0 created (now f147ea47ac)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/c2/c2-client-bundle/c2-client-service/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at f147ea47ac Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/org.apache.commons-commons-compress-1.24.0 created (now b44fa9f465)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at b44fa9f465 Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-hive-bundle/org.apache.commons-commons-compress-1.24.0 created (now 73708da342)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-hive-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at 73708da342 Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-cassandra-bundle/org.apache.commons-commons-compress-1.24.0 created (now a202d325ce)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-cassandra-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at a202d325ce Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-media-bundle/org.apache.commons-commons-compress-1.24.0 created (now 776bf45f43)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-media-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at 776bf45f43 Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-confluent-platform-bundle/org.apache.commons-commons-compress-1.24.0 created (now d9e091312c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-confluent-platform-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at d9e091312c Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/org.apache.commons-commons-compress-1.24.0 created (now 411ce43739)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at 411ce43739 Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-nar-bundles/nifi-ranger-bundle/org.apache.commons-commons-compress-1.24.0 created (now 8225cd6ddb)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-nar-bundles/nifi-ranger-bundle/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at 8225cd6ddb Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] branch dependabot/maven/nifi-commons/nifi-flowfile-packager/org.apache.commons-commons-compress-1.24.0 created (now 4fe2b0172f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/nifi-commons/nifi-flowfile-packager/org.apache.commons-commons-compress-1.24.0 in repository https://gitbox.apache.org/repos/asf/nifi.git at 4fe2b0172f Bump org.apache.commons:commons-compress No new revisions were added by this update.
[nifi] 02/02: NIFI-12037 Changed List.of to Collections.singletonList for Java 8
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit c04f587fb7ec52b72785d048ce87c7a280361725
Author: exceptionfactory
AuthorDate: Thu Sep 14 14:16:31 2023 -0500
NIFI-12037 Changed List.of to Collections.singletonList for Java 8
Signed-off-by: David Handermann
---
.../apache/nifi/authorization/azure/AzureGraphUserGroupProvider.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/src/main/java/org/apache/nifi/authorization/azure/AzureGraphUserGroupProvider.java
b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/src/main/java/org/apache/nifi/authorization/azure/AzureGraphUserGroupProvider.java
index 0bffadd35f..62ae451b9f 100644
---
a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/src/main/java/org/apache/nifi/authorization/azure/AzureGraphUserGroupProvider.java
+++
b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/src/main/java/org/apache/nifi/authorization/azure/AzureGraphUserGroupProvider.java
@@ -297,7 +297,7 @@ public class AzureGraphUserGroupProvider implements
UserGroupProvider {
IGroupCollectionPage filterResults;
if (prefix != null && !prefix.isEmpty()) {
// build a $filter query option and create a graph request if
prefix is given
-final List requestOptions = List.of(new
QueryOption("$filter", String.format("startswith(displayName, '%s')", prefix)));
+final List requestOptions = Collections.singletonList(new
QueryOption("$filter", String.format("startswith(displayName, '%s')", prefix)));
gRequest =
graphClient.groups().buildRequest(requestOptions).select("displayName");
} else {
// default group graph request
@@ -342,7 +342,7 @@ public class AzureGraphUserGroupProvider implements
UserGroupProvider {
private UserGroupQueryResult getUsersFrom(String groupName, int pageSize)
throws IOException, ClientException {
final Set users = new HashSet<>();
-final List requestOptions = List.of(new QueryOption("$filter",
String.format("displayName eq '%s'", groupName)));
+final List requestOptions = Collections.singletonList(new
QueryOption("$filter", String.format("displayName eq '%s'", groupName)));
final IGroupCollectionPage results =
graphClient.groups().buildRequest(requestOptions).get();
final List currentPage =
results.getCurrentPage();
[nifi] branch support/nifi-1.x updated (e5a0b58aa4 -> c04f587fb7)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git from e5a0b58aa4 NIFI-12037 Update AzureUserGroupProvider to allow configuration of the graph endpoint and API scope to support regional clouds. new 0862c105f0 NIFI-12060 This closes #7694. Removed Groovy Tests using Spock Framework new c04f587fb7 NIFI-12037 Changed List.of to Collections.singletonList for Java 8 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-commons/nifi-metrics/pom.xml | 46 - .../nifi/metrics/jvm/JmxJvmMetricsSpec.groovy | 101 -- nifi-commons/nifi-site-to-site-client/pom.xml |5 - .../nifi/remote/client/PeerSelectorTest.groovy | 1131 .../azure/AzureGraphUserGroupProvider.java |4 +- .../pom.xml|7 - .../nifi/CassandraDistributedMapCacheIT.groovy | 154 --- .../nifi-mock-record-utils/pom.xml | 36 - .../nifi-framework/nifi-framework-cluster/pom.xml | 16 - .../node/NodeClusterCoordinatorSpec.groovy | 99 -- .../http/StandardHttpResponseMapperSpec.groovy | 219 .../StatusHistoryEndpointMergerSpec.groovy | 89 -- .../manager/ConnectionEntityMergerSpec.groovy | 68 -- .../ControllerServiceEntityMergerSpec.groovy | 156 --- .../cluster/manager/LabelEntityMergerSpec.groovy | 60 -- .../manager/PermissionBasedStatusMergerSpec.groovy | 325 -- .../nifi-framework/nifi-framework-core/pom.xml | 16 - .../nifi/controller/PositionScalerSpec.groovy | 49 - .../NonLocalPartitionPartitionerSpec.groovy| 107 -- .../EncryptedFileSystemRepositoryTest.groovy | 623 --- ...cryptedSequentialAccessWriteAheadLogTest.groovy | 232 .../nifi-framework/nifi-runtime/pom.xml| 35 - .../InMemoryJanusGraphClientServiceTest.groovy | 63 -- .../nifi-persistent-provenance-repository/pom.xml |5 - .../EncryptedSchemaRecordReaderWriterTest.groovy | 232 ...ryptedWriteAheadProvenanceRepositoryTest.groovy | 267 - .../lookup/script/TestScriptedLookupService.groovy | 150 --- .../script/TestSimpleScriptedLookupService.groovy | 106 -- .../script/ExecuteScriptGroovyTest.groovy | 165 --- .../nifi/record/script/ScriptedReaderTest.groovy | 211 .../script/ScriptedRecordSetWriterTest.groovy | 127 --- .../script/ScriptedReportingTaskTest.groovy| 196 .../nifi-registry-framework/pom.xml| 16 - .../authorization/AuthorizerFactorySpec.groovy | 135 --- .../service/AuthorizationServiceSpec.groovy| 630 --- .../nifi-registry-web-api/pom.xml | 29 - nifi-registry/pom.xml | 63 -- nifi-toolkit/nifi-toolkit-admin/pom.xml| 39 - .../toolkit/admin/client/NiFiClientUtilSpec.groovy | 138 --- .../admin/configmigrator/ConfigMigratorSpec.groovy | 228 .../admin/filemanager/FileManagerToolSpec.groovy | 515 - .../admin/nodemanager/NodeManagerToolSpec.groovy | 732 - .../admin/notify/NotificationToolSpec.groovy | 266 - .../nifi/toolkit/admin/util/AdminUtilSpec.groovy | 85 -- .../conf/bootstrap-notification-services.xml | 46 - .../src/test/resources/conf/bootstrap.conf | 32 - .../src/test/resources/conf/logback.xml| 164 --- .../resources/conf/login-identity-providers.xml| 112 -- .../src/test/resources/conf/nifi.properties| 28 - .../test/resources/external/conf/bootstrap.conf| 32 - .../external/conf/login-identity-providers.xml | 112 -- .../test/resources/external/conf/nifi.properties | 28 - .../src/test/resources/filemanager/bootstrap.conf | 32 - .../src/test/resources/filemanager/myid|1 - .../resources/filemanager/nifi-test-archive.tar.gz | Bin 29306 -> 0 bytes .../resources/filemanager/nifi-test-archive.zip| Bin 32415 -> 0 bytes .../src/test/resources/filemanager/nifi.properties | 32 - .../resources/lib/nifi-framework-nar-1.2.0.nar | Bin 1385 -> 0 bytes .../test/resources/no_rules/conf/bootstrap.conf| 21 - .../no_rules/conf/login-identity-providers.xml | 112 -- .../test/resources/no_rules/conf/nifi.properties | 29 - .../src/test/resources/notify/conf/bootstrap.conf | 74 -- .../resources/notify/conf/nifi-secured.properties | 105 -- .../src/test/resources/notify/conf/nifi.properties | 202 .../resources/notify/conf_secure/bootstrap.conf| 74 -- .../resources/notify/conf_secure/nifi.properties | 105 --
[nifi] branch support/nifi-1.x updated: NIFI-12037 Update AzureUserGroupProvider to allow configuration of the graph endpoint and API scope to support regional clouds.
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new e5a0b58aa4 NIFI-12037 Update AzureUserGroupProvider to allow
configuration of the graph endpoint and API scope to support regional clouds.
e5a0b58aa4 is described below
commit e5a0b58aa42a410848a073b017bf9960ecd3ff1d
Author: Justin <22872623+ren...@users.noreply.github.com>
AuthorDate: Fri Sep 8 17:53:56 2023 -0600
NIFI-12037 Update AzureUserGroupProvider to allow configuration of the
graph endpoint and API scope to support regional clouds.
Signed-off-by: Pierre Villard
This closes #7675.
---
.../src/main/asciidoc/administration-guide.adoc| 4 +-
.../azure/AzureGraphUserGroupProvider.java | 46 +-
.../azure/ClientCredentialAuthProvider.java| 34 ++--
3 files changed, 54 insertions(+), 30 deletions(-)
diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc
b/nifi-docs/src/main/asciidoc/administration-guide.adoc
index 7e81718e57..530e36781a 100644
--- a/nifi-docs/src/main/asciidoc/administration-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc
@@ -801,7 +801,9 @@ The AzureGraphUserGroupProvider has the following
properties:
|==
| Property Name | Description
|`Refresh Delay` | Duration of delay between each user and group refresh.
Default is `5 mins`.
-|`Authority Endpoint` | The endpoint of the Azure AD login. This can be found
in the Azure portal under Azure Active Directory -> App registrations ->
[application name] -> Endpoints. For example, the global authority endpoint is
https://login.microsoftonline.com.
+|`Authority Endpoint` | The endpoint of the Azure AD login. This can be found
in the Azure portal under Azure Active Directory -> App registrations ->
[application name] -> Endpoints. For example, the global authority endpoint is
`https://login.microsoftonline.com`.
+|`Graph Endpoint` | The endpoint of the Azure Graph API, with the version
identifier attached. The base url can be found in the Azure portal under Azure
Active Directory -> App registrations -> [application name] -> Endpoints. For
example, the global graph endpoint is `https://graph.microsoft.com/v1.0`, which
is also the default setting.
+|`Graph Scope` | The url for the Graph api scope. See
https://learn.microsoft.com/en-us/azure/active-directory/develop/scopes-oidc
for an explanation of scopes. This usually only needs to be changed if you are
connecting to a different `Graph Endpoint`. The Azure global default scope is
`https://graph.microsoft.com/.default`, which is also the default setting.
|`Directory ID` | Tenant ID or Directory ID of the Azure AD tenant. This can
be found in the Azure portal under Azure Active Directory -> App registrations
-> [application name] -> Directory (tenant) ID.
|`Application ID` | Client ID or Application ID of the Azure app registration.
This can be found in the Azure portal under Azure Active Directory -> App
registrations -> [application name] -> Overview -> Application (client) ID.
|`Client Secret` | A client secret from the Azure app registration. Secrets
can be created in the Azure portal under Azure Active Directory -> App
registrations -> [application name] -> Certificates & secrets -> Client secrets
-> [+] New client secret.
diff --git
a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/src/main/java/org/apache/nifi/authorization/azure/AzureGraphUserGroupProvider.java
b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/src/main/java/org/apache/nifi/authorization/azure/AzureGraphUserGroupProvider.java
index 6a45cfe1f1..0bffadd35f 100644
---
a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/src/main/java/org/apache/nifi/authorization/azure/AzureGraphUserGroupProvider.java
+++
b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/src/main/java/org/apache/nifi/authorization/azure/AzureGraphUserGroupProvider.java
@@ -56,12 +56,13 @@ import org.apache.nifi.components.PropertyValue;
import org.apache.nifi.util.FormatUtils;
import org.apache.nifi.util.StopWatch;
import org.apache.nifi.util.StringUtils;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* The AzureGraphUserGroupProvider provides support for retrieving users and
- * groups from Azure Activy Driectory (AAD) using graph rest-api & SDK.
+ * groups from Azure Active Directory (AAD) using graph rest-api & SDK.
*/
public class AzureGraphUserGroupProvider implements UserGroupProvider {
private final static Logger logger =
[nifi] branch main updated: NIFI-12037 Update AzureUserGroupProvider to allow configuration of the graph endpoint and API scope to support regional clouds.
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 7a79e8c01f NIFI-12037 Update AzureUserGroupProvider to allow
configuration of the graph endpoint and API scope to support regional clouds.
7a79e8c01f is described below
commit 7a79e8c01fe9b725cb00d7f308a9930be2d3cb94
Author: Justin <22872623+ren...@users.noreply.github.com>
AuthorDate: Fri Sep 8 17:53:56 2023 -0600
NIFI-12037 Update AzureUserGroupProvider to allow configuration of the
graph endpoint and API scope to support regional clouds.
Signed-off-by: Pierre Villard
This closes #7675.
---
.../src/main/asciidoc/administration-guide.adoc| 4 +-
.../azure/AzureGraphUserGroupProvider.java | 46 +-
.../azure/ClientCredentialAuthProvider.java| 34 ++--
3 files changed, 54 insertions(+), 30 deletions(-)
diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc
b/nifi-docs/src/main/asciidoc/administration-guide.adoc
index b2a5c209b9..74cba4e12e 100644
--- a/nifi-docs/src/main/asciidoc/administration-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc
@@ -838,7 +838,9 @@ The AzureGraphUserGroupProvider has the following
properties:
|==
| Property Name | Description
|`Refresh Delay` | Duration of delay between each user and group refresh.
Default is `5 mins`.
-|`Authority Endpoint` | The endpoint of the Azure AD login. This can be found
in the Azure portal under Azure Active Directory -> App registrations ->
[application name] -> Endpoints. For example, the global authority endpoint is
https://login.microsoftonline.com.
+|`Authority Endpoint` | The endpoint of the Azure AD login. This can be found
in the Azure portal under Azure Active Directory -> App registrations ->
[application name] -> Endpoints. For example, the global authority endpoint is
`https://login.microsoftonline.com`.
+|`Graph Endpoint` | The endpoint of the Azure Graph API, with the version
identifier attached. The base url can be found in the Azure portal under Azure
Active Directory -> App registrations -> [application name] -> Endpoints. For
example, the global graph endpoint is `https://graph.microsoft.com/v1.0`, which
is also the default setting.
+|`Graph Scope` | The url for the Graph api scope. See
https://learn.microsoft.com/en-us/azure/active-directory/develop/scopes-oidc
for an explanation of scopes. This usually only needs to be changed if you are
connecting to a different `Graph Endpoint`. The Azure global default scope is
`https://graph.microsoft.com/.default`, which is also the default setting.
|`Directory ID` | Tenant ID or Directory ID of the Azure AD tenant. This can
be found in the Azure portal under Azure Active Directory -> App registrations
-> [application name] -> Directory (tenant) ID.
|`Application ID` | Client ID or Application ID of the Azure app registration.
This can be found in the Azure portal under Azure Active Directory -> App
registrations -> [application name] -> Overview -> Application (client) ID.
|`Client Secret` | A client secret from the Azure app registration. Secrets
can be created in the Azure portal under Azure Active Directory -> App
registrations -> [application name] -> Certificates & secrets -> Client secrets
-> [+] New client secret.
diff --git
a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/src/main/java/org/apache/nifi/authorization/azure/AzureGraphUserGroupProvider.java
b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/src/main/java/org/apache/nifi/authorization/azure/AzureGraphUserGroupProvider.java
index 6a45cfe1f1..0bffadd35f 100644
---
a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/src/main/java/org/apache/nifi/authorization/azure/AzureGraphUserGroupProvider.java
+++
b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/src/main/java/org/apache/nifi/authorization/azure/AzureGraphUserGroupProvider.java
@@ -56,12 +56,13 @@ import org.apache.nifi.components.PropertyValue;
import org.apache.nifi.util.FormatUtils;
import org.apache.nifi.util.StopWatch;
import org.apache.nifi.util.StringUtils;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* The AzureGraphUserGroupProvider provides support for retrieving users and
- * groups from Azure Activy Driectory (AAD) using graph rest-api & SDK.
+ * groups from Azure Active Directory (AAD) using graph rest-api & SDK.
*/
public class AzureGraphUserGroupProvider implements UserGroupProvider {
private final static Logger logger =
LoggerFactory.getLogger(AzureGraphUserGroupProvider.class);
@@
[nifi] branch main updated: NIFI-12023: Add FastCSV parser to CSVReader
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new a7a281c215 NIFI-12023: Add FastCSV parser to CSVReader
a7a281c215 is described below
commit a7a281c215b2ca2c172981159cb7ca9399ba6486
Author: Matt Burgess
AuthorDate: Tue Sep 12 22:04:47 2023 -0400
NIFI-12023: Add FastCSV parser to CSVReader
Signed-off-by: Pierre Villard
This closes #7685.
---
.../main/java/org/apache/nifi/csv/CSVUtils.java| 2 +
.../nifi-record-serialization-services/pom.xml | 8 +
.../apache/nifi/csv/AbstractCSVRecordReader.java | 2 +-
.../main/java/org/apache/nifi/csv/CSVReader.java | 10 +-
.../org/apache/nifi/csv/FastCSVRecordReader.java | 199
.../apache/nifi/csv/TestFastCSVRecordReader.java | 506 +
.../resources/csv/multi-bank-account_RFC4180.csv | 3 +
.../csv/multi-bank-account_escapechar_RFC4180.csv | 3 +
.../resources/csv/single-bank-account_RFC4180.csv | 2 +
9 files changed, 733 insertions(+), 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/csv/CSVUtils.java
b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/csv/CSVUtils.java
index 50efc8dc8b..cd3b16a3f1 100644
---
a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/csv/CSVUtils.java
+++
b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/csv/CSVUtils.java
@@ -151,6 +151,8 @@ public class CSVUtils {
"* Apache Commons CSV - duplicate headers will result in
column data \"shifting\" right with new fields " +
"created for \"unknown_field_index_X\" where \"X\" is the CSV
column index number\n" +
"* Jackson CSV - duplicate headers will be de-duplicated with
the field value being that of the right-most " +
+"duplicate CSV column\n" +
+"* FastCSV - duplicate headers will be de-duplicated with the
field value being that of the left-most " +
"duplicate CSV column")
.expressionLanguageSupported(ExpressionLanguageScope.NONE)
.allowableValues("true", "false")
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml
b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml
index c636c23f63..5bc6e4e968 100755
---
a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml
@@ -75,6 +75,11 @@
com.fasterxml.jackson.dataformat
jackson-dataformat-csv
+
+de.siegmar
+fastcsv
+2.2.2
+
commons-io
commons-io
@@ -183,8 +188,11 @@
src/test/resources/csv/extra-white-space.csv
src/test/resources/csv/multi-bank-account.csv
+
src/test/resources/csv/multi-bank-account_RFC4180.csv
src/test/resources/csv/single-bank-account.csv
+
src/test/resources/csv/single-bank-account_RFC4180.csv
src/test/resources/csv/multi-bank-account_escapechar.csv
+
src/test/resources/csv/multi-bank-account_escapechar_RFC4180.csv
src/test/resources/csv/multi-bank-account_spec_delimiter.csv
src/test/resources/csv/prov-events.csv
src/test/resources/grok/error-with-stack-trace.log
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/csv/AbstractCSVRecordReader.java
b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/csv/AbstractCSVRecordReader.java
index 4174e9d476..6a2651bd9e 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/csv/AbstractCSVRecordReader.java
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/csv/AbstractCSVRecordReader.java
@@ -150,7 +150,7 @@ abstract public class AbstractCSVRecordReader implements
[nifi] branch main updated: NIFI-12016: This closes #7662. Allow use of compatible NAR bundles when loading flow from cluster connection; when determining what bundles are compatible, consider not jus
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new f27ace1ccf NIFI-12016: This closes #7662. Allow use of compatible NAR
bundles when loading flow from cluster connection; when determining what
bundles are compatible, consider not just any bundle if it's the only one but
also any bundle whose version matches the framework version so that when NiFi
is upgraded, it is handled more gracefully.
f27ace1ccf is described below
commit f27ace1ccf36cb0f7a958462499c388652dde1c0
Author: Mark Payne
AuthorDate: Wed Aug 30 17:39:31 2023 -0400
NIFI-12016: This closes #7662. Allow use of compatible NAR bundles when
loading flow from cluster connection; when determining what bundles are
compatible, consider not just any bundle if it's the only one but also any
bundle whose version matches the framework version so that when NiFi is
upgraded, it is handled more gracefully.
Signed-off-by: Joseph Witt
---
.../java/org/apache/nifi/util/BundleUtils.java | 44 ++---
.../java/org/apache/nifi/util/TestBundleUtils.java | 100 +++
.../nifi/controller/StandardFlowService.java | 2 +-
.../system/clustering/FlowSynchronizationIT.java | 109 -
4 files changed, 133 insertions(+), 122 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/BundleUtils.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/BundleUtils.java
index d0c428f263..d7ad003f62 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/BundleUtils.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/BundleUtils.java
@@ -20,22 +20,40 @@ import org.apache.nifi.bundle.Bundle;
import org.apache.nifi.bundle.BundleCoordinate;
import org.apache.nifi.flow.VersionedProcessGroup;
import org.apache.nifi.nar.ExtensionManager;
+import org.apache.nifi.nar.NarClassLoadersHolder;
import org.apache.nifi.nar.PythonBundle;
import org.apache.nifi.web.api.dto.BundleDTO;
import java.util.List;
import java.util.Optional;
-import java.util.stream.Collectors;
/**
* Utility class for Bundles.
*/
public final class BundleUtils {
-private static Optional findOptionalBundleForType(final
ExtensionManager extensionManager, final String type, final BundleCoordinate
desiredCoordinate) {
+static Optional findOptionalBundleForType(final
ExtensionManager extensionManager, final String type, final Bundle
frameworkBundle) {
final List bundles = extensionManager.getBundles(type);
if (bundles.size() == 1) {
return
Optional.of(bundles.get(0).getBundleDetails().getCoordinate());
}
+
+// All NARs that are packaged with NiFi will have the same bundle
coordinate as the NiFi framework bundle.
+// During an upgrade, it's fairly common to have two versions of a
NAR: the version shipped with NiFi and another version, perhaps to maintain
+// backward compatibility to because the new version behaves some
different way and the user wants the old behavior in some instances, etc.
+// In this case, the user may have two versions. For example, version
2.2.0 and 2.4.0 while NiFi is at version 2.4.0.
+// Now, during upgrade to 2.4.1, there will no longer be a 2.4.0
available. We want to be smart enough to realize that those extension using
version
+// 2.2.0 stay there but those using 2.4.0 upgrade to 2.4.1.
+// To do this, we always first match on the exact version but this
method is called when there's no exact match. So those marked 2.2.0 won't
arrive here.
+// But for those extensions that were using 2.4.0, we want to now look
for version 2.4.1 - I.e., the one with the same version as the framework. If we
+// find that version, then we want to use it. This helps to smooth out
the upgrade process even when users have multiple versions of a given NAR.
+final String frameworkVersion =
frameworkBundle.getBundleDetails().getCoordinate().getVersion();
+for (final Bundle bundle : bundles) {
+final String componentVersion =
bundle.getBundleDetails().getCoordinate().getVersion();
+if (frameworkVersion.equals(componentVersion)) {
+return Optional.of(bundle.getBundleDetails().getCoordinate());
+}
+}
+
return Optional.empty();
}
@@ -71,7 +89,10 @@ public final class BundleUtils {
throw new IllegalStateException(String.format("%s from %s is
not known to this NiFi instance.", type, coordinate));
}
[nifi] branch support/nifi-1.x updated: NIFI-12058 Upgraded Apache Kudu from 1.16.0 to 1.17.0
This is an automated email from the ASF dual-hosted git repository.
joewitt 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 0157d72b49 NIFI-12058 Upgraded Apache Kudu from 1.16.0 to 1.17.0
0157d72b49 is described below
commit 0157d72b49ae2c530ff68e6f80b1db5257dd7c28
Author: exceptionfactory
AuthorDate: Thu Sep 14 10:53:10 2023 -0500
NIFI-12058 Upgraded Apache Kudu from 1.16.0 to 1.17.0
Signed-off-by: Joseph Witt
---
nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/pom.xml | 6 ++
nifi-nar-bundles/nifi-kudu-bundle/pom.xml | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/pom.xml
b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/pom.xml
index ac70b22ea4..3de82819a0 100644
--- a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/pom.xml
@@ -94,6 +94,12 @@
kudu-test-utils
${kudu.version}
test
+
+
+org.apache.logging.log4j
+log4j-core
+
+
org.apache.nifi
diff --git a/nifi-nar-bundles/nifi-kudu-bundle/pom.xml
b/nifi-nar-bundles/nifi-kudu-bundle/pom.xml
index 92db171940..73424bf7dc 100644
--- a/nifi-nar-bundles/nifi-kudu-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-kudu-bundle/pom.xml
@@ -27,7 +27,7 @@
None
-1.16.0
+1.17.0
[nifi] branch main updated: NIFI-12058 This closes #7693. Upgraded Apache Kudu from 1.16.0 to 1.17.0
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 292b5d18a0 NIFI-12058 This closes #7693. Upgraded Apache Kudu from
1.16.0 to 1.17.0
292b5d18a0 is described below
commit 292b5d18a0a5d8e58e6a399ae9fb5241fe493ded
Author: exceptionfactory
AuthorDate: Thu Sep 14 10:53:10 2023 -0500
NIFI-12058 This closes #7693. Upgraded Apache Kudu from 1.16.0 to 1.17.0
Signed-off-by: Joseph Witt
---
nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/pom.xml | 6 ++
nifi-nar-bundles/nifi-kudu-bundle/pom.xml | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/pom.xml
b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/pom.xml
index c6c7b1d6c4..8ea6beacee 100644
--- a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/pom.xml
@@ -94,6 +94,12 @@
kudu-test-utils
${kudu.version}
test
+
+
+org.apache.logging.log4j
+log4j-core
+
+
org.apache.nifi
diff --git a/nifi-nar-bundles/nifi-kudu-bundle/pom.xml
b/nifi-nar-bundles/nifi-kudu-bundle/pom.xml
index 152c3cbc5c..5332031f5b 100644
--- a/nifi-nar-bundles/nifi-kudu-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-kudu-bundle/pom.xml
@@ -27,7 +27,7 @@
None
-1.16.0
+1.17.0
[nifi] branch support/nifi-1.x updated: NIFI-12057 Refactored Groovy tests to Java in nifi-lookup-services
This is an automated email from the ASF dual-hosted git repository.
joewitt 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 4edf713bae NIFI-12057 Refactored Groovy tests to Java in
nifi-lookup-services
4edf713bae is described below
commit 4edf713baecfb02f4d8ada0fd075b9ca04ca559f
Author: exceptionfactory
AuthorDate: Thu Sep 14 09:06:22 2023 -0500
NIFI-12057 Refactored Groovy tests to Java in nifi-lookup-services
Signed-off-by: Joseph Witt
---
.../nifi-lookup-services/pom.xml | 28 +--
.../nifi/lookup/TestRestLookupService.groovy | 160 --
.../lookup/TestRestLookupServiceProcessor.groovy | 45
.../db/TestDatabaseRecordLookupService.groovy | 229 -
.../db/TestSimpleDatabaseLookupService.groovy | 186 -
.../nifi/lookup/rest/MockRestLookupService.groovy | 38
.../org/apache/nifi/lookup/rest/SchemaUtil.groovy | 24 ---
.../nifi/lookup/rest/handlers/BasicAuth.groovy | 55 -
.../nifi/lookup/rest/handlers/ComplexJson.groovy | 45
.../nifi/lookup/rest/handlers/NoRecord.groovy | 40
.../nifi/lookup/rest/handlers/SimpleJson.groovy| 45
.../lookup/rest/handlers/SimpleJsonArray.groovy| 42
.../nifi/lookup/rest/handlers/VerbTest.groovy | 70 ---
.../apache/nifi/lookup/TestRestLookupService.java | 190 +
.../lookup/db/TestDatabaseRecordLookupService.java | 161 +++
.../lookup/db/TestSimpleDatabaseLookupService.java | 146 +
.../src/test/resources/complex.avsc| 36
.../src/test/resources/simple.avsc | 14 --
18 files changed, 501 insertions(+), 1053 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
index bfcdfb3d25..9360b3e487 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
@@ -127,6 +127,10 @@
2.7
compile
+
+com.squareup.okhttp3
+mockwebserver
+
org.apache.nifi
nifi-mock
@@ -154,28 +158,6 @@
nifi-schema-registry-service-api
test
-
-javax.servlet
-javax.servlet-api
-test
-
-
-org.eclipse.jetty
-jetty-servlet
-test
-
-
-org.apache.derby
-derby
-10.14.2.0
-test
-
-
-org.codehaus.groovy
-groovy-json
-${nifi.groovy.version}
-test
-
@@ -184,8 +166,6 @@
apache-rat-plugin
- src/test/resources/complex.avsc
- src/test/resources/simple.avsc
src/test/resources/test.csv
src/test/resources/test_sep_escape_comment.csv
src/test/resources/test_Windows-31J.csv
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/groovy/org/apache/nifi/lookup/TestRestLookupService.groovy
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/groovy/org/apache/nifi/lookup/TestRestLookupService.groovy
deleted file mode 100644
index 2184f3d72f..00
---
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/groovy/org/apache/nifi/lookup/TestRestLookupService.groovy
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.nifi.lookup
-
-import okhttp3.MediaType
-import okhttp3.Protocol
[nifi] branch main updated: NIFI-12057 Refactored Groovy tests to Java in nifi-lookup-services
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 591c323f0a NIFI-12057 Refactored Groovy tests to Java in
nifi-lookup-services
591c323f0a is described below
commit 591c323f0a64c430fa0d76325cfbe6a3b9a62e07
Author: exceptionfactory
AuthorDate: Thu Sep 14 09:06:22 2023 -0500
NIFI-12057 Refactored Groovy tests to Java in nifi-lookup-services
Signed-off-by: Joseph Witt
---
.../nifi-lookup-services/pom.xml | 34 +--
.../nifi/lookup/TestRestLookupService.groovy | 160 --
.../lookup/TestRestLookupServiceProcessor.groovy | 45
.../db/TestDatabaseRecordLookupService.groovy | 229 -
.../db/TestSimpleDatabaseLookupService.groovy | 186 -
.../nifi/lookup/rest/MockRestLookupService.groovy | 38
.../org/apache/nifi/lookup/rest/SchemaUtil.groovy | 24 ---
.../nifi/lookup/rest/handlers/BasicAuth.groovy | 55 -
.../nifi/lookup/rest/handlers/ComplexJson.groovy | 45
.../nifi/lookup/rest/handlers/NoRecord.groovy | 40
.../nifi/lookup/rest/handlers/SimpleJson.groovy| 45
.../lookup/rest/handlers/SimpleJsonArray.groovy| 42
.../nifi/lookup/rest/handlers/VerbTest.groovy | 70 ---
.../apache/nifi/lookup/TestRestLookupService.java | 190 +
.../lookup/db/TestDatabaseRecordLookupService.java | 161 +++
.../lookup/db/TestSimpleDatabaseLookupService.java | 146 +
.../src/test/resources/complex.avsc| 36
.../src/test/resources/simple.avsc | 14 --
18 files changed, 501 insertions(+), 1059 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
index af9c124788..81cd910588 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
@@ -127,6 +127,10 @@
2.7
compile
+
+com.squareup.okhttp3
+mockwebserver
+
org.apache.nifi
nifi-mock
@@ -154,34 +158,6 @@
nifi-schema-registry-service-api
test
-
-javax.servlet
-javax.servlet-api
-test
-
-
-org.eclipse.jetty
-jetty-servlet
-test
-
-
-org.apache.derby
-derby
-${derby.version}
-test
-
-
-org.apache.derby
-derbytools
-${derby.version}
-test
-
-
-org.codehaus.groovy
-groovy-json
-${nifi.groovy.version}
-test
-
@@ -190,8 +166,6 @@
apache-rat-plugin
- src/test/resources/complex.avsc
- src/test/resources/simple.avsc
src/test/resources/test.csv
src/test/resources/test_sep_escape_comment.csv
src/test/resources/test_Windows-31J.csv
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/groovy/org/apache/nifi/lookup/TestRestLookupService.groovy
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/groovy/org/apache/nifi/lookup/TestRestLookupService.groovy
deleted file mode 100644
index 2184f3d72f..00
---
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/groovy/org/apache/nifi/lookup/TestRestLookupService.groovy
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under
[nifi] branch support/nifi-1.x updated: NIFI-12054: PutIceberg should produce a provenance send event
This is an automated email from the ASF dual-hosted git repository.
turcsanyi 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 9b15bbf6b9 NIFI-12054: PutIceberg should produce a provenance send
event
9b15bbf6b9 is described below
commit 9b15bbf6b9005f9a3e1aece0932cdf6e517086e5
Author: Mark Bathori
AuthorDate: Thu Sep 14 14:01:36 2023 +0200
NIFI-12054: PutIceberg should produce a provenance send event
This closes #7690.
Signed-off-by: Peter Turcsanyi
---
.../org/apache/nifi/processors/iceberg/PutIceberg.java | 3 +++
.../iceberg/TestPutIcebergWithHiveCatalog.java | 16
2 files changed, 19 insertions(+)
diff --git
a/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/main/java/org/apache/nifi/processors/iceberg/PutIceberg.java
b/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/main/java/org/apache/nifi/processors/iceberg/PutIceberg.java
index 360ea17f1b..02bd0b074f 100644
---
a/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/main/java/org/apache/nifi/processors/iceberg/PutIceberg.java
+++
b/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/main/java/org/apache/nifi/processors/iceberg/PutIceberg.java
@@ -234,6 +234,7 @@ public class PutIceberg extends AbstractIcebergProcessor {
@Override
public void doOnTrigger(ProcessContext context, ProcessSession session,
FlowFile flowFile) throws ProcessException {
+final long startNanos = System.nanoTime();
final RecordReaderFactory readerFactory =
context.getProperty(RECORD_READER).asControllerService(RecordReaderFactory.class);
final String fileFormat = context.getProperty(FILE_FORMAT).getValue();
final String maximumFileSize =
context.getProperty(MAXIMUM_FILE_SIZE).evaluateAttributeExpressions(flowFile).getValue();
@@ -281,6 +282,8 @@ public class PutIceberg extends AbstractIcebergProcessor {
}
flowFile = session.putAttribute(flowFile, ICEBERG_RECORD_COUNT,
String.valueOf(recordCount));
+final long transferMillis =
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNanos);
+session.getProvenanceReporter().send(flowFile, table.location(),
transferMillis);
session.transfer(flowFile, REL_SUCCESS);
}
diff --git
a/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/test/java/org/apache/nifi/processors/iceberg/TestPutIcebergWithHiveCatalog.java
b/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/test/java/org/apache/nifi/processors/iceberg/TestPutIcebergWithHiveCatalog.java
index c672d90e8b..bc159ef470 100644
---
a/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/test/java/org/apache/nifi/processors/iceberg/TestPutIcebergWithHiveCatalog.java
+++
b/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/test/java/org/apache/nifi/processors/iceberg/TestPutIcebergWithHiveCatalog.java
@@ -32,6 +32,8 @@ import org.apache.nifi.hive.metastore.ThriftMetastore;
import org.apache.nifi.processors.iceberg.catalog.IcebergCatalogFactory;
import org.apache.nifi.processors.iceberg.catalog.TestHiveCatalogService;
import org.apache.nifi.processors.iceberg.util.IcebergTestUtils;
+import org.apache.nifi.provenance.ProvenanceEventRecord;
+import org.apache.nifi.provenance.ProvenanceEventType;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.serialization.record.MockRecordParser;
import org.apache.nifi.serialization.record.RecordField;
@@ -60,6 +62,8 @@ import static
org.apache.nifi.processors.iceberg.PutIceberg.ICEBERG_RECORD_COUNT
import static
org.apache.nifi.processors.iceberg.util.IcebergTestUtils.validateData;
import static
org.apache.nifi.processors.iceberg.util.IcebergTestUtils.validateNumberOfDataFiles;
import static
org.apache.nifi.processors.iceberg.util.IcebergTestUtils.validatePartitionFolders;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.condition.OS.WINDOWS;
@DisabledOnOs(WINDOWS)
@@ -174,6 +178,7 @@ public class TestPutIcebergWithHiveCatalog {
validateNumberOfDataFiles(tableLocation, 3);
validatePartitionFolders(tableLocation, Arrays.asList(
"department_bucket=0", "department_bucket=1",
"department_bucket=2"));
+assertProvenanceEvents();
}
@ParameterizedTest
@@ -211,6 +216,7 @@ public class TestPutIcebergWithHiveCatalog {
validateNumberOfDataFiles(tableLocation, 3);
validatePartitionFolders(tableLocation, Arrays.asList(
"department=Finance", "department=Marketing",
"department=Sales"));
+assertProvenanceEvents();
}
@ParameterizedTest
@@ -253,6 +259,7 @@ public class
[nifi] branch main updated: NIFI-12054: PutIceberg should produce a provenance send event
This is an automated email from the ASF dual-hosted git repository.
turcsanyi 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 ea4c2055d6 NIFI-12054: PutIceberg should produce a provenance send
event
ea4c2055d6 is described below
commit ea4c2055d6d884a13e23304fff2f72309587e785
Author: Mark Bathori
AuthorDate: Thu Sep 14 14:01:36 2023 +0200
NIFI-12054: PutIceberg should produce a provenance send event
This closes #7690.
Signed-off-by: Peter Turcsanyi
---
.../org/apache/nifi/processors/iceberg/PutIceberg.java | 3 +++
.../iceberg/TestPutIcebergWithHiveCatalog.java | 16
2 files changed, 19 insertions(+)
diff --git
a/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/main/java/org/apache/nifi/processors/iceberg/PutIceberg.java
b/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/main/java/org/apache/nifi/processors/iceberg/PutIceberg.java
index 360ea17f1b..02bd0b074f 100644
---
a/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/main/java/org/apache/nifi/processors/iceberg/PutIceberg.java
+++
b/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/main/java/org/apache/nifi/processors/iceberg/PutIceberg.java
@@ -234,6 +234,7 @@ public class PutIceberg extends AbstractIcebergProcessor {
@Override
public void doOnTrigger(ProcessContext context, ProcessSession session,
FlowFile flowFile) throws ProcessException {
+final long startNanos = System.nanoTime();
final RecordReaderFactory readerFactory =
context.getProperty(RECORD_READER).asControllerService(RecordReaderFactory.class);
final String fileFormat = context.getProperty(FILE_FORMAT).getValue();
final String maximumFileSize =
context.getProperty(MAXIMUM_FILE_SIZE).evaluateAttributeExpressions(flowFile).getValue();
@@ -281,6 +282,8 @@ public class PutIceberg extends AbstractIcebergProcessor {
}
flowFile = session.putAttribute(flowFile, ICEBERG_RECORD_COUNT,
String.valueOf(recordCount));
+final long transferMillis =
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNanos);
+session.getProvenanceReporter().send(flowFile, table.location(),
transferMillis);
session.transfer(flowFile, REL_SUCCESS);
}
diff --git
a/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/test/java/org/apache/nifi/processors/iceberg/TestPutIcebergWithHiveCatalog.java
b/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/test/java/org/apache/nifi/processors/iceberg/TestPutIcebergWithHiveCatalog.java
index c672d90e8b..bc159ef470 100644
---
a/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/test/java/org/apache/nifi/processors/iceberg/TestPutIcebergWithHiveCatalog.java
+++
b/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/test/java/org/apache/nifi/processors/iceberg/TestPutIcebergWithHiveCatalog.java
@@ -32,6 +32,8 @@ import org.apache.nifi.hive.metastore.ThriftMetastore;
import org.apache.nifi.processors.iceberg.catalog.IcebergCatalogFactory;
import org.apache.nifi.processors.iceberg.catalog.TestHiveCatalogService;
import org.apache.nifi.processors.iceberg.util.IcebergTestUtils;
+import org.apache.nifi.provenance.ProvenanceEventRecord;
+import org.apache.nifi.provenance.ProvenanceEventType;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.serialization.record.MockRecordParser;
import org.apache.nifi.serialization.record.RecordField;
@@ -60,6 +62,8 @@ import static
org.apache.nifi.processors.iceberg.PutIceberg.ICEBERG_RECORD_COUNT
import static
org.apache.nifi.processors.iceberg.util.IcebergTestUtils.validateData;
import static
org.apache.nifi.processors.iceberg.util.IcebergTestUtils.validateNumberOfDataFiles;
import static
org.apache.nifi.processors.iceberg.util.IcebergTestUtils.validatePartitionFolders;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.condition.OS.WINDOWS;
@DisabledOnOs(WINDOWS)
@@ -174,6 +178,7 @@ public class TestPutIcebergWithHiveCatalog {
validateNumberOfDataFiles(tableLocation, 3);
validatePartitionFolders(tableLocation, Arrays.asList(
"department_bucket=0", "department_bucket=1",
"department_bucket=2"));
+assertProvenanceEvents();
}
@ParameterizedTest
@@ -211,6 +216,7 @@ public class TestPutIcebergWithHiveCatalog {
validateNumberOfDataFiles(tableLocation, 3);
validatePartitionFolders(tableLocation, Arrays.asList(
"department=Finance", "department=Marketing",
"department=Sales"));
+assertProvenanceEvents();
}
@ParameterizedTest
@@ -253,6 +259,7 @@ public class TestPutIcebergWithHiveCatalog {
[nifi] branch main updated: NIFI-12050 Upgraded Mockito from 4.11.0 to 5.5.0
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 4d4c97d091 NIFI-12050 Upgraded Mockito from 4.11.0 to 5.5.0
4d4c97d091 is described below
commit 4d4c97d091debf5e9d09cf3842bf9c2e5c033fa5
Author: Joseph Witt
AuthorDate: Wed Sep 13 12:52:15 2023 -0700
NIFI-12050 Upgraded Mockito from 4.11.0 to 5.5.0
This closes #7689
Signed-off-by: David Handermann
---
nifi-commons/nifi-deprecation-log/pom.xml | 6
.../log/StandardDeprecationLoggerTest.java | 4 +--
.../nifi-property-protection-azure/pom.xml | 6
.../ssl/StandardSslContextBuilderTest.java | 16 +--
.../TestAbstractPolicyBasedAuthorizer.java | 24
.../nifi-azure-processors/pom.xml | 6
.../nifi-enrich-processors/pom.xml | 6
...StandardVersionedComponentSynchronizerTest.java | 3 +-
.../nifi/web/api/TestDataTransferResource.java | 2 +-
.../processors/gcp/storage/FetchGCSObjectTest.java | 31 ++--
.../processors/gcp/storage/PutGCSObjectTest.java | 33 +-
.../nifi-standard-processors/pom.xml | 6
.../nifi-windows-event-log-processors/pom.xml | 6
.../TlsCertificateSigningRequestPerformerTest.java | 11 +---
pom.xml| 2 +-
15 files changed, 66 insertions(+), 96 deletions(-)
diff --git a/nifi-commons/nifi-deprecation-log/pom.xml
b/nifi-commons/nifi-deprecation-log/pom.xml
index ff2a601dcc..291bd9110b 100644
--- a/nifi-commons/nifi-deprecation-log/pom.xml
+++ b/nifi-commons/nifi-deprecation-log/pom.xml
@@ -27,11 +27,5 @@
org.slf4j
slf4j-api
-
-org.mockito
-mockito-inline
-${mockito.version}
-test
-
diff --git
a/nifi-commons/nifi-deprecation-log/src/test/java/org/apache/nifi/deprecation/log/StandardDeprecationLoggerTest.java
b/nifi-commons/nifi-deprecation-log/src/test/java/org/apache/nifi/deprecation/log/StandardDeprecationLoggerTest.java
index 827cd3aca0..d6236f4cd3 100644
---
a/nifi-commons/nifi-deprecation-log/src/test/java/org/apache/nifi/deprecation/log/StandardDeprecationLoggerTest.java
+++
b/nifi-commons/nifi-deprecation-log/src/test/java/org/apache/nifi/deprecation/log/StandardDeprecationLoggerTest.java
@@ -54,7 +54,7 @@ class StandardDeprecationLoggerTest {
deprecationLogger.warn(MESSAGE);
-verify(logger).warn(eq(MESSAGE), ArgumentMatchers.any());
+verify(logger).warn(eq(MESSAGE),
ArgumentMatchers.any(Object[].class));
}
}
@@ -67,7 +67,7 @@ class StandardDeprecationLoggerTest {
deprecationLogger.warn(MESSAGE_PLACEHOLDER, PLACEHOLDER);
-verify(logger).warn(eq(MESSAGE_PLACEHOLDER),
ArgumentMatchers.any());
+verify(logger).warn(eq(MESSAGE_PLACEHOLDER),
ArgumentMatchers.any(Object[].class));
}
}
}
diff --git a/nifi-commons/nifi-property-protection-azure/pom.xml
b/nifi-commons/nifi-property-protection-azure/pom.xml
index 83c4d0473d..341f85b89f 100644
--- a/nifi-commons/nifi-property-protection-azure/pom.xml
+++ b/nifi-commons/nifi-property-protection-azure/pom.xml
@@ -91,11 +91,5 @@
com.azure
azure-core-http-okhttp
-
-org.mockito
-mockito-inline
-${mockito.version}
-test
-
diff --git
a/nifi-commons/nifi-security-ssl/src/test/java/org/apache/nifi/security/ssl/StandardSslContextBuilderTest.java
b/nifi-commons/nifi-security-ssl/src/test/java/org/apache/nifi/security/ssl/StandardSslContextBuilderTest.java
index ea00afcb84..4149ab8702 100644
---
a/nifi-commons/nifi-security-ssl/src/test/java/org/apache/nifi/security/ssl/StandardSslContextBuilderTest.java
+++
b/nifi-commons/nifi-security-ssl/src/test/java/org/apache/nifi/security/ssl/StandardSslContextBuilderTest.java
@@ -22,10 +22,11 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import javax.net.ssl.SSLContext;
-
+import java.util.Enumeration;
import java.security.KeyStore;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
class StandardSslContextBuilderTest {
@@ -67,7 +68,18 @@ class StandardSslContextBuilderTest {
}
@Test
-void testBuildTrustStore() {
+void testBuildTrustStore() throws Exception {
+when(trustStore.aliases()).thenReturn(new Enumeration() {
+@Override
+public boolean hasMoreElements() {
+return false;
+}
+
+@Override
+public String nextElement() {
+
[nifi] branch main updated: NIFI-12047 Added HTTP/2 to Default Application Protocols
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 6841aa6e99 NIFI-12047 Added HTTP/2 to Default Application Protocols
6841aa6e99 is described below
commit 6841aa6e99ab794a61164712e0936914b4e96f79
Author: exceptionfactory
AuthorDate: Mon Sep 11 16:57:13 2023 -0500
NIFI-12047 Added HTTP/2 to Default Application Protocols
- Changed default value of nifi.web.https.application.protocols to include
both h2 and http/1.1
- Changed default value of nifi.registry.web.https.application.protocols to
include both h2 and http/1.1
- Updated HostHeaderHandler logging
Signed-off-by: Pierre Villard
This closes #7684.
---
.../java/org/apache/nifi/util/NiFiProperties.java | 4 +-
.../nifi-framework/nifi-resources/pom.xml | 2 +-
.../apache/nifi/web/server/HostHeaderHandler.java | 81 ++
.../connector/FrameworkServerConnectorFactory.java | 4 ++
.../nifi/web/server/HostHeaderHandlerTest.java | 22 --
.../FrameworkServerConnectorFactoryTest.java | 5 +-
nifi-registry/nifi-registry-assembly/pom.xml | 2 +-
.../properties/NiFiRegistryProperties.java | 4 +-
8 files changed, 32 insertions(+), 92 deletions(-)
diff --git
a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
index 92cfde96d1..9c4763b0b6 100644
---
a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
+++
b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
@@ -350,7 +350,7 @@ public class NiFiProperties extends ApplicationProperties {
public static final String DEFAULT_AUTHORIZER_CONFIGURATION_FILE =
"conf/authorizers.xml";
public static final String
DEFAULT_LOGIN_IDENTITY_PROVIDER_CONFIGURATION_FILE =
"conf/login-identity-providers.xml";
public static final Integer DEFAULT_REMOTE_INPUT_PORT = null;
-private static final String DEFAULT_WEB_HTTPS_APPLICATION_PROTOCOLS =
"http/1.1";
+private static final String DEFAULT_WEB_HTTPS_APPLICATION_PROTOCOLS = "h2
http/1.1";
public static final int DEFAULT_WEB_THREADS = 200;
public static final String DEFAULT_WEB_MAX_HEADER_SIZE = "16 KB";
public static final String DEFAULT_WEB_WORKING_DIR = "./work/jetty";
@@ -725,7 +725,7 @@ public class NiFiProperties extends ApplicationProperties {
}
/**
- * Get Web HTTPS Application Protocols defaults to HTTP/1.1
+ * Get Web HTTPS Application Protocols defaults to HTTP/2 and HTTP/1.1
*
* @return Set of configured HTTPS Application Protocols
*/
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
index 723f2eee4a..5c430f5aef 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
@@ -127,7 +127,7 @@
127.0.0.1
8443
-
http/1.1
+h2
http/1.1
./work/jetty
200
16 KB
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java
index 5cc917ff52..62348bb53b 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java
@@ -47,52 +47,13 @@ public class HostHeaderHandler extends ScopedHandler {
private final int serverPort;
private final List validHosts;
-/**
- * Instantiates a handler with a given server name and port 0.
- *
- * @param serverName the {@code serverName} to set on the request (the
{@code serverPort} will not be set)
- * @deprecated Use {@link #HostHeaderHandler(NiFiProperties)} which
accepts a {@link NiFiProperties} object to allow for custom network interface
binding.
- */
-public HostHeaderHandler(String serverName) {
-this(serverName, 0);
-}
-
-/**
- * Instantiates a handler with a given server name and port.
- *
- * @param serverName the {@code serverName} to set on the request
- * @param serverPort the {@code serverPort} to set on the request
- * @deprecated Use {@link #HostHeaderHandler(NiFiProperties)} which
accepts a {@link NiFiProperties} object to allow for custom
