You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by iv...@apache.org on 2011/11/04 11:24:34 UTC
svn commit: r1197489 - in /zookeeper/bookkeeper/trunk: CHANGES.txt
bookkeeper-benchmark/pom.xml bookkeeper-server/pom.xml
hedwig-client/pom.xml hedwig-protocol/pom.xml hedwig-server/pom.xml pom.xml
Author: ivank
Date: Fri Nov 4 10:24:34 2011
New Revision: 1197489
URL: http://svn.apache.org/viewvc?rev=1197489&view=rev
Log:
BOOKKEEPER-102: Make bookkeeper use ZK from temporary repo (ivank)
Modified:
zookeeper/bookkeeper/trunk/CHANGES.txt
zookeeper/bookkeeper/trunk/bookkeeper-benchmark/pom.xml
zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml
zookeeper/bookkeeper/trunk/hedwig-client/pom.xml
zookeeper/bookkeeper/trunk/hedwig-protocol/pom.xml
zookeeper/bookkeeper/trunk/hedwig-server/pom.xml
zookeeper/bookkeeper/trunk/pom.xml
Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1197489&r1=1197488&r2=1197489&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Fri Nov 4 10:24:34 2011
@@ -88,6 +88,8 @@ IMPROVEMENTS:
BOOKKEEPER-65: fix dependencies on incompatible versions of netty (mmorel via ivank)
+ BOOKKEEPER-102: Make bookkeeper use ZK from temporary repo (ivank)
+
hedwig-client/
BOOKKEEPER-44: Reuse publish channel to default server to avoid too many connect requests to default server when lots of producers came in same time (Sijie Guo via breed)
Modified: zookeeper/bookkeeper/trunk/bookkeeper-benchmark/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-benchmark/pom.xml?rev=1197489&r1=1197488&r2=1197489&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-benchmark/pom.xml (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-benchmark/pom.xml Fri Nov 4 10:24:34 2011
@@ -5,7 +5,7 @@
<parent>
<artifactId>bookkeeper</artifactId>
<groupId>org.apache.bookkeeper</groupId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>bookkeeper-benchmark</artifactId>
@@ -31,14 +31,14 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.4.0</version>
+ <version>3.4.0-BK-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-test</artifactId>
- <version>3.4.0</version>
+ <version>3.4.0-BK-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -56,11 +56,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>jboss.release</id>
- <name>JBoss releases</name>
- <url>http://repository.jboss.org/maven2</url>
- </repository>
- </repositories>
</project>
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml?rev=1197489&r1=1197488&r2=1197489&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml Fri Nov 4 10:24:34 2011
@@ -5,7 +5,7 @@
<parent>
<artifactId>bookkeeper</artifactId>
<groupId>org.apache.bookkeeper</groupId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>bookkeeper-server</artifactId>
@@ -31,13 +31,13 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.4.0</version>
+ <version>3.4.0-BK-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-test</artifactId>
- <version>3.4.0</version>
+ <version>3.4.0-BK-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -73,13 +73,4 @@
</plugin>
</plugins>
</build>
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
</project>
Modified: zookeeper/bookkeeper/trunk/hedwig-client/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/pom.xml?rev=1197489&r1=1197488&r2=1197489&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/pom.xml (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/pom.xml Fri Nov 4 10:24:34 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>bookkeeper</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<properties>
<mainclass>org.apache.hedwig.client.App</mainclass>
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.3.3</version>
+ <version>3.4.0-BK-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
@@ -75,13 +75,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <url>>http://repository.jboss.org/nexus/content/groups/public/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
</project>
Modified: zookeeper/bookkeeper/trunk/hedwig-protocol/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-protocol/pom.xml?rev=1197489&r1=1197488&r2=1197489&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-protocol/pom.xml (original)
+++ zookeeper/bookkeeper/trunk/hedwig-protocol/pom.xml Fri Nov 4 10:24:34 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>bookkeeper</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>hedwig-protocol</artifactId>
<packaging>jar</packaging>
Modified: zookeeper/bookkeeper/trunk/hedwig-server/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/pom.xml?rev=1197489&r1=1197488&r2=1197489&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/pom.xml (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/pom.xml Fri Nov 4 10:24:34 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>bookkeeper</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<properties>
<mainclass>org.apache.hedwig.server.netty.PubSubServer</mainclass>
@@ -53,13 +53,13 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.4.0</version>
+ <version>3.4.0-BK-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-test</artifactId>
- <version>3.4.0</version>
+ <version>3.4.0-BK-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: zookeeper/bookkeeper/trunk/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/pom.xml?rev=1197489&r1=1197488&r2=1197489&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/pom.xml (original)
+++ zookeeper/bookkeeper/trunk/pom.xml Fri Nov 4 10:24:34 2011
@@ -19,9 +19,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>9</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.bookkeeper</groupId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<artifactId>bookkeeper</artifactId>
<packaging>pom</packaging>
<name>bookkeeper</name>
@@ -37,6 +42,14 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
<repositories>
+ <repository>
+ <id>ivank.waitingforzk.repo</id>
+ <name>Temporary repo waiting for ZK 3.4.0 official release</name>
+ <url>http://people.apache.org/~ivank/repo</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
<url>http://zookeeper.apache.org/bookkeeper</url>
<build>