aboutsummaryrefslogtreecommitdiffstats
path: root/zookeeper-client-common
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2023-12-14 09:36:44 +0100
committerjonmv <venstad@gmail.com>2023-12-14 15:29:23 +0100
commit8cf57efff55fa887d2702941dec74e428e239ec9 (patch)
treef90d646b824fd4e583653a60e85ace6b4a0a8f95 /zookeeper-client-common
parent3980d0e44b1501b561b9208fd62f76e04ce9cca3 (diff)
Move tls auth to separate package, to avoid cancelling imports in dependents
Diffstat (limited to 'zookeeper-client-common')
-rw-r--r--zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilder.java2
-rw-r--r--zookeeper-client-common/src/main/java/org/apache/zookeeper/common/ClientX509Util.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilder.java b/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilder.java
index 1b240aa4785..1aaae08d4ef 100644
--- a/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilder.java
+++ b/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilder.java
@@ -2,7 +2,7 @@
package com.yahoo.vespa.zookeeper.client;
import com.yahoo.security.tls.TlsContext;
-import com.yahoo.vespa.zookeeper.VespaZookeeperTlsContextUtils;
+import com.yahoo.vespa.zookeeper.tls.VespaZookeeperTlsContextUtils;
import org.apache.zookeeper.client.ZKClientConfig;
import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
diff --git a/zookeeper-client-common/src/main/java/org/apache/zookeeper/common/ClientX509Util.java b/zookeeper-client-common/src/main/java/org/apache/zookeeper/common/ClientX509Util.java
index 93053435e13..ab528ca7cbb 100644
--- a/zookeeper-client-common/src/main/java/org/apache/zookeeper/common/ClientX509Util.java
+++ b/zookeeper-client-common/src/main/java/org/apache/zookeeper/common/ClientX509Util.java
@@ -20,7 +20,7 @@ package org.apache.zookeeper.common;
import com.yahoo.security.tls.MixedMode;
import com.yahoo.security.tls.TransportSecurityUtils;
-import com.yahoo.vespa.zookeeper.VespaZookeeperTlsContextUtils;
+import com.yahoo.vespa.zookeeper.tls.VespaZookeeperTlsContextUtils;
import io.netty.handler.ssl.DelegatingSslContext;
import io.netty.handler.ssl.SslContext;
import io.netty.handler.ssl.SslContextBuilder;