This is an automated email from the ASF dual-hosted git repository.
mattisonchao 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 96f82627193 [improve][broker] Add oshi library to help control OS
resources. (#18990)
96f82627193 is described below
commit 96f8262719300da1c87f371de285d0b758bd509e
Author: Qiang Zhao <[email protected]>
AuthorDate: Mon Jan 9 11:35:37 2023 +0800
[improve][broker] Add oshi library to help control OS resources. (#18990)
---
distribution/server/src/assemble/LICENSE.bin.txt | 8 ++++++--
pom.xml | 6 ++++++
pulsar-broker/pom.xml | 6 ++++++
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt
b/distribution/server/src/assemble/LICENSE.bin.txt
index b5e839aa01e..791dcee2193 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -339,7 +339,10 @@ The Apache Software License, Version 2.0
- org.apache.logging.log4j-log4j-core-2.18.0.jar
- org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar
- org.apache.logging.log4j-log4j-web-2.18.0.jar
- * Java Native Access JNA -- net.java.dev.jna-jna-5.12.1.jar
+ * Java Native Access JNA
+ - net.java.dev.jna-jna-5.12.1.jar
+ - net.java.dev.jna-jna-jpms-5.12.1.jar
+ - net.java.dev.jna-jna-platform-jpms-5.12.1.jar
* BookKeeper
- org.apache.bookkeeper-bookkeeper-common-4.15.3.jar
- org.apache.bookkeeper-bookkeeper-common-allocator-4.15.3.jar
@@ -509,7 +512,8 @@ MIT License
- org.slf4j-jcl-over-slf4j-1.7.32.jar
* The Checker Framework
- org.checkerframework-checker-qual-3.12.0.jar
-
+ * oshi
+ - com.github.oshi-oshi-core-java11-6.4.0.jar
Protocol Buffers License
* Protocol Buffers
- com.google.protobuf-protobuf-java-3.19.6.jar --
../licenses/LICENSE-protobuf.txt
diff --git a/pom.xml b/pom.xml
index 1685003a23f..db6de83545f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -286,6 +286,7 @@ flexible messaging model and an intuitive client
API.</description>
<roaringbitmap.version>0.9.15</roaringbitmap.version>
<extra-enforcer-rules.version>1.6.1</extra-enforcer-rules.version>
<lombok.plugin.version>1.18.20.0</lombok.plugin.version>
+ <oshi.version>6.4.0</oshi.version>
<!-- Used to configure rename.netty.native. Libs -->
<rename.netty.native.libs>rename-netty-native-libs.sh</rename.netty.native.libs>
@@ -1344,6 +1345,11 @@ flexible messaging model and an intuitive client
API.</description>
<artifactId>RoaringBitmap</artifactId>
<version>${roaringbitmap.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.github.oshi</groupId>
+ <artifactId>oshi-core-java11</artifactId>
+ <version>${oshi.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml
index ce20aed7bed..074c6fc8a9b 100644
--- a/pulsar-broker/pom.xml
+++ b/pulsar-broker/pom.xml
@@ -342,6 +342,11 @@
<artifactId>RoaringBitmap</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.github.oshi</groupId>
+ <artifactId>oshi-core-java11</artifactId>
+ </dependency>
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-functions-api-examples</artifactId>
@@ -425,6 +430,7 @@
<artifactId>pulsar-package-filesystem-storage</artifactId>
<version>${project.version}</version>
</dependency>
+
</dependencies>
<build>
