Merge remote-tracking branch 'origin/master'

maven

5 天以前 5323d2e4d07d5ceaaae6a5bf12254641a2d77174

 pom.xml

@@ -37,6 +37,8 @@
        <velocity.version>2.3</velocity.version>

        <!-- override dependency version -->

        <tomcat.version>9.0.102</tomcat.version>

        <minio.version>8.4.3</minio.version>

        <okhttp.version>4.9.0</okhttp.version>

        <logback.version>1.2.13</logback.version>

        <spring-security.version>5.7.12</spring-security.version>

        <spring-framework.version>5.3.39</spring-framework.version>

@@ -252,6 +254,28 @@
            <artifactId>lombok</artifactId>

        </dependency>







        <!-- minio -->

        <dependency>

            <groupId>io.minio</groupId>

            <artifactId>minio</artifactId>

            <version>${minio.version}</version>

            <exclusions>

                <exclusion>

                    <groupId>com.squareup.okhttp3</groupId>

                    <artifactId>okhttp</artifactId>

                </exclusion>

            </exclusions>

        </dependency>



        <!-- minio依赖okhttp 不然报错 -->

        <dependency>

            <groupId>com.squareup.okhttp3</groupId>

            <artifactId>okhttp</artifactId>

            <version>${okhttp.version}</version>

        </dependency>



    </dependencies>



   <build>