(syncope) branch master updated: Bump org.apache.zookeeper:zookeeper from 3.9.3 to 3.9.4 (#1172)

[ilgrosso]

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/master by this push:
     new 52b3c2303f Bump org.apache.zookeeper:zookeeper from 3.9.3 to 3.9.4 
(#1172)
52b3c2303f is described below

commit 52b3c2303fbb546c3f8c50307b20000c0b520a0e
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Tue Sep 16 10:42:25 2025 +0200

    Bump org.apache.zookeeper:zookeeper from 3.9.3 to 3.9.4 (#1172)
    
    Signed-off-by: dependabot[bot] <supp...@github.com>
    Co-authored-by: dependabot[bot] 
<49699333+dependabot[bot]@users.noreply.github.com>
    Co-authored-by: Francesco Chicchiriccò <ilgro...@apache.org>
---
 .../zookeeper/ZookeeperKeymasterClientContext.java    | 19 +++++++++++++++++--
 pom.xml                                               |  2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git 
a/common/keymaster/client-zookeeper/src/main/java/org/apache/syncope/common/keymaster/client/zookeeper/ZookeeperKeymasterClientContext.java
 
b/common/keymaster/client-zookeeper/src/main/java/org/apache/syncope/common/keymaster/client/zookeeper/ZookeeperKeymasterClientContext.java
index 5a76d543b3..0265a3bd1b 100644
--- 
a/common/keymaster/client-zookeeper/src/main/java/org/apache/syncope/common/keymaster/client/zookeeper/ZookeeperKeymasterClientContext.java
+++ 
b/common/keymaster/client-zookeeper/src/main/java/org/apache/syncope/common/keymaster/client/zookeeper/ZookeeperKeymasterClientContext.java
@@ -33,9 +33,12 @@ import 
org.apache.syncope.common.keymaster.client.api.DomainOps;
 import org.apache.syncope.common.keymaster.client.api.KeymasterProperties;
 import org.apache.syncope.common.keymaster.client.api.ServiceOps;
 import org.apache.zookeeper.ZooDefs;
+import org.apache.zookeeper.client.ZKClientConfig;
+import org.apache.zookeeper.common.X509Util;
 import org.apache.zookeeper.data.ACL;
 import org.apache.zookeeper.server.auth.DigestLoginModule;
 import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
+import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
 import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -63,8 +66,20 @@ public class ZookeeperKeymasterClientContext {
     }
 
     @Conditional(ZookeeperCondition.class)
+    @ConditionalOnMissingBean
     @Bean
-    public CuratorFramework curatorFramework(final KeymasterProperties props) 
throws InterruptedException {
+    public ZKClientConfig zkClientConfig() {
+        ZKClientConfig zkClientConfig = new ZKClientConfig();
+        zkClientConfig.setProperty(X509Util.FIPS_MODE_PROPERTY, "false");
+        return zkClientConfig;
+    }
+
+    @Conditional(ZookeeperCondition.class)
+    @Bean
+    public CuratorFramework curatorFramework(
+            final ZKClientConfig zkClientConfig,
+            final KeymasterProperties props) throws InterruptedException {
+
         if (StringUtils.isNotBlank(props.getUsername()) && 
StringUtils.isNotBlank(props.getPassword())) {
             javax.security.auth.login.Configuration.setConfiguration(new 
javax.security.auth.login.Configuration() {
 
@@ -102,7 +117,7 @@ public class ZookeeperKeymasterClientContext {
                 }
             });
         }
-        CuratorFramework client = clientBuilder.build();
+        CuratorFramework client = 
clientBuilder.zkClientConfig(zkClientConfig).build();
         client.start();
         client.blockUntilConnected(3, TimeUnit.SECONDS);
 
diff --git a/pom.xml b/pom.xml
index a7c0b00380..15d78e71c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -471,7 +471,7 @@ under the License.
     <antlr4.version>4.13.2</antlr4.version>
 
     <curator.version>5.9.0</curator.version>
-    <zookeeper.version>3.9.3</zookeeper.version>
+    <zookeeper.version>3.9.4</zookeeper.version>
 
     <zonky.embedded-postgres.version>2.1.1</zonky.embedded-postgres.version>
     
<zonky.embedded-postgres-binaries.version>17.6.0</zonky.embedded-postgres-binaries.version>