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/08/29 19:34:17 UTC
svn commit: r1162913 [1/3] - in /zookeeper/bookkeeper/trunk: ./
bookkeeper-benchmark/ hedwig-client/ hedwig-protocol/
hedwig-protocol/src/main/java/org/apache/hedwig/protocol/ hedwig-server/
Author: ivank
Date: Mon Aug 29 17:34:16 2011
New Revision: 1162913
URL: http://svn.apache.org/viewvc?rev=1162913&view=rev
Log:
BOOKKEEPER-18: maven build is unstable (morel, ivank via ivank)
Added:
zookeeper/bookkeeper/trunk/hedwig-protocol/src/main/java/org/apache/hedwig/protocol/
zookeeper/bookkeeper/trunk/hedwig-protocol/src/main/java/org/apache/hedwig/protocol/PubSubProtocol.java
Modified:
zookeeper/bookkeeper/trunk/CHANGES.txt
zookeeper/bookkeeper/trunk/bookkeeper-benchmark/pom.xml
zookeeper/bookkeeper/trunk/hedwig-client/pom.xml
zookeeper/bookkeeper/trunk/hedwig-protocol/pom.xml
zookeeper/bookkeeper/trunk/hedwig-server/pom.xml
Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1162913&r1=1162912&r2=1162913&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Mon Aug 29 17:34:16 2011
@@ -34,6 +34,8 @@ BUGFIXES:
BOOKKEEPER-58: Changes introduced in BK-38 cause BookieClientTest to hang indefinitely. (ivank)
+ BOOKKEEPER-18: maven build is unstable (morel, ivank via ivank)
+
hedwig-server/
BOOKKEEPER-43: NullPointException when releasing topic (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=1162913&r1=1162912&r2=1162913&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-benchmark/pom.xml (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-benchmark/pom.xml Mon Aug 29 17:34:16 2011
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>bookkeeper-server</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>${project.parent.version}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Modified: zookeeper/bookkeeper/trunk/hedwig-client/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/pom.xml?rev=1162913&r1=1162912&r2=1162913&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/pom.xml (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/pom.xml Mon Aug 29 17:34:16 2011
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>hedwig-protocol</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>${project.parent.version}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>bookkeeper-server</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>${project.parent.version}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Modified: zookeeper/bookkeeper/trunk/hedwig-protocol/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-protocol/pom.xml?rev=1162913&r1=1162912&r2=1162913&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-protocol/pom.xml (original)
+++ zookeeper/bookkeeper/trunk/hedwig-protocol/pom.xml Mon Aug 29 17:34:16 2011
@@ -50,19 +50,14 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
+ <id>default-cli</id>
<configuration>
<tasks>
- <mkdir dir="target/generated-sources/java" />
- <mkdir dir="target/generated-sources/cpp" />
<exec executable="protoc" failonerror="true">
- <arg value="--java_out=target/generated-sources/java" />
- <arg value="--cpp_out=target/generated-sources/cpp" />
+ <arg value="--java_out=src/main/java" />
<arg value="src/main/protobuf/PubSubProtocol.proto" />
</exec>
</tasks>
- <sourceRoot>target/generated-sources/java</sourceRoot>
</configuration>
<goals>
<goal>run</goal>