Author: ivank
Date: Fri Mar 7 17:54:49 2014
New Revision: 1575343
URL: http://svn.apache.org/r1575343
Log:
BOOKKEEPER-708: Shade protobuf library to avoid incompatible versions (ivank)
Modified:
zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt
zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/pom.xml
zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/pom.xml
zookeeper/bookkeeper/branches/branch-4.2/hedwig-protocol/pom.xml
zookeeper/bookkeeper/branches/branch-4.2/pom.xml
Modified: zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt?rev=1575343&r1=1575342&r2=1575343&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt Fri Mar 7 17:54:49 2014
@@ -100,6 +100,8 @@ Release 4.2.2 - 2013-10-02
BOOKKEEPER-685: Race in compaction algorithm from BOOKKEEPER-664 (ivank)
+ BOOKKEEPER-708: Shade protobuf library to avoid incompatible versions (ivank)
+
hedwig-server:
BOOKKEEPER-579: TestSubAfterCloseSub was put in a wrong package (sijie via ivank)
Modified: zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/pom.xml?rev=1575343&r1=1575342&r2=1575343&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/pom.xml (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/pom.xml Fri Mar 7 17:54:49
2014
@@ -35,13 +35,13 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>2.4.1</version>
+ <version>${protobuf.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>13.0.1</version>
+ <version>${guava.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -156,6 +156,38 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <!-- put your configurations here -->
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ <artifactSet>
+ <includes>
+ <include>com.google.protobuf:protobuf-java</include>
+ <include>com.google.guava:guava</include>
+ </includes>
+ </artifactSet>
+ <minimizeJar>true</minimizeJar>
+ <relocations>
+ <relocation>
+ <pattern>com.google</pattern>
+ <shadedPattern>bk-shade.com.google</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<executions>
Modified: zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/pom.xml?rev=1575343&r1=1575342&r2=1575343&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/pom.xml (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/pom.xml Fri Mar 7 17:54:49 2014
@@ -33,6 +33,11 @@
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
Modified: zookeeper/bookkeeper/branches/branch-4.2/hedwig-protocol/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/hedwig-protocol/pom.xml?rev=1575343&r1=1575342&r2=1575343&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/hedwig-protocol/pom.xml (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/hedwig-protocol/pom.xml Fri Mar 7 17:54:49 2014
@@ -32,7 +32,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>2.4.1</version>
+ <version>${protobuf.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified: zookeeper/bookkeeper/branches/branch-4.2/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/pom.xml?rev=1575343&r1=1575342&r2=1575343&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/pom.xml (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/pom.xml Fri Mar 7 17:54:49 2014
@@ -41,6 +41,10 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <!-- ProtocolBuffer version -->
+ <protobuf.version>2.4.1</protobuf.version>
+ <!-- Guava version -->
+ <guava.version>13.0.1</guava.version>
</properties>
<url>http://zookeeper.apache.org/bookkeeper</url>
<build>
|