This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 57025bc1191 [improve][broker] Include runtime dependencies in server
distribution (#22001)
57025bc1191 is described below
commit 57025bc11913680f7aac26ab42399ea8a6fccc05
Author: Dragos Misca <[email protected]>
AuthorDate: Wed Jan 31 10:01:44 2024 -0800
[improve][broker] Include runtime dependencies in server distribution
(#22001)
---
distribution/server/src/assemble/LICENSE.bin.txt | 2 +-
distribution/server/src/assemble/bin.xml | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt
b/distribution/server/src/assemble/LICENSE.bin.txt
index f509287f8f0..0bf0fee823c 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -500,6 +500,7 @@ The Apache Software License, Version 2.0
- io.reactivex.rxjava3-rxjava-3.0.1.jar
* RoaringBitmap
- org.roaringbitmap-RoaringBitmap-0.9.44.jar
+ - org.roaringbitmap-shims-0.9.44.jar
BSD 3-clause "New" or "Revised" License
* Google auth library
@@ -532,7 +533,6 @@ Protocol Buffers License
CDDL-1.1 -- ../licenses/LICENSE-CDDL-1.1.txt
* Java Annotations API
- - javax.annotation-javax.annotation-api-1.3.2.jar
- com.sun.activation-javax.activation-1.2.0.jar
- javax.xml.bind-jaxb-api-2.3.1.jar
* Java Servlet API -- javax.servlet-javax.servlet-api-3.1.0.jar
diff --git a/distribution/server/src/assemble/bin.xml
b/distribution/server/src/assemble/bin.xml
index 949c2657069..4dfec015c0e 100644
--- a/distribution/server/src/assemble/bin.xml
+++ b/distribution/server/src/assemble/bin.xml
@@ -110,7 +110,7 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<unpack>false</unpack>
- <scope>compile</scope>
+ <scope>runtime</scope>
<useProjectArtifact>false</useProjectArtifact>
<!-- Include 'groupId' in the dependencies Jar names to better identify
the provenance of the jar -->
@@ -119,12 +119,15 @@
<excludes>
<exclude>org.apache.pulsar:pulsar-functions-runtime-all</exclude>
- <exclude>org.projectlombok:lombok</exclude>
-
<!-- prevent adding pulsar-functions-api-examples in lib -->
<exclude>org.apache.pulsar:pulsar-functions-api-examples</exclude>
<!-- prevent adding any distribution .tar.gz files in lib -->
<exclude>*:tar.gz</exclude>
+ <!-- prevent adding annotation libraries -->
+ <exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude>
+ <exclude>com.google.android:annotations</exclude>
+ <!-- Needed only in the pulsar-shell distro only -->
+ <exclude>net.java.dev.jna:jna</exclude>
</excludes>
</dependencySet>
</dependencySets>
