This is an automated email from the ASF dual-hosted git repository.
pvillard31 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 62fc8812f74 NIFI-16013 - Bump Spring Security to 7.1.0, gRPC to
1.82.0, jGit to 7.7.0, and others (#11327)
62fc8812f74 is described below
commit 62fc8812f74b5b25f480eb1d65797b387e41038a
Author: Pierre Villard <[email protected]>
AuthorDate: Sat Jun 13 09:46:43 2026 -0700
NIFI-16013 - Bump Spring Security to 7.1.0, gRPC to 1.82.0, jGit to 7.7.0,
and others (#11327)
- Spring Vault from 4.0.2 to 4.1.0 -
https://github.com/spring-projects/spring-vault/releases/tag/4.1.0
- Spring Boot from 4.0.6 to 4.1.0 -
https://github.com/spring-projects/spring-boot/releases/tag/v4.1.0
- Spring Data Redis from 4.0.5 to 4.1.0 -
https://github.com/spring-projects/spring-data-redis/releases/tag/4.1.0
- Spring Integration from 7.0.4 to 7.1.0 -
https://github.com/spring-projects/spring-integration/releases/tag/v7.1.0
- Spring Security from 7.0.5 to 7.1.0 -
https://github.com/spring-projects/spring-security/releases/tag/7.1.0
- Spotbugs Maven Plugin from 4.9.8.3 to 4.10.2.0 -
https://github.com/spotbugs/spotbugs-maven-plugin/releases/tag/spotbugs-maven-plugin-4.10.2.0
- HiveMQ MQTT Client from 1.3.14 to 1.3.15 -
https://github.com/hivemq/hivemq-mqtt-client/releases/tag/v1.3.15
- gRPC from 1.81.0 to 1.82.0 - https://github.com/grpc/grpc/tree/v1.82.x
- Error Prone Annotations from 2.49.0 to 2.50.0 -
https://github.com/google/error-prone/releases/tag/v2.50.0
- jGit from 7.6.0 to 7.7.0 -
https://github.com/eclipse-jgit/jgit/releases/tag/v7.7.0.202606012155-r
- AWS SDK BOM from 2.46.6 to 2.46.8 -
https://github.com/aws/aws-sdk-java-v2/blob/master/CHANGELOG.md
Signed-off-by: Pierre Villard <[email protected]>
---
nifi-code-coverage/pom.xml | 2 +-
nifi-commons/nifi-calcite-utils/pom.xml | 2 +-
nifi-commons/nifi-hashicorp-vault/pom.xml | 2 +-
...StandardHashiCorpVaultCommunicationService.java | 18 +++++++++++----
.../config/HashiCorpVaultConfiguration.java | 27 +++++-----------------
...StandardHashiCorpVaultCommunicationService.java | 4 ++--
nifi-commons/nifi-xml-processing/pom.xml | 2 +-
nifi-extension-bundles/nifi-aws-bundle/pom.xml | 2 +-
nifi-extension-bundles/nifi-box-bundle/pom.xml | 2 +-
.../nifi-email-processors/pom.xml | 2 +-
nifi-extension-bundles/nifi-gcp-bundle/pom.xml | 2 +-
.../nifi-mqtt-bundle/nifi-mqtt-processors/pom.xml | 2 +-
.../nifi-opentelemetry-bundle/pom.xml | 2 +-
.../nifi-protobuf-services/pom.xml | 2 +-
.../nifi/redis/state/RedisStateProvider.java | 13 ++++++++---
.../nifi/redis/state/ITRedisStateProvider.java | 2 +-
nifi-extension-bundles/nifi-redis-bundle/pom.xml | 2 +-
.../nifi-snowflake-bundle/pom.xml | 4 ++--
.../nifi-standard-shared-bom/pom.xml | 2 +-
.../nifi-windows-event-log-processors/pom.xml | 2 +-
.../nifi-ldap-iaa-providers/pom.xml | 2 +-
.../nifi/ldap/tenants/LdapUserGroupProvider.java | 8 +++----
.../StandardSaml2LogoutRequestRepositoryTest.java | 1 +
.../nifi-registry-framework/pom.xml | 2 +-
.../nifi-registry-core/nifi-registry-test/pom.xml | 2 +-
.../nifi-registry-web-api/pom.xml | 2 +-
nifi-registry/pom.xml | 4 ++--
pom.xml | 12 +++++-----
28 files changed, 66 insertions(+), 63 deletions(-)
diff --git a/nifi-code-coverage/pom.xml b/nifi-code-coverage/pom.xml
index 7f9c947ba76..feca3b49327 100644
--- a/nifi-code-coverage/pom.xml
+++ b/nifi-code-coverage/pom.xml
@@ -122,7 +122,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>4.35.0</version>
+ <version>4.35.1</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/nifi-commons/nifi-calcite-utils/pom.xml
b/nifi-commons/nifi-calcite-utils/pom.xml
index 4df2c19f6f4..a03e0c72b56 100644
--- a/nifi-commons/nifi-calcite-utils/pom.xml
+++ b/nifi-commons/nifi-calcite-utils/pom.xml
@@ -69,7 +69,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>4.35.0</version>
+ <version>4.35.1</version>
</dependency>
</dependencies>
diff --git a/nifi-commons/nifi-hashicorp-vault/pom.xml
b/nifi-commons/nifi-hashicorp-vault/pom.xml
index 9130a24b783..c3011246526 100644
--- a/nifi-commons/nifi-hashicorp-vault/pom.xml
+++ b/nifi-commons/nifi-hashicorp-vault/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>nifi-hashicorp-vault</artifactId>
<properties>
- <spring.vault.version>4.0.2</spring.vault.version>
+ <spring.vault.version>4.1.0</spring.vault.version>
</properties>
<dependencies>
<dependency>
diff --git
a/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/StandardHashiCorpVaultCommunicationService.java
b/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/StandardHashiCorpVaultCommunicationService.java
index fc8cccab810..83dedff06d2 100644
---
a/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/StandardHashiCorpVaultCommunicationService.java
+++
b/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/StandardHashiCorpVaultCommunicationService.java
@@ -27,7 +27,9 @@ import
org.springframework.http.client.JdkClientHttpRequestFactory;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
import org.springframework.vault.authentication.LifecycleAwareSessionManager;
import org.springframework.vault.client.ClientHttpRequestFactoryFactory;
+import org.springframework.vault.client.VaultClient;
import org.springframework.vault.client.VaultClients;
+import org.springframework.vault.client.VaultEndpoint;
import org.springframework.vault.core.VaultKeyValueOperations;
import
org.springframework.vault.core.VaultKeyValueOperationsSupport.KeyValueBackend;
import org.springframework.vault.core.VaultTemplate;
@@ -36,7 +38,7 @@ import org.springframework.vault.support.Ciphertext;
import org.springframework.vault.support.ClientOptions;
import org.springframework.vault.support.Plaintext;
import org.springframework.vault.support.VaultResponseSupport;
-import org.springframework.web.client.RestOperations;
+import org.springframework.web.client.RestTemplate;
import java.io.Closeable;
import java.io.IOException;
@@ -102,10 +104,18 @@ public class StandardHashiCorpVaultCommunicationService
implements HashiCorpVaul
}
}
- final RestOperations restOperations =
VaultClients.createRestTemplate(vaultConfiguration.vaultEndpoint(),
clientHttpRequestFactory);
+ final VaultEndpoint vaultEndpoint = vaultConfiguration.vaultEndpoint();
+ final RestTemplate restTemplate =
VaultClients.createRestTemplate(vaultEndpoint, clientHttpRequestFactory);
- sessionManager = new
LifecycleAwareSessionManager(vaultConfiguration.clientAuthentication(),
taskScheduler, restOperations);
- vaultTemplate = new VaultTemplate(vaultConfiguration.vaultEndpoint(),
clientHttpRequestFactory, sessionManager);
+ final VaultClient.Builder vaultClientBuilder =
VaultClient.builder(restTemplate).endpoint(vaultEndpoint);
+ final String namespace = vaultConfiguration.getNamespace();
+ if (namespace != null && !namespace.isEmpty()) {
+ vaultClientBuilder.defaultNamespace(namespace);
+ }
+ final VaultClient vaultClient = vaultClientBuilder.build();
+
+ sessionManager = new
LifecycleAwareSessionManager(vaultConfiguration.clientAuthentication(),
taskScheduler, vaultClient);
+ vaultTemplate = new VaultTemplate(vaultClient, sessionManager);
transitOperations = vaultTemplate.opsForTransit();
keyValueBackend = vaultConfiguration.getKeyValueBackend();
diff --git
a/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/config/HashiCorpVaultConfiguration.java
b/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/config/HashiCorpVaultConfiguration.java
index 3188733c3bf..012f0fb83e3 100644
---
a/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/config/HashiCorpVaultConfiguration.java
+++
b/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/config/HashiCorpVaultConfiguration.java
@@ -23,11 +23,6 @@ import org.springframework.core.env.PropertySource;
import org.springframework.core.env.StandardEnvironment;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.support.ResourcePropertySource;
-import org.springframework.http.client.ClientHttpRequestFactory;
-import org.springframework.vault.client.RestTemplateBuilder;
-import org.springframework.vault.client.RestTemplateFactory;
-import org.springframework.vault.client.VaultEndpointProvider;
-import org.springframework.vault.client.VaultHttpHeaders;
import org.springframework.vault.config.EnvironmentVaultConfiguration;
import
org.springframework.vault.core.VaultKeyValueOperationsSupport.KeyValueBackend;
import org.springframework.vault.support.ClientOptions;
@@ -150,22 +145,12 @@ public class HashiCorpVaultConfiguration extends
EnvironmentVaultConfiguration {
return clientOptions;
}
- @Override
- protected RestTemplateFactory getRestTemplateFactory() {
- return this.restTemplateFactory(clientHttpRequestFactoryWrapper());
- }
-
- @Override
- protected RestTemplateBuilder restTemplateBuilder(final
VaultEndpointProvider endpointProvider,
- final
ClientHttpRequestFactory requestFactory) {
- RestTemplateBuilder builder =
super.restTemplateBuilder(endpointProvider, requestFactory);
- final String namespace =
getEnvironment().getProperty(VaultConfigurationKey.NAMESPACE.key);
-
- if (namespace != null && !namespace.isEmpty()) {
- builder = builder.defaultHeader(VaultHttpHeaders.VAULT_NAMESPACE,
namespace);
- }
-
- return builder;
+ /**
+ * Returns the configured Vault namespace, or {@code null} if no namespace
is configured.
+ * @return The Vault namespace to send with each request, or {@code null}
when unset
+ */
+ public String getNamespace() {
+ return
getEnvironment().getProperty(VaultConfigurationKey.NAMESPACE.key);
}
@Override
diff --git
a/nifi-commons/nifi-hashicorp-vault/src/test/java/org/apache/nifi/vault/hashicorp/TestStandardHashiCorpVaultCommunicationService.java
b/nifi-commons/nifi-hashicorp-vault/src/test/java/org/apache/nifi/vault/hashicorp/TestStandardHashiCorpVaultCommunicationService.java
index 8960bff1494..d9de2fbcc2a 100644
---
a/nifi-commons/nifi-hashicorp-vault/src/test/java/org/apache/nifi/vault/hashicorp/TestStandardHashiCorpVaultCommunicationService.java
+++
b/nifi-commons/nifi-hashicorp-vault/src/test/java/org/apache/nifi/vault/hashicorp/TestStandardHashiCorpVaultCommunicationService.java
@@ -65,8 +65,8 @@ public class TestStandardHashiCorpVaultCommunicationService {
@Test
public void testBasicConfiguration() {
try (StandardHashiCorpVaultCommunicationService ignored =
this.configureService()) {
- // Once to check if the URI is https, once by VaultTemplate, once
by RestTemplate
- Mockito.verify(properties, Mockito.times(3)).getUri();
+ // Once to check if the URI is https, and once to resolve the
Vault endpoint shared by the client
+ Mockito.verify(properties, Mockito.times(2)).getUri();
// Once to check if the property is set, and once to retrieve the
value
Mockito.verify(properties,
Mockito.times(2)).getAuthPropertiesFilename();
diff --git a/nifi-commons/nifi-xml-processing/pom.xml
b/nifi-commons/nifi-xml-processing/pom.xml
index 8f57709a302..a8eeaa9b70f 100644
--- a/nifi-commons/nifi-xml-processing/pom.xml
+++ b/nifi-commons/nifi-xml-processing/pom.xml
@@ -27,7 +27,7 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
- <version>4.9.8.3</version>
+ <version>4.10.2.0</version>
<executions>
<execution>
<phase>package</phase>
diff --git a/nifi-extension-bundles/nifi-aws-bundle/pom.xml
b/nifi-extension-bundles/nifi-aws-bundle/pom.xml
index 35f5eb822bb..f2f044f3308 100644
--- a/nifi-extension-bundles/nifi-aws-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-aws-bundle/pom.xml
@@ -28,7 +28,7 @@
<properties>
<guava.version>33.6.0-jre</guava.version>
- <protobuf.version>4.35.0</protobuf.version>
+ <protobuf.version>4.35.1</protobuf.version>
</properties>
<modules>
diff --git a/nifi-extension-bundles/nifi-box-bundle/pom.xml
b/nifi-extension-bundles/nifi-box-bundle/pom.xml
index ae132be3b72..0a513eda21d 100644
--- a/nifi-extension-bundles/nifi-box-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-box-bundle/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>com.box</groupId>
<artifactId>box-java-sdk</artifactId>
- <version>5.12.0</version>
+ <version>5.13.0</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git
a/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
b/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
index 8986c2cc266..c9c9103988a 100644
--- a/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
+++ b/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
@@ -25,7 +25,7 @@
<artifactId>nifi-email-processors</artifactId>
<packaging>jar</packaging>
<properties>
- <spring.integration.version>7.0.4</spring.integration.version>
+ <spring.integration.version>7.1.0</spring.integration.version>
</properties>
<dependencies>
diff --git a/nifi-extension-bundles/nifi-gcp-bundle/pom.xml
b/nifi-extension-bundles/nifi-gcp-bundle/pom.xml
index 7029a5bc2bd..d3fabe7b553 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.83.0</google.libraries.version>
+ <google.libraries.version>26.84.0</google.libraries.version>
</properties>
<dependencyManagement>
diff --git
a/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/pom.xml
b/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/pom.xml
index 06834e761c2..a8bcd9e67f4 100644
--- a/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/pom.xml
+++ b/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/pom.xml
@@ -59,7 +59,7 @@
<dependency>
<groupId>com.hivemq</groupId>
<artifactId>hivemq-mqtt-client</artifactId>
- <version>1.3.14</version>
+ <version>1.3.15</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/nifi-extension-bundles/nifi-opentelemetry-bundle/pom.xml
b/nifi-extension-bundles/nifi-opentelemetry-bundle/pom.xml
index d672ce1ae20..07470eac5d3 100644
--- a/nifi-extension-bundles/nifi-opentelemetry-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-opentelemetry-bundle/pom.xml
@@ -32,7 +32,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-bom</artifactId>
- <version>4.35.0</version>
+ <version>4.35.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
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 4ba7852958e..c2beb3de253 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 @@
<artifactId>nifi-protobuf-services</artifactId>
<properties>
- <protobuf.version>4.35.0</protobuf.version>
+ <protobuf.version>4.35.1</protobuf.version>
<wire.version>6.4.0</wire.version>
</properties>
diff --git
a/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-extensions/src/main/java/org/apache/nifi/redis/state/RedisStateProvider.java
b/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-extensions/src/main/java/org/apache/nifi/redis/state/RedisStateProvider.java
index 0b78b3d989c..c13ff694d66 100644
---
a/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-extensions/src/main/java/org/apache/nifi/redis/state/RedisStateProvider.java
+++
b/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-extensions/src/main/java/org/apache/nifi/redis/state/RedisStateProvider.java
@@ -225,14 +225,21 @@ public class RedisStateProvider extends
AbstractConfigurableComponent implements
boolean replaced = false;
- // start a watch on the key and retrieve the current value
+ // start a watch on the key so the transaction will abort if the
value is modified concurrently
final byte[] key =
getComponentKey(componentId).getBytes(StandardCharsets.UTF_8);
redisConnection.watch(key);
final Optional<String> previousVersion = oldValue == null ?
Optional.empty() : oldValue.getStateVersion();
- final byte[] currValue = redisConnection.stringCommands().get(key);
- final RedisStateMap currStateMap = serDe.deserialize(currValue);
+ // Once a key is being watched the connection is in queueing mode,
so a read issued on the same connection
+ // is enqueued into the pending transaction and returns no value.
The current value must therefore be read
+ // on a separate connection in order to execute immediately. The
watch placed above still guarantees that
+ // the transaction below aborts if the value is modified after
this read.
+ final RedisStateMap currStateMap;
+ try (final RedisConnection readConnection = getRedis()) {
+ final byte[] currValue =
readConnection.stringCommands().get(key);
+ currStateMap = serDe.deserialize(currValue);
+ }
final Optional<String> currentVersion = currStateMap == null ?
Optional.empty() : currStateMap.getStateVersion();
// start a transaction
diff --git
a/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-extensions/src/test/java/org/apache/nifi/redis/state/ITRedisStateProvider.java
b/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-extensions/src/test/java/org/apache/nifi/redis/state/ITRedisStateProvider.java
index 98c25067184..3eb7bfcc22f 100644
---
a/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-extensions/src/test/java/org/apache/nifi/redis/state/ITRedisStateProvider.java
+++
b/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-extensions/src/test/java/org/apache/nifi/redis/state/ITRedisStateProvider.java
@@ -55,7 +55,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class ITRedisStateProvider {
protected final String componentId =
"111111111-1111-1111-1111-111111111111";
- public static RedisContainer redisContainer = new
RedisContainer("redis:8.4-alpine").withExposedPorts(6379);
+ public static RedisContainer redisContainer = new
RedisContainer("redis:8.8-alpine").withExposedPorts(6379);
private RedisStateProvider provider;
diff --git a/nifi-extension-bundles/nifi-redis-bundle/pom.xml
b/nifi-extension-bundles/nifi-redis-bundle/pom.xml
index 7586552d32c..b14ed06e8c1 100644
--- a/nifi-extension-bundles/nifi-redis-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-redis-bundle/pom.xml
@@ -25,7 +25,7 @@
<packaging>pom</packaging>
<properties>
- <spring.data.redis.version>4.0.5</spring.data.redis.version>
+ <spring.data.redis.version>4.1.0</spring.data.redis.version>
<jedis.version>7.5.2</jedis.version>
</properties>
diff --git a/nifi-extension-bundles/nifi-snowflake-bundle/pom.xml
b/nifi-extension-bundles/nifi-snowflake-bundle/pom.xml
index 19964e85b6a..291562bf428 100644
--- a/nifi-extension-bundles/nifi-snowflake-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-snowflake-bundle/pom.xml
@@ -22,8 +22,8 @@
<properties>
<guava.version>33.6.0-jre</guava.version>
- <protobuf.version>4.35.0</protobuf.version>
- <grpc.version>1.81.0</grpc.version>
+ <protobuf.version>4.35.1</protobuf.version>
+ <grpc.version>1.82.0</grpc.version>
<snowflake-jdbc-thin.version>4.3.0</snowflake-jdbc-thin.version>
</properties>
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 c66a484007a..406df066ec6 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
@@ -127,7 +127,7 @@
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
- <version>2.49.0</version>
+ <version>2.50.0</version>
<scope>provided</scope>
</dependency>
<!-- OkHttp -->
diff --git
a/nifi-extension-bundles/nifi-windows-event-log-bundle/nifi-windows-event-log-processors/pom.xml
b/nifi-extension-bundles/nifi-windows-event-log-bundle/nifi-windows-event-log-processors/pom.xml
index b5436ba6daf..817d58d3158 100644
---
a/nifi-extension-bundles/nifi-windows-event-log-bundle/nifi-windows-event-log-processors/pom.xml
+++
b/nifi-extension-bundles/nifi-windows-event-log-bundle/nifi-windows-event-log-processors/pom.xml
@@ -21,7 +21,7 @@ language governing permissions and limitations under the
License. -->
<packaging>jar</packaging>
<properties>
- <jna.version>5.19.0</jna.version>
+ <jna.version>5.19.1</jna.version>
<javassist.version>3.31.0-GA</javassist.version>
</properties>
diff --git
a/nifi-framework-bundle/nifi-framework-extensions/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/pom.xml
b/nifi-framework-bundle/nifi-framework-extensions/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/pom.xml
index 676305b25b4..b1d791ce2e8 100644
---
a/nifi-framework-bundle/nifi-framework-extensions/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/pom.xml
+++
b/nifi-framework-bundle/nifi-framework-extensions/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/pom.xml
@@ -87,7 +87,7 @@
<dependency>
<groupId>com.unboundid</groupId>
<artifactId>unboundid-ldapsdk</artifactId>
- <version>7.0.4</version>
+ <version>7.0.5</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/nifi-framework-bundle/nifi-framework-extensions/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/src/main/java/org/apache/nifi/ldap/tenants/LdapUserGroupProvider.java
b/nifi-framework-bundle/nifi-framework-extensions/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/src/main/java/org/apache/nifi/ldap/tenants/LdapUserGroupProvider.java
index b57f274e78f..cdc8ed5949f 100644
---
a/nifi-framework-bundle/nifi-framework-extensions/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/src/main/java/org/apache/nifi/ldap/tenants/LdapUserGroupProvider.java
+++
b/nifi-framework-bundle/nifi-framework-extensions/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/src/main/java/org/apache/nifi/ldap/tenants/LdapUserGroupProvider.java
@@ -40,7 +40,7 @@ import org.apache.nifi.util.FormatUtils;
import org.apache.nifi.util.NiFiProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.ldap.control.PagedResultsDirContextProcessor;
+import
org.springframework.ldap.control.PagedResultsControlExchangeDirContextProcessor;
import org.springframework.ldap.core.ContextSource;
import org.springframework.ldap.core.DirContextAdapter;
import org.springframework.ldap.core.DirContextOperations;
@@ -478,7 +478,7 @@ public class LdapUserGroupProvider implements
UserGroupProvider {
if (pageSize == null) {
userProcessor = new NullDirContextProcessor();
} else {
- userProcessor = new
PagedResultsDirContextProcessor(pageSize);
+ userProcessor = new
PagedResultsControlExchangeDirContextProcessor(pageSize);
}
// looking for objects matching the user object class
@@ -551,7 +551,7 @@ public class LdapUserGroupProvider implements
UserGroupProvider {
if (pageSize == null) {
groupProcessor = new NullDirContextProcessor();
} else {
- groupProcessor = new
PagedResultsDirContextProcessor(pageSize);
+ groupProcessor = new
PagedResultsControlExchangeDirContextProcessor(pageSize);
}
// looking for objects matching the group object class
@@ -692,7 +692,7 @@ public class LdapUserGroupProvider implements
UserGroupProvider {
}
private boolean hasMorePages(final DirContextProcessor processor) {
- return processor instanceof PagedResultsDirContextProcessor &&
((PagedResultsDirContextProcessor) processor).hasMore();
+ return processor instanceof
PagedResultsControlExchangeDirContextProcessor &&
((PagedResultsControlExchangeDirContextProcessor) processor).hasMore();
}
private User buildUser(final DirContextOperations dirContextOperations) {
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/java/org/apache/nifi/web/security/saml2/web/authentication/logout/StandardSaml2LogoutRequestRepositoryTest.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/java/org/apache/nifi/web/security/saml2/web/authentication/logout/StandardSaml2LogoutRequestRepositoryTest.java
index ffd02666f5f..3d1ce71af4a 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/java/org/apache/nifi/web/security/saml2/web/authentication/logout/StandardSaml2LogoutRequestRepositoryTest.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/java/org/apache/nifi/web/security/saml2/web/authentication/logout/StandardSaml2LogoutRequestRepositoryTest.java
@@ -131,6 +131,7 @@ class StandardSaml2LogoutRequestRepositoryTest {
.assertingPartyMetadata(assertingPartyMetadata -> {
assertingPartyMetadata.entityId(Saml2RegistrationProperty.REGISTRATION_ID.getProperty());
assertingPartyMetadata.singleSignOnServiceLocation(LOCATION);
+
assertingPartyMetadata.singleLogoutServiceLocation(LOCATION);
})
.build();
return
Saml2LogoutRequest.withRelyingPartyRegistration(registration).samlRequest(SAML_REQUEST).relayState(RELAY_STATE).build();
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
b/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
index a3b35ea15e5..6626cc164de 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
@@ -400,7 +400,7 @@
<dependency>
<groupId>com.unboundid</groupId>
<artifactId>unboundid-ldapsdk</artifactId>
- <version>7.0.4</version>
+ <version>7.0.5</version>
<scope>test</scope>
</dependency>
<dependency>
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 00d9d8b5678..32306479bad 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>3.5.8</version>
+ <version>3.5.9</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml
b/nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml
index 37985a5165b..b7f4e87309d 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml
@@ -322,7 +322,7 @@
<dependency>
<groupId>com.unboundid</groupId>
<artifactId>unboundid-ldapsdk</artifactId>
- <version>7.0.4</version>
+ <version>7.0.5</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml
index bae6501be37..8865d70aab0 100644
--- a/nifi-registry/pom.xml
+++ b/nifi-registry/pom.xml
@@ -35,11 +35,11 @@
<module>nifi-registry-docker-maven</module>
</modules>
<properties>
- <spring.boot.version>4.0.6</spring.boot.version>
+ <spring.boot.version>4.1.0</spring.boot.version>
<flyway.version>12.8.1</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>
+ <jgit.version>7.7.0.202606012155-r</jgit.version>
<h2.version>2.4.240</h2.version>
</properties>
<dependencyManagement>
diff --git a/pom.xml b/pom.xml
index e3fd940cbfa..c4e32aff9ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@
<docker.jre.image.name>bellsoft/liberica-openjre-debian</docker.jre.image.name>
<!-- Frontend tooling -->
- <frontend.mvn.plugin.version>2.0.0</frontend.mvn.plugin.version>
+ <frontend.mvn.plugin.version>2.0.1</frontend.mvn.plugin.version>
<node.version>v24.14.1</node.version>
<!-- NiFi build -->
@@ -122,7 +122,7 @@
<nifi.nar.maven.plugin.version>2.3.0</nifi.nar.maven.plugin.version>
<!-- CSPs SDK -->
- <software.amazon.awssdk.version>2.46.6</software.amazon.awssdk.version>
+
<software.amazon.awssdk.version>2.46.10</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 -->
@@ -153,7 +153,7 @@
<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-10</com.github.luben.zstd-jni.version>
+
<com.github.luben.zstd-jni.version>1.5.7-11</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>
@@ -201,9 +201,9 @@
<jersey.bom.version>4.0.2</jersey.bom.version>
<jetty.version>12.1.10</jetty.version>
<servlet-api.version>6.1.0</servlet-api.version>
- <spring.security.version>7.0.5</spring.security.version>
+ <spring.security.version>7.1.0</spring.security.version>
<spring.version>7.0.8</spring.version>
- <swagger.annotations.version>2.2.50</swagger.annotations.version>
+ <swagger.annotations.version>2.2.51</swagger.annotations.version>
<!-- Testing and quality -->
<junit.version>6.1.0</junit.version>
@@ -839,7 +839,7 @@
<plugin>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-maven-plugin-jakarta</artifactId>
- <version>2.2.50</version>
+ <version>2.2.51</version>
</plugin>
<plugin>
<groupId>io.swagger.codegen.v3</groupId>
