Skip to content

Commit 164ebb0

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 164ebb0

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

pulsar-client-admin-shaded/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@
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+
<version>${project.version}</version>
59+
<scope>test</scope>
60+
</dependency>
5561
</dependencies>
5662
<build>
5763
<plugins>
@@ -128,7 +134,6 @@
128134
<include>com.yahoo.datasketches:sketches-core</include>
129135
<include>commons-*:*</include>
130136
<include>commons-codec:commons-codec</include>
131-
<include>org.apache.commons:commons-collections4</include>
132137
<include>io.airlift:*</include>
133138
<include>io.grpc:*</include>
134139
<include>io.netty.incubator:*</include>
@@ -143,7 +148,6 @@
143148
<include>javax.ws.rs:*</include>
144149
<include>javax.xml.bind:jaxb-api</include>
145150
<include>net.jcip:jcip-annotations</include>
146-
<include>org.apache.bookkeeper:*</include>
147151
<include>org.apache.commons:commons-compress</include>
148152
<include>org.apache.commons:commons-lang3</include>
149153
<include>org.apache.pulsar:pulsar-client-admin-original</include>
@@ -352,10 +356,6 @@
352356
<pattern>org.aopalliance</pattern>
353357
<shadedPattern>org.apache.pulsar.shade.org.aopalliance</shadedPattern>
354358
</relocation>
355-
<relocation>
356-
<pattern>org.apache.bookkeeper</pattern>
357-
<shadedPattern>org.apache.pulsar.shade.org.apache.bookkeeper</shadedPattern>
358-
</relocation>
359359
<relocation>
360360
<pattern>org.apache.commons</pattern>
361361
<shadedPattern>org.apache.pulsar.shade.org.apache.commons</shadedPattern>

pulsar-client-all/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,12 @@
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+
<version>${project.version}</version>
84+
<scope>test</scope>
85+
</dependency>
8086
</dependencies>
8187
<build>
8288
<plugins>
@@ -171,7 +177,6 @@
171177
<include>com.yahoo.datasketches:sketches-core</include>
172178
<include>commons-*:*</include>
173179
<include>commons-codec:commons-codec</include>
174-
<include>org.apache.commons:commons-collections4</include>
175180
<include>io.airlift:*</include>
176181
<include>io.grpc:*</include>
177182
<include>io.netty.incubator:*</include>
@@ -192,7 +197,6 @@
192197
<include>javax.xml.bind:jaxb-api</include>
193198
<include>net.jcip:jcip-annotations</include>
194199
<include>org.apache.avro:*</include>
195-
<include>org.apache.bookkeeper:*</include>
196200
<include>org.apache.commons:commons-compress</include>
197201
<include>org.apache.commons:commons-lang3</include>
198202
<include>org.apache.pulsar:pulsar-client-admin-original</include>
@@ -416,10 +420,6 @@
416420
<exclude>org.apache.avro.reflect.Union</exclude>
417421
</excludes>
418422
</relocation>
419-
<relocation>
420-
<pattern>org.apache.bookkeeper</pattern>
421-
<shadedPattern>org.apache.pulsar.shade.org.apache.bookkeeper</shadedPattern>
422-
</relocation>
423423
<relocation>
424424
<pattern>org.apache.commons</pattern>
425425
<shadedPattern>org.apache.pulsar.shade.org.apache.commons</shadedPattern>

pulsar-client-shaded/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@
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+
<version>${project.version}</version>
63+
<scope>test</scope>
64+
</dependency>
5965
</dependencies>
6066
<build>
6167
<plugins>
@@ -145,7 +151,6 @@
145151
<include>com.yahoo.datasketches:sketches-core</include>
146152
<include>commons-*:*</include>
147153
<include>commons-codec:commons-codec</include>
148-
<include>org.apache.commons:commons-collections4</include>
149154
<include>io.airlift:*</include>
150155
<include>io.netty.incubator:*</include>
151156
<include>io.netty:*</include>
@@ -160,7 +165,6 @@
160165
<include>javax.ws.rs:*</include>
161166
<include>net.jcip:jcip-annotations</include>
162167
<include>org.apache.avro:*</include>
163-
<include>org.apache.bookkeeper:*</include>
164168
<include>org.apache.commons:commons-compress</include>
165169
<include>org.apache.commons:commons-lang3</include>
166170
<!-- Issue #6834, Since Netty ByteBuf shaded, we need also shade this module -->
@@ -330,10 +334,6 @@
330334
<exclude>org.apache.avro.reflect.Union</exclude>
331335
</excludes>
332336
</relocation>
333-
<relocation>
334-
<pattern>org.apache.bookkeeper</pattern>
335-
<shadedPattern>org.apache.pulsar.shade.org.apache.bookkeeper</shadedPattern>
336-
</relocation>
337337
<relocation>
338338
<pattern>org.apache.commons</pattern>
339339
<shadedPattern>org.apache.pulsar.shade.org.apache.commons</shadedPattern>

0 commit comments

Comments
 (0)