diff options
author | jonmv <venstad@gmail.com> | 2023-12-14 09:36:44 +0100 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2023-12-14 15:29:23 +0100 |
commit | 8cf57efff55fa887d2702941dec74e428e239ec9 (patch) | |
tree | f90d646b824fd4e583653a60e85ace6b4a0a8f95 /zookeeper-server | |
parent | 3980d0e44b1501b561b9208fd62f76e04ce9cca3 (diff) |
Move tls auth to separate package, to avoid cancelling imports in dependents
Diffstat (limited to 'zookeeper-server')
2 files changed, 2 insertions, 1 deletions
diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java index ca18e7ef146..14288bab710 100644 --- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java +++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java @@ -6,6 +6,7 @@ import com.yahoo.cloud.config.ZookeeperServerConfig.Server; import com.yahoo.security.tls.MixedMode; import com.yahoo.security.tls.TlsContext; import com.yahoo.security.tls.TransportSecurityUtils; +import com.yahoo.vespa.zookeeper.tls.VespaZookeeperTlsContextUtils; import java.io.FileWriter; import java.io.IOException; diff --git a/zookeeper-server/zookeeper-server/src/main/java/org/apache/zookeeper/common/ClientX509Util.java b/zookeeper-server/zookeeper-server/src/main/java/org/apache/zookeeper/common/ClientX509Util.java index 9eda60ea361..83cfaf11a92 100644 --- a/zookeeper-server/zookeeper-server/src/main/java/org/apache/zookeeper/common/ClientX509Util.java +++ b/zookeeper-server/zookeeper-server/src/main/java/org/apache/zookeeper/common/ClientX509Util.java @@ -18,7 +18,7 @@ package org.apache.zookeeper.common; -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; |