Skip to content

Commit 9182493

Browse files
author
Zach Chuba
committed
Unshade bookkeeper from pulsar-client jars
To clear jar scans and remove a transitive dependency for these artifacts: commons-collections base version
1 parent 0f2fffa commit 9182493

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

pulsar-client-admin-shaded/pom.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@
5252
<version>${project.parent.version}</version>
5353
<optional>true</optional>
5454
</dependency>
55+
<dependency>
56+
<groupId>org.apache.bookkeeper</groupId>
57+
<artifactId>bookkeeper-server</artifactId>
58+
<scope>test</scope>
59+
</dependency>
5560
</dependencies>
5661
<build>
5762
<plugins>
@@ -128,7 +133,6 @@
128133
<include>com.yahoo.datasketches:sketches-core</include>
129134
<include>commons-*:*</include>
130135
<include>commons-codec:commons-codec</include>
131-
<include>org.apache.commons:commons-collections4</include>
132136
<include>io.airlift:*</include>
133137
<include>io.grpc:*</include>
134138
<include>io.netty.incubator:*</include>
@@ -143,7 +147,6 @@
143147
<include>javax.ws.rs:*</include>
144148
<include>javax.xml.bind:jaxb-api</include>
145149
<include>net.jcip:jcip-annotations</include>
146-
<include>org.apache.bookkeeper:*</include>
147150
<include>org.apache.commons:commons-compress</include>
148151
<include>org.apache.commons:commons-lang3</include>
149152
<include>org.apache.pulsar:pulsar-client-admin-original</include>

pulsar-client-all/pom.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,11 @@
7777
<artifactId>log4j-slf4j2-impl</artifactId>
7878
<scope>test</scope>
7979
</dependency>
80+
<dependency>
81+
<groupId>org.apache.bookkeeper</groupId>
82+
<artifactId>bookkeeper-server</artifactId>
83+
<scope>test</scope>
84+
</dependency>
8085
</dependencies>
8186
<build>
8287
<plugins>
@@ -171,7 +176,6 @@
171176
<include>com.yahoo.datasketches:sketches-core</include>
172177
<include>commons-*:*</include>
173178
<include>commons-codec:commons-codec</include>
174-
<include>org.apache.commons:commons-collections4</include>
175179
<include>io.airlift:*</include>
176180
<include>io.grpc:*</include>
177181
<include>io.netty.incubator:*</include>
@@ -192,7 +196,6 @@
192196
<include>javax.xml.bind:jaxb-api</include>
193197
<include>net.jcip:jcip-annotations</include>
194198
<include>org.apache.avro:*</include>
195-
<include>org.apache.bookkeeper:*</include>
196199
<include>org.apache.commons:commons-compress</include>
197200
<include>org.apache.commons:commons-lang3</include>
198201
<include>org.apache.pulsar:pulsar-client-admin-original</include>

pulsar-client-shaded/pom.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@
5656
<artifactId>pulsar-client-messagecrypto-bc</artifactId>
5757
<version>${project.version}</version>
5858
</dependency>
59+
<dependency>
60+
<groupId>org.apache.bookkeeper</groupId>
61+
<artifactId>bookkeeper-server</artifactId>
62+
<scope>test</scope>
63+
</dependency>
5964
</dependencies>
6065
<build>
6166
<plugins>
@@ -145,7 +150,6 @@
145150
<include>com.yahoo.datasketches:sketches-core</include>
146151
<include>commons-*:*</include>
147152
<include>commons-codec:commons-codec</include>
148-
<include>org.apache.commons:commons-collections4</include>
149153
<include>io.airlift:*</include>
150154
<include>io.netty.incubator:*</include>
151155
<include>io.netty:*</include>
@@ -160,7 +164,6 @@
160164
<include>javax.ws.rs:*</include>
161165
<include>net.jcip:jcip-annotations</include>
162166
<include>org.apache.avro:*</include>
163-
<include>org.apache.bookkeeper:*</include>
164167
<include>org.apache.commons:commons-compress</include>
165168
<include>org.apache.commons:commons-lang3</include>
166169
<!-- Issue #6834, Since Netty ByteBuf shaded, we need also shade this module -->

0 commit comments

Comments
 (0)