From 1b4fe15e98d0e1a57ee7ab0337f326eb61440891 Mon Sep 17 00:00:00 2001 From: Pierre Villard Date: Wed, 25 Feb 2026 11:58:02 +0100 Subject: [PATCH 1/2] NIFI-15651 - Bump NiFi NAR Plugin to 2.3.0, Protobuf to 4.34.0, Lucene to 10.4.0, and others - Protobuf from 4.33.5 to 4.34.0 - https://github.com/protocolbuffers/protobuf/releases/tag/v34.0 - MySQL Binlog Connector from 0.40.4 to 0.40.5 - https://github.com/debezium/mysql-binlog-connector-java - Elasticsearch from 9.3.0 to 9.3.1 - https://github.com/elastic/elasticsearch-java/releases/tag/v9.3.1 - Google Drive Services API from v3-rev20251210-2.0.0 to v3-rev20260220-2.0.0 - https://github.com/googleapis/google-api-java-client-services/blob/main/clients/google-api-services-drive/v3/2.0.0/README.md - Hadoop from 3.4.2 to 3.4.3 - https://github.com/apache/hadoop/releases/tag/rel%2Frelease-3.4.3 - Jetbrains Annotations from 26.0.2-1 to 26.1.0 - https://github.com/JetBrains/java-annotations/releases/tag/26.1.0 - Apache Lucene from 10.3.2 to 10.4.0 - https://github.com/apache/lucene/releases/tag/releases%2Flucene%2F10.4.0 - QuestDB from 9.3.2 to 9.3.3 - https://github.com/questdb/questdb/releases/tag/9.3.3 - Apache NiFi NAR Maven Plugin from 2.2.0 to 2.3.0 - https://github.com/apache/nifi-maven/releases/tag/rel%2Fnifi-nar-maven-plugin-2.3.0 - AWS SDK BOM from 2.41.34 to 2.42.3 - https://github.com/aws/aws-sdk-java-v2/blob/master/CHANGELOG.md - SnakeYAML from 2.5 to 2.6 - https://bitbucket.org/snakeyaml/snakeyaml/wiki/Changes Signed-off-by: Pierre Villard --- nifi-code-coverage/pom.xml | 2 +- nifi-commons/nifi-calcite-utils/pom.xml | 2 +- nifi-extension-bundles/nifi-aws-bundle/pom.xml | 2 +- .../nifi-cdc-mysql-processors/pom.xml | 2 +- nifi-extension-bundles/nifi-elasticsearch-bundle/pom.xml | 2 +- .../nifi-gcp-bundle/nifi-gcp-processors/pom.xml | 2 +- .../nifi-iceberg-parquet-writer/pom.xml | 2 +- nifi-extension-bundles/nifi-opentelemetry-bundle/pom.xml | 2 +- .../nifi-protobuf-bundle/nifi-protobuf-services/pom.xml | 2 +- nifi-extension-bundles/nifi-snowflake-bundle/pom.xml | 2 +- .../nifi-standard-shared-bom/pom.xml | 2 +- .../nifi-provenance-repository-bundle/pom.xml | 2 +- .../nifi-questdb-bundle/nifi-questdb/pom.xml | 2 +- pom.xml | 8 ++++---- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/nifi-code-coverage/pom.xml b/nifi-code-coverage/pom.xml index 15682b3cae4b..1f451e491b0c 100644 --- a/nifi-code-coverage/pom.xml +++ b/nifi-code-coverage/pom.xml @@ -122,7 +122,7 @@ com.google.protobuf protobuf-java - 4.33.5 + 4.34.0 diff --git a/nifi-commons/nifi-calcite-utils/pom.xml b/nifi-commons/nifi-calcite-utils/pom.xml index b9a281df6bbd..c16c3fc4ae13 100644 --- a/nifi-commons/nifi-calcite-utils/pom.xml +++ b/nifi-commons/nifi-calcite-utils/pom.xml @@ -69,7 +69,7 @@ com.google.protobuf protobuf-java - 4.33.5 + 4.34.0 diff --git a/nifi-extension-bundles/nifi-aws-bundle/pom.xml b/nifi-extension-bundles/nifi-aws-bundle/pom.xml index 9fc78809b3e0..020c1cbd17c6 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/pom.xml +++ b/nifi-extension-bundles/nifi-aws-bundle/pom.xml @@ -28,7 +28,7 @@ 33.5.0-jre - 4.33.5 + 4.34.0 diff --git a/nifi-extension-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml b/nifi-extension-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml index b29808b86051..45a8375491eb 100644 --- a/nifi-extension-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml +++ b/nifi-extension-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml @@ -36,7 +36,7 @@ language governing permissions and limitations under the License. --> io.debezium mysql-binlog-connector-java - 0.40.4 + 0.40.5 org.apache.commons diff --git a/nifi-extension-bundles/nifi-elasticsearch-bundle/pom.xml b/nifi-extension-bundles/nifi-elasticsearch-bundle/pom.xml index b5efa8c8ad75..d85860d10c85 100644 --- a/nifi-extension-bundles/nifi-elasticsearch-bundle/pom.xml +++ b/nifi-extension-bundles/nifi-elasticsearch-bundle/pom.xml @@ -33,7 +33,7 @@ language governing permissions and limitations under the License. --> - 9.3.0 + 9.3.1 diff --git a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml index f31aeec0eb47..70e0367955c3 100644 --- a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml +++ b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml @@ -132,7 +132,7 @@ com.google.apis google-api-services-drive - v3-rev20251210-2.0.0 + v3-rev20260220-2.0.0 com.tdunning diff --git a/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-parquet-writer/pom.xml b/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-parquet-writer/pom.xml index 9910a84a3bee..813ddb158555 100644 --- a/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-parquet-writer/pom.xml +++ b/nifi-extension-bundles/nifi-iceberg-bundle/nifi-iceberg-parquet-writer/pom.xml @@ -66,7 +66,7 @@ org.apache.hadoop hadoop-common - 3.4.2 + ${hadoop.version} * diff --git a/nifi-extension-bundles/nifi-opentelemetry-bundle/pom.xml b/nifi-extension-bundles/nifi-opentelemetry-bundle/pom.xml index f2c01e14665f..73fc4233cd37 100644 --- a/nifi-extension-bundles/nifi-opentelemetry-bundle/pom.xml +++ b/nifi-extension-bundles/nifi-opentelemetry-bundle/pom.xml @@ -32,7 +32,7 @@ com.google.protobuf protobuf-bom - 4.33.5 + 4.34.0 pom import diff --git a/nifi-extension-bundles/nifi-protobuf-bundle/nifi-protobuf-services/pom.xml b/nifi-extension-bundles/nifi-protobuf-bundle/nifi-protobuf-services/pom.xml index 5f3d185355ef..764b6dd55d8d 100644 --- a/nifi-extension-bundles/nifi-protobuf-bundle/nifi-protobuf-services/pom.xml +++ b/nifi-extension-bundles/nifi-protobuf-bundle/nifi-protobuf-services/pom.xml @@ -26,7 +26,7 @@ nifi-protobuf-services - 4.33.5 + 4.34.0 5.5.0 diff --git a/nifi-extension-bundles/nifi-snowflake-bundle/pom.xml b/nifi-extension-bundles/nifi-snowflake-bundle/pom.xml index f4fb0c43c09a..f6ca7e2c0731 100644 --- a/nifi-extension-bundles/nifi-snowflake-bundle/pom.xml +++ b/nifi-extension-bundles/nifi-snowflake-bundle/pom.xml @@ -23,7 +23,7 @@ 1.17.0 33.5.0-jre - 4.33.5 + 4.34.0 1.79.0 4.4.2-unshaded diff --git a/nifi-extension-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml b/nifi-extension-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml index 44cd1d0e9c84..570cb703dcdf 100644 --- a/nifi-extension-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml +++ b/nifi-extension-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml @@ -171,7 +171,7 @@ org.jetbrains annotations - 26.0.2-1 + 26.1.0 provided diff --git a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/pom.xml b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/pom.xml index e37bc6249c59..50f0d7c92a1d 100644 --- a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/pom.xml +++ b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/pom.xml @@ -27,7 +27,7 @@ nifi-provenance-repository-nar - 10.3.2 + 10.4.0 diff --git a/nifi-framework-bundle/nifi-framework-extensions/nifi-questdb-bundle/nifi-questdb/pom.xml b/nifi-framework-bundle/nifi-framework-extensions/nifi-questdb-bundle/nifi-questdb/pom.xml index cdabef3abddf..e4a188c8e0e6 100644 --- a/nifi-framework-bundle/nifi-framework-extensions/nifi-questdb-bundle/nifi-questdb/pom.xml +++ b/nifi-framework-bundle/nifi-framework-extensions/nifi-questdb-bundle/nifi-questdb/pom.xml @@ -35,7 +35,7 @@ org.questdb questdb - 9.3.2 + 9.3.3 org.springframework diff --git a/pom.xml b/pom.xml index 7e74be87520b..6a215410edc3 100644 --- a/pom.xml +++ b/pom.xml @@ -117,10 +117,10 @@ 2.6.0 - 2.2.0 + 2.3.0 - 2.41.34 + 2.42.3 4.0.1 1.3.4 @@ -137,7 +137,7 @@ 1.15.0 - 3.4.2 + 3.4.3 1.4.1 @@ -155,7 +155,7 @@ 2.21 2.21.1 2.6.0 - 2.5 + 2.6 1.9.25.1 From c9721318121f3c5c0ba31dc634fc46258e972628 Mon Sep 17 00:00:00 2001 From: Pierre Villard Date: Fri, 27 Feb 2026 17:49:34 +0100 Subject: [PATCH 2/2] review --- .../java/org/apache/nifi/provenance/lucene/LuceneUtil.java | 4 ++-- .../apache/nifi/provenance/lucene/TestSimpleIndexManager.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/LuceneUtil.java b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/LuceneUtil.java index e584114786ad..0936afbb286c 100644 --- a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/LuceneUtil.java +++ b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/LuceneUtil.java @@ -90,7 +90,7 @@ public static List getProvenanceLogFiles(final String baseName, final Coll public static org.apache.lucene.search.Query convertQuery(final org.apache.nifi.provenance.search.Query query) { if (query.getStartDate() == null && query.getEndDate() == null && query.getSearchTerms().isEmpty()) { - return new MatchAllDocsQuery(); + return MatchAllDocsQuery.INSTANCE; } final BooleanQuery.Builder queryBuilder = new BooleanQuery.Builder(); @@ -134,7 +134,7 @@ public static org.apache.lucene.search.Query convertQuery(final org.apache.nifi. } if (!occurMust) { - queryBuilder.add(new MatchAllDocsQuery(), Occur.SHOULD); + queryBuilder.add(MatchAllDocsQuery.INSTANCE, Occur.SHOULD); } return queryBuilder.build(); diff --git a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/lucene/TestSimpleIndexManager.java b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/lucene/TestSimpleIndexManager.java index 61dab7721951..3418d83219af 100644 --- a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/lucene/TestSimpleIndexManager.java +++ b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/lucene/TestSimpleIndexManager.java @@ -95,7 +95,7 @@ public void testMultipleWritersSimultaneouslySameIndex() throws IOException { mgr.returnIndexWriter(writer1); final EventIndexSearcher searcher = mgr.borrowIndexSearcher(dir); - final TopDocs topDocs = searcher.getIndexSearcher().search(new MatchAllDocsQuery(), 2); + final TopDocs topDocs = searcher.getIndexSearcher().search(MatchAllDocsQuery.INSTANCE, 2); assertEquals(2, topDocs.totalHits.value()); mgr.returnIndexSearcher(searcher); } finally {