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

sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new 19846b2  Make shading rule consistent between bookkeeper-server-shaded 
and bookkeeper-server-tests-shaded
19846b2 is described below

commit 19846b23de3be13e28082d4ba73e21bb8fa39ad2
Author: Sijie Guo <si...@apache.org>
AuthorDate: Tue Mar 6 16:45:51 2018 -0800

    Make shading rule consistent between bookkeeper-server-shaded and 
bookkeeper-server-tests-shaded
    
    Descriptions of the changes in this PR:
    
    `bookkeeper-server:test-jar` is working with `bookkeeper-server`. we should 
make `bookkeeper-server-tests-shaded` work with `bookkeeper-server-shaded`.  so 
this change is to make they have consistent shading rule.
    
    ```
    <dependency>
          <groupId>org.apache.bookkeeper</groupId>
          <artifactId>bookkeeper-server-shaded</artifactId>
          <version>${bookkeeper.version}</version>
          <scope>test</scope>
        </dependency>
    <dependency>
          <groupId>org.apache.bookkeeper</groupId>
          <artifactId>bookkeeper-server-tests-shaded</artifactId>
          <version>${bookkeeper.version}</version>
          <scope>test</scope>
        </dependency>
    ```
    
    Author: Sijie Guo <si...@apache.org>
    
    Reviewers: Enrico Olivelli <eolive...@gmail.com>, Matteo Merli 
<mme...@apache.org>
    
    This closes #1234 from sijie/sijie_improve_tests_shaded
---
 shaded/bookkeeper-server-tests-shaded/pom.xml | 28 ++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml 
b/shaded/bookkeeper-server-tests-shaded/pom.xml
index 5fb33fe..3254f99 100644
--- a/shaded/bookkeeper-server-tests-shaded/pom.xml
+++ b/shaded/bookkeeper-server-tests-shaded/pom.xml
@@ -32,16 +32,19 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.bookkeeper</groupId>
-      <artifactId>bookkeeper-server-shaded</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.bookkeeper</groupId>
       <artifactId>bookkeeper-server</artifactId>
       <type>test-jar</type>
       <version>${project.version}</version>
       <exclusions>
         <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-log4j12</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>org.apache.bookkeeper</groupId>
           <artifactId>bookkeeper-common</artifactId>
         </exclusion>
@@ -54,16 +57,12 @@
           <artifactId>bookkeeper-server</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>org.apache.bookkeeper.stats</groupId>
-          <artifactId>bookkeeper-stats-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-log4j12</artifactId>
+          <groupId>org.apache.bookkeeper</groupId>
+          <artifactId>circe-checksum</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
+          <groupId>org.apache.bookkeeper.stats</groupId>
+          <artifactId>bookkeeper-stats-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -86,10 +85,13 @@
               <minimizeJar>false</minimizeJar>
               <artifactSet>
                 <includes>
+                  <include>com.google.guava:guava</include>
+                  <include>com.google.protobuf:protobuf-java</include>
                   
<include>org.apache.bookkeeper:bookkeeper-server:test-jar:tests</include>
                 </includes>
               </artifactSet>
               <relocations>
+                <!-- make the relocation rules consistent with 
`bookkeeper-server-shaded` -->
                 <relocation>
                   <pattern>com.google</pattern>
                   
<shadedPattern>org.apache.bookkeeper.shaded.com.google</shadedPattern>

-- 
To stop receiving notification emails like this one, please contact
si...@apache.org.

Reply via email to