This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 7335efc ZOOKEEPER-3122: Rename zookeeper-server to zookeeper
7335efc is described below
commit 7335efc6662d85a774f49a0732cd922cfc843333
Author: Norbert Kalmar <[email protected]>
AuthorDate: Wed Apr 3 12:54:58 2019 +0200
ZOOKEEPER-3122: Rename zookeeper-server to zookeeper
To stay backward compatible and make dependency management less confusing,
everyone using ZooKeeper can stay on "zookeeper" as artifactid.
When java client is separated from server code, we can think on the module
names to make sense.
Author: Norbert Kalmar <[email protected]>
Reviewers: [email protected]
Closes #890 from nkalmar/ZK-3122
---
pom.xml | 2 +-
zookeeper-assembly/pom.xml | 4 ++--
zookeeper-assembly/src/main/assembly/bin-package.xml | 2 +-
zookeeper-client/pom.xml | 2 +-
zookeeper-contrib/pom.xml | 2 +-
zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml | 2 +-
zookeeper-contrib/zookeeper-contrib-rest/pom.xml | 4 ++--
zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml | 2 +-
zookeeper-docs/pom.xml | 2 +-
zookeeper-jute/pom.xml | 2 +-
zookeeper-recipes/pom.xml | 2 +-
zookeeper-recipes/zookeeper-recipes-election/pom.xml | 4 ++--
zookeeper-recipes/zookeeper-recipes-lock/pom.xml | 4 ++--
zookeeper-recipes/zookeeper-recipes-queue/pom.xml | 4 ++--
zookeeper-server/pom.xml | 4 ++--
15 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0d0a054..0988ca1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<!-- no parent resolution -->
</parent>
<groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
+ <artifactId>parent</artifactId>
<packaging>pom</packaging>
<!-- to change version: mvn -\-batch-mode release:update-versions
-DdevelopmentVersion=3.6.0-SNAPSHOT -->
<version>3.6.0-SNAPSHOT</version>
diff --git a/zookeeper-assembly/pom.xml b/zookeeper-assembly/pom.xml
index 566ad4f..447db9a 100755
--- a/zookeeper-assembly/pom.xml
+++ b/zookeeper-assembly/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
+ <artifactId>parent</artifactId>
<version>3.6.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper-server</artifactId>
+ <artifactId>zookeeper</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/zookeeper-assembly/src/main/assembly/bin-package.xml
b/zookeeper-assembly/src/main/assembly/bin-package.xml
index 3653575..503de6f 100644
--- a/zookeeper-assembly/src/main/assembly/bin-package.xml
+++ b/zookeeper-assembly/src/main/assembly/bin-package.xml
@@ -34,7 +34,7 @@
<moduleSet>
<useAllReactorProjects>true</useAllReactorProjects>
<includes>
- <include>org.apache.zookeeper:zookeeper-server</include>
+ <include>org.apache.zookeeper:zookeeper</include>
<include>org.apache.zookeeper:zookeeper-recipes-election</include>
<include>org.apache.zookeeper:zookeeper-recipes-lock</include>
<include>org.apache.zookeeper:zookeeper-recipes-queue</include>
diff --git a/zookeeper-client/pom.xml b/zookeeper-client/pom.xml
index ae4c6ee..e05ef4c 100755
--- a/zookeeper-client/pom.xml
+++ b/zookeeper-client/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
+ <artifactId>parent</artifactId>
<version>3.6.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/zookeeper-contrib/pom.xml b/zookeeper-contrib/pom.xml
index 6d7e6f2..bac3e05 100755
--- a/zookeeper-contrib/pom.xml
+++ b/zookeeper-contrib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
+ <artifactId>parent</artifactId>
<version>3.6.0-SNAPSHOT</version>
</parent>
diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
b/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
index 8a40b99..b8c6354 100755
--- a/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper-server</artifactId>
+ <artifactId>zookeeper</artifactId>
<version>3.6.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/zookeeper-contrib/zookeeper-contrib-rest/pom.xml
b/zookeeper-contrib/zookeeper-contrib-rest/pom.xml
index 530fd2a..d4e2ad8 100755
--- a/zookeeper-contrib/zookeeper-contrib-rest/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-rest/pom.xml
@@ -55,12 +55,12 @@
<dependencies>
<dependency>
<groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper-server</artifactId>
+ <artifactId>zookeeper</artifactId>
<version>3.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper-server</artifactId>
+ <artifactId>zookeeper</artifactId>
<version>3.6.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
b/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
index 3e480ed..2c48502 100755
--- a/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
@@ -43,7 +43,7 @@
<dependencies>
<dependency>
<groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper-server</artifactId>
+ <artifactId>zookeeper</artifactId>
<version>3.6.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/zookeeper-docs/pom.xml b/zookeeper-docs/pom.xml
index 45b19eb..da3ba0f 100644
--- a/zookeeper-docs/pom.xml
+++ b/zookeeper-docs/pom.xml
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
+ <artifactId>parent</artifactId>
<version>3.6.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/zookeeper-jute/pom.xml b/zookeeper-jute/pom.xml
index 9bb696e..0c4ce54 100755
--- a/zookeeper-jute/pom.xml
+++ b/zookeeper-jute/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
+ <artifactId>parent</artifactId>
<version>3.6.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/zookeeper-recipes/pom.xml b/zookeeper-recipes/pom.xml
index 76eaa7a..5245c06 100755
--- a/zookeeper-recipes/pom.xml
+++ b/zookeeper-recipes/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
+ <artifactId>parent</artifactId>
<version>3.6.0-SNAPSHOT</version>
</parent>
diff --git a/zookeeper-recipes/zookeeper-recipes-election/pom.xml
b/zookeeper-recipes/zookeeper-recipes-election/pom.xml
index 7cb1f9a..40e1d79 100755
--- a/zookeeper-recipes/zookeeper-recipes-election/pom.xml
+++ b/zookeeper-recipes/zookeeper-recipes-election/pom.xml
@@ -37,12 +37,12 @@
<dependencies>
<dependency>
<groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper-server</artifactId>
+ <artifactId>zookeeper</artifactId>
<version>3.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper-server</artifactId>
+ <artifactId>zookeeper</artifactId>
<version>3.6.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/zookeeper-recipes/zookeeper-recipes-lock/pom.xml
b/zookeeper-recipes/zookeeper-recipes-lock/pom.xml
index 9e8d147..fd175fe 100755
--- a/zookeeper-recipes/zookeeper-recipes-lock/pom.xml
+++ b/zookeeper-recipes/zookeeper-recipes-lock/pom.xml
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper-server</artifactId>
+ <artifactId>zookeeper</artifactId>
<version>3.6.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -49,7 +49,7 @@
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper-server</artifactId>
+ <artifactId>zookeeper</artifactId>
<version>3.6.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/zookeeper-recipes/zookeeper-recipes-queue/pom.xml
b/zookeeper-recipes/zookeeper-recipes-queue/pom.xml
index d4e6652..89321b7 100755
--- a/zookeeper-recipes/zookeeper-recipes-queue/pom.xml
+++ b/zookeeper-recipes/zookeeper-recipes-queue/pom.xml
@@ -42,12 +42,12 @@
<dependencies>
<dependency>
<groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper-server</artifactId>
+ <artifactId>zookeeper</artifactId>
<version>3.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper-server</artifactId>
+ <artifactId>zookeeper</artifactId>
<version>3.6.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml
index c35e0e7..0c24014 100755
--- a/zookeeper-server/pom.xml
+++ b/zookeeper-server/pom.xml
@@ -22,13 +22,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
+ <artifactId>parent</artifactId>
<version>3.6.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper-server</artifactId>
+ <artifactId>zookeeper</artifactId>
<packaging>jar</packaging>
<name>Apache ZooKeeper - Server</name>
<description>ZooKeeper server</description>
