Skip to content

Commit ad676fb

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 ad676fb

File tree

3 files changed

+1
-19
lines changed

3 files changed

+1
-19
lines changed

pulsar-client-admin-shaded/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@
128128
<include>com.yahoo.datasketches:sketches-core</include>
129129
<include>commons-*:*</include>
130130
<include>commons-codec:commons-codec</include>
131-
<include>org.apache.commons:commons-collections4</include>
132131
<include>io.airlift:*</include>
133132
<include>io.grpc:*</include>
134133
<include>io.netty.incubator:*</include>
@@ -143,7 +142,6 @@
143142
<include>javax.ws.rs:*</include>
144143
<include>javax.xml.bind:jaxb-api</include>
145144
<include>net.jcip:jcip-annotations</include>
146-
<include>org.apache.bookkeeper:*</include>
147145
<include>org.apache.commons:commons-compress</include>
148146
<include>org.apache.commons:commons-lang3</include>
149147
<include>org.apache.pulsar:pulsar-client-admin-original</include>
@@ -352,10 +350,6 @@
352350
<pattern>org.aopalliance</pattern>
353351
<shadedPattern>org.apache.pulsar.shade.org.aopalliance</shadedPattern>
354352
</relocation>
355-
<relocation>
356-
<pattern>org.apache.bookkeeper</pattern>
357-
<shadedPattern>org.apache.pulsar.shade.org.apache.bookkeeper</shadedPattern>
358-
</relocation>
359353
<relocation>
360354
<pattern>org.apache.commons</pattern>
361355
<shadedPattern>org.apache.pulsar.shade.org.apache.commons</shadedPattern>

pulsar-client-all/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@
171171
<include>com.yahoo.datasketches:sketches-core</include>
172172
<include>commons-*:*</include>
173173
<include>commons-codec:commons-codec</include>
174-
<include>org.apache.commons:commons-collections4</include>
175174
<include>io.airlift:*</include>
176175
<include>io.grpc:*</include>
177176
<include>io.netty.incubator:*</include>
@@ -192,7 +191,6 @@
192191
<include>javax.xml.bind:jaxb-api</include>
193192
<include>net.jcip:jcip-annotations</include>
194193
<include>org.apache.avro:*</include>
195-
<include>org.apache.bookkeeper:*</include>
196194
<include>org.apache.commons:commons-compress</include>
197195
<include>org.apache.commons:commons-lang3</include>
198196
<include>org.apache.pulsar:pulsar-client-admin-original</include>
@@ -416,10 +414,6 @@
416414
<exclude>org.apache.avro.reflect.Union</exclude>
417415
</excludes>
418416
</relocation>
419-
<relocation>
420-
<pattern>org.apache.bookkeeper</pattern>
421-
<shadedPattern>org.apache.pulsar.shade.org.apache.bookkeeper</shadedPattern>
422-
</relocation>
423417
<relocation>
424418
<pattern>org.apache.commons</pattern>
425419
<shadedPattern>org.apache.pulsar.shade.org.apache.commons</shadedPattern>

pulsar-client-shaded/pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
under the License.
2020
2121
-->
22-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:dxsi="http://www.w3.org/2001/XMLSchema-instance"
2323
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2424
<modelVersion>4.0.0</modelVersion>
2525
<parent>
@@ -145,7 +145,6 @@
145145
<include>com.yahoo.datasketches:sketches-core</include>
146146
<include>commons-*:*</include>
147147
<include>commons-codec:commons-codec</include>
148-
<include>org.apache.commons:commons-collections4</include>
149148
<include>io.airlift:*</include>
150149
<include>io.netty.incubator:*</include>
151150
<include>io.netty:*</include>
@@ -160,7 +159,6 @@
160159
<include>javax.ws.rs:*</include>
161160
<include>net.jcip:jcip-annotations</include>
162161
<include>org.apache.avro:*</include>
163-
<include>org.apache.bookkeeper:*</include>
164162
<include>org.apache.commons:commons-compress</include>
165163
<include>org.apache.commons:commons-lang3</include>
166164
<!-- Issue #6834, Since Netty ByteBuf shaded, we need also shade this module -->
@@ -330,10 +328,6 @@
330328
<exclude>org.apache.avro.reflect.Union</exclude>
331329
</excludes>
332330
</relocation>
333-
<relocation>
334-
<pattern>org.apache.bookkeeper</pattern>
335-
<shadedPattern>org.apache.pulsar.shade.org.apache.bookkeeper</shadedPattern>
336-
</relocation>
337331
<relocation>
338332
<pattern>org.apache.commons</pattern>
339333
<shadedPattern>org.apache.pulsar.shade.org.apache.commons</shadedPattern>

0 commit comments

Comments
 (0)