From bb7a36cd3baeda42df10987e1e8a81915eb6364f Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 26 Sep 2023 16:24:16 +0800
Subject: [PATCH] build: Upgrade dependency version

---
 backend/framework/sdk/pom.xml                 | 35 -------------------
 .../system/security/TotpFilter.java           |  2 +-
 .../metersphere/system/uid/BitsAllocator.java |  4 +--
 .../system/uid/impl/DefaultUidGenerator.java  |  2 +-
 .../system/uid/utils/DockerUtils.java         |  2 +-
 .../system/uid/utils/NamingThreadFactory.java |  4 +--
 .../system/uid/utils/TimeUtils.java           |  4 +--
 .../worker/DisposableWorkerIdAssigner.java    |  4 +--
 pom.xml                                       | 14 +++-----
 9 files changed, 16 insertions(+), 55 deletions(-)

diff --git a/backend/framework/sdk/pom.xml b/backend/framework/sdk/pom.xml
index 668bf6103d..de8ccfb9ef 100644
--- a/backend/framework/sdk/pom.xml
+++ b/backend/framework/sdk/pom.xml
@@ -261,18 +261,6 @@
             <groupId>com.google.guava</groupId>
             <version>${guava.version}</version>
         </dependency>
-        <!--解决升级JDK11后动态加载JAR 需要JVM的JCA签名信任才能作为加密提供者-->
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-            <version>${bcprov-jdk15on.version}</version>
-        </dependency>
-        <!-- jdk11 环境下有 Illegal reflective access   -->
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
-            <version>${guice.version}</version>
-        </dependency>
         <!--   排除jmeter中的 xstream 解决bug     -->
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
@@ -285,12 +273,6 @@
             <version>${xmlbeans.version}</version>
         </dependency>
 
-
-        <dependency>
-            <groupId>org.jsoup</groupId>
-            <artifactId>jsoup</artifactId>
-            <version>${jsoup.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.commonmark</groupId>
             <artifactId>commonmark</artifactId>
@@ -347,23 +329,6 @@
             <artifactId>generex</artifactId>
             <version>${generex.version}</version>
         </dependency>
-        <dependency>
-            <groupId>net.sf.json-lib</groupId>
-            <artifactId>json-lib</artifactId>
-            <version>${json-lib.version}</version>
-            <classifier>jdk15</classifier>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-collections</artifactId>
-                    <groupId>commons-collections</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>commons-beanutils</artifactId>
-                    <groupId>commons-beanutils</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <!--java json schema json格式校验-->
         <dependency>
             <groupId>com.github.java-json-tools</groupId>
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/security/TotpFilter.java b/backend/services/system-setting/src/main/java/io/metersphere/system/security/TotpFilter.java
index e432b9689b..ea0daf89ba 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/security/TotpFilter.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/security/TotpFilter.java
@@ -7,7 +7,7 @@ import io.metersphere.sdk.util.CommonBeanFactory;
 import jakarta.servlet.ServletRequest;
 import jakarta.servlet.ServletResponse;
 import jakarta.servlet.http.HttpServletRequest;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.web.filter.authc.AnonymousFilter;
 import org.apache.shiro.web.util.WebUtils;
 
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/uid/BitsAllocator.java b/backend/services/system-setting/src/main/java/io/metersphere/system/uid/BitsAllocator.java
index 848e90d97e..80aeec84e6 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/uid/BitsAllocator.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/uid/BitsAllocator.java
@@ -1,8 +1,8 @@
 
 package io.metersphere.system.uid;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.util.Assert;
 
 /**
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/uid/impl/DefaultUidGenerator.java b/backend/services/system-setting/src/main/java/io/metersphere/system/uid/impl/DefaultUidGenerator.java
index 420f6baf15..1f8e7b049c 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/uid/impl/DefaultUidGenerator.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/uid/impl/DefaultUidGenerator.java
@@ -7,7 +7,7 @@ import io.metersphere.system.uid.utils.TimeUtils;
 import io.metersphere.system.uid.worker.WorkerIdAssigner;
 import io.metersphere.sdk.util.LogUtils;
 import jakarta.annotation.Resource;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/uid/utils/DockerUtils.java b/backend/services/system-setting/src/main/java/io/metersphere/system/uid/utils/DockerUtils.java
index 4d8e450314..7edebf53cf 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/uid/utils/DockerUtils.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/uid/utils/DockerUtils.java
@@ -1,7 +1,7 @@
 
 package io.metersphere.system.uid.utils;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/uid/utils/NamingThreadFactory.java b/backend/services/system-setting/src/main/java/io/metersphere/system/uid/utils/NamingThreadFactory.java
index 59b99be01d..8b48b389bd 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/uid/utils/NamingThreadFactory.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/uid/utils/NamingThreadFactory.java
@@ -1,8 +1,8 @@
 
 package io.metersphere.system.uid.utils;
 
-import org.apache.commons.lang.ClassUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ClassUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/uid/utils/TimeUtils.java b/backend/services/system-setting/src/main/java/io/metersphere/system/uid/utils/TimeUtils.java
index 472413df6d..78e0d770ce 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/uid/utils/TimeUtils.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/uid/utils/TimeUtils.java
@@ -1,6 +1,6 @@
 package io.metersphere.system.uid.utils;
 
-import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -9,7 +9,7 @@ import java.util.Date;
 /**
  * DateUtils provides date formatting, parsing
  */
-public abstract class TimeUtils extends org.apache.commons.lang.time.DateUtils {
+public abstract class TimeUtils extends org.apache.commons.lang3.time.DateUtils {
     /**
      * Patterns
      */
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/uid/worker/DisposableWorkerIdAssigner.java b/backend/services/system-setting/src/main/java/io/metersphere/system/uid/worker/DisposableWorkerIdAssigner.java
index aecb92bf07..eec045e4df 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/uid/worker/DisposableWorkerIdAssigner.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/uid/worker/DisposableWorkerIdAssigner.java
@@ -7,7 +7,7 @@ import io.metersphere.system.mapper.BaseWorkerNodeMapper;
 import io.metersphere.system.uid.utils.DockerUtils;
 import io.metersphere.system.uid.utils.NetUtils;
 import jakarta.annotation.Resource;
-import org.apache.commons.lang.math.RandomUtils;
+import org.apache.commons.lang3.RandomUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -55,7 +55,7 @@ public class DisposableWorkerIdAssigner implements WorkerIdAssigner {
         } else {
             workerNode.setType(WorkerNodeType.ACTUAL.value());
             workerNode.setHostName(NetUtils.getLocalAddress());
-            workerNode.setPort(System.currentTimeMillis() + "-" + RandomUtils.nextInt(100000));
+            workerNode.setPort(System.currentTimeMillis() + "-" + RandomUtils.nextInt());
         }
         workerNode.setCreated(System.currentTimeMillis());
         workerNode.setModified(System.currentTimeMillis());
diff --git a/pom.xml b/pom.xml
index 09647580ce..87525100d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,12 +20,11 @@
     <properties>
         <revision>3.x</revision>
         <java.version>21</java.version>
-        <dubbo.version>2.7.22</dubbo.version>
         <platform-plugin-sdk.version>1.5.0</platform-plugin-sdk.version>
         <shiro.version>1.12.0</shiro.version>
-        <java-websocket.version>1.5.3</java-websocket.version>
+        <java-websocket.version>1.5.4</java-websocket.version>
         <easyexcel.version>3.3.2</easyexcel.version>
-        <dom4j.version>2.1.3</dom4j.version>
+        <dom4j.version>2.1.4</dom4j.version>
         <guava.version>32.0.1-jre</guava.version>
         <pagehelper.version>5.3.3</pagehelper.version>
         <metersphere-jmeter-functions.version>1.5</metersphere-jmeter-functions.version>
@@ -35,14 +34,13 @@
         <mybatis-starter.version>3.0.2</mybatis-starter.version>
         <reflections.version>0.10.2</reflections.version>
         <bcprov-jdk15on.version>1.70</bcprov-jdk15on.version>
-        <commons-io.version>2.11.0</commons-io.version>
+        <commons-io.version>2.13.0</commons-io.version>
         <commons-text.version>1.10.0</commons-text.version>
         <xstream.version>1.4.20</xstream.version>
-        <xmlbeans.version>3.1.0</xmlbeans.version>
-        <swagger-parser.version>2.1.12</swagger-parser.version>
+        <xmlbeans.version>5.1.1</xmlbeans.version>
+        <swagger-parser.version>2.1.16</swagger-parser.version>
         <swagger.version>2.2.8</swagger.version>
         <springdoc-openapi-ui.version>2.1.0</springdoc-openapi-ui.version>
-        <jsoup.version>1.15.3</jsoup.version>
         <commonmark.version>0.19.0</commonmark.version>
         <commons-compress.version>1.21</commons-compress.version>
         <htmlcleaner.version>2.26</htmlcleaner.version>
@@ -51,7 +49,6 @@
         <plexus.version>3.0.24</plexus.version>
         <common-random.version>1.0.14</common-random.version>
         <generex.version>1.0.2</generex.version>
-        <json-lib.version>2.4</json-lib.version>
         <json-schema-validator.version>2.2.14</json-schema-validator.version>
         <xz.version>1.9</xz.version>
         <flatten.version>1.2.7</flatten.version>
@@ -70,7 +67,6 @@
         <dec.version>0.1.2</dec.version>
         <dingtalk-sdk.version>2.0.0</dingtalk-sdk.version>
         <dingtalk-client.version>2.0.29</dingtalk-client.version>
-        <org-json.version>20220924</org-json.version>
         <minio.version>8.5.2</minio.version>
         <hikaricp.version>5.0.1</hikaricp.version>
         <xmlgraphics-commons.version>2.7</xmlgraphics-commons.version>