You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by si...@apache.org on 2016/08/16 17:42:22 UTC
[4/4] bookkeeper git commit: BOOKKEEPER-937: Upgrade protobuf to 2.6
BOOKKEEPER-937: Upgrade protobuf to 2.6
protobuf/protoc 2.4 cannot be installed with brew on mac and building it on mac always result is build errors hence leaves an option of switching to linux to run protoc.
I upgraded to 2.6 instead. It is compatible with 2.4 on the wire and shaded so should not create any problems. All tests passed.
Please ignore changes in java files in attached patch during review; these are auto-generated.
protobuf 2.4 in compat* dependencies is shaded now to not conflict with 2.6.
Author: Andrey Yegorov <ay...@salesforce.com>
Reviewers: eolivelli@gmail.com <eo...@gmail.com>, zhaijia03@gmail.com <zh...@gmail.com>, sijie@apache.org <si...@apache.org>
Closes #51 from dlg99/task/BOOKKEEPER-937
Project: http://git-wip-us.apache.org/repos/asf/bookkeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/bookkeeper/commit/28f23e80
Tree: http://git-wip-us.apache.org/repos/asf/bookkeeper/tree/28f23e80
Diff: http://git-wip-us.apache.org/repos/asf/bookkeeper/diff/28f23e80
Branch: refs/heads/master
Commit: 28f23e80bc1f64a22b45c52166cd51d526eacb5b
Parents: 64f596f
Author: Andrey Yegorov <ay...@salesforce.com>
Authored: Tue Aug 16 10:42:13 2016 -0700
Committer: Sijie Guo <si...@apache.org>
Committed: Tue Aug 16 10:42:13 2016 -0700
----------------------------------------------------------------------
bookkeeper-server/pom.xml | 4 +
.../bookkeeper/proto/BookkeeperProtocol.java | 4257 ++++++++++++------
.../apache/bookkeeper/proto/DataFormats.java | 4124 +++++++++++------
.../bookkeeper/proto/TestDataFormats.java | 75 +-
.../src/test/proto/TestDataFormats.proto | 2 +-
.../bookkeeper-server-compat-4.0.0/pom.xml | 10 +
.../bookkeeper-server-compat-4.1.0/pom.xml | 10 +
.../bookkeeper-server-compat-4.2.0/pom.xml | 10 +
pom.xml | 2 +-
9 files changed, 5765 insertions(+), 2729 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/28f23e80/bookkeeper-server/pom.xml
----------------------------------------------------------------------
diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml
index 81e4532..e47d0d3 100644
--- a/bookkeeper-server/pom.xml
+++ b/bookkeeper-server/pom.xml
@@ -200,6 +200,10 @@
<minimizeJar>true</minimizeJar>
<relocations>
<relocation>
+ <pattern>com.google.protobuf</pattern>
+ <shadedPattern>bk-shade.com.google.proto_${protobuf.version}</shadedPattern>
+ </relocation>
+ <relocation>
<pattern>com.google</pattern>
<shadedPattern>bk-shade.com.google</shadedPattern>
</relocation>