Skip to content

Commit 21eca70

Browse files
authored
optimize: update the LICENSE and NOTICE files and standardize dependency versions (apache#6841)
1 parent 22f9c47 commit 21eca70

File tree

12 files changed

+340
-252
lines changed

12 files changed

+340
-252
lines changed

build/pom.xml

+2-4
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@
8181
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
8282

8383
<!-- The version of spring-boot for 'spring-boot-dependencies' and 'spring-boot-maven-plugin' -->
84-
<spring-boot.version>2.5.15</spring-boot.version>
85-
<spring-framework.version>5.3.27</spring-framework.version>
84+
<spring-boot.version>2.7.18</spring-boot.version>
85+
<spring-framework.version>5.3.39</spring-framework.version>
8686

8787
<!-- server side dependency-->
8888
<kafka-appender.version>0.2.0-RC2</kafka-appender.version>
@@ -137,8 +137,6 @@
137137
<pmd.skip>true</pmd.skip>
138138
<maven.test.skip>false</maven.test.skip>
139139
<maven.git-commit-id.skip>true</maven.git-commit-id.skip>
140-
<maven.surefire.argLine></maven.surefire.argLine>
141-
<maven.surefire.excludes></maven.surefire.excludes>
142140

143141
<!-- For docker image-->
144142
<image.publish.skip>true</image.publish.skip>

changes/en-us/2.x.md

+2
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ Add changes here for all PR submitted to the 2.x branch.
9696
- [[#6819](https://github.com/apache/incubator-seata/pull/6819)] merge the packaging processes of namingserver and seata-server
9797
- [[#6827](https://github.com/apache/incubator-seata/pull/6827)] rename namingserver registry type
9898
- [[#6836](https://github.com/apache/incubator-seata/pull/6836)] add independent nacos for the CI process
99+
- [[#6841](https://github.com/apache/incubator-seata/pull/6841)] update the LICENSE and NOTICE files and standardize dependency versions
100+
- [[#6823](https://github.com/apache/incubator-seata/pull/6823)] fix typo
99101
- [[#6779](https://github.com/apache/incubator-seata/pull/6779)] use curator instead of zkclient in config model
100102
- [[#6831](https://github.com/apache/incubator-seata/pull/6831)] use curator instead of zkclient in registry model
101103
- [[#6852](https://github.com/apache/incubator-seata/pull/6852)] optimize raft metadata api

changes/zh-cn/2.x.md

+2
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@
9797
- [[#6819](https://github.com/apache/incubator-seata/pull/6819)] namingserver与server的合并打包
9898
- [[#6827](https://github.com/apache/incubator-seata/pull/6827)] 重命名namingserver注册类型改为seata
9999
- [[#6836](https://github.com/apache/incubator-seata/pull/6836)] 为CI流程增加独立nacos
100+
- [[#6841](https://github.com/apache/incubator-seata/pull/6841)] 更新license和notice文件并统一依赖版本
101+
- [[#6823](https://github.com/apache/incubator-seata/pull/6823)] 修正DefaultGlobalTransaction日志的错别字
100102
- [[#6779](https://github.com/apache/incubator-seata/pull/6779)] 在config模块中使用curator替代zkclient
101103
- [[#6831](https://github.com/apache/incubator-seata/pull/6831)] 在registry模块中使用curator替代zkclient
102104
- [[#6803](https://github.com/apache/incubator-seata/pull/6803)] 优化 ARM64 架构的编译打包

console/pom.xml

+20-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
<properties>
3535
<spring-boot-for-server.version>2.7.18</spring-boot-for-server.version>
36-
<spring-framework-for-server.version>5.3.37</spring-framework-for-server.version>
36+
<spring-framework-for-server.version>5.3.39</spring-framework-for-server.version>
3737
<snakeyaml-for-server.version>2.0</snakeyaml-for-server.version>
3838
<tomcat-embed.version>9.0.90</tomcat-embed.version>
3939
</properties>
@@ -64,6 +64,10 @@
6464
<artifactId>spring-boot-dependencies</artifactId>
6565
<version>${spring-boot-for-server.version}</version>
6666
<exclusions>
67+
<exclusion>
68+
<groupId>org.apache.kafka</groupId>
69+
<artifactId>kafka-clients</artifactId>
70+
</exclusion>
6771
<exclusion>
6872
<groupId>org.springframework</groupId>
6973
<artifactId>spring-framework-bom</artifactId>
@@ -86,6 +90,21 @@
8690
</dependencyManagement>
8791

8892
<dependencies>
93+
<dependency>
94+
<groupId>org.apache.tomcat.embed</groupId>
95+
<artifactId>tomcat-embed-core</artifactId>
96+
<version>${tomcat-embed.version}</version>
97+
</dependency>
98+
<dependency>
99+
<groupId>org.apache.tomcat.embed</groupId>
100+
<artifactId>tomcat-embed-el</artifactId>
101+
<version>${tomcat-embed.version}</version>
102+
</dependency>
103+
<dependency>
104+
<groupId>org.apache.tomcat.embed</groupId>
105+
<artifactId>tomcat-embed-websocket</artifactId>
106+
<version>${tomcat-embed.version}</version>
107+
</dependency>
89108
<dependency>
90109
<groupId>org.springframework.boot</groupId>
91110
<artifactId>spring-boot-autoconfigure</artifactId>
@@ -141,10 +160,6 @@
141160
<artifactId>jjwt-jackson</artifactId>
142161
<scope>runtime</scope>
143162
</dependency>
144-
<dependency>
145-
<groupId>org.apache.tomcat.embed</groupId>
146-
<artifactId>tomcat-embed-core</artifactId>
147-
</dependency>
148163
<dependency>
149164
<groupId>org.apache.seata</groupId>
150165
<artifactId>seata-common</artifactId>

dependencies/pom.xml

+47-5
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,8 @@
7272
<ant.version>1.10.12</ant.version>
7373
<lz4.version>1.7.1</lz4.version>
7474
<jraft.version>1.3.14</jraft.version>
75-
<netty.version>4.1.86.Final</netty.version>
7675
<snakeyaml.version>2.0</snakeyaml.version>
77-
<netty.version>4.1.94.Final</netty.version>
76+
<netty.version>4.1.101.Final</netty.version>
7877
<sofa.hessian.version>4.0.3</sofa.hessian.version>
7978
<sofa.bolt.version>1.6.7</sofa.bolt.version>
8079

@@ -86,6 +85,9 @@
8685
<groovy.version>2.4.4</groovy.version>
8786
<zstd.version>1.5.0-4</zstd.version>
8887
<xstream.version>1.4.20</xstream.version>
88+
<checker-qual.version>3.37.0</checker-qual.version>
89+
<error_prone_annotations.version>2.21.1</error_prone_annotations.version>
90+
<tomcat-embed.version>9.0.90</tomcat-embed.version>
8991

9092
<!-- The `httpcore` and `httpclient` have been removed in spring-boot 3.1.0 and above. -->
9193
<httpcore.version>4.4.16</httpcore.version>
@@ -111,7 +113,7 @@
111113
<druid.version>1.2.20</druid.version>
112114
<commons-dbcp2.version>2.9.0</commons-dbcp2.version>
113115
<hikari.version>3.4.3</hikari.version>
114-
<caffeine.version>2.8.8</caffeine.version>
116+
<caffeine.version>2.9.3</caffeine.version>
115117
<!-- sql parser -->
116118
<antlr4.version>4.8</antlr4.version>
117119
<!-- for jdbc driver when package -->
@@ -132,7 +134,7 @@
132134
<mockito.version>4.11.0</mockito.version>
133135
<assertj-core.version>3.12.2</assertj-core.version>
134136
<jetty-version>9.4.38.v20210224</jetty-version>
135-
<janino-version>3.1.7</janino-version>
137+
<janino-version>3.1.10</janino-version>
136138
<mockwebserver-version>4.12.0</mockwebserver-version>
137139
<native-lib-loader.version>2.4.0</native-lib-loader.version>
138140
</properties>
@@ -163,6 +165,10 @@
163165
<artifactId>spring-boot-dependencies</artifactId>
164166
<version>${spring-boot.version}</version>
165167
<exclusions>
168+
<exclusion>
169+
<groupId>org.apache.kafka</groupId>
170+
<artifactId>kafka-clients</artifactId>
171+
</exclusion>
166172
<exclusion>
167173
<groupId>org.springframework</groupId>
168174
<artifactId>spring-framework-bom</artifactId>
@@ -171,17 +177,49 @@
171177
<groupId>org.apache.tomcat.embed</groupId>
172178
<artifactId>tomcat-embed-core</artifactId>
173179
</exclusion>
180+
<exclusion>
181+
<groupId>org.apache.tomcat.embed</groupId>
182+
<artifactId>tomcat-embed-websocket</artifactId>
183+
</exclusion>
184+
<exclusion>
185+
<groupId>org.apache.tomcat.embed</groupId>
186+
<artifactId>tomcat-embed-el</artifactId>
187+
</exclusion>
174188
</exclusions>
175189
<type>pom</type>
176190
<scope>import</scope>
177191
</dependency>
178-
192+
<dependency>
193+
<groupId>org.apache.tomcat.embed</groupId>
194+
<artifactId>tomcat-embed-core</artifactId>
195+
<version>${tomcat-embed.version}</version>
196+
</dependency>
197+
<dependency>
198+
<groupId>org.apache.tomcat.embed</groupId>
199+
<artifactId>tomcat-embed-el</artifactId>
200+
<version>${tomcat-embed.version}</version>
201+
</dependency>
202+
<dependency>
203+
<groupId>org.apache.tomcat.embed</groupId>
204+
<artifactId>tomcat-embed-websocket</artifactId>
205+
<version>${tomcat-embed.version}</version>
206+
</dependency>
179207
<!-- the 3rd part -->
180208
<dependency>
181209
<groupId>io.netty</groupId>
182210
<artifactId>netty-all</artifactId>
183211
<version>${netty.version}</version>
184212
</dependency>
213+
<dependency>
214+
<groupId>org.checkerframework</groupId>
215+
<artifactId>checker-qual</artifactId>
216+
<version>${checker-qual.version}</version>
217+
</dependency>
218+
<dependency>
219+
<groupId>com.google.errorprone</groupId>
220+
<artifactId>error_prone_annotations</artifactId>
221+
<version>${error_prone_annotations.version}</version>
222+
</dependency>
185223
<dependency>
186224
<groupId>org.yaml</groupId>
187225
<artifactId>snakeyaml</artifactId>
@@ -445,6 +483,10 @@
445483
<groupId>org.codehaus.jettison</groupId>
446484
<artifactId>jettison</artifactId>
447485
</exclusion>
486+
<exclusion>
487+
<groupId>org.antlr</groupId>
488+
<artifactId>antlr-runtime</artifactId>
489+
</exclusion>
448490
</exclusions>
449491
</dependency>
450492
<dependency>

0 commit comments

Comments
 (0)