Skip to content

Commit 1995591

Browse files
authored
Merge branch '3.1_ds' into debezium-upgrade
2 parents 40695d5 + b453330 commit 1995591

File tree

153 files changed

+5025
-1780
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+5025
-1780
lines changed

.github/workflows/ci-maven-cache-update.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
mvn_arguments: ''
6464

6565
- name: all modules - macos
66-
runs-on: macos-11
66+
runs-on: macos-latest
6767
cache_name: 'm2-dependencies-all'
6868

6969
- name: core-modules

.github/workflows/pulsar-ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1209,7 +1209,7 @@ jobs:
12091209
12101210
macos-build:
12111211
name: Build Pulsar on MacOS
1212-
runs-on: macos-11
1212+
runs-on: macos-latest
12131213
timeout-minutes: 120
12141214
needs: ['preconditions', 'integration-tests']
12151215
if: ${{ needs.preconditions.outputs.docs_only != 'true' }}

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,5 @@ test-reports/
9797

9898
# Gradle Enterprise
9999
.mvn/.gradle-enterprise/
100+
# Gradle Develocity
101+
.mvn/.develocity/

.mvn/gradle-enterprise.xml .mvn/develocity.xml

+6-7
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,21 @@
1919
under the License.
2020
2121
-->
22-
<gradleEnterprise
23-
xmlns="https://www.gradle.com/gradle-enterprise-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
24-
xsi:schemaLocation="https://www.gradle.com/gradle-enterprise-maven https://www.gradle.com/schema/gradle-enterprise-maven.xsd">
22+
<develocity xmlns="https://www.gradle.com/develocity-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23+
xsi:schemaLocation="https://www.gradle.com/develocity-maven https://www.gradle.com/schema/develocity-maven.xsd">
24+
<!-- Enable Gradle Develocity extension when GRADLE_ENTERPRISE_ACCESS_KEY/DEVELOCITY_ACCESS_KEY is set and the build isn't
25+
a pull request from a branch or forked repository with a name that indicates it's a work in progress. -->
26+
<enabled>#{(env['GRADLE_ENTERPRISE_ACCESS_KEY']?.trim() > '' or env['DEVELOCITY_ACCESS_KEY']?.trim() > '') and !(env['GITHUB_HEAD_REF']?.matches('(?i).*(experiment|wip|private).*') or env['GITHUB_REPOSITORY']?.matches('(?i).*(experiment|wip|private).*'))}</enabled>
2527
<server>
2628
<url>https://ge.apache.org</url>
2729
<allowUntrusted>false</allowUntrusted>
2830
</server>
2931
<buildScan>
3032
<capture>
31-
<goalInputFiles>true</goalInputFiles>
3233
<buildLogging>true</buildLogging>
3334
<testLogging>true</testLogging>
3435
</capture>
3536
<backgroundBuildScanUpload>#{isFalse(env['GITHUB_ACTIONS'])}</backgroundBuildScanUpload>
36-
<publish>ALWAYS</publish>
37-
<publishIfAuthenticated>true</publishIfAuthenticated>
3837
<obfuscation>
3938
<ipAddresses>#{{'0.0.0.0'}}</ipAddresses>
4039
</obfuscation>
@@ -47,4 +46,4 @@
4746
<enabled>false</enabled>
4847
</remote>
4948
</buildCache>
50-
</gradleEnterprise>
49+
</develocity>

.mvn/extensions.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
2424
<extension>
2525
<groupId>com.gradle</groupId>
26-
<artifactId>gradle-enterprise-maven-extension</artifactId>
27-
<version>1.17.1</version>
26+
<artifactId>develocity-maven-extension</artifactId>
27+
<version>1.21.4</version>
2828
</extension>
2929
<extension>
3030
<groupId>com.gradle</groupId>
3131
<artifactId>common-custom-user-data-maven-extension</artifactId>
32-
<version>1.11.1</version>
32+
<version>2.0</version>
3333
</extension>
3434
</extensions>

README.md

-2
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,6 @@ components in the Pulsar ecosystem, including connectors, adapters, and other la
141141
>
142142
> This project includes a [Maven Wrapper](https://maven.apache.org/wrapper/) that can be used instead of a system-installed Maven.
143143
> Use it by replacing `mvn` by `./mvnw` on Linux and `mvnw.cmd` on Windows in the commands below.
144-
>
145-
> It's better to use CMD rather than Powershell on Windows. Because maven will activate the `windows` profile which runs `rename-netty-native-libs.cmd`.
146144
147145
### Build
148146

bin/pulsar-daemon

+9-10
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ start ()
157157
echo starting $command, logging to $logfile
158158
echo Note: Set immediateFlush to true in conf/log4j2.yaml will guarantee the logging event is flushing to disk immediately. The default behavior is switched off due to performance considerations.
159159
pulsar=$PULSAR_HOME/bin/pulsar
160-
nohup $pulsar $command "$1" > "$out" 2>&1 < /dev/null &
160+
nohup $pulsar $command "$@" > "$out" 2>&1 < /dev/null &
161161
echo $! > $pid
162162
sleep 1; head $out
163163
sleep 2;
@@ -216,29 +216,28 @@ stop ()
216216

217217
case $startStop in
218218
(start)
219-
start "$*"
219+
start "$@"
220220
;;
221221

222222
(stop)
223223
stop $1
224224
;;
225225

226226
(restart)
227-
forceStopFlag=$(echo "$*"|grep "\-force")
228-
if [[ "$forceStopFlag" != "" ]]
227+
if [[ "$1" == "-force" ]]
229228
then
230-
stop "-force"
229+
stop -force
230+
# remove "-force" from the arguments
231+
shift
231232
else
232233
stop
233234
fi
234235
if [ "$?" == 0 ]
235236
then
236-
sleep 3
237-
paramaters="$*"
238-
startParamaters=${paramaters//-force/}
239-
start "$startParamaters"
237+
sleep 3
238+
start "$@"
240239
else
241-
echo "WARNNING : $command failed restart, for $command is not stopped completely."
240+
echo "WARNNING : $command failed restart, for $command is not stopped completely."
242241
fi
243242
;;
244243

build/pulsar_ci_tool.sh

+5-4
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,7 @@ _ci_upload_coverage_files() {
389389
--transform="flags=r;s|\\(/jacoco.*\\).exec$|\\1_${testtype}_${testgroup}.exec|" \
390390
--transform="flags=r;s|\\(/tmp/jacocoDir/.*\\).exec$|\\1_${testtype}_${testgroup}.exec|" \
391391
--exclude="*/META-INF/bundled-dependencies/*" \
392+
--exclude="*/META-INF/versions/*" \
392393
$GITHUB_WORKSPACE/target/classpath_* \
393394
$(find "$GITHUB_WORKSPACE" -path "*/target/jacoco*.exec" -printf "%p\n%h/classes\n" | sort | uniq) \
394395
$([ -d /tmp/jacocoDir ] && echo "/tmp/jacocoDir" ) \
@@ -530,11 +531,11 @@ ci_create_test_coverage_report() {
530531
local classfilesArgs="--classfiles $({
531532
{
532533
for classpathEntry in $(cat $completeClasspathFile | { grep -v -f $filterArtifactsFile || true; } | sort | uniq | { grep -v -E "$excludeJarsPattern" || true; }); do
533-
if [[ -f $classpathEntry && -n "$(unzip -Z1C $classpathEntry 'META-INF/bundled-dependencies/*' 2>/dev/null)" ]]; then
534-
# file must be processed by removing META-INF/bundled-dependencies
534+
if [[ -f $classpathEntry && -n "$(unzip -Z1C $classpathEntry 'META-INF/bundled-dependencies/*' 'META-INF/versions/*' 2>/dev/null)" ]]; then
535+
# file must be processed by removing META-INF/bundled-dependencies and META-INF/versions
535536
local jartempfile=$(mktemp -t jarfile.XXXX --suffix=.jar)
536537
cp $classpathEntry $jartempfile
537-
zip -q -d $jartempfile 'META-INF/bundled-dependencies/*' &> /dev/null
538+
zip -q -d $jartempfile 'META-INF/bundled-dependencies/*' 'META-INF/versions/*' &> /dev/null
538539
echo $jartempfile
539540
else
540541
echo $classpathEntry
@@ -596,7 +597,7 @@ ci_create_inttest_coverage_report() {
596597
# remove jar file that causes duplicate classes issue
597598
rm /tmp/jacocoDir/pulsar_lib/org.apache.pulsar-bouncy-castle* || true
598599
# remove any bundled dependencies as part of .jar/.nar files
599-
find /tmp/jacocoDir/pulsar_lib '(' -name "*.jar" -or -name "*.nar" ')' -exec echo "Processing {}" \; -exec zip -q -d {} 'META-INF/bundled-dependencies/*' \; |grep -E -v "Nothing to do|^$" || true
600+
find /tmp/jacocoDir/pulsar_lib '(' -name "*.jar" -or -name "*.nar" ')' -exec echo "Processing {}" \; -exec zip -q -d {} 'META-INF/bundled-dependencies/*' 'META-INF/versions/*' \; |grep -E -v "Nothing to do|^$" || true
600601
fi
601602
# projects that aren't considered as production code and their own src/main/java source code shouldn't be analysed
602603
local excludeProjectsPattern="testmocks|testclient|buildtools"

buildtools/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<license-maven-plugin.version>4.1</license-maven-plugin.version>
4848
<puppycrawl.checkstyle.version>10.14.2</puppycrawl.checkstyle.version>
4949
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
50-
<netty.version>4.1.108.Final</netty.version>
50+
<netty.version>4.1.111.Final</netty.version>
5151
<guice.version>4.2.3</guice.version>
5252
<guava.version>32.1.1-jre</guava.version>
5353
<ant.version>1.10.12</ant.version>

distribution/server/pom.xml

+13
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,19 @@
4646
<version>${project.version}</version>
4747
</dependency>
4848

49+
<dependency>
50+
<groupId>${project.groupId}</groupId>
51+
<artifactId>pulsar-metadata</artifactId>
52+
<version>${project.version}</version>
53+
</dependency>
54+
55+
<dependency>
56+
<groupId>${project.groupId}</groupId>
57+
<artifactId>jetcd-core-shaded</artifactId>
58+
<version>${project.version}</version>
59+
<classifier>shaded</classifier>
60+
</dependency>
61+
4962
<dependency>
5063
<groupId>${project.groupId}</groupId>
5164
<artifactId>pulsar-proxy</artifactId>

distribution/server/src/assemble/LICENSE.bin.txt

+52-57
Original file line numberDiff line numberDiff line change
@@ -289,26 +289,26 @@ The Apache Software License, Version 2.0
289289
- org.apache.commons-commons-lang3-3.11.jar
290290
- org.apache.commons-commons-text-1.10.0.jar
291291
* Netty
292-
- io.netty-netty-buffer-4.1.108.Final.jar
293-
- io.netty-netty-codec-4.1.108.Final.jar
294-
- io.netty-netty-codec-dns-4.1.108.Final.jar
295-
- io.netty-netty-codec-http-4.1.108.Final.jar
296-
- io.netty-netty-codec-http2-4.1.108.Final.jar
297-
- io.netty-netty-codec-socks-4.1.108.Final.jar
298-
- io.netty-netty-codec-haproxy-4.1.108.Final.jar
299-
- io.netty-netty-common-4.1.108.Final.jar
300-
- io.netty-netty-handler-4.1.108.Final.jar
301-
- io.netty-netty-handler-proxy-4.1.108.Final.jar
302-
- io.netty-netty-resolver-4.1.108.Final.jar
303-
- io.netty-netty-resolver-dns-4.1.108.Final.jar
304-
- io.netty-netty-resolver-dns-classes-macos-4.1.108.Final.jar
305-
- io.netty-netty-resolver-dns-native-macos-4.1.108.Final-osx-aarch_64.jar
306-
- io.netty-netty-resolver-dns-native-macos-4.1.108.Final-osx-x86_64.jar
307-
- io.netty-netty-transport-4.1.108.Final.jar
308-
- io.netty-netty-transport-classes-epoll-4.1.108.Final.jar
309-
- io.netty-netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar
310-
- io.netty-netty-transport-native-unix-common-4.1.108.Final.jar
311-
- io.netty-netty-transport-native-unix-common-4.1.108.Final-linux-x86_64.jar
292+
- io.netty-netty-buffer-4.1.111.Final.jar
293+
- io.netty-netty-codec-4.1.111.Final.jar
294+
- io.netty-netty-codec-dns-4.1.111.Final.jar
295+
- io.netty-netty-codec-http-4.1.111.Final.jar
296+
- io.netty-netty-codec-http2-4.1.111.Final.jar
297+
- io.netty-netty-codec-socks-4.1.111.Final.jar
298+
- io.netty-netty-codec-haproxy-4.1.111.Final.jar
299+
- io.netty-netty-common-4.1.111.Final.jar
300+
- io.netty-netty-handler-4.1.111.Final.jar
301+
- io.netty-netty-handler-proxy-4.1.111.Final.jar
302+
- io.netty-netty-resolver-4.1.111.Final.jar
303+
- io.netty-netty-resolver-dns-4.1.111.Final.jar
304+
- io.netty-netty-resolver-dns-classes-macos-4.1.111.Final.jar
305+
- io.netty-netty-resolver-dns-native-macos-4.1.111.Final-osx-aarch_64.jar
306+
- io.netty-netty-resolver-dns-native-macos-4.1.111.Final-osx-x86_64.jar
307+
- io.netty-netty-transport-4.1.111.Final.jar
308+
- io.netty-netty-transport-classes-epoll-4.1.111.Final.jar
309+
- io.netty-netty-transport-native-epoll-4.1.111.Final-linux-aarch_64.jar
310+
- io.netty-netty-transport-native-epoll-4.1.111.Final-linux-x86_64.jar
311+
- io.netty-netty-transport-native-unix-common-4.1.111.Final.jar
312312
- io.netty-netty-tcnative-boringssl-static-2.0.65.Final.jar
313313
- io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar
314314
- io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar
@@ -345,34 +345,34 @@ The Apache Software License, Version 2.0
345345
- net.java.dev.jna-jna-jpms-5.12.1.jar
346346
- net.java.dev.jna-jna-platform-jpms-5.12.1.jar
347347
* BookKeeper
348-
- org.apache.bookkeeper-bookkeeper-common-4.16.5.jar
349-
- org.apache.bookkeeper-bookkeeper-common-allocator-4.16.5.jar
350-
- org.apache.bookkeeper-bookkeeper-proto-4.16.5.jar
351-
- org.apache.bookkeeper-bookkeeper-server-4.16.5.jar
352-
- org.apache.bookkeeper-bookkeeper-tools-framework-4.16.5.jar
353-
- org.apache.bookkeeper-circe-checksum-4.16.5.jar
354-
- org.apache.bookkeeper-cpu-affinity-4.16.5.jar
355-
- org.apache.bookkeeper-statelib-4.16.5.jar
356-
- org.apache.bookkeeper-stream-storage-api-4.16.5.jar
357-
- org.apache.bookkeeper-stream-storage-common-4.16.5.jar
358-
- org.apache.bookkeeper-stream-storage-java-client-4.16.5.jar
359-
- org.apache.bookkeeper-stream-storage-java-client-base-4.16.5.jar
360-
- org.apache.bookkeeper-stream-storage-proto-4.16.5.jar
361-
- org.apache.bookkeeper-stream-storage-server-4.16.5.jar
362-
- org.apache.bookkeeper-stream-storage-service-api-4.16.5.jar
363-
- org.apache.bookkeeper-stream-storage-service-impl-4.16.5.jar
364-
- org.apache.bookkeeper.http-http-server-4.16.5.jar
365-
- org.apache.bookkeeper.http-vertx-http-server-4.16.5.jar
366-
- org.apache.bookkeeper.stats-bookkeeper-stats-api-4.16.5.jar
367-
- org.apache.bookkeeper.stats-prometheus-metrics-provider-4.16.5.jar
368-
- org.apache.distributedlog-distributedlog-common-4.16.5.jar
369-
- org.apache.distributedlog-distributedlog-core-4.16.5-tests.jar
370-
- org.apache.distributedlog-distributedlog-core-4.16.5.jar
371-
- org.apache.distributedlog-distributedlog-protocol-4.16.5.jar
372-
- org.apache.bookkeeper.stats-codahale-metrics-provider-4.16.5.jar
373-
- org.apache.bookkeeper-bookkeeper-slogger-api-4.16.5.jar
374-
- org.apache.bookkeeper-bookkeeper-slogger-slf4j-4.16.5.jar
375-
- org.apache.bookkeeper-native-io-4.16.5.jar
348+
- org.apache.bookkeeper-bookkeeper-common-4.16.6.jar
349+
- org.apache.bookkeeper-bookkeeper-common-allocator-4.16.6.jar
350+
- org.apache.bookkeeper-bookkeeper-proto-4.16.6.jar
351+
- org.apache.bookkeeper-bookkeeper-server-4.16.6.jar
352+
- org.apache.bookkeeper-bookkeeper-tools-framework-4.16.6.jar
353+
- org.apache.bookkeeper-circe-checksum-4.16.6.jar
354+
- org.apache.bookkeeper-cpu-affinity-4.16.6.jar
355+
- org.apache.bookkeeper-statelib-4.16.6.jar
356+
- org.apache.bookkeeper-stream-storage-api-4.16.6.jar
357+
- org.apache.bookkeeper-stream-storage-common-4.16.6.jar
358+
- org.apache.bookkeeper-stream-storage-java-client-4.16.6.jar
359+
- org.apache.bookkeeper-stream-storage-java-client-base-4.16.6.jar
360+
- org.apache.bookkeeper-stream-storage-proto-4.16.6.jar
361+
- org.apache.bookkeeper-stream-storage-server-4.16.6.jar
362+
- org.apache.bookkeeper-stream-storage-service-api-4.16.6.jar
363+
- org.apache.bookkeeper-stream-storage-service-impl-4.16.6.jar
364+
- org.apache.bookkeeper.http-http-server-4.16.6.jar
365+
- org.apache.bookkeeper.http-vertx-http-server-4.16.6.jar
366+
- org.apache.bookkeeper.stats-bookkeeper-stats-api-4.16.6.jar
367+
- org.apache.bookkeeper.stats-prometheus-metrics-provider-4.16.6.jar
368+
- org.apache.distributedlog-distributedlog-common-4.16.6.jar
369+
- org.apache.distributedlog-distributedlog-core-4.16.6-tests.jar
370+
- org.apache.distributedlog-distributedlog-core-4.16.6.jar
371+
- org.apache.distributedlog-distributedlog-protocol-4.16.6.jar
372+
- org.apache.bookkeeper.stats-codahale-metrics-provider-4.16.6.jar
373+
- org.apache.bookkeeper-bookkeeper-slogger-api-4.16.6.jar
374+
- org.apache.bookkeeper-bookkeeper-slogger-slf4j-4.16.6.jar
375+
- org.apache.bookkeeper-native-io-4.16.6.jar
376376
* Apache HTTP Client
377377
- org.apache.httpcomponents-httpclient-4.5.13.jar
378378
- org.apache.httpcomponents-httpcore-4.4.15.jar
@@ -423,7 +423,6 @@ The Apache Software License, Version 2.0
423423
- io.grpc-grpc-auth-1.55.3.jar
424424
- io.grpc-grpc-context-1.55.3.jar
425425
- io.grpc-grpc-core-1.55.3.jar
426-
- io.grpc-grpc-netty-1.55.3.jar
427426
- io.grpc-grpc-protobuf-1.55.3.jar
428427
- io.grpc-grpc-protobuf-lite-1.55.3.jar
429428
- io.grpc-grpc-stub-1.55.3.jar
@@ -482,7 +481,6 @@ The Apache Software License, Version 2.0
482481
- io.vertx-vertx-core-4.5.8.jar
483482
- io.vertx-vertx-web-4.5.8.jar
484483
- io.vertx-vertx-web-common-4.5.8.jar
485-
- io.vertx-vertx-grpc-4.5.8.jar
486484
* Apache ZooKeeper
487485
- org.apache.zookeeper-zookeeper-3.9.2.jar
488486
- org.apache.zookeeper-zookeeper-jute-3.9.2.jar
@@ -494,17 +492,14 @@ The Apache Software License, Version 2.0
494492
- com.google.http-client-google-http-client-1.41.0.jar
495493
- com.google.auto.value-auto-value-annotations-1.9.jar
496494
- com.google.re2j-re2j-1.6.jar
497-
* Jetcd
498-
- io.etcd-jetcd-api-0.7.7.jar
499-
- io.etcd-jetcd-common-0.7.7.jar
500-
- io.etcd-jetcd-core-0.7.7.jar
501-
- io.etcd-jetcd-grpc-0.7.7.jar
495+
* Jetcd - shaded
502496
* IPAddress
503-
- com.github.seancfoley-ipaddress-5.3.3.jar
497+
- com.github.seancfoley-ipaddress-5.5.0.jar
504498
* RxJava
505499
- io.reactivex.rxjava3-rxjava-3.0.1.jar
506500
* RoaringBitmap
507501
- org.roaringbitmap-RoaringBitmap-0.9.44.jar
502+
- org.roaringbitmap-shims-0.9.44.jar
508503

509504
BSD 3-clause "New" or "Revised" License
510505
* Google auth library
@@ -537,7 +532,6 @@ Protocol Buffers License
537532

538533
CDDL-1.1 -- ../licenses/LICENSE-CDDL-1.1.txt
539534
* Java Annotations API
540-
- javax.annotation-javax.annotation-api-1.3.2.jar
541535
- com.sun.activation-javax.activation-1.2.0.jar
542536
- javax.xml.bind-jaxb-api-2.3.1.jar
543537
* Java Servlet API -- javax.servlet-javax.servlet-api-3.1.0.jar
@@ -607,6 +601,7 @@ Datastax
607601
- com.datastax.oss-pulsar-transaction-common-3.1.4.3-SNAPSHOT.jar
608602
- com.datastax.oss-pulsar-transaction-coordinator-3.1.4.3-SNAPSHOT.jar
609603
- com.datastax.oss-testmocks-3.1.4.3-SNAPSHOT.jar
604+
- com.datastax.oss-jetcd-core-shaded-3.1.4.3-SNAPSHOT-shaded.jar
610605

611606
------------------------
612607

distribution/server/src/assemble/bin.xml

+6-4
Original file line numberDiff line numberDiff line change
@@ -126,21 +126,23 @@
126126
<dependencySet>
127127
<outputDirectory>lib</outputDirectory>
128128
<unpack>false</unpack>
129-
<scope>compile</scope>
129+
<scope>runtime</scope>
130130
<useProjectArtifact>false</useProjectArtifact>
131131
<!-- Include 'groupId' in the dependencies Jar names to better identify
132132
the provenance of the jar -->
133133
<outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
134134

135135
<excludes>
136136
<exclude>com.datastax.oss:pulsar-functions-runtime-all</exclude>
137-
138-
<exclude>org.projectlombok:lombok</exclude>
139-
140137
<!-- prevent adding pulsar-functions-api-examples in lib -->
141138
<exclude>com.datastax.oss:pulsar-functions-api-examples</exclude>
142139
<!-- prevent adding any distribution .tar.gz files in lib -->
143140
<exclude>*:tar.gz</exclude>
141+
<!-- prevent adding annotation libraries -->
142+
<exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude>
143+
<exclude>com.google.android:annotations</exclude>
144+
<!-- Needed only in the pulsar-shell distro only -->
145+
<exclude>net.java.dev.jna:jna</exclude>
144146
</excludes>
145147
</dependencySet>
146148
</dependencySets>

0 commit comments

Comments
 (0)