zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From an...@apache.org
Subject [zookeeper] branch branch-3.4 updated: ZOOKEEPER-3122: MAVEN MIGRATION - 3.4 - - pom versions fix
Date Mon, 14 Jan 2019 18:51:00 GMT
This is an automated email from the ASF dual-hosted git repository.

andor pushed a commit to branch branch-3.4
in repository https://gitbox.apache.org/repos/asf/zookeeper.git


The following commit(s) were added to refs/heads/branch-3.4 by this push:
     new 00db0cc  ZOOKEEPER-3122: MAVEN MIGRATION - 3.4 - - pom versions fix
00db0cc is described below

commit 00db0cc55328d8748ea20b4e9d8e9ec3455265ed
Author: Norbert Kalmar <nkalmar@yahoo.com>
AuthorDate: Mon Jan 14 11:50:56 2019 -0700

    ZOOKEEPER-3122: MAVEN MIGRATION - 3.4 - - pom versions fix
    
    Author: Norbert Kalmar <nkalmar@yahoo.com>
    
    Reviewers: andor@apache.org
    
    Closes #772 from nkalmar/ZK-3122-3.4 and squashes the following commits:
    
    efbbb26ec [Norbert Kalmar] ZOOKEEPER-3122 - remove contrib build from default build profile
    51e6d47c0 [Norbert Kalmar] ZOOKEEPER-3122 -add toaster to local repo in contrib
    df3b7668f [Norbert Kalmar] ZOOKEEPER-3122 - pom versions fix
---
 pom.xml                                            |   5 ++-
 zookeeper-contrib/pom.xml                          |   2 +-
 .../zookeeper-contrib-loggraph/pom.xml             |   6 ++--
 zookeeper-contrib/zookeeper-contrib-rest/pom.xml   |   6 ++--
 .../utils/toaster/1.0.4/_remote.repositories       |   4 +++
 .../nitido/utils/toaster/1.0.4/toaster-1.0.4.jar   | Bin 0 -> 14975 bytes
 .../nitido/utils/toaster/1.0.4/toaster-1.0.4.pom   |   9 +++++
 .../nitido/utils/toaster/maven-metadata-local.xml  |  12 +++++++
 .../zookeeper-contrib-zooinspector/pom.xml         |  38 ++++++---------------
 zookeeper-recipes/pom.xml                          |   2 +-
 .../zookeeper-recipes-election/pom.xml             |   6 ++--
 zookeeper-recipes/zookeeper-recipes-lock/pom.xml   |   6 ++--
 zookeeper-recipes/zookeeper-recipes-queue/pom.xml  |   6 ++--
 13 files changed, 57 insertions(+), 45 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4a6b52a..17823fd 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..5f45c8b 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.4.14-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..45d9a0e 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.4.14-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.4.14-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper-server</artifactId>
-      <version>3.6.0-SNAPSHOT</version>
+      <version>3.4.14-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..c25c85d 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.4.14-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.4.14-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper-server</artifactId>
-      <version>3.6.0-SNAPSHOT</version>
+      <version>3.4.14-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/lib/com/nitido/utils/toaster/1.0.4/_remote.repositories
b/zookeeper-contrib/zookeeper-contrib-zooinspector/lib/com/nitido/utils/toaster/1.0.4/_remote.repositories
new file mode 100644
index 0000000..7806722
--- /dev/null
+++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/lib/com/nitido/utils/toaster/1.0.4/_remote.repositories
@@ -0,0 +1,4 @@
+#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without
prior notice.
+#Mon Jan 14 12:22:09 CET 2019
+toaster-1.0.4.jar>=
+toaster-1.0.4.pom>=
diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/lib/com/nitido/utils/toaster/1.0.4/toaster-1.0.4.jar
b/zookeeper-contrib/zookeeper-contrib-zooinspector/lib/com/nitido/utils/toaster/1.0.4/toaster-1.0.4.jar
new file mode 100644
index 0000000..aaf3f6e
Binary files /dev/null and b/zookeeper-contrib/zookeeper-contrib-zooinspector/lib/com/nitido/utils/toaster/1.0.4/toaster-1.0.4.jar
differ
diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/lib/com/nitido/utils/toaster/1.0.4/toaster-1.0.4.pom
b/zookeeper-contrib/zookeeper-contrib-zooinspector/lib/com/nitido/utils/toaster/1.0.4/toaster-1.0.4.pom
new file mode 100644
index 0000000..e2cfef6
--- /dev/null
+++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/lib/com/nitido/utils/toaster/1.0.4/toaster-1.0.4.pom
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.nitido.utils</groupId>
+  <artifactId>toaster</artifactId>
+  <version>1.0.4</version>
+  <description>POM was created from install:install-file</description>
+</project>
diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/lib/com/nitido/utils/toaster/maven-metadata-local.xml
b/zookeeper-contrib/zookeeper-contrib-zooinspector/lib/com/nitido/utils/toaster/maven-metadata-local.xml
new file mode 100644
index 0000000..8c3df8b
--- /dev/null
+++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/lib/com/nitido/utils/toaster/maven-metadata-local.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>com.nitido.utils</groupId>
+  <artifactId>toaster</artifactId>
+  <versioning>
+    <release>1.0.4</release>
+    <versions>
+      <version>1.0.4</version>
+    </versions>
+    <lastUpdated>20190114112209</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml b/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
index a4bab6e..53c3151 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.4.14-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.zookeeper</groupId>
@@ -38,13 +38,21 @@
     <rat.version>0.6</rat.version>
     <commons-lang.version>2.4</commons-lang.version>
     <guava.version>18.0</guava.version>
+    <toaster.version>1.0.4</toaster.version>
   </properties>
 
+  <repositories>
+    <repository>
+      <id>local-contrib-repo</id>
+      <url>file://${basedir}/lib</url>
+    </repository>
+  </repositories>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper-server</artifactId>
-      <version>3.6.0-SNAPSHOT</version>
+      <version>3.4.14-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -97,32 +105,8 @@
     <dependency>
       <groupId>com.nitido.utils</groupId>
       <artifactId>toaster</artifactId>
-      <version>1.0.4</version>
+      <version>${toaster.version}</version>
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>initialize</phase>
-            <goals>
-              <goal>install-file</goal>
-            </goals>
-            <configuration>
-              <groupId>com.nitido.utils</groupId>
-              <artifactId>toaster</artifactId>
-              <version>1.0.4</version>
-              <packaging>jar</packaging>
-              <file>${basedir}/lib/jtoaster-1.0.4.jar</file>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
\ No newline at end of file
diff --git a/zookeeper-recipes/pom.xml b/zookeeper-recipes/pom.xml
index 7051333..8e80d93 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.4.14-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..5ae390d 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.4.14-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.4.14-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper-server</artifactId>
-      <version>3.6.0-SNAPSHOT</version>
+      <version>3.4.14-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..c05f40f 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.4.14-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.4.14-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper-server</artifactId>
-      <version>3.6.0-SNAPSHOT</version>
+      <version>3.4.14-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..0f2f1ad 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.4.14-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.4.14-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper-server</artifactId>
-      <version>3.6.0-SNAPSHOT</version>
+      <version>3.4.14-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>


Mime
View raw message