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 e572af9b1c3 NIFI-16381 Bump SLF4J to 2.0.20, Caffeine to 3.3.0, Groovy
to 6.0.0, and others (#11714)
e572af9b1c3 is described below
commit e572af9b1c3d03e71deb4effe3b7f9b799d447bb
Author: Pierre Villard <[email protected]>
AuthorDate: Wed Sep 23 20:38:43 2026 +0200
NIFI-16381 Bump SLF4J to 2.0.20, Caffeine to 3.3.0, Groovy to 6.0.0, and
others (#11714)
- Debezium MySQL Binlog Connector from 0.41.4 to 0.41.5 -
https://github.com/debezium/mysql-binlog-connector-java/releases/tag/v0.41.5
- GCP SDK from 26.88.0 to 26.88.1 -
https://github.com/googleapis/google-cloud-java/releases#release-libraries-bom/v26.88.1
- AWS SDK from 2.55.1 to 2.55.3 -
https://github.com/aws/aws-sdk-java-v2/releases/tag/2.55.3
- zstd from 1.5.7-18 to 1.5.7-19 -
https://github.com/luben/zstd-jni/releases/tag/v1.5.7-19
- Jackson 2 from 2.22.2 to 2.22.3 -
https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.22.3
- Jackson 3 from 3.2.2 to 3.2.3 -
https://github.com/FasterXML/jackson/wiki/Jackson-Release-3.2.3
- Apache Groovy from 5.1.2 to 6.0.0 -
https://groovy-lang.org/releasenotes/groovy-6.0.html
- SLF4J from 2.0.19 to 2.0.20 -
https://github.com/qos-ch/slf4j/releases/tag/v_2.0.20
- Caffeine from 3.2.4 to 3.3.0 -
https://github.com/ben-manes/caffeine/releases/tag/v3.3.0
- JSON Flattener from 0.18.4 to 0.18.5 -
https://github.com/wnameless/json-flattener/releases/tag/json-flattener-0.18.5
- JanusGraph from 1.2.0-20260918-114752.9c2c304 to
1.2.0-20260923-050325.ada815d - https://github.com/JanusGraph/janusgraph
Signed-off-by: David Handermann <[email protected]>
---
.../nifi-aws-abstract-processors/pom.xml | 2 +-
.../processors/aws/AbstractAwsSyncProcessor.java | 6 +++---
.../nifi-aws-parameter-providers/pom.xml | 2 +-
.../aws/AwsSecretsManagerParameterProvider.java | 4 ++--
.../nifi-aws-bundle/nifi-aws-processors/pom.xml | 2 +-
.../strategies/AssumeRoleCredentialsStrategy.java | 22 +++++++++++++++-------
.../strategies/WebIdentityCredentialsStrategy.java | 22 +++++++++++++++-------
.../nifi-aws-schema-registry-service/pom.xml | 2 +-
.../schemaregistry/AmazonGlueSchemaRegistry.java | 6 +++---
.../nifi-cdc-mysql-processors/pom.xml | 2 +-
nifi-extension-bundles/nifi-gcp-bundle/pom.xml | 2 +-
.../nifi-graph-test-clients/pom.xml | 2 +-
.../nifi-kafka-service-aws/pom.xml | 2 +-
.../service/aws/AmazonMSKConnectionService.java | 20 ++++++++++++++------
.../nifi-standard-bundle/pom.xml | 2 +-
pom.xml | 14 +++++++-------
16 files changed, 68 insertions(+), 44 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml
index 38de7f1f1fc..2f3be4b6a5a 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml
@@ -31,7 +31,7 @@
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
- <artifactId>apache-client</artifactId>
+ <artifactId>apache5-client</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAwsSyncProcessor.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAwsSyncProcessor.java
index 752873c8666..75ef9af3341 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAwsSyncProcessor.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAwsSyncProcessor.java
@@ -24,7 +24,7 @@ import
software.amazon.awssdk.awscore.client.builder.AwsSyncClientBuilder;
import software.amazon.awssdk.http.SdkHttpClient;
import software.amazon.awssdk.http.TlsKeyManagersProvider;
import software.amazon.awssdk.http.TlsTrustManagersProvider;
-import software.amazon.awssdk.http.apache.ApacheHttpClient;
+import software.amazon.awssdk.http.apache5.Apache5HttpClient;
import java.net.URI;
import java.time.Duration;
@@ -49,7 +49,7 @@ public abstract class AbstractAwsSyncProcessor<
}
private SdkHttpClient createSdkHttpClient(final ProcessContext context) {
- final ApacheHttpClient.Builder builder = ApacheHttpClient.builder();
+ final Apache5HttpClient.Builder builder = Apache5HttpClient.builder();
final AwsHttpClientConfigurer configurer = new
AwsHttpClientConfigurer() {
@Override
@@ -67,7 +67,7 @@ public abstract class AbstractAwsSyncProcessor<
@Override
public void configureProxy(final ProxyConfiguration
proxyConfiguration) {
- final
software.amazon.awssdk.http.apache.ProxyConfiguration.Builder
proxyConfigBuilder =
software.amazon.awssdk.http.apache.ProxyConfiguration.builder()
+ final
software.amazon.awssdk.http.apache5.ProxyConfiguration.Builder
proxyConfigBuilder =
software.amazon.awssdk.http.apache5.ProxyConfiguration.builder()
.endpoint(URI.create(String.format("http://%s:%s";,
proxyConfiguration.getProxyServerHost(),
proxyConfiguration.getProxyServerPort())));
if (proxyConfiguration.hasCredential()) {
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-parameter-providers/pom.xml
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-parameter-providers/pom.xml
index 8f7735f650c..ec03015a852 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-parameter-providers/pom.xml
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-parameter-providers/pom.xml
@@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
- <artifactId>apache-client</artifactId>
+ <artifactId>apache5-client</artifactId>
</dependency>
</dependencies>
</project>
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-parameter-providers/src/main/java/org/apache/nifi/parameter/aws/AwsSecretsManagerParameterProvider.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-parameter-providers/src/main/java/org/apache/nifi/parameter/aws/AwsSecretsManagerParameterProvider.java
index d3a7874c490..3bca9acbafc 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-parameter-providers/src/main/java/org/apache/nifi/parameter/aws/AwsSecretsManagerParameterProvider.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-parameter-providers/src/main/java/org/apache/nifi/parameter/aws/AwsSecretsManagerParameterProvider.java
@@ -42,7 +42,7 @@ import
software.amazon.awssdk.core.client.config.SdkAdvancedClientOption;
import software.amazon.awssdk.http.SdkHttpClient;
import software.amazon.awssdk.http.TlsKeyManagersProvider;
import software.amazon.awssdk.http.TlsTrustManagersProvider;
-import software.amazon.awssdk.http.apache.ApacheHttpClient;
+import software.amazon.awssdk.http.apache5.Apache5HttpClient;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.retries.DefaultRetryStrategy;
import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
@@ -373,7 +373,7 @@ public class AwsSecretsManagerParameterProvider extends
AbstractParameterProvide
}
private SdkHttpClient createHttpClient(final ConfigurationContext context)
{
- final ApacheHttpClient.Builder builder = ApacheHttpClient.builder();
+ final Apache5HttpClient.Builder builder = Apache5HttpClient.builder();
final Duration commsTimeout =
context.getProperty(TIMEOUT).asDuration();
builder.connectionTimeout(commsTimeout);
diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml
index bd58560b6be..a2f6a5ad4ac 100644
--- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml
+++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml
@@ -237,7 +237,7 @@
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
- <artifactId>apache-client</artifactId>
+ <artifactId>apache5-client</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/factory/strategies/AssumeRoleCredentialsStrategy.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/factory/strategies/AssumeRoleCredentialsStrategy.java
index 9933e1ce96e..643fe32c5ac 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/factory/strategies/AssumeRoleCredentialsStrategy.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/factory/strategies/AssumeRoleCredentialsStrategy.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.processors.aws.credentials.provider.factory.strategies;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
@@ -27,7 +26,7 @@ import org.apache.nifi.proxy.ProxyConfiguration;
import org.apache.nifi.proxy.ProxyConfigurationService;
import org.apache.nifi.ssl.SSLContextProvider;
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
-import software.amazon.awssdk.http.apache.ApacheHttpClient;
+import software.amazon.awssdk.http.apache5.Apache5HttpClient;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.sts.StsClient;
import software.amazon.awssdk.services.sts.StsClientBuilder;
@@ -38,7 +37,10 @@ import java.net.Proxy;
import java.net.URI;
import java.util.Collection;
import java.util.Collections;
-import javax.net.ssl.SSLContext;
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509ExtendedKeyManager;
+import javax.net.ssl.X509TrustManager;
import static
org.apache.nifi.processors.aws.credentials.provider.service.AWSCredentialsProviderControllerService.ASSUME_ROLE_ARN;
import static
org.apache.nifi.processors.aws.credentials.provider.service.AWSCredentialsProviderControllerService.ASSUME_ROLE_EXTERNAL_ID;
@@ -115,17 +117,23 @@ public class AssumeRoleCredentialsStrategy extends
AbstractCredentialsStrategy {
final StsAssumeRoleCredentialsProvider.Builder builder =
StsAssumeRoleCredentialsProvider.builder();
- final ApacheHttpClient.Builder httpClientBuilder =
ApacheHttpClient.builder();
+ final Apache5HttpClient.Builder httpClientBuilder =
Apache5HttpClient.builder();
if (sslContextProvider != null) {
- final SSLContext sslContext = sslContextProvider.createContext();
- httpClientBuilder.socketFactory(new
SSLConnectionSocketFactory(sslContext));
+ final X509TrustManager trustManager =
sslContextProvider.createTrustManager();
+ final TrustManager[] trustManagers = new
TrustManager[]{trustManager};
+ httpClientBuilder.tlsTrustManagersProvider(() -> trustManagers);
+
+ sslContextProvider.createKeyManager().ifPresent(keyManager -> {
+ final KeyManager[] keyManagers = new
X509ExtendedKeyManager[]{keyManager};
+ httpClientBuilder.tlsKeyManagersProvider(() -> keyManagers);
+ });
}
if (proxyConfigurationService != null) {
final ProxyConfiguration proxyConfiguration =
proxyConfigurationService.getConfiguration();
if (proxyConfiguration.getProxyType() == Proxy.Type.HTTP) {
- final
software.amazon.awssdk.http.apache.ProxyConfiguration.Builder
proxyConfigBuilder =
software.amazon.awssdk.http.apache.ProxyConfiguration.builder()
+ final
software.amazon.awssdk.http.apache5.ProxyConfiguration.Builder
proxyConfigBuilder =
software.amazon.awssdk.http.apache5.ProxyConfiguration.builder()
.endpoint(URI.create(String.format("http://%s:%s";,
proxyConfiguration.getProxyServerHost(),
proxyConfiguration.getProxyServerPort())));
if (proxyConfiguration.hasCredential()) {
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/factory/strategies/WebIdentityCredentialsStrategy.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/factory/strategies/WebIdentityCredentialsStrategy.java
index 77fc65d6e15..f9eb62077bf 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/factory/strategies/WebIdentityCredentialsStrategy.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/factory/strategies/WebIdentityCredentialsStrategy.java
@@ -17,7 +17,6 @@
package org.apache.nifi.processors.aws.credentials.provider.factory.strategies;
import org.apache.commons.lang3.StringUtils;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
@@ -31,7 +30,7 @@ import org.apache.nifi.ssl.SSLContextProvider;
import software.amazon.awssdk.auth.credentials.AwsCredentials;
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
-import software.amazon.awssdk.http.apache.ApacheHttpClient;
+import software.amazon.awssdk.http.apache5.Apache5HttpClient;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.sts.StsClient;
import software.amazon.awssdk.services.sts.StsClientBuilder;
@@ -47,7 +46,10 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.Objects;
-import javax.net.ssl.SSLContext;
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509ExtendedKeyManager;
+import javax.net.ssl.X509TrustManager;
import static
org.apache.nifi.processors.aws.credentials.provider.service.AWSCredentialsProviderControllerService.ASSUME_ROLE_ARN;
import static
org.apache.nifi.processors.aws.credentials.provider.service.AWSCredentialsProviderControllerService.ASSUME_ROLE_NAME;
@@ -90,17 +92,23 @@ public class WebIdentityCredentialsStrategy extends
AbstractCredentialsStrategy
final SSLContextProvider sslContextProvider =
propertyContext.getProperty(ASSUME_ROLE_SSL_CONTEXT_SERVICE).asControllerService(SSLContextProvider.class);
final ProxyConfigurationService proxyConfigurationService =
propertyContext.getProperty(ASSUME_ROLE_PROXY_CONFIGURATION_SERVICE).asControllerService(ProxyConfigurationService.class);
- final ApacheHttpClient.Builder httpClientBuilder =
ApacheHttpClient.builder();
+ final Apache5HttpClient.Builder httpClientBuilder =
Apache5HttpClient.builder();
if (sslContextProvider != null) {
- final SSLContext sslContext = sslContextProvider.createContext();
- httpClientBuilder.socketFactory(new
SSLConnectionSocketFactory(sslContext));
+ final X509TrustManager trustManager =
sslContextProvider.createTrustManager();
+ final TrustManager[] trustManagers = new
TrustManager[]{trustManager};
+ httpClientBuilder.tlsTrustManagersProvider(() -> trustManagers);
+
+ sslContextProvider.createKeyManager().ifPresent(keyManager -> {
+ final KeyManager[] keyManagers = new
X509ExtendedKeyManager[]{keyManager};
+ httpClientBuilder.tlsKeyManagersProvider(() -> keyManagers);
+ });
}
if (proxyConfigurationService != null) {
final ProxyConfiguration proxyConfiguration =
proxyConfigurationService.getConfiguration();
if (proxyConfiguration.getProxyType() == Proxy.Type.HTTP) {
- final
software.amazon.awssdk.http.apache.ProxyConfiguration.Builder
proxyConfigBuilder =
software.amazon.awssdk.http.apache.ProxyConfiguration.builder()
+ final
software.amazon.awssdk.http.apache5.ProxyConfiguration.Builder
proxyConfigBuilder =
software.amazon.awssdk.http.apache5.ProxyConfiguration.builder()
.endpoint(URI.create(String.format("http://%s:%s";,
proxyConfiguration.getProxyServerHost(),
proxyConfiguration.getProxyServerPort())));
if (proxyConfiguration.hasCredential()) {
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/pom.xml
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/pom.xml
index 626f244586d..dc16f1152e8 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/pom.xml
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/pom.xml
@@ -37,7 +37,7 @@
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
- <artifactId>apache-client</artifactId>
+ <artifactId>apache5-client</artifactId>
</dependency>
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/src/main/java/org/apache/nifi/aws/schemaregistry/AmazonGlueSchemaRegistry.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/src/main/java/org/apache/nifi/aws/schemaregistry/AmazonGlueSchemaRegistry.java
index 60c78433366..f6340ce7554 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/src/main/java/org/apache/nifi/aws/schemaregistry/AmazonGlueSchemaRegistry.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/src/main/java/org/apache/nifi/aws/schemaregistry/AmazonGlueSchemaRegistry.java
@@ -41,7 +41,7 @@ import org.apache.nifi.serialization.record.SchemaIdentifier;
import org.apache.nifi.ssl.SSLContextProvider;
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
import software.amazon.awssdk.http.SdkHttpClient;
-import software.amazon.awssdk.http.apache.ApacheHttpClient;
+import software.amazon.awssdk.http.apache5.Apache5HttpClient;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.glue.GlueClient;
import software.amazon.awssdk.services.glue.GlueClientBuilder;
@@ -224,7 +224,7 @@ public class AmazonGlueSchemaRegistry extends
AbstractControllerService implemen
}
private SdkHttpClient createSdkHttpClient(final ConfigurationContext
context) {
- final ApacheHttpClient.Builder builder = ApacheHttpClient.builder();
+ final Apache5HttpClient.Builder builder = Apache5HttpClient.builder();
final int communicationsTimeout =
context.getProperty(COMMUNICATIONS_TIMEOUT).asTimePeriod(TimeUnit.MILLISECONDS).intValue();
builder.connectionTimeout(Duration.ofMillis(communicationsTimeout));
@@ -248,7 +248,7 @@ public class AmazonGlueSchemaRegistry extends
AbstractControllerService implemen
final ProxyConfiguration proxyConfig =
ProxyConfiguration.getConfiguration(context);
if (Proxy.Type.HTTP.equals(proxyConfig.getProxyType())) {
- final
software.amazon.awssdk.http.apache.ProxyConfiguration.Builder
proxyConfigBuilder =
software.amazon.awssdk.http.apache.ProxyConfiguration.builder()
+ final
software.amazon.awssdk.http.apache5.ProxyConfiguration.Builder
proxyConfigBuilder =
software.amazon.awssdk.http.apache5.ProxyConfiguration.builder()
.endpoint(URI.create(String.format("http://%s:%s";,
proxyConfig.getProxyServerHost(), proxyConfig.getProxyServerPort())));
if (proxyConfig.hasCredential()) {
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 e6568beb09b..0d7083d2d16 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
@@ -32,7 +32,7 @@ language governing permissions and limitations under the
License. -->
<dependency>
<groupId>io.debezium</groupId>
<artifactId>mysql-binlog-connector-java</artifactId>
- <version>0.41.4</version>
+ <version>0.41.5</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/nifi-extension-bundles/nifi-gcp-bundle/pom.xml
b/nifi-extension-bundles/nifi-gcp-bundle/pom.xml
index 65c232410da..9d590761c65 100644
--- a/nifi-extension-bundles/nifi-gcp-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-gcp-bundle/pom.xml
@@ -25,7 +25,7 @@
<packaging>pom</packaging>
<properties>
- <google.libraries.version>26.88.0</google.libraries.version>
+ <google.libraries.version>26.88.1</google.libraries.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 a78325b21ea..f7046bbf8e1 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
@@ -25,7 +25,7 @@
<artifactId>nifi-graph-test-clients</artifactId>
<packaging>jar</packaging>
<properties>
- <janusgraph.version>1.2.0-20260918-114752.9c2c304</janusgraph.version>
+ <janusgraph.version>1.2.0-20260923-050325.ada815d</janusgraph.version>
<guava.version>33.7.1-jre</guava.version>
<amqp-client.version>5.36.0</amqp-client.version>
</properties>
diff --git
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-aws/pom.xml
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-aws/pom.xml
index 3cb61efb9e0..d23fe56255e 100644
--- a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-aws/pom.xml
+++ b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-aws/pom.xml
@@ -80,7 +80,7 @@
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
- <artifactId>apache-client</artifactId>
+ <artifactId>apache5-client</artifactId>
<version>${software.amazon.awssdk.version}</version>
</dependency>
</dependencies>
diff --git
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-aws/src/main/java/org/apache/nifi/kafka/service/aws/AmazonMSKConnectionService.java
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-aws/src/main/java/org/apache/nifi/kafka/service/aws/AmazonMSKConnectionService.java
index 54f0cc3d266..1cea4b71e85 100644
---
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-aws/src/main/java/org/apache/nifi/kafka/service/aws/AmazonMSKConnectionService.java
+++
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-aws/src/main/java/org/apache/nifi/kafka/service/aws/AmazonMSKConnectionService.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.kafka.service.aws;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
@@ -37,7 +36,7 @@ import org.apache.nifi.util.StringUtils;
import software.amazon.awssdk.auth.credentials.AwsCredentials;
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
-import software.amazon.awssdk.http.apache.ApacheHttpClient;
+import software.amazon.awssdk.http.apache5.Apache5HttpClient;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.sts.StsClient;
import software.amazon.awssdk.services.sts.StsClientBuilder;
@@ -56,7 +55,10 @@ import java.util.Map;
import java.util.Objects;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import javax.net.ssl.SSLContext;
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509ExtendedKeyManager;
+import javax.net.ssl.X509TrustManager;
@Tags({"AWS", "MSK", "streaming", "kafka"})
@CapabilityDescription("Provides and manages connections to AWS MSK Kafka
Brokers for producer or consumer operations.")
@@ -215,11 +217,17 @@ public class AmazonMSKConnectionService extends
Kafka3ConnectionService {
final String stsEndpoint =
propertyContext.getProperty(AWS_WEB_IDENTITY_STS_ENDPOINT).getValue();
final SSLContextProvider sslContextProvider =
propertyContext.getProperty(AWS_WEB_IDENTITY_SSL_CONTEXT_PROVIDER).asControllerService(SSLContextProvider.class);
- final ApacheHttpClient.Builder httpClientBuilder =
ApacheHttpClient.builder();
+ final Apache5HttpClient.Builder httpClientBuilder =
Apache5HttpClient.builder();
if (sslContextProvider != null) {
- final SSLContext sslContext = sslContextProvider.createContext();
- httpClientBuilder.socketFactory(new
SSLConnectionSocketFactory(sslContext));
+ final X509TrustManager trustManager =
sslContextProvider.createTrustManager();
+ final TrustManager[] trustManagers = new
TrustManager[]{trustManager};
+ httpClientBuilder.tlsTrustManagersProvider(() -> trustManagers);
+
+ sslContextProvider.createKeyManager().ifPresent(keyManager -> {
+ final KeyManager[] keyManagers = new
X509ExtendedKeyManager[]{keyManager};
+ httpClientBuilder.tlsKeyManagersProvider(() -> keyManagers);
+ });
}
final StsClientBuilder stsClientBuilder =
StsClient.builder().httpClient(httpClientBuilder.build());
diff --git a/nifi-extension-bundles/nifi-standard-bundle/pom.xml
b/nifi-extension-bundles/nifi-standard-bundle/pom.xml
index cdb627bc5c2..f00c54f8c77 100644
--- a/nifi-extension-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-standard-bundle/pom.xml
@@ -147,7 +147,7 @@
<dependency>
<groupId>com.github.wnameless.json</groupId>
<artifactId>json-flattener</artifactId>
- <version>0.18.4</version>
+ <version>0.18.5</version>
</dependency>
<dependency>
<groupId>io.krakens</groupId>
diff --git a/pom.xml b/pom.xml
index e2494c177b4..7aaa3c9432e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
<nifi.nar.maven.plugin.version>2.4.0</nifi.nar.maven.plugin.version>
<!-- CSPs SDK -->
- <software.amazon.awssdk.version>2.55.1</software.amazon.awssdk.version>
+ <software.amazon.awssdk.version>2.55.3</software.amazon.awssdk.version>
<software.amazon.encryption.s3.version>4.0.2</software.amazon.encryption.s3.version>
<azure.sdk.bom.version>1.3.8</azure.sdk.bom.version> <!-- when
changing this version, also update msal4j to the version that is required by
azure-identity -->
@@ -154,24 +154,24 @@
<kafka.docker.image>apache/kafka:4.3.1</kafka.docker.image>
<avro.version>1.12.2</avro.version>
<calcite.version>1.42.0</calcite.version>
-
<com.github.luben.zstd-jni.version>1.5.7-18</com.github.luben.zstd-jni.version>
+
<com.github.luben.zstd-jni.version>1.5.7-19</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.22</jackson.annotations.version>
- <jackson.bom.version>2.22.2</jackson.bom.version>
- <jackson3.bom.version>3.2.2</jackson3.bom.version>
+ <jackson.bom.version>2.22.3</jackson.bom.version>
+ <jackson3.bom.version>3.2.3</jackson3.bom.version>
<json.smart.version>2.6.0</json.smart.version>
<snakeyaml.version>2.7</snakeyaml.version>
<!-- JVM languages and bytecode -->
<aspectj.version>1.9.25.1</aspectj.version>
- <groovy.version>5.1.2</groovy.version>
+ <groovy.version>6.0.0</groovy.version>
<kotlin.version>2.4.20</kotlin.version>
<!-- Logging and observability -->
<log4j2.version>2.26.1</log4j2.version>
<logback.version>1.6.3</logback.version>
- <org.slf4j.version>2.0.19</org.slf4j.version>
+ <org.slf4j.version>2.0.20</org.slf4j.version>
<prometheus.version>0.16.0</prometheus.version>
<simple-syslog-5424.version>0.0.19</simple-syslog-5424.version>
@@ -192,7 +192,7 @@
<org.bouncycastle.provider.version>1.86</org.bouncycastle.provider.version>
<!-- Utilities -->
- <caffeine.version>3.2.4</caffeine.version>
+ <caffeine.version>3.3.0</caffeine.version>
<velocity-engine-core.version>2.4.1</velocity-engine-core.version>
<!-- Web and API frameworks -->
