optimize: optimize the versions of the dependencies (apache#4227)

itfsw · Feb 16, 2022 · 314ec7c · 314ec7c
1 parent 031f4c3
commit 314ec7c
Show file tree

Hide file tree

Showing 23 changed files with 309 additions and 273 deletions.
diff --git a/build/pom.xml b/build/pom.xml
@@ -72,6 +72,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
+        <!-- The version of spring-boot for 'spring-boot-dependencies' and 'spring-boot-maven-plugin' -->
+        <spring-boot.version>2.4.13</spring-boot.version>
 
         <!-- Maven plugin versions -->
         <!-- Build -->

diff --git a/config/seata-config-etcd3/pom.xml b/config/seata-config-etcd3/pom.xml
@@ -34,12 +34,6 @@
         <dependency>
             <groupId>io.etcd</groupId>
             <artifactId>jetcd-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.google.guava</groupId>
-                    <artifactId>guava</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>

diff --git a/console/pom.xml b/console/pom.xml
@@ -12,23 +12,6 @@
     <packaging>jar</packaging>
     <name>seata-console ${project.version}</name>
 
-    <properties>
-        <spring-boot.version>2.3.10.RELEASE</spring-boot.version>
-        <jwt.version>0.10.5</jwt.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -55,23 +38,19 @@
         <!--<dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt</artifactId>
-            <version>${jwt.version}</version>
         </dependency>-->
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt-api</artifactId>
-            <version>${jwt.version}</version>
         </dependency>
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt-impl</artifactId>
-            <version>${jwt.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt-jackson</artifactId>
-            <version>${jwt.version}</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>

diff --git a/console/src/main/java/io/seata/console/config/WebSecurityConfig.java b/console/src/main/java/io/seata/console/config/WebSecurityConfig.java
@@ -40,7 +40,7 @@
  *
  * @author jameslcj
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableGlobalMethodSecurity(prePostEnabled = true)
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {