From a93da6d0fc9f30959e7b82d3eb0af460c245a2d9 Mon Sep 17 00:00:00 2001 From: ReaJason Date: Sun, 16 Nov 2025 13:07:31 +0800 Subject: [PATCH] chore: upgrade deps --- gradle/libs.versions.toml | 26 +++++++++---------- .../javaweb/integration/ShellAssertion.java | 8 +++--- .../integration/TestCasesProvider.java | 2 +- .../Tomcat8CommandEncryptorContainerTest.java | 4 +-- .../wildfly/Wildfly9ContainerTest.java | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c5352b67..8443232d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -asm = "9.8" +asm = "9.9" jna = "5.13.0" # 为适配 JDK6+ 这个不可修改 bcel = "5.2" javax-servlet-api = "3.0.1" @@ -10,21 +10,21 @@ reactor-netty = "1.1.25" jackson = "2.19.0" jetbrains-annotations = "26.0.2" -byte-buddy = "1.17.7" -commons-io = "2.20.0" -commons-lang3 = "3.18.0" -commons-codec = "1.19.0" -logback = "1.5.18" -okhttp3 = "5.1.0" -fastjson2 = "2.0.58" +byte-buddy = "1.18.1" +commons-io = "2.21.0" +commons-lang3 = "3.19.0" +commons-codec = "1.20.0" +logback = "1.5.21" +okhttp3 = "5.3.0" +fastjson2 = "2.0.60" java-websocket = "1.6.0" -mockito = "5.19.0" +mockito = "5.20.0" hamcrest = "3.0" -junit-jupiter = "5.13.4" +junit-jupiter = "5.14.1" junit-pioneer = "2.3.0" -junit-platform = "1.13.4" -testcontainers = "1.21.3" +junit-platform = "1.14.1" +testcontainers = "2.0.2" [libraries] byte-buddy = { module = "net.bytebuddy:byte-buddy", version.ref = "byte-buddy" } @@ -54,7 +54,7 @@ junit-pioneer = { module = "org.junit-pioneer:junit-pioneer", version.ref = "jun junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform" } junit-platform-reporting = { module = "org.junit.platform:junit-platform-reporting", version.ref = "junit-platform" } testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" } -testcontainers-junit-jupiter = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" } +testcontainers-junit-jupiter = { module = "org.testcontainers:testcontainers-junit-jupiter", version.ref = "testcontainers" } [bundles] jna = ["jna", "jna-platform"] diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertion.java b/integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertion.java index 7c07cae3..233d9ba4 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertion.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertion.java @@ -23,10 +23,10 @@ import okhttp3.Request; import okhttp3.Response; import org.testcontainers.containers.Container; import org.testcontainers.containers.GenericContainer; -import org.testcontainers.shaded.org.apache.commons.io.FileUtils; -import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils; -import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils; -import org.testcontainers.shaded.org.apache.commons.lang3.tuple.Pair; +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.Pair; import org.testcontainers.utility.MountableFile; import java.io.IOException; diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/TestCasesProvider.java b/integration-test/src/test/java/com/reajason/javaweb/integration/TestCasesProvider.java index 7bc1da24..0de9f646 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/TestCasesProvider.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/TestCasesProvider.java @@ -3,8 +3,8 @@ package com.reajason.javaweb.integration; import com.reajason.javaweb.memshell.ServerFactory; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; +import org.apache.commons.lang3.tuple.Triple; import org.junit.jupiter.params.provider.Arguments; -import org.testcontainers.shaded.org.apache.commons.lang3.tuple.Triple; import java.util.*; import java.util.stream.Collectors; diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat8CommandEncryptorContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat8CommandEncryptorContainerTest.java index 761189ea..942b5077 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat8CommandEncryptorContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat8CommandEncryptorContainerTest.java @@ -18,8 +18,8 @@ import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; -import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils; -import org.testcontainers.shaded.org.apache.commons.lang3.tuple.Pair; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.tuple.Pair; import java.util.Base64; import java.util.stream.Stream; diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly9ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly9ContainerTest.java index 732c0e01..35074393 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly9ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly9ContainerTest.java @@ -17,7 +17,7 @@ import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.images.builder.ImageFromDockerfile; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; -import org.testcontainers.shaded.org.apache.commons.lang3.tuple.Triple; +import org.apache.commons.lang3.tuple.Triple; import java.util.List; import java.util.stream.Stream;