diff options
author | Harald Musum <musum@yahooinc.com> | 2022-05-11 09:26:45 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2022-05-11 09:26:45 +0200 |
commit | 138f2a38192801522e5c1241839f9a9e6a431982 (patch) | |
tree | a0eef3c5cfca13cf8c2bc9f6df141599a7df8c10 | |
parent | ac03a5b8316d0dea32b49fe46539275fdab188ba (diff) |
Move zookeeper server to a module without version name
* Keep our own code for zookeeper server in the same directory independent
of zookeeper server version
* Remove the need to depend on a module with version from other (internal)
modules
-rw-r--r-- | zookeeper-server/CMakeLists.txt | 2 | ||||
-rw-r--r-- | zookeeper-server/README | 7 | ||||
-rw-r--r-- | zookeeper-server/pom.xml | 4 | ||||
-rw-r--r-- | zookeeper-server/zookeeper-server-common/pom.xml | 2 | ||||
-rw-r--r-- | zookeeper-server/zookeeper-server/CMakeLists.txt (renamed from zookeeper-server/zookeeper-server-3.7.0/CMakeLists.txt) | 2 | ||||
-rw-r--r-- | zookeeper-server/zookeeper-server/pom.xml (renamed from zookeeper-server/zookeeper-server-3.7.0/pom.xml) | 4 | ||||
-rw-r--r-- | zookeeper-server/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java (renamed from zookeeper-server/zookeeper-server-3.7.0/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java) | 0 | ||||
-rw-r--r-- | zookeeper-server/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/VespaMtlsAuthenticationProvider.java (renamed from zookeeper-server/zookeeper-server-3.7.0/src/main/java/com/yahoo/vespa/zookeeper/VespaMtlsAuthenticationProvider.java) | 0 | ||||
-rw-r--r-- | zookeeper-server/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java (renamed from zookeeper-server/zookeeper-server-3.7.0/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java) | 0 | ||||
-rw-r--r-- | zookeeper-server/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java (renamed from zookeeper-server/zookeeper-server-3.7.0/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java) | 0 | ||||
-rw-r--r-- | zookeeper-server/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java (renamed from zookeeper-server/zookeeper-server-3.7.0/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java) | 0 | ||||
-rw-r--r-- | zookeeper-server/zookeeper-server/src/main/java/org/apache/zookeeper/common/NetUtils.java (renamed from zookeeper-server/zookeeper-server-3.7.0/src/main/java/org/apache/zookeeper/common/NetUtils.java) | 0 | ||||
-rw-r--r-- | zookeeper-server/zookeeper-server/src/main/java/org/apache/zookeeper/server/VespaNettyServerCnxnFactory.java (renamed from zookeeper-server/zookeeper-server-3.7.0/src/main/java/org/apache/zookeeper/server/VespaNettyServerCnxnFactory.java) | 0 | ||||
-rw-r--r-- | zookeeper-server/zookeeper-server/src/test/java/com/yahoo/vespa/zookeper/VespaZooKeeperTest.java (renamed from zookeeper-server/zookeeper-server-3.7.0/src/test/java/com/yahoo/vespa/zookeper/VespaZooKeeperTest.java) | 0 |
14 files changed, 14 insertions, 7 deletions
diff --git a/zookeeper-server/CMakeLists.txt b/zookeeper-server/CMakeLists.txt index a4e4ddaeb2d..e88493c1a1b 100644 --- a/zookeeper-server/CMakeLists.txt +++ b/zookeeper-server/CMakeLists.txt @@ -1,3 +1,3 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. add_subdirectory(zookeeper-server-common) -add_subdirectory(zookeeper-server-3.7.0) +add_subdirectory(zookeeper-server) diff --git a/zookeeper-server/README b/zookeeper-server/README index 9bf49ab7f87..2f4845dad29 100644 --- a/zookeeper-server/README +++ b/zookeeper-server/README @@ -1 +1,8 @@ Vespa ZooKeeper server interface + +Subdirectory zookeeper-server has code for the zookeeper server +version we use by default, testing out new versions can be done by +copying zookeeper-server dir to zookeeper-server-<version> and +updating CMakeLists.txt and pom.xml in that directory and pom.xml and +CMakeLists.txt in this directory. Selecting zookeeper server version +is done with feature flag ZOOKEEPER_SERVER_VERSION. diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml index 3efdde2cd81..1685a075955 100644 --- a/zookeeper-server/pom.xml +++ b/zookeeper-server/pom.xml @@ -8,12 +8,12 @@ <version>7-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> - <artifactId>zookeeper-server</artifactId> + <artifactId>zookeeper-server-parent</artifactId> <packaging>pom</packaging> <version>7-SNAPSHOT</version> <modules> <module>zookeeper-server-common</module> - <module>zookeeper-server-3.7.0</module> + <module>zookeeper-server</module> </modules> <dependencies> <dependency> diff --git a/zookeeper-server/zookeeper-server-common/pom.xml b/zookeeper-server/zookeeper-server-common/pom.xml index a9f74cb1d0e..82494e7bd14 100644 --- a/zookeeper-server/zookeeper-server-common/pom.xml +++ b/zookeeper-server/zookeeper-server-common/pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>com.yahoo.vespa</groupId> - <artifactId>zookeeper-server</artifactId> + <artifactId>zookeeper-server-parent</artifactId> <version>7-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/zookeeper-server/zookeeper-server-3.7.0/CMakeLists.txt b/zookeeper-server/zookeeper-server/CMakeLists.txt index 8a41fc8b8fa..c1cf27fc0bc 100644 --- a/zookeeper-server/zookeeper-server-3.7.0/CMakeLists.txt +++ b/zookeeper-server/zookeeper-server/CMakeLists.txt @@ -1,4 +1,4 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. install_fat_java_artifact(zookeeper-server-3.7.0) -# Needs to be included when this is the wanted default version (and symlinks for other versions need to be removed) +# Make symlink so that we have a default version install_symlink(lib/jars/zookeeper-server-3.7.0-jar-with-dependencies.jar lib/jars/zookeeper-server-jar-with-dependencies.jar) diff --git a/zookeeper-server/zookeeper-server-3.7.0/pom.xml b/zookeeper-server/zookeeper-server/pom.xml index 8daa6003f1e..6fb80069185 100644 --- a/zookeeper-server/zookeeper-server-3.7.0/pom.xml +++ b/zookeeper-server/zookeeper-server/pom.xml @@ -4,11 +4,11 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>com.yahoo.vespa</groupId> - <artifactId>zookeeper-server</artifactId> + <artifactId>zookeeper-server-parent</artifactId> <version>7-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>zookeeper-server-3.7.0</artifactId> + <artifactId>zookeeper-server</artifactId> <packaging>container-plugin</packaging> <version>7-SNAPSHOT</version> <properties> diff --git a/zookeeper-server/zookeeper-server-3.7.0/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java b/zookeeper-server/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java index e94110af2fb..e94110af2fb 100644 --- a/zookeeper-server/zookeeper-server-3.7.0/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java +++ b/zookeeper-server/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java diff --git a/zookeeper-server/zookeeper-server-3.7.0/src/main/java/com/yahoo/vespa/zookeeper/VespaMtlsAuthenticationProvider.java b/zookeeper-server/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/VespaMtlsAuthenticationProvider.java index 66742b0e05b..66742b0e05b 100644 --- a/zookeeper-server/zookeeper-server-3.7.0/src/main/java/com/yahoo/vespa/zookeeper/VespaMtlsAuthenticationProvider.java +++ b/zookeeper-server/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/VespaMtlsAuthenticationProvider.java diff --git a/zookeeper-server/zookeeper-server-3.7.0/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java b/zookeeper-server/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java index 47ec03367c1..47ec03367c1 100644 --- a/zookeeper-server/zookeeper-server-3.7.0/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java +++ b/zookeeper-server/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java diff --git a/zookeeper-server/zookeeper-server-3.7.0/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java b/zookeeper-server/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java index ae7bf8d84f5..ae7bf8d84f5 100644 --- a/zookeeper-server/zookeeper-server-3.7.0/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java +++ b/zookeeper-server/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java diff --git a/zookeeper-server/zookeeper-server-3.7.0/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java b/zookeeper-server/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java index 48f95d28910..48f95d28910 100644 --- a/zookeeper-server/zookeeper-server-3.7.0/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java +++ b/zookeeper-server/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java diff --git a/zookeeper-server/zookeeper-server-3.7.0/src/main/java/org/apache/zookeeper/common/NetUtils.java b/zookeeper-server/zookeeper-server/src/main/java/org/apache/zookeeper/common/NetUtils.java index 33ec9b1303a..33ec9b1303a 100644 --- a/zookeeper-server/zookeeper-server-3.7.0/src/main/java/org/apache/zookeeper/common/NetUtils.java +++ b/zookeeper-server/zookeeper-server/src/main/java/org/apache/zookeeper/common/NetUtils.java diff --git a/zookeeper-server/zookeeper-server-3.7.0/src/main/java/org/apache/zookeeper/server/VespaNettyServerCnxnFactory.java b/zookeeper-server/zookeeper-server/src/main/java/org/apache/zookeeper/server/VespaNettyServerCnxnFactory.java index fdfe0fe8467..fdfe0fe8467 100644 --- a/zookeeper-server/zookeeper-server-3.7.0/src/main/java/org/apache/zookeeper/server/VespaNettyServerCnxnFactory.java +++ b/zookeeper-server/zookeeper-server/src/main/java/org/apache/zookeeper/server/VespaNettyServerCnxnFactory.java diff --git a/zookeeper-server/zookeeper-server-3.7.0/src/test/java/com/yahoo/vespa/zookeper/VespaZooKeeperTest.java b/zookeeper-server/zookeeper-server/src/test/java/com/yahoo/vespa/zookeper/VespaZooKeeperTest.java index db643d76e0d..db643d76e0d 100644 --- a/zookeeper-server/zookeeper-server-3.7.0/src/test/java/com/yahoo/vespa/zookeper/VespaZooKeeperTest.java +++ b/zookeeper-server/zookeeper-server/src/test/java/com/yahoo/vespa/zookeper/VespaZooKeeperTest.java |