From 65de0a24ea030de6bc0af330c73f3a772fa41e36 Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@vespa.ai>
Date: Sat, 16 Dec 2023 10:04:42 +0100
Subject: Revert "Jonmv/reapply zk 3.9.1"

---
 zookeeper-common/OWNERS                            |  1 -
 zookeeper-common/README.md                         |  4 --
 zookeeper-common/pom.xml                           | 51 ----------------------
 .../tls/VespaZookeeperTlsContextUtils.java         | 26 -----------
 4 files changed, 82 deletions(-)
 delete mode 100644 zookeeper-common/OWNERS
 delete mode 100644 zookeeper-common/README.md
 delete mode 100644 zookeeper-common/pom.xml
 delete mode 100644 zookeeper-common/src/main/java/com/yahoo/vespa/zookeeper/tls/VespaZookeeperTlsContextUtils.java

(limited to 'zookeeper-common')

diff --git a/zookeeper-common/OWNERS b/zookeeper-common/OWNERS
deleted file mode 100644
index d0a102ecbf4..00000000000
--- a/zookeeper-common/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-jonmv
diff --git a/zookeeper-common/README.md b/zookeeper-common/README.md
deleted file mode 100644
index f0c7cee342d..00000000000
--- a/zookeeper-common/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-<!-- Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-# zookeeper-common
-
-Shared configuration logic for ZooKeeper
diff --git a/zookeeper-common/pom.xml b/zookeeper-common/pom.xml
deleted file mode 100644
index 2c8ed8fe476..00000000000
--- a/zookeeper-common/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.yahoo.vespa</groupId>
-    <artifactId>parent</artifactId>
-    <version>8-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
-  </parent>
-  <artifactId>zookeeper-common</artifactId>
-  <packaging>jar</packaging>
-  <version>8-SNAPSHOT</version>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>security-utils</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>defaults</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/zookeeper-common/src/main/java/com/yahoo/vespa/zookeeper/tls/VespaZookeeperTlsContextUtils.java b/zookeeper-common/src/main/java/com/yahoo/vespa/zookeeper/tls/VespaZookeeperTlsContextUtils.java
deleted file mode 100644
index 78de6c61e17..00000000000
--- a/zookeeper-common/src/main/java/com/yahoo/vespa/zookeeper/tls/VespaZookeeperTlsContextUtils.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.yahoo.vespa.zookeeper.tls;
-
-import com.yahoo.security.tls.ConfigFileBasedTlsContext;
-import com.yahoo.security.tls.TlsContext;
-import com.yahoo.security.tls.TransportSecurityUtils;
-import com.yahoo.vespa.defaults.Defaults;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Optional;
-
-/**
- * @author jonmv
- */
-public class VespaZookeeperTlsContextUtils {
-
-    private static final Path ZOOKEEPER_TLS_CONFIG_FILE = Path.of(Defaults.getDefaults().underVespaHome("var/zookeeper/conf/tls.conf.json"));
-    private static final TlsContext tlsContext = Files.exists(ZOOKEEPER_TLS_CONFIG_FILE)
-                                                 ? new ConfigFileBasedTlsContext(ZOOKEEPER_TLS_CONFIG_FILE, TransportSecurityUtils.getInsecureAuthorizationMode())
-                                                 : TransportSecurityUtils.getSystemTlsContext().orElse(null);
-
-    public static Optional<TlsContext> tlsContext() {
-        return Optional.ofNullable(tlsContext);
-    }
-
-}
-- 
cgit v1.2.3