fix 修复 升级依赖导致的依赖冲突

疯狂的狮子Li

2024-08-29 a3c9edde78cccda0ab36096e365fc5ebc0ae7eee

 pom.xml

@@ -13,8 +13,8 @@
    <description>RuoYi-Vue-Plus多租户管理系统</description>

    <properties>
        <revision>5.2.1</revision>
        <spring-boot.version>3.2.8</spring-boot.version>
        <revision>5.2.2</revision>
        <spring-boot.version>3.2.9</spring-boot.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <java.version>17</java.version>
@@ -32,8 +32,8 @@
        <redisson.version>3.34.1</redisson.version>
        <lock4j.version>2.2.7</lock4j.version>
        <dynamic-ds.version>4.3.1</dynamic-ds.version>
        <snailjob.version>1.1.1</snailjob.version>
        <mapstruct-plus.version>1.4.3</mapstruct-plus.version>
        <snailjob.version>1.1.2</snailjob.version>
        <mapstruct-plus.version>1.4.4</mapstruct-plus.version>
        <mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
        <lombok.version>1.18.34</lombok.version>
        <bouncycastle.version>1.76</bouncycastle.version>
@@ -292,12 +292,6 @@
                <version>${snailjob.version}</version>
            </dependency>

            <dependency>
                <groupId>com.alibaba</groupId>
                <artifactId>transmittable-thread-local</artifactId>
                <version>${alibaba-ttl.version}</version>
            </dependency>

            <!-- 加密包引入 -->
            <dependency>
                <groupId>org.bouncycastle</groupId>
@@ -332,12 +326,6 @@
                <groupId>io.undertow</groupId>
                <artifactId>undertow-websockets-jsr</artifactId>
                <version>${undertow.version}</version>
            </dependency>

            <dependency>
                <artifactId>commons-compress</artifactId>
                <groupId>org.apache.commons</groupId>
                <version>1.26.2</version>
            </dependency>

            <dependency>