Procházet zdrojové kódy

升级spring-cloud相关组件到最新版

RuoYi před 1 rokem
rodič
revize
d47352253e
1 změnil soubory, kde provedl 43 přidání a 7 odebrání
  1. 43 7
      pom.xml

+ 43 - 7
pom.xml

@@ -18,30 +18,34 @@
18 18
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
19 19
         <java.version>1.8</java.version>
20 20
         <spring-boot.version>2.7.18</spring-boot.version>
21
-        <spring-cloud.version>2021.0.8</spring-cloud.version>
22
-        <spring-cloud-alibaba.version>2021.0.5.0</spring-cloud-alibaba.version>
23
-        <spring-framework.version>5.3.33</spring-framework.version>
24
-        <spring-boot-admin.version>2.7.15</spring-boot-admin.version>
21
+        <spring-cloud.version>2021.0.9</spring-cloud.version>
22
+        <spring-cloud-alibaba.version>2021.0.6.1</spring-cloud-alibaba.version>
23
+        <spring-boot-admin.version>2.7.16</spring-boot-admin.version>
25 24
         <tobato.version>1.27.2</tobato.version>
26 25
         <kaptcha.version>2.3.3</kaptcha.version>
27 26
         <pagehelper.boot.version>2.0.0</pagehelper.boot.version>
28 27
         <druid.version>1.2.23</druid.version>
29
-        <dynamic-ds.version>4.2.0</dynamic-ds.version>
28
+        <dynamic-ds.version>4.3.1</dynamic-ds.version>
30 29
         <commons.io.version>2.13.0</commons.io.version>
31 30
         <velocity.version>2.3</velocity.version>
32
-        <fastjson.version>2.0.43</fastjson.version>
31
+        <fastjson.version>2.0.53</fastjson.version>
33 32
         <jjwt.version>0.9.1</jjwt.version>
34 33
         <minio.version>8.2.2</minio.version>
35 34
         <poi.version>4.1.2</poi.version>
36 35
         <springdoc.version>1.6.9</springdoc.version>
37 36
         <transmittable-thread-local.version>2.14.4</transmittable-thread-local.version>
37
+
38
+        <!-- override dependency version -->
39
+        <tomcat.version>9.0.96</tomcat.version>
40
+        <logback.version>1.2.13</logback.version>
41
+        <spring-framework.version>5.3.39</spring-framework.version>
38 42
     </properties>
39 43
 
40 44
     <!-- 依赖声明 -->
41 45
     <dependencyManagement>
42 46
         <dependencies>
43 47
 
44
-            <!-- SpringFramework的依赖配置-->
48
+            <!-- 覆盖SpringFramework的依赖配置-->
45 49
             <dependency>
46 50
                 <groupId>org.springframework</groupId>
47 51
                 <artifactId>spring-framework-bom</artifactId>
@@ -77,6 +81,38 @@
77 81
                 <scope>import</scope>
78 82
             </dependency>
79 83
 
84
+            <!-- 覆盖logback的依赖配置-->
85
+            <dependency>
86
+                <groupId>ch.qos.logback</groupId>
87
+                <artifactId>logback-core</artifactId>
88
+                <version>${logback.version}</version>
89
+            </dependency>
90
+
91
+            <dependency>
92
+                <groupId>ch.qos.logback</groupId>
93
+                <artifactId>logback-classic</artifactId>
94
+                <version>${logback.version}</version>
95
+            </dependency>
96
+
97
+            <!-- 覆盖tomcat的依赖配置-->
98
+            <dependency>
99
+                <groupId>org.apache.tomcat.embed</groupId>
100
+                <artifactId>tomcat-embed-core</artifactId>
101
+                <version>${tomcat.version}</version>
102
+            </dependency>
103
+
104
+            <dependency>
105
+                <groupId>org.apache.tomcat.embed</groupId>
106
+                <artifactId>tomcat-embed-el</artifactId>
107
+                <version>${tomcat.version}</version>
108
+            </dependency>
109
+
110
+            <dependency>
111
+                <groupId>org.apache.tomcat.embed</groupId>
112
+                <artifactId>tomcat-embed-websocket</artifactId>
113
+                <version>${tomcat.version}</version>
114
+            </dependency>
115
+
80 116
             <!-- FastDFS 分布式文件系统 -->
81 117
             <dependency>
82 118
                 <groupId>com.github.tobato</groupId>