[bookkeeper] branch branch-4.6 updated: Issue-1003 Backward Compatility tests fail on branch-4.6 Reviewers: Ivan Kelly , Sijie Guo , Matteo Merli

[eo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

eolivelli pushed a commit to branch branch-4.6
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/branch-4.6 by this push:
     new 807678c  Issue-1003 Backward Compatility tests fail on branch-4.6 Reviewers: Ivan Kelly <iv...@apache.org>, Sijie Guo <si...@apache.org>, Matteo Merli <mm...@apache.org>
807678c is described below

commit 807678c78468db3d40c7a2ccfc9c0cdbb1cc5f66
Author: Enrico Olivelli <eo...@apache.org>
AuthorDate: Thu Jan 18 06:49:54 2018 +0100

    Issue-1003 Backward Compatility tests fail on branch-4.6
    Reviewers: Ivan Kelly <iv...@apache.org>, Sijie Guo <si...@apache.org>, Matteo Merli <mm...@apache.org>
    
    closes #1006 #1003
---
 tests/bookkeeper-server-shaded-artifact-test/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/bookkeeper-server-shaded-artifact-test/pom.xml b/tests/bookkeeper-server-shaded-artifact-test/pom.xml
index 2ce8f4a..c9f1337 100644
--- a/tests/bookkeeper-server-shaded-artifact-test/pom.xml
+++ b/tests/bookkeeper-server-shaded-artifact-test/pom.xml
@@ -41,6 +41,13 @@
           <groupId>org.apache.bookkeeper</groupId>
           <artifactId>bookkeeper-proto</artifactId>
         </exclusion>
+        <exclusion>
+          <!-- actually on branch 4.6 the dependency tree is different from 4.7, in which we have bookkeeper-proto module
+               in order to make tests pass on 4.6 we have to exclude this dependency manually
+               it is only important that the main artifact bookkeeper-server:shaded:jar contains the relocated version of protobuf -->
+          <groupId>com.google.protobuf</groupId>
+          <artifactId>protobuf-java</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
   </dependencies>

-- 
To stop receiving notification emails like this one, please contact
['"commits@bookkeeper.apache.org" <co...@bookkeeper.apache.org>'].