From 6fcd33e135db54d44d4b800c28d6870e7bb6d803 Mon Sep 17 00:00:00 2001
From: Pierre Villard <pierre.villard.fr@gmail.com>
Date: Sun, 31 May 2026 17:26:10 -0700
Subject: [PATCH] NIFI-15986 - Bump Apache Calcite to 1.42.0, Apache ActiveMQ
 to 6.2.6, Jackson to 2.21.4, and others

- Apache Calcite from 1.41.0 to 1.42.0 - https://calcite.apache.org/docs/history.html#v1-42-0
- RabbitMQ fron 5.30.0 to 5.31.0 - https://github.com/rabbitmq/rabbitmq-java-client/releases/tag/v5.31.0
- Elasticsearch from 9.4.1 to 9.4.2 - https://github.com/elastic/elasticsearch-java/releases/tag/v9.4.2
- Apache ActiveMQ from 6.2.5 to 6.2.6 - https://github.com/apache/activemq/releases/tag/activemq-6.2.6
- Jedis from 7.5.0 to 7.5.2 - https://github.com/redis/jedis/releases/tag/v7.5.2
- XMLUnit from 2.11.0 to 2.12.0 - https://github.com/xmlunit/xmlunit/releases/tag/v2.12.0
- FlywayDB from 12.6.2 to 12.7.0 - https://github.com/flyway/flyway/releases/tag/flyway-12.7.0
- JLine from 4.1.2 to 4.1.3 - https://github.com/jline/jline3/releases/tag/4.1.3
- AWS SDK BOM from 2.44.14 to 2.45.1 - https://github.com/aws/aws-sdk-java-v2/blob/master/CHANGELOG.md
- Jackson Annotations from 2.21 to 2.22 - https://github.com/FasterXML/jackson-annotations/releases/tag/jackson-annotations-2.22
- Jackson 3.x from 3.1.3 to 3.1.4 - https://github.com/FasterXML/jackson/wiki/Jackson-Release-3.1.4
- Jackson 2.x from 2.21.3 to 2.21.4 - https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.21.4
- Nimbus JOSE JWT from 10.9 to 10.9.1 - https://bitbucket.org/connect2id/nimbus-jose-jwt/src/master/
- PMD from 7.24.0 to 7.25.0 - https://github.com/pmd/pmd/releases/tag/pmd_releases%2F7.25.0
- Maven Site Plugin from 3.21.0 to 3.22.0 - https://github.com/apache/maven-site-plugin/releases/tag/maven-site-plugin-3.22.0

Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>
---
 nifi-commons/nifi-calcite-utils/pom.xml             |  4 ++--
 .../nifi-amqp-bundle/nifi-amqp-processors/pom.xml   |  2 +-
 .../nifi-elasticsearch-bundle/pom.xml               |  2 +-
 .../nifi-graph-test-clients/pom.xml                 |  2 +-
 .../nifi-jms-bundle/nifi-jms-processors/pom.xml     |  2 +-
 nifi-extension-bundles/nifi-mongodb-bundle/pom.xml  |  2 +-
 nifi-extension-bundles/nifi-redis-bundle/pom.xml    |  2 +-
 .../nifi-sql-reporting-tasks/pom.xml                |  2 +-
 nifi-extension-bundles/nifi-standard-bundle/pom.xml |  2 +-
 .../nifi-record-serialization-services/pom.xml      |  4 ++--
 nifi-registry/pom.xml                               |  4 ++--
 nifi-toolkit/nifi-toolkit-cli/pom.xml               |  2 +-
 pom.xml                                             | 13 +++++++------
 13 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/nifi-commons/nifi-calcite-utils/pom.xml b/nifi-commons/nifi-calcite-utils/pom.xml
index b0465355acd0..4df2c19f6f42 100644
--- a/nifi-commons/nifi-calcite-utils/pom.xml
+++ b/nifi-commons/nifi-calcite-utils/pom.xml
@@ -52,12 +52,12 @@
         <dependency>
             <groupId>org.apache.calcite</groupId>
             <artifactId>calcite-linq4j</artifactId>
-            <version>1.41.0</version>
+            <version>${calcite.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.calcite</groupId>
             <artifactId>calcite-core</artifactId>
-            <version>1.41.0</version>
+            <version>${calcite.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>
diff --git a/nifi-extension-bundles/nifi-amqp-bundle/nifi-amqp-processors/pom.xml b/nifi-extension-bundles/nifi-amqp-bundle/nifi-amqp-processors/pom.xml
index dec8a1e1b333..a7fa0aa8b01c 100644
--- a/nifi-extension-bundles/nifi-amqp-bundle/nifi-amqp-processors/pom.xml
+++ b/nifi-extension-bundles/nifi-amqp-bundle/nifi-amqp-processors/pom.xml
@@ -20,7 +20,7 @@ language governing permissions and limitations under the License. -->
     <packaging>jar</packaging>
 
     <properties>
-        <amqp-client.version>5.30.0</amqp-client.version>
+        <amqp-client.version>5.31.0</amqp-client.version>
     </properties>
 
     <dependencies>
diff --git a/nifi-extension-bundles/nifi-elasticsearch-bundle/pom.xml b/nifi-extension-bundles/nifi-elasticsearch-bundle/pom.xml
index 0324decc9b9f..7cfba74578df 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. -->
     </modules>
 
     <properties>
-        <elasticsearch.client.version>9.4.1</elasticsearch.client.version>
+        <elasticsearch.client.version>9.4.2</elasticsearch.client.version>
     </properties>
 
     <dependencyManagement>
diff --git a/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml b/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml
index f65257484da1..4336390d9f1a 100644
--- a/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml
+++ b/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml
@@ -27,7 +27,7 @@
     <properties>
         <janusgraph.version>1.2.0-20260518-231441.3ed2758</janusgraph.version>
         <guava.version>33.6.0-jre</guava.version>
-        <amqp-client.version>5.30.0</amqp-client.version>
+        <amqp-client.version>5.31.0</amqp-client.version>
     </properties>
     <dependencyManagement>
         <dependencies>
diff --git a/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml b/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml
index 3570da705a0d..08f0630507b7 100644
--- a/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml
+++ b/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml
@@ -19,7 +19,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <activemq.version>6.2.5</activemq.version>
+        <activemq.version>6.2.6</activemq.version>
     </properties>
 
     <dependencies>
diff --git a/nifi-extension-bundles/nifi-mongodb-bundle/pom.xml b/nifi-extension-bundles/nifi-mongodb-bundle/pom.xml
index ae7c7825f6c1..e75fd78dc025 100644
--- a/nifi-extension-bundles/nifi-mongodb-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-mongodb-bundle/pom.xml
@@ -34,6 +34,6 @@
     </modules>
 
     <properties>
-        <mongo.driver.version>5.7.1</mongo.driver.version>
+        <mongo.driver.version>5.8.0</mongo.driver.version>
     </properties>
 </project>
diff --git a/nifi-extension-bundles/nifi-redis-bundle/pom.xml b/nifi-extension-bundles/nifi-redis-bundle/pom.xml
index c522d84a733c..7586552d32cb 100644
--- a/nifi-extension-bundles/nifi-redis-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-redis-bundle/pom.xml
@@ -26,7 +26,7 @@
 
     <properties>
         <spring.data.redis.version>4.0.5</spring.data.redis.version>
-        <jedis.version>7.5.0</jedis.version>
+        <jedis.version>7.5.2</jedis.version>
     </properties>
 
     <modules>
diff --git a/nifi-extension-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml b/nifi-extension-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml
index 035e44e94760..bb9d16baeae2 100644
--- a/nifi-extension-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml
+++ b/nifi-extension-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.apache.calcite</groupId>
             <artifactId>calcite-core</artifactId>
-            <version>1.41.0</version>
+            <version>${calcite.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>
diff --git a/nifi-extension-bundles/nifi-standard-bundle/pom.xml b/nifi-extension-bundles/nifi-standard-bundle/pom.xml
index 16f3cf8c61c1..5c49e372ec07 100644
--- a/nifi-extension-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-standard-bundle/pom.xml
@@ -163,7 +163,7 @@
             <dependency>
                 <groupId>org.apache.calcite</groupId>
                 <artifactId>calcite-core</artifactId>
-                <version>1.41.0</version>
+                <version>${calcite.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>log4j</groupId>
diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml
index 27fd6c182a08..3573e98a6c78 100755
--- a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml
+++ b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml
@@ -130,13 +130,13 @@
         <dependency>
             <groupId>org.xmlunit</groupId>
             <artifactId>xmlunit-matchers</artifactId>
-            <version>2.11.0</version>
+            <version>2.12.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.xmlunit</groupId>
             <artifactId>xmlunit-core</artifactId>
-            <version>2.11.0</version>
+            <version>2.12.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml
index 885370a55fa7..f9f3dd8e1419 100644
--- a/nifi-registry/pom.xml
+++ b/nifi-registry/pom.xml
@@ -36,7 +36,7 @@
     </modules>
     <properties>
         <spring.boot.version>4.0.6</spring.boot.version>
-        <flyway.version>12.6.2</flyway.version>
+        <flyway.version>12.7.0</flyway.version>
         <flyway.tests.version>10.0.0</flyway.tests.version>
         <swagger.ui.version>3.12.0</swagger.ui.version>
         <jgit.version>7.6.0.202603022253-r</jgit.version>
@@ -264,7 +264,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>3.21.0</version>
+                    <version>3.22.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
diff --git a/nifi-toolkit/nifi-toolkit-cli/pom.xml b/nifi-toolkit/nifi-toolkit-cli/pom.xml
index 487ab723d2e3..5b2428c8fc33 100644
--- a/nifi-toolkit/nifi-toolkit-cli/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-cli/pom.xml
@@ -24,7 +24,7 @@
     <description>Tooling to make tls configuration easier</description>
 
     <properties>
-        <jline.version>4.1.2</jline.version>
+        <jline.version>4.1.3</jline.version>
     </properties>
 
     <build>
diff --git a/pom.xml b/pom.xml
index 0997d94b294f..bca612044edd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
         <nifi.nar.maven.plugin.version>2.3.0</nifi.nar.maven.plugin.version>
 
         <!-- CSPs SDK -->
-        <software.amazon.awssdk.version>2.44.14</software.amazon.awssdk.version>
+        <software.amazon.awssdk.version>2.45.1</software.amazon.awssdk.version>
         <software.amazon.encryption.s3.version>4.0.1</software.amazon.encryption.s3.version>
         <azure.sdk.bom.version>1.3.7</azure.sdk.bom.version> <!-- when changing this version, also update msal4j to the version that is required by azure-identity -->
 
@@ -152,12 +152,13 @@
         <!-- Data formats and serialization -->
         <kafka-clients.version>4.3.0</kafka-clients.version>
         <avro.version>1.12.1</avro.version>
+        <calcite.version>1.42.0</calcite.version>
         <com.github.luben.zstd-jni.version>1.5.7-9</com.github.luben.zstd-jni.version>
         <com.jayway.jsonpath.version>3.0.0</com.jayway.jsonpath.version>
         <gson.version>2.14.0</gson.version>
-        <jackson.annotations.version>2.21</jackson.annotations.version>
-        <jackson.bom.version>2.21.3</jackson.bom.version>
-        <jackson3.bom.version>3.1.3</jackson3.bom.version>
+        <jackson.annotations.version>2.22</jackson.annotations.version>
+        <jackson.bom.version>2.21.4</jackson.bom.version>
+        <jackson3.bom.version>3.1.4</jackson3.bom.version>
         <json.smart.version>2.6.0</json.smart.version>
         <snakeyaml.version>2.6</snakeyaml.version>
 
@@ -182,7 +183,7 @@
         <org.apache.sshd.version>2.18.0</org.apache.sshd.version>
 
         <!-- Security -->
-        <nimbus-jose-jwt.version>10.9</nimbus-jose-jwt.version>
+        <nimbus-jose-jwt.version>10.9.1</nimbus-jose-jwt.version>
         <nimbus-oauth2-oidc.version>11.37.2</nimbus-oauth2-oidc.version>
         <org.bouncycastle.version>1.84</org.bouncycastle.version>
 
@@ -207,7 +208,7 @@
         <!-- Testing and quality -->
         <junit.version>6.1.0</junit.version>
         <mockito.version>5.23.0</mockito.version>
-        <pmd.version>7.24.0</pmd.version>
+        <pmd.version>7.25.0</pmd.version>
         <checkstyle.version>13.4.2</checkstyle.version>
         <testcontainers.version>2.0.5</testcontainers.version>
         <jacoco.version>0.8.14</jacoco.version>