From 15e5193099768bb201f759e812957d19f7089201 Mon Sep 17 00:00:00 2001
From: Joseph Witt <joewitt@apache.org>
Date: Thu, 4 Jul 2024 22:38:09 -0700
Subject: [PATCH] NIFI-13517 Upgraded Jetty from 12.0.10 to 12.0.11 and others

- Upgraded AWS SDK 1 from 1.12.755 to 1.12.756
- Upgraded AWS SDK 2 from 2.26.14 to 2.26.15
- Upgraded Azure SDK BOM from 1.2.24 to 1.2.25
- Upgraded Elasticsearch Client from 8.14.1 to 8.14.2
- Upgraded GitHub Client from 1.322 to 1.323
- Upgraded mysql-connector-j from 8.4.0 to 9.0.0
- Upgraded Azure Kusto from 5.0.5 to 5.1.0
- Upgraded Datafaker from 2.2.2 to 2.3.0
- Upgraded nimbus-jose-jwt from 9.37.3 to 9.40
- Upgraded oauth2-oidc-sdk from 11.10.1 to 11.13

This closes #9051

Signed-off-by: David Handermann <exceptionfactory@apache.org>
---
 .../nifi-azure-bundle/nifi-azure-processors/pom.xml         | 4 ++--
 nifi-extension-bundles/nifi-azure-bundle/pom.xml            | 4 ++--
 nifi-extension-bundles/nifi-elasticsearch-bundle/pom.xml    | 4 ++--
 .../nifi-extension-utils/nifi-hadoop-utils/pom.xml          | 2 +-
 nifi-extension-bundles/nifi-github-bundle/pom.xml           | 2 +-
 .../nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml         | 2 +-
 nifi-extension-bundles/nifi-hadoop-libraries-bundle/pom.xml | 2 +-
 nifi-extension-bundles/nifi-iceberg-bundle/pom.xml          | 2 +-
 .../nifi-parquet-bundle/nifi-parquet-processors/pom.xml     | 2 +-
 .../nifi-standard-bundle/nifi-standard-processors/pom.xml   | 2 +-
 .../nifi-hadoop-dbcp-service/pom.xml                        | 2 +-
 nifi-framework-bundle/pom.xml                               | 4 ++--
 nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml | 2 +-
 nifi-registry/nifi-registry-core/pom.xml                    | 4 ++--
 pom.xml                                                     | 6 +++---
 15 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
index 798bdea31d..d3ebc0997f 100644
--- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
+++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
@@ -128,12 +128,12 @@
         <dependency>
             <groupId>com.microsoft.azure.kusto</groupId>
             <artifactId>kusto-data</artifactId>
-            <version>5.0.5</version>
+            <version>5.1.0</version>
         </dependency>
         <dependency>
             <groupId>com.microsoft.azure.kusto</groupId>
             <artifactId>kusto-ingest</artifactId>
-            <version>5.0.5</version>
+            <version>5.1.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/nifi-extension-bundles/nifi-azure-bundle/pom.xml b/nifi-extension-bundles/nifi-azure-bundle/pom.xml
index cd2a104208..4b4b10eae5 100644
--- a/nifi-extension-bundles/nifi-azure-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-azure-bundle/pom.xml
@@ -28,7 +28,7 @@
 
     <properties>
         <!-- when changing the Azure SDK version, also update msal4j to the version that is required by azure-identity -->
-        <azure.sdk.bom.version>1.2.24</azure.sdk.bom.version>
+        <azure.sdk.bom.version>1.2.25</azure.sdk.bom.version>
         <msal4j.version>1.15.1</msal4j.version>
         <qpid.proton.version>0.34.1</qpid.proton.version>
     </properties>
@@ -73,7 +73,7 @@
             <dependency>
                 <groupId>com.nimbusds</groupId>
                 <artifactId>nimbus-jose-jwt</artifactId>
-                <version>9.37.3</version>
+                <version>9.40</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
diff --git a/nifi-extension-bundles/nifi-elasticsearch-bundle/pom.xml b/nifi-extension-bundles/nifi-elasticsearch-bundle/pom.xml
index b2239d1bd4..71bca214b9 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>8.14.1</elasticsearch.client.version>
+        <elasticsearch.client.version>8.14.2</elasticsearch.client.version>
     </properties>
 
     <dependencyManagement>
@@ -88,7 +88,7 @@ language governing permissions and limitations under the License. -->
             </activation>
             <properties>
                 <!-- also update the default Elasticsearch version in nifi-elasticsearch-test-utils#src/main/java/org/apache/nifi/elasticsearch/integration/AbstractElasticsearchITBase.java-->
-                <elasticsearch_docker_image>8.14.1</elasticsearch_docker_image>
+                <elasticsearch_docker_image>8.14.2</elasticsearch_docker_image>
                 <elasticsearch.elastic.password>s3cret</elasticsearch.elastic.password>
             </properties>
             <build>
diff --git a/nifi-extension-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml b/nifi-extension-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml
index 09ef38c602..9d09773b3d 100644
--- a/nifi-extension-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml
+++ b/nifi-extension-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml
@@ -119,7 +119,7 @@
         <dependency>
             <groupId>com.nimbusds</groupId>
             <artifactId>nimbus-jose-jwt</artifactId>
-            <version>9.37.3</version>
+            <version>9.40</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/nifi-extension-bundles/nifi-github-bundle/pom.xml b/nifi-extension-bundles/nifi-github-bundle/pom.xml
index 8faeefa840..a77881be5a 100644
--- a/nifi-extension-bundles/nifi-github-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-github-bundle/pom.xml
@@ -26,7 +26,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <github-api.version>1.322</github-api.version>
+        <github-api.version>1.323</github-api.version>
     </properties>
 
     <modules>
diff --git a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml
index d9b3a6a703..4f73fd261f 100644
--- a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml
+++ b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml
@@ -170,7 +170,7 @@
         <dependency>
             <groupId>com.nimbusds</groupId>
             <artifactId>nimbus-jose-jwt</artifactId>
-            <version>9.37.3</version>
+            <version>9.40</version>
         </dependency>
     </dependencies>
 
diff --git a/nifi-extension-bundles/nifi-hadoop-libraries-bundle/pom.xml b/nifi-extension-bundles/nifi-hadoop-libraries-bundle/pom.xml
index a5243605e7..2fb01e5a77 100644
--- a/nifi-extension-bundles/nifi-hadoop-libraries-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-hadoop-libraries-bundle/pom.xml
@@ -37,7 +37,7 @@
             <dependency>
                 <groupId>com.nimbusds</groupId>
                 <artifactId>nimbus-jose-jwt</artifactId>
-                <version>9.37.3</version>
+                <version>9.40</version>
             </dependency>
             <!-- Override Guava 27 -->
             <dependency>
diff --git a/nifi-extension-bundles/nifi-iceberg-bundle/pom.xml b/nifi-extension-bundles/nifi-iceberg-bundle/pom.xml
index 035ebbb710..17103ce8ad 100644
--- a/nifi-extension-bundles/nifi-iceberg-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-iceberg-bundle/pom.xml
@@ -82,7 +82,7 @@
             <dependency>
                 <groupId>com.nimbusds</groupId>
                 <artifactId>nimbus-jose-jwt</artifactId>
-                <version>9.37.3</version>
+                <version>9.40</version>
             </dependency>
             <!-- Override Hadoop 3.1.0 -->
             <dependency>
diff --git a/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/pom.xml b/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/pom.xml
index 06f9f4d087..23bcde87cf 100644
--- a/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/pom.xml
+++ b/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/pom.xml
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>com.nimbusds</groupId>
             <artifactId>nimbus-jose-jwt</artifactId>
-            <version>9.37.3</version>
+            <version>9.40</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
index a54f57aa2f..b30e53bf23 100644
--- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
+++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
@@ -410,7 +410,7 @@
         <dependency>
             <groupId>net.datafaker</groupId>
             <artifactId>datafaker</artifactId>
-            <version>2.2.2</version>
+            <version>2.3.0</version>
             <exclusions>
                 <!-- Exclude snakeyaml with android qualifier -->
                 <exclusion>
diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/pom.xml b/nifi-extension-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/pom.xml
index f4797913d9..b87bfdd90e 100644
--- a/nifi-extension-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/pom.xml
+++ b/nifi-extension-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/pom.xml
@@ -96,7 +96,7 @@
         <dependency>
             <groupId>com.nimbusds</groupId>
             <artifactId>nimbus-jose-jwt</artifactId>
-            <version>9.37.3</version>
+            <version>9.40</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/nifi-framework-bundle/pom.xml b/nifi-framework-bundle/pom.xml
index 81019ceca3..861462dd2c 100644
--- a/nifi-framework-bundle/pom.xml
+++ b/nifi-framework-bundle/pom.xml
@@ -113,12 +113,12 @@
             <dependency>
                 <groupId>com.nimbusds</groupId>
                 <artifactId>oauth2-oidc-sdk</artifactId>
-                <version>11.10.1</version>
+                <version>11.13</version>
             </dependency>
             <dependency>
                 <groupId>com.nimbusds</groupId>
                 <artifactId>nimbus-jose-jwt</artifactId>
-                <version>9.37.3</version>
+                <version>9.40</version>
             </dependency>
             <dependency>
                 <groupId>org.codehaus.jettison</groupId>
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml b/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml
index d05576ee09..86cc35c324 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>
-            <version>8.4.0</version>
+            <version>9.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
diff --git a/nifi-registry/nifi-registry-core/pom.xml b/nifi-registry/nifi-registry-core/pom.xml
index 18ab855740..3b55b30a16 100644
--- a/nifi-registry/nifi-registry-core/pom.xml
+++ b/nifi-registry/nifi-registry-core/pom.xml
@@ -104,12 +104,12 @@
             <dependency>
                 <groupId>com.nimbusds</groupId>
                 <artifactId>oauth2-oidc-sdk</artifactId>
-                <version>11.10.1</version>
+                <version>11.13</version>
             </dependency>
             <dependency>
                 <groupId>com.nimbusds</groupId>
                 <artifactId>nimbus-jose-jwt</artifactId>
-                <version>9.37.3</version>
+                <version>9.40</version>
             </dependency>
             <dependency>
                 <groupId>com.google.guava</groupId>
diff --git a/pom.xml b/pom.xml
index ac9efd6e9b..ce2906cc75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,8 +109,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <inceptionYear>2014</inceptionYear>
-        <com.amazonaws.version>1.12.755</com.amazonaws.version>
-        <software.amazon.awssdk.version>2.26.14</software.amazon.awssdk.version>
+        <com.amazonaws.version>1.12.756</com.amazonaws.version>
+        <software.amazon.awssdk.version>2.26.15</software.amazon.awssdk.version>
         <gson.version>2.10.1</gson.version>
         <io.fabric8.kubernetes.client.version>6.13.1</io.fabric8.kubernetes.client.version>
         <kotlin.version>1.9.24</kotlin.version>
@@ -132,7 +132,7 @@
         <org.slf4j.version>2.0.13</org.slf4j.version>
         <com.jayway.jsonpath.version>2.9.0</com.jayway.jsonpath.version>
         <derby.version>10.17.1.0</derby.version>
-        <jetty.version>12.0.10</jetty.version>
+        <jetty.version>12.0.11</jetty.version>
         <jackson.bom.version>2.17.1</jackson.bom.version>
         <avro.version>1.11.3</avro.version>
         <jaxb.runtime.version>4.0.5</jaxb.runtime.version>