This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.5 by this push:
new cc363ec ZOOKEEPER-3122: MAVEN MIGRATION - 3.5 - - pom versions fix
cc363ec is described below
commit cc363ec4a063fc63105842fcf676fcd6ec6fc3a2
Author: Norbert Kalmar <[email protected]>
AuthorDate: Mon Jan 14 11:50:18 2019 -0700
ZOOKEEPER-3122: MAVEN MIGRATION - 3.5 - - pom versions fix
Author: Norbert Kalmar <[email protected]>
Reviewers: [email protected]
Closes #773 from nkalmar/ZK-3122-3.5 and squashes the following commits:
c4e5cddea [Norbert Kalmar] ZOOKEEPER-3122 - remove contrib build from
default build profile
90abc3451 [Norbert Kalmar] ZOOKEEPER-3122 - pom versions fix
---
pom.xml | 5 ++++-
zookeeper-contrib/pom.xml | 2 +-
zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml | 6 +++---
zookeeper-contrib/zookeeper-contrib-rest/pom.xml | 6 +++---
zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml | 4 ++--
zookeeper-recipes/pom.xml | 2 +-
zookeeper-recipes/zookeeper-recipes-election/pom.xml | 6 +++---
zookeeper-recipes/zookeeper-recipes-lock/pom.xml | 6 +++---
zookeeper-recipes/zookeeper-recipes-queue/pom.xml | 6 +++---
9 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5d3f7f7..6d63041 100755
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,6 @@
<module>zookeeper-server</module>
<module>zookeeper-client</module>
<module>zookeeper-recipes</module>
- <module>zookeeper-contrib</module>
</modules>
<scm>
@@ -242,8 +241,12 @@
<profiles>
<profile>
<id>full-build</id>
+ <modules>
+ <module>zookeeper-contrib</module>
+ </modules>
</profile>
<profile>
+ <!-- Excluds contrib -->
<id>java-build</id>
<activation>
<activeByDefault>true</activeByDefault>
diff --git a/zookeeper-contrib/pom.xml b/zookeeper-contrib/pom.xml
index b796ecf..3ae211a 100755
--- a/zookeeper-contrib/pom.xml
+++ b/zookeeper-contrib/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.5.5-beta-SNAPSHOT</version>
</parent>
<groupId>org.apache.zookeeper</groupId>
diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
b/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
index 8a40b99..e90c232 100755
--- a/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-contrib</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.5.5-beta-SNAPSHOT</version>
</parent>
<groupId>org.apache.zookeeper</groupId>
@@ -38,12 +38,12 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-jute</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.5.5-beta-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-server</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.5.5-beta-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/zookeeper-contrib/zookeeper-contrib-rest/pom.xml
b/zookeeper-contrib/zookeeper-contrib-rest/pom.xml
index 530fd2a..dcdc55a 100755
--- a/zookeeper-contrib/zookeeper-contrib-rest/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-rest/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-contrib</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.5.5-beta-SNAPSHOT</version>
</parent>
<groupId>org.apache.zookeeper</groupId>
@@ -56,12 +56,12 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-server</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.5.5-beta-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-server</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.5.5-beta-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
b/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
index 3e480ed..20aa543 100755
--- a/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-contrib</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.5.5-beta-SNAPSHOT</version>
</parent>
<groupId>org.apache.zookeeper</groupId>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-server</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.5.5-beta-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/zookeeper-recipes/pom.xml b/zookeeper-recipes/pom.xml
index 7051333..512e798 100755
--- a/zookeeper-recipes/pom.xml
+++ b/zookeeper-recipes/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.5.5-beta-SNAPSHOT</version>
</parent>
<groupId>org.apache.zookeeper</groupId>
diff --git a/zookeeper-recipes/zookeeper-recipes-election/pom.xml
b/zookeeper-recipes/zookeeper-recipes-election/pom.xml
index 7cb1f9a..1520872 100755
--- a/zookeeper-recipes/zookeeper-recipes-election/pom.xml
+++ b/zookeeper-recipes/zookeeper-recipes-election/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-recipes</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.5.5-beta-SNAPSHOT</version>
</parent>
<groupId>org.apache.zookeeper</groupId>
@@ -38,12 +38,12 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-server</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.5.5-beta-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-server</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.5.5-beta-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/zookeeper-recipes/zookeeper-recipes-lock/pom.xml
b/zookeeper-recipes/zookeeper-recipes-lock/pom.xml
index 6448728..ee9a796 100755
--- a/zookeeper-recipes/zookeeper-recipes-lock/pom.xml
+++ b/zookeeper-recipes/zookeeper-recipes-lock/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-recipes</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.5.5-beta-SNAPSHOT</version>
</parent>
<groupId>org.apache.zookeeper</groupId>
@@ -38,12 +38,12 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-server</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.5.5-beta-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-server</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.5.5-beta-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/zookeeper-recipes/zookeeper-recipes-queue/pom.xml
b/zookeeper-recipes/zookeeper-recipes-queue/pom.xml
index d4e6652..3131a98 100755
--- a/zookeeper-recipes/zookeeper-recipes-queue/pom.xml
+++ b/zookeeper-recipes/zookeeper-recipes-queue/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-recipes</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.5.5-beta-SNAPSHOT</version>
</parent>
<groupId>org.apache.zookeeper</groupId>
@@ -43,12 +43,12 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-server</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.5.5-beta-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-server</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.5.5-beta-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
