From 833c360698054a17591f49845d36ba639d06bf50 Mon Sep 17 00:00:00 2001
From: zengqiao <zengqiao@didiglobal.com>
Date: Thu, 22 Sep 2022 11:17:59 +0800
Subject: [PATCH] bump oshi-core version to 5.6.1

---
 km-task/pom.xml | 14 ++++++++++++++
 pom.xml         | 13 +++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/km-task/pom.xml b/km-task/pom.xml
index 502d806d..d07b37b3 100644
--- a/km-task/pom.xml
+++ b/km-task/pom.xml
@@ -43,7 +43,21 @@
         <dependency>
             <groupId>io.github.zqrferrari</groupId>
             <artifactId>logi-job-spring-boot-starter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>oshi-core</artifactId>
+                    <groupId>com.github.oshi</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
+
+        <!-- 感谢 linG5821 的反馈，LogiJob中会依赖oshi-core，但是oshi-core使用的版本过低，因此windows系统上会存在问题，因此升级oshi-core版本 -->
+        <dependency>
+            <groupId>com.github.oshi</groupId>
+            <artifactId>oshi-core</artifactId>
+            <version>5.6.1</version>
+        </dependency>
+
         <dependency>
             <groupId>io.github.zqrferrari</groupId>
             <artifactId>logi-security-spring-boot-starter</artifactId>
diff --git a/pom.xml b/pom.xml
index e30add73..619f24c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -230,6 +230,19 @@
                 <groupId>io.github.zqrferrari</groupId>
                 <artifactId>logi-job-spring-boot-starter</artifactId>
                 <version>1.0.23</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>oshi-core</artifactId>
+                        <groupId>com.github.oshi</groupId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <!-- 感谢 linG5821 的反馈，LogiJob中会依赖oshi-core，但是oshi-core使用的版本过低，因此windows系统上会存在问题，因此升级oshi-core版本 -->
+            <dependency>
+                <groupId>com.github.oshi</groupId>
+                <artifactId>oshi-core</artifactId>
+                <version>5.6.1</version>
             </dependency>
 
             <dependency>
-- 
GitLab