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 @@ com.google.guava ${guava.version} - - - org.bouncycastle - bcprov-jdk15on - ${bcprov-jdk15on.version} - - - - com.google.inject - guice - ${guice.version} - com.thoughtworks.xstream @@ -285,12 +273,6 @@ ${xmlbeans.version} - - - org.jsoup - jsoup - ${jsoup.version} - org.commonmark commonmark @@ -347,23 +329,6 @@ generex ${generex.version} - - net.sf.json-lib - json-lib - ${json-lib.version} - jdk15 - - - commons-collections - commons-collections - - - commons-beanutils - commons-beanutils - - - - com.github.java-json-tools 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 @@ 3.x 21 - 2.7.22 1.5.0 1.12.0 - 1.5.3 + 1.5.4 3.3.2 - 2.1.3 + 2.1.4 32.0.1-jre 5.3.3 1.5 @@ -35,14 +34,13 @@ 3.0.2 0.10.2 1.70 - 2.11.0 + 2.13.0 1.10.0 1.4.20 - 3.1.0 - 2.1.12 + 5.1.1 + 2.1.16 2.2.8 2.1.0 - 1.15.3 0.19.0 1.21 2.26 @@ -51,7 +49,6 @@ 3.0.24 1.0.14 1.0.2 - 2.4 2.2.14 1.9 1.2.7 @@ -70,7 +67,6 @@ 0.1.2 2.0.0 2.0.29 - 20220924 8.5.2 5.0.1 2.7