sijie closed pull request #1234: Make shading rule consistent between
bookkeeper-server-shaded and bookkeeper-server-tests-shaded
URL: https://github.com/apache/bookkeeper/pull/1234
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/shaded/bookkeeper-server-tests-shaded/pom.xml
b/shaded/bookkeeper-server-tests-shaded/pom.xml
index 5fb33fe8b..3254f99d6 100644
--- a/shaded/bookkeeper-server-tests-shaded/pom.xml
+++ b/shaded/bookkeeper-server-tests-shaded/pom.xml
@@ -30,17 +30,20 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<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>
@@ -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>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
