This is an automated email from the ASF dual-hosted git repository. andor pushed a commit to branch branch-3.5.5 in repository https://gitbox.apache.org/repos/asf/zookeeper.git
commit 77d8c751f2cbb2d7039ec042bf4075072cd5179e Author: Norbert Kalmar <[email protected]> AuthorDate: Wed Apr 3 13:57:55 2019 +0200 ZOOKEEPER-3122: Rename zookeeper-server to zookeeper Author: Norbert Kalmar <[email protected]> Reviewers: [email protected] Closes #892 from nkalmar/ZK-3122.3.5 --- 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 e45a39d..58ff541 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> <version>3.5.5</version> <name>Apache ZooKeeper</name> diff --git a/zookeeper-assembly/pom.xml b/zookeeper-assembly/pom.xml index cdef889..99d53ff 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.5.5</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 5caf245..5c07689 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.5.5</version> <relativePath>..</relativePath> </parent> diff --git a/zookeeper-contrib/pom.xml b/zookeeper-contrib/pom.xml index 2424b23..27ba0af 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.5.5</version> </parent> diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml b/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml index 0147477..6c09362 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.5.5</version> </dependency> <dependency> diff --git a/zookeeper-contrib/zookeeper-contrib-rest/pom.xml b/zookeeper-contrib/zookeeper-contrib-rest/pom.xml index d3899d5..6ad8891 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.5.5</version> </dependency> <dependency> <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper-server</artifactId> + <artifactId>zookeeper</artifactId> <version>3.5.5</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 6edd1a1..c027af6 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.5.5</version> </dependency> <dependency> diff --git a/zookeeper-docs/pom.xml b/zookeeper-docs/pom.xml index bde77c7..94dff39 100644 --- a/zookeeper-docs/pom.xml +++ b/zookeeper-docs/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.5.5</version> <relativePath>..</relativePath> </parent> diff --git a/zookeeper-jute/pom.xml b/zookeeper-jute/pom.xml index d6f7925..2202d74 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.5.5</version> <relativePath>..</relativePath> </parent> diff --git a/zookeeper-recipes/pom.xml b/zookeeper-recipes/pom.xml index 20ac85d..bd9133f 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.5.5</version> </parent> diff --git a/zookeeper-recipes/zookeeper-recipes-election/pom.xml b/zookeeper-recipes/zookeeper-recipes-election/pom.xml index 0d1b201..8fddf48 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.5.5</version> </dependency> <dependency> <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper-server</artifactId> + <artifactId>zookeeper</artifactId> <version>3.5.5</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 9d2132c..0c9a274 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.5.5</version> </dependency> <dependency> @@ -49,7 +49,7 @@ </dependency> <dependency> <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper-server</artifactId> + <artifactId>zookeeper</artifactId> <version>3.5.5</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 ee20bd5..ceeadab 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.5.5</version> </dependency> <dependency> <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper-server</artifactId> + <artifactId>zookeeper</artifactId> <version>3.5.5</version> <type>test-jar</type> <scope>test</scope> diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml index a9ca038..9fadf93 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.5.5</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>
