This is an automated email from the ASF dual-hosted git repository.
jianbin pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.x by this push:
new 21eca70bca optimize: update the LICENSE and NOTICE files and
standardize dependency versions (#6841)
21eca70bca is described below
commit 21eca70bca40ab4e38c71aa6de1007d90125d232
Author: funkye <jian...@apache.org>
AuthorDate: Mon Sep 16 16:31:59 2024 +0800
optimize: update the LICENSE and NOTICE files and standardize dependency
versions (#6841)
---
build/pom.xml | 6 +-
changes/en-us/2.x.md | 2 +
changes/zh-cn/2.x.md | 2 +
console/pom.xml | 25 +-
dependencies/pom.xml | 52 +++-
distribution/LICENSE | 306 ++++++++-------------
distribution/NOTICE | 12 +
namingserver/pom.xml | 48 +++-
.../seata/namingserver/NamingControllerTest.java | 65 +++--
script/client/conf/registry.conf | 4 +-
server/pom.xml | 52 +++-
test-mock-server/pom.xml | 18 +-
12 files changed, 340 insertions(+), 252 deletions(-)
diff --git a/build/pom.xml b/build/pom.xml
index c9038af989..87f476eb36 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -81,8 +81,8 @@
<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.5.15</spring-boot.version>
- <spring-framework.version>5.3.27</spring-framework.version>
+ <spring-boot.version>2.7.18</spring-boot.version>
+ <spring-framework.version>5.3.39</spring-framework.version>
<!-- server side dependency-->
<kafka-appender.version>0.2.0-RC2</kafka-appender.version>
@@ -137,8 +137,6 @@
<pmd.skip>true</pmd.skip>
<maven.test.skip>false</maven.test.skip>
<maven.git-commit-id.skip>true</maven.git-commit-id.skip>
- <maven.surefire.argLine></maven.surefire.argLine>
- <maven.surefire.excludes></maven.surefire.excludes>
<!-- For docker image-->
<image.publish.skip>true</image.publish.skip>
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 07eb237f33..1471b2bb43 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -96,6 +96,8 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#6819](https://github.com/apache/incubator-seata/pull/6819)] merge the
packaging processes of namingserver and seata-server
- [[#6827](https://github.com/apache/incubator-seata/pull/6827)] rename
namingserver registry type
- [[#6836](https://github.com/apache/incubator-seata/pull/6836)] add
independent nacos for the CI process
+- [[#6841](https://github.com/apache/incubator-seata/pull/6841)] update the
LICENSE and NOTICE files and standardize dependency versions
+- [[#6823](https://github.com/apache/incubator-seata/pull/6823)] fix typo
- [[#6779](https://github.com/apache/incubator-seata/pull/6779)] use curator
instead of zkclient in config model
- [[#6831](https://github.com/apache/incubator-seata/pull/6831)] use curator
instead of zkclient in registry model
- [[#6852](https://github.com/apache/incubator-seata/pull/6852)] optimize raft
metadata api
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index e0f6cd0604..8370ce8a46 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -97,6 +97,8 @@
- [[#6819](https://github.com/apache/incubator-seata/pull/6819)]
namingserver与server的合并打包
- [[#6827](https://github.com/apache/incubator-seata/pull/6827)]
重命名namingserver注册类型改为seata
- [[#6836](https://github.com/apache/incubator-seata/pull/6836)] 为CI流程增加独立nacos
+- [[#6841](https://github.com/apache/incubator-seata/pull/6841)]
更新license和notice文件并统一依赖版本
+- [[#6823](https://github.com/apache/incubator-seata/pull/6823)]
修正DefaultGlobalTransaction日志的错别字
- [[#6779](https://github.com/apache/incubator-seata/pull/6779)]
在config模块中使用curator替代zkclient
- [[#6831](https://github.com/apache/incubator-seata/pull/6831)]
在registry模块中使用curator替代zkclient
- [[#6803](https://github.com/apache/incubator-seata/pull/6803)] 优化 ARM64
架构的编译打包
diff --git a/console/pom.xml b/console/pom.xml
index 9f341ece2f..23610df3a0 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -33,7 +33,7 @@
<properties>
<spring-boot-for-server.version>2.7.18</spring-boot-for-server.version>
-
<spring-framework-for-server.version>5.3.37</spring-framework-for-server.version>
+
<spring-framework-for-server.version>5.3.39</spring-framework-for-server.version>
<snakeyaml-for-server.version>2.0</snakeyaml-for-server.version>
<tomcat-embed.version>9.0.90</tomcat-embed.version>
</properties>
@@ -64,6 +64,10 @@
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot-for-server.version}</version>
<exclusions>
+ <exclusion>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
@@ -86,6 +90,21 @@
</dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ <version>${tomcat-embed.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-el</artifactId>
+ <version>${tomcat-embed.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-websocket</artifactId>
+ <version>${tomcat-embed.version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
@@ -141,10 +160,6 @@
<artifactId>jjwt-jackson</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-core</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.seata</groupId>
<artifactId>seata-common</artifactId>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 44f1662f45..42df7870a0 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -72,9 +72,8 @@
<ant.version>1.10.12</ant.version>
<lz4.version>1.7.1</lz4.version>
<jraft.version>1.3.14</jraft.version>
- <netty.version>4.1.86.Final</netty.version>
<snakeyaml.version>2.0</snakeyaml.version>
- <netty.version>4.1.94.Final</netty.version>
+ <netty.version>4.1.101.Final</netty.version>
<sofa.hessian.version>4.0.3</sofa.hessian.version>
<sofa.bolt.version>1.6.7</sofa.bolt.version>
@@ -86,6 +85,9 @@
<groovy.version>2.4.4</groovy.version>
<zstd.version>1.5.0-4</zstd.version>
<xstream.version>1.4.20</xstream.version>
+ <checker-qual.version>3.37.0</checker-qual.version>
+
<error_prone_annotations.version>2.21.1</error_prone_annotations.version>
+ <tomcat-embed.version>9.0.90</tomcat-embed.version>
<!-- The `httpcore` and `httpclient` have been removed in spring-boot
3.1.0 and above. -->
<httpcore.version>4.4.16</httpcore.version>
@@ -111,7 +113,7 @@
<druid.version>1.2.20</druid.version>
<commons-dbcp2.version>2.9.0</commons-dbcp2.version>
<hikari.version>3.4.3</hikari.version>
- <caffeine.version>2.8.8</caffeine.version>
+ <caffeine.version>2.9.3</caffeine.version>
<!-- sql parser -->
<antlr4.version>4.8</antlr4.version>
<!-- for jdbc driver when package -->
@@ -132,7 +134,7 @@
<mockito.version>4.11.0</mockito.version>
<assertj-core.version>3.12.2</assertj-core.version>
<jetty-version>9.4.38.v20210224</jetty-version>
- <janino-version>3.1.7</janino-version>
+ <janino-version>3.1.10</janino-version>
<mockwebserver-version>4.12.0</mockwebserver-version>
<native-lib-loader.version>2.4.0</native-lib-loader.version>
</properties>
@@ -163,6 +165,10 @@
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<exclusions>
+ <exclusion>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
@@ -171,17 +177,49 @@
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-websocket</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-el</artifactId>
+ </exclusion>
</exclusions>
<type>pom</type>
<scope>import</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ <version>${tomcat-embed.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-el</artifactId>
+ <version>${tomcat-embed.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-websocket</artifactId>
+ <version>${tomcat-embed.version}</version>
+ </dependency>
<!-- the 3rd part -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>${netty.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ <version>${checker-qual.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ <version>${error_prone_annotations.version}</version>
+ </dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
@@ -445,6 +483,10 @@
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr-runtime</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/distribution/LICENSE b/distribution/LICENSE
index 1b549abb5b..9aa892f816 100644
--- a/distribution/LICENSE
+++ b/distribution/LICENSE
@@ -172,7 +172,6 @@
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
-
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
@@ -236,14 +235,10 @@ Apache-2.0 licenses
com.ecwid.consul:consul-api 1.4.2 Apache-2.0
com.fasterxml.jackson.core:jackson-annotations 2.12.7 Apache-2.0
com.fasterxml.jackson.core:jackson-annotations 2.13.5 Apache-2.0
- com.fasterxml.jackson.core:jackson-core 2.12.7 Apache-2.0
com.fasterxml.jackson.core:jackson-core 2.13.5 Apache-2.0
- com.fasterxml.jackson.core:jackson-databind 2.12.7.1 Apache-2.0
com.fasterxml.jackson.core:jackson-databind 2.13.5 Apache-2.0
com.fasterxml.jackson.datatype:jackson-datatype-jdk8 2.13.5 Apache-2.0
- com.fasterxml.jackson.datatype:jackson-datatype-jdk8 2.12.7 Apache-2.0
com.fasterxml.jackson.module:jackson-module-parameter-names 2.13.5
Apache-2.0
- com.fasterxml.jackson.module:jackson-module-parameter-names 2.12.7
Apache-2.0
com.github.ben-manes.caffeine:caffeine 2.9.3 Apache-2.0
com.github.danielwegener:logback-kafka-appender 0.2.0-RC2 Apache-2.0
com.github.vlsi.compactmap:compactmap 2.0 Apache-2.0
@@ -253,7 +248,6 @@ Apache-2.0 licenses
com.google.code.gson:gson 2.8.9 Apache-2.0
com.google.code.gson:gson 2.9.1 Apache-2.0
com.google.errorprone:error_prone_annotations 2.21.1 Apache-2.0
- com.google.errorprone:error_prone_annotations 2.10.0 Apache-2.0
com.google.guava:failureaccess 1.0.1 Apache-2.0
com.google.guava:guava 32.1.3-jre Apache-2.0
com.google.inject:guice 5.0.1 Apache-2.0
@@ -296,98 +290,37 @@ Apache-2.0 licenses
io.jsonwebtoken:jjwt-api 0.10.5 Apache-2.0
io.jsonwebtoken:jjwt-impl 0.10.5 Apache-2.0
io.jsonwebtoken:jjwt-jackson 0.10.5 Apache-2.0
- io.netty:netty-all 4.1.94.Final Apache-2.0
- io.netty:netty-all 4.1.100.Final Apache-2.0
- io.netty:netty-buffer 4.1.92.Final Apache-2.0
- io.netty:netty-buffer 4.1.94.Final Apache-2.0
- io.netty:netty-buffer 4.1.100.Final Apache-2.0
- io.netty:netty-codec 4.1.92.Final Apache-2.0
- io.netty:netty-codec 4.1.94.Final Apache-2.0
- io.netty:netty-codec 4.1.100.Final Apache-2.0
- io.netty:netty-codec-dns 4.1.92.Final Apache-2.0
- io.netty:netty-codec-dns 4.1.94.Final Apache-2.0
- io.netty:netty-codec-dns 4.1.100.Final Apache-2.0
- io.netty:netty-codec-haproxy 4.1.92.Final Apache-2.0
- io.netty:netty-codec-haproxy 4.1.94.Final Apache-2.0
- io.netty:netty-codec-haproxy 4.1.100.Final Apache-2.0
- io.netty:netty-codec-http 4.1.92.Final Apache-2.0
- io.netty:netty-codec-http 4.1.94.Final Apache-2.0
- io.netty:netty-codec-http 4.1.100.Final Apache-2.0
- io.netty:netty-codec-http2 4.1.92.Final Apache-2.0
- io.netty:netty-codec-http2 4.1.94.Final Apache-2.0
- io.netty:netty-codec-http2 4.1.100.Final Apache-2.0
- io.netty:netty-codec-memcache 4.1.92.Final Apache-2.0
- io.netty:netty-codec-memcache 4.1.94.Final Apache-2.0
- io.netty:netty-codec-memcache 4.1.100.Final Apache-2.0
- io.netty:netty-codec-mqtt 4.1.92.Final Apache-2.0
- io.netty:netty-codec-mqtt 4.1.94.Final Apache-2.0
- io.netty:netty-codec-mqtt 4.1.100.Final Apache-2.0
- io.netty:netty-codec-redis 4.1.92.Final Apache-2.0
- io.netty:netty-codec-redis 4.1.94.Final Apache-2.0
- io.netty:netty-codec-redis 4.1.100.Final Apache-2.0
- io.netty:netty-codec-smtp 4.1.92.Final Apache-2.0
- io.netty:netty-codec-smtp 4.1.94.Final Apache-2.0
- io.netty:netty-codec-smtp 4.1.100.Final Apache-2.0
- io.netty:netty-codec-socks 4.1.92.Final Apache-2.0
- io.netty:netty-codec-socks 4.1.94.Final Apache-2.0
- io.netty:netty-codec-socks 4.1.100.Final Apache-2.0
- io.netty:netty-codec-stomp 4.1.92.Final Apache-2.0
- io.netty:netty-codec-stomp 4.1.94.Final Apache-2.0
- io.netty:netty-codec-stomp 4.1.100.Final Apache-2.0
- io.netty:netty-codec-xml 4.1.92.Final Apache-2.0
- io.netty:netty-codec-xml 4.1.94.Final Apache-2.0
- io.netty:netty-codec-xml 4.1.100.Final Apache-2.0
- io.netty:netty-common 4.1.92.Final Apache-2.0
- io.netty:netty-common 4.1.94.Final Apache-2.0
- io.netty:netty-common 4.1.100.Final Apache-2.0
- io.netty:netty-handler 4.1.92.Final Apache-2.0
- io.netty:netty-handler 4.1.94.Final Apache-2.0
- io.netty:netty-handler 4.1.100.Final Apache-2.0
- io.netty:netty-handler-proxy 4.1.92.Final Apache-2.0
- io.netty:netty-handler-proxy 4.1.94.Final Apache-2.0
- io.netty:netty-handler-proxy 4.1.100.Final Apache-2.0
- io.netty:netty-handler-ssl-ocsp 4.1.92.Final Apache-2.0
- io.netty:netty-handler-ssl-ocsp 4.1.94.Final Apache-2.0
- io.netty:netty-handler-ssl-ocsp 4.1.100.Final Apache-2.0
- io.netty:netty-resolver 4.1.92.Final Apache-2.0
- io.netty:netty-resolver 4.1.94.Final Apache-2.0
- io.netty:netty-resolver 4.1.100.Final Apache-2.0
- io.netty:netty-resolver-dns 4.1.92.Final Apache-2.0
- io.netty:netty-resolver-dns 4.1.94.Final Apache-2.0
- io.netty:netty-resolver-dns 4.1.100.Final Apache-2.0
- io.netty:netty-resolver-dns-classes-macos 4.1.92.Final Apache-2.0
- io.netty:netty-resolver-dns-classes-macos 4.1.94.Final Apache-2.0
- io.netty:netty-resolver-dns-classes-macos 4.1.100.Final Apache-2.0
- io.netty:netty-resolver-dns-native-macos 4.1.92.Final Apache-2.0
- io.netty:netty-resolver-dns-native-macos 4.1.94.Final Apache-2.0
- io.netty:netty-resolver-dns-native-macos 4.1.100.Final Apache-2.0
- io.netty:netty-transport 4.1.92.Final Apache-2.0
- io.netty:netty-transport 4.1.94.Final Apache-2.0
- io.netty:netty-transport 4.1.100.Final Apache-2.0
- io.netty:netty-transport-classes-epoll 4.1.92.Final Apache-2.0
- io.netty:netty-transport-classes-epoll 4.1.94.Final Apache-2.0
- io.netty:netty-transport-classes-epoll 4.1.100.Final Apache-2.0
- io.netty:netty-transport-classes-kqueue 4.1.92.Final Apache-2.0
- io.netty:netty-transport-classes-kqueue 4.1.94.Final Apache-2.0
- io.netty:netty-transport-classes-kqueue 4.1.100.Final Apache-2.0
- io.netty:netty-transport-native-epoll 4.1.92.Final Apache-2.0
- io.netty:netty-transport-native-epoll 4.1.94.Final Apache-2.0
- io.netty:netty-transport-native-epoll 4.1.100.Final Apache-2.0
- io.netty:netty-transport-native-kqueue 4.1.92.Final Apache-2.0
- io.netty:netty-transport-native-kqueue 4.1.94.Final Apache-2.0
- io.netty:netty-transport-native-kqueue 4.1.100.Final Apache-2.0
- io.netty:netty-transport-native-unix-common 4.1.92.Final Apache-2.0
- io.netty:netty-transport-native-unix-common 4.1.94.Final Apache-2.0
- io.netty:netty-transport-native-unix-common 4.1.100.Final Apache-2.0
- io.netty:netty-transport-rxtx 4.1.92.Final Apache-2.0
- io.netty:netty-transport-rxtx 4.1.94.Final Apache-2.0
- io.netty:netty-transport-rxtx 4.1.100.Final Apache-2.0
- io.netty:netty-transport-sctp 4.1.92.Final Apache-2.0
- io.netty:netty-transport-sctp 4.1.94.Final Apache-2.0
- io.netty:netty-transport-sctp 4.1.100.Final Apache-2.0
- io.netty:netty-transport-udt 4.1.92.Final Apache-2.0
- io.netty:netty-transport-udt 4.1.94.Final Apache-2.0
- io.netty:netty-transport-udt 4.1.100.Final Apache-2.0
+ io.netty:netty-all 4.1.101.Final Apache-2.0
+ io.netty:netty-buffer 4.1.101.Final Apache-2.0
+ io.netty:netty-codec 4.1.101.Final Apache-2.0
+ io.netty:netty-codec-dns 4.1.101.Final Apache-2.0
+ io.netty:netty-codec-haproxy 4.1.101.Final Apache-2.0
+ io.netty:netty-codec-http 4.1.101.Final Apache-2.0
+ io.netty:netty-codec-http2 4.1.101.Final Apache-2.0
+ io.netty:netty-codec-memcache 4.1.101.Final Apache-2.0
+ io.netty:netty-codec-mqtt 4.1.101.Final Apache-2.0
+ io.netty:netty-codec-redis 4.1.101.Final Apache-2.0
+ io.netty:netty-codec-smtp 4.1.101.Final Apache-2.0
+ io.netty:netty-codec-socks 4.1.101.Final Apache-2.0
+ io.netty:netty-codec-stomp 4.1.101.Final Apache-2.0
+ io.netty:netty-codec-xml 4.1.101.Final Apache-2.0
+ io.netty:netty-common 4.1.101.Final Apache-2.0
+ io.netty:netty-handler 4.1.101.Final Apache-2.0
+ io.netty:netty-handler-proxy 4.1.101.Final Apache-2.0
+ io.netty:netty-handler-ssl-ocsp 4.1.101.Final Apache-2.0
+ io.netty:netty-resolver 4.1.101.Final Apache-2.0
+ io.netty:netty-resolver-dns 4.1.101.Final Apache-2.0
+ io.netty:netty-resolver-dns-classes-macos 4.1.101.Final Apache-2.0
+ io.netty:netty-resolver-dns-native-macos 4.1.101.Final Apache-2.0
+ io.netty:netty-transport 4.1.101.Final Apache-2.0
+ io.netty:netty-transport-classes-epoll 4.1.101.Final Apache-2.0
+ io.netty:netty-transport-classes-kqueue 4.1.101.Final Apache-2.0
+ io.netty:netty-transport-native-epoll 4.1.101.Final Apache-2.0
+ io.netty:netty-transport-native-kqueue 4.1.101.Final Apache-2.0
+ io.netty:netty-transport-native-unix-common 4.1.101.Final Apache-2.0
+ io.netty:netty-transport-rxtx 4.1.101.Final Apache-2.0
+ io.netty:netty-transport-sctp 4.1.101.Final Apache-2.0
+ io.netty:netty-transport-udt 4.1.101.Final Apache-2.0
io.perfmark:perfmark-api 0.19.0 Apache-2.0
io.prometheus:simpleclient 0.10.0 Apache-2.0
io.prometheus:simpleclient 0.15.0 Apache-2.0
@@ -421,12 +354,9 @@ Apache-2.0 licenses
org.apache.rocketmq:rocketmq-common 5.0.0 Apache-2.0
org.apache.rocketmq:rocketmq-logging 5.0.0 Apache-2.0
org.apache.rocketmq:rocketmq-remoting 5.0.0 Apache-2.0
- org.apache.tomcat.embed:tomcat-embed-el 9.0.82 Apache-2.0
- org.apache.tomcat.embed:tomcat-embed-el 9.0.75 Apache-2.0
- org.apache.tomcat.embed:tomcat-embed-websocket 9.0.82 Apache-2.0
- org.apache.tomcat.embed:tomcat-embed-websocket 9.0.75 Apache-2.0
- org.apache.tomcat:tomcat-annotations-api 9.0.82 Apache-2.0
- org.apache.tomcat:tomcat-annotations-api 9.0.75 Apache-2.0
+ org.apache.tomcat.embed:tomcat-embed-el 9.0.90 Apache-2.0
+ org.apache.tomcat.embed:tomcat-embed-websocket 9.0.90 Apache-2.0
+ org.apache.tomcat:tomcat-annotations-api 9.0.83 Apache-2.0
org.apache.yetus:audience-annotations 0.12.0 Apache-2.0
org.awaitility:awaitility 4.0.3 Apache-2.0
org.codehaus.groovy:groovy-all 2.4.4 Apache-2.0
@@ -442,32 +372,19 @@ Apache-2.0 licenses
org.lz4:lz4-java 1.7.1 Apache-2.0
org.objenesis:objenesis 3.3 Apache-2.0
org.objenesis:objenesis 3.2 Apache-2.0
- org.springframework.boot:spring-boot 2.7.17 Apache-2.0
- org.springframework.boot:spring-boot 2.5.15 Apache-2.0
- org.springframework.boot:spring-boot-autoconfigure 2.7.17 Apache-2.0
- org.springframework.boot:spring-boot-autoconfigure 2.5.15 Apache-2.0
- org.springframework.boot:spring-boot-configuration-processor 2.7.17
Apache-2.0
- org.springframework.boot:spring-boot-configuration-processor 2.5.15
Apache-2.0
- org.springframework.boot:spring-boot-starter 2.7.17 Apache-2.0
- org.springframework.boot:spring-boot-starter 2.5.15 Apache-2.0
- org.springframework.boot:spring-boot-starter-json 2.7.17 Apache-2.0
- org.springframework.boot:spring-boot-starter-json 2.5.15 Apache-2.0
- org.springframework.boot:spring-boot-starter-logging 2.7.17 Apache-2.0
- org.springframework.boot:spring-boot-starter-logging 2.5.15 Apache-2.0
- org.springframework.boot:spring-boot-starter-security 2.7.17 Apache-2.0
- org.springframework.boot:spring-boot-starter-security 2.5.15 Apache-2.0
- org.springframework.boot:spring-boot-starter-tomcat 2.7.17 Apache-2.0
- org.springframework.boot:spring-boot-starter-tomcat 2.5.15 Apache-2.0
- org.springframework.boot:spring-boot-starter-web 2.7.17 Apache-2.0
- org.springframework.boot:spring-boot-starter-web 2.5.15 Apache-2.0
+ org.springframework.boot:spring-boot 2.7.18 Apache-2.0
+ org.springframework.boot:spring-boot-autoconfigure 2.7.18 Apache-2.0
+ org.springframework.boot:spring-boot-configuration-processor 2.7.18
Apache-2.0
+ org.springframework.boot:spring-boot-starter 2.7.18 Apache-2.0
+ org.springframework.boot:spring-boot-starter-json 2.7.18 Apache-2.0
+ org.springframework.boot:spring-boot-starter-logging 2.7.18 Apache-2.0
+ org.springframework.boot:spring-boot-starter-security 2.7.18 Apache-2.0
+ org.springframework.boot:spring-boot-starter-tomcat 2.7.18 Apache-2.0
+ org.springframework.boot:spring-boot-starter-web 2.7.18 Apache-2.0
org.springframework.security:spring-security-config 5.7.11 Apache-2.0
- org.springframework.security:spring-security-config 5.5.8 Apache-2.0
org.springframework.security:spring-security-core 5.7.11 Apache-2.0
- org.springframework.security:spring-security-core 5.5.8 Apache-2.0
org.springframework.security:spring-security-crypto 5.7.11 Apache-2.0
- org.springframework.security:spring-security-crypto 5.5.8 Apache-2.0
org.springframework.security:spring-security-web 5.7.11 Apache-2.0
- org.springframework.security:spring-security-web 5.5.8 Apache-2.0
org.xerial.snappy:snappy-java 1.1.10.5 Apache-2.0
org.xerial.snappy:snappy-java 1.1.8.4 Apache-2.0
org.yaml:snakeyaml 2.0 Apache-2.0
@@ -476,7 +393,6 @@ Apache-2.0 licenses
io.dropwizard.metrics:metrics-core 4.1.36 Apache-2.0
com.alipay.sofa:jraft-core 1.3.14 Apache-2.0
com.fasterxml.jackson.datatype:jackson-datatype-jsr310 2.13.5 Apache-2.0
- com.fasterxml.jackson.datatype:jackson-datatype-jsr310 2.12.7 Apache-2.0
io.protostuff:protostuff-api 1.5.9 Apache-2.0
io.protostuff:protostuff-collectionschema 1.5.9 Apache-2.0
io.protostuff:protostuff-core 1.5.9 Apache-2.0
@@ -487,33 +403,25 @@ Apache-2.0 licenses
org.apache.zookeeper:zookeeper 3.7.2 Apache-2.0
org.apache.zookeeper:zookeeper-jute 3.7.2 Apache-2.0
org.apache.skywalking 8.4.0 Apache-2.0
- org.apache.tomcat.embed:tomcat-embed-core 9.0.83 Apache-2.0
- org.apache.tomcat.embed:tomcat-embed-core 9.0.82 Apache-2.0
+ org.apache.tomcat.embed:tomcat-embed-core 9.0.90 Apache-2.0
net.java.dev.jna:jna 5.5.0 Apache-2.0
org.rocksdb:rocksdbjni 8.8.1 Apache-2.0
- org.springframework:spring-aop 5.3.27 Apache-2.0
- org.springframework:spring-aop 5.3.26 Apache-2.0
- org.springframework:spring-aop 5.3.30 Apache-2.0
- org.springframework:spring-beans 5.3.27 Apache-2.0
- org.springframework:spring-beans 5.3.30 Apache-2.0
- org.springframework:spring-context 5.3.27 Apache-2.0
- org.springframework:spring-context 5.3.30 Apache-2.0
- org.springframework:spring-context-support 5.3.27 Apache-2.0
- org.springframework:spring-core 5.3.27 Apache-2.0
- org.springframework:spring-core 5.3.26 Apache-2.0
- org.springframework:spring-core 5.3.30 Apache-2.0
- org.springframework:spring-expression 5.3.27 Apache-2.0
- org.springframework:spring-expression 5.3.30 Apache-2.0
- org.springframework:spring-jcl 5.3.27 Apache-2.0
- org.springframework:spring-jcl 5.3.26 Apache-2.0
- org.springframework:spring-jcl 5.3.30 Apache-2.0
- org.springframework:spring-jdbc 5.3.27 Apache-2.0
- org.springframework:spring-tx 5.3.27 Apache-2.0
- org.springframework:spring-web 5.3.27 Apache-2.0
- org.springframework:spring-web 5.3.30 Apache-2.0
- org.springframework:spring-webmvc 5.3.26 Apache-2.0
- org.springframework:spring-webmvc 5.3.30 Apache-2.0
+ org.springframework:spring-aop 5.3.39 Apache-2.0
+ org.springframework:spring-beans 5.3.39 Apache-2.0
+ org.springframework:spring-context 5.3.39 Apache-2.0
+ org.springframework:spring-context-support 5.3.39 Apache-2.0
+ org.springframework:spring-core 5.3.39 Apache-2.0
+ org.springframework:spring-expression 5.3.39 Apache-2.0
+ org.springframework:spring-jcl 5.3.39 Apache-2.0
+ org.springframework:spring-jdbc 5.3.39 Apache-2.0
+ org.springframework:spring-tx 5.3.39 Apache-2.0
+ org.springframework:spring-web 5.3.39 Apache-2.0
+ org.springframework:spring-webmvc 5.3.39 Apache-2.0
org.apache.commons:commons-math 2.2 Apache-2.0
+ org.apache.curator:curator-recipes:jar 5.1.0 Apache-2.0
+ org.apache.curator:curator-framework:jar 5.1.0 Apache-2.0
+ org.apache.curator:curator-client:jar 5.1.0 Apache-2.0
+ org.apache.curator:curator-test:jar 5.1.0 Apache-2.0
========================================================================
BSD-2-Clause licenses
@@ -536,11 +444,15 @@ BSD-3-Clause licenses
@uni/page-scroll-to 1.0.0 BSD-3-Clause
@uni/vibrate 1.0.1 BSD-3-Clause
@uni/video 1.0.8 BSD-3-Clause
- diff 5.0.0 BSD-3-Clause
+ babel-plugin-emotion/node_modules/source-map 0.5.7 BSD-3-Clause
driver-dom 2.2.2 BSD-3-Clause
+ driver-dom/node_modules/style-unit 3.0.5 BSD-3-Clause
driver-miniapp 0.1.5 BSD-3-Clause
driver-universal 3.5.0 BSD-3-Clause
driver-weex 2.1.0 BSD-3-Clause
+ driver-weex/node_modules/style-unit 3.0.5 BSD-3-Clause
+ dva-core/node_modules/warning 3.0.0 BSD-3-Clause
+ dva/node_modules/hoist-non-react-statics 2.5.5 BSD-3-Clause
flat 5.0.2 BSD-3-Clause
hoist-non-react-statics 2.5.5 BSD-3-Clause
hoist-non-react-statics 3.3.2 BSD-3-Clause
@@ -555,25 +467,24 @@ BSD-3-Clause licenses
sprintf-js 1.0.3 BSD-3-Clause
style-unit 2.0.1 BSD-3-Clause
style-unit 3.0.5 BSD-3-Clause
+ style-unit/node_modules/universal-env 2.0.0 BSD-3-Clause
universal-choose-image 1.3.0 BSD-3-Clause
universal-device 1.0.3 BSD-3-Clause
universal-device 2.3.1 BSD-3-Clause
universal-env 0.6.6 BSD-3-Clause
universal-env 2.0.0 BSD-3-Clause
universal-panresponder 0.6.5 BSD-3-Clause
+ universal-panresponder/node_modules/universal-env 0.6.6 BSD-3-Clause
universal-transition 1.1.1 BSD-3-Clause
universal-unit-tool 1.0.0 BSD-3-Clause
+ universal-unit-tool/node_modules/universal-device 2.3.1 BSD-3-Clause
warning 3.0.0 BSD-3-Clause
com.thoughtworks.xstream:xstream 1.4.20 BSD-3-Clause
org.antlr:ST4 4.3 The BSD License
org.antlr:antlr-runtime 3.5.2 The BSD License
- org.antlr:antlr-runtime 3.4 The BSD License
org.antlr:antlr4 4.8 The BSD License
org.codehaus.janino:commons-compiler 3.1.10 BSD-3-Clause
- org.codehaus.janino:commons-compiler 3.1.10 BSD-3-Clause
- org.codehaus.janino:commons-compiler 3.1.9 BSD-3-Clause
org.codehaus.janino:janino 3.1.10 BSD-3-Clause
- org.codehaus.janino:janino 3.1.7 BSD-3-Clause
org.antlr:stringtemplate 3.2.1 BSD-3-Clause
antlr:antlr 2.7.7 BSD-3-Clause
org.antlr:antlr4-runtime 4.8 BSD-3-Clause
@@ -597,13 +508,11 @@ CDDL-1.0 licenses
com.sun.jersey:jersey-core 1.19.1 CDDL-1.0
========================================================================
-EPL-1.0 licenses
+EPL-1.0 licenses
========================================================================
ch.qos.logback:logback-classic 1.2.12 EPL-1.0
- ch.qos.logback:logback-classic 1.3.14 EPL-1.0
ch.qos.logback:logback-core 1.2.12 EPL-1.0
- ch.qos.logback:logback-core 1.3.14 EPL-1.0
========================================================================
EPL-2.0 licenses
@@ -618,13 +527,12 @@ ISC licenses
@ungap/promise-all-settled 1.1.2 ISC
anymatch 3.1.3 ISC
browser-stdout 1.3.1 ISC
- browserify-sign 4.2.2 ISC
+ browserify-sign 4.2.3 ISC
cliui 7.0.4 ISC
css-color-keywords 1.0.0 ISC
electron-to-chromium 1.4.681 ISC
fs.realpath 1.0.0 ISC
get-caller-file 2.0.5 ISC
- glob 7.1.6 ISC
glob 7.2.3 ISC
glob-parent 5.1.2 ISC
inflight 1.0.6 ISC
@@ -633,10 +541,9 @@ ISC licenses
isexe 2.0.0 ISC
lru-cache 5.1.1 ISC
minimalistic-assert 1.0.1 ISC
- minimatch 3.0.4 ISC
minimatch 3.1.2 ISC
once 1.4.0 ISC
- parse-asn1 5.1.6 ISC
+ parse-asn1 5.1.7 ISC
picocolors 1.0.0 ISC
semver 6.3.1 ISC
which 2.0.2 ISC
@@ -656,12 +563,14 @@ MIT licenses
@alicloud/console-components-app-layout 1.1.4 MIT
@alicloud/console-components-console-menu 1.2.12 MIT
@alicloud/css-var-utils 0.1.0 MIT
- @alifd/field 1.5.8 MIT
+ @alifd/babel-runtime-jsx-style-transform 1.0.0 MIT
@alifd/field 1.7.0 MIT
- @alifd/meet-react 2.9.8 MIT
+ @alifd/meet-react 2.9.9 MIT
@alifd/meet-react-component-one 1.3.2 MIT
+ @alifd/meet-react/node_modules/classnames 2.2.6 MIT
@alifd/next 1.24.18 MIT
- @alifd/validate 1.2.3 MIT
+ @alifd/next/node_modules/@alifd/field 1.5.8 MIT
+ @alifd/next/node_modules/@alifd/validate 1.2.3 MIT
@alifd/validate 1.4.0 MIT
@babel/code-frame 7.23.5 MIT
@babel/compat-data 7.23.5 MIT
@@ -707,6 +616,7 @@ MIT licenses
@emotion/is-prop-valid 0.8.8 MIT
@emotion/memoize 0.7.4 MIT
@emotion/serialize 0.11.16 MIT
+ @emotion/serialize/node_modules/csstype 2.6.21 MIT
@emotion/sheet 0.9.4 MIT
@emotion/stylis 0.8.5 MIT
@emotion/unitless 0.7.5 MIT
@@ -729,7 +639,8 @@ MIT licenses
@types/react 16.14.56 MIT
@types/react-dom 16.9.24 MIT
@types/react-router 5.1.20 MIT
- @types/react-router-dom 4.3.5 MIT
+ @types/react-router-dom 16.9.24 MIT
+ @types/react-router 5.1.20 MIT
@types/react-router-redux 5.0.27 MIT
@types/scheduler 0.16.8 MIT
@types/use-sync-external-store 0.0.3 MIT
@@ -737,27 +648,32 @@ MIT licenses
ansi-regex 3.0.1 MIT
ansi-regex 5.0.1 MIT
ansi-styles 3.2.1 MIT
- ansi-styles 4.3.0 MIT
argparse 1.0.10 MIT
- asn1.js 5.4.1 MIT
+ asn1.js 4.10.1 MIT
+ asn1.js/node_modules/bn.js 4.12.0 MIT
asynckit 0.4.0 MIT
- axios 1.6.7 MIT
+ axios 1.7.4 MIT
babel-plugin-emotion 10.2.2 MIT
- babel-plugin-macros 2.8.0 MIT
+ babel-plugin-emotion/node_modules/babel-plugin-macros 2.8.0 MIT
+ babel-plugin-emotion/node_modules/convert-source-map 1.9.0 MIT
+ babel-plugin-emotion/node_modules/cosmiconfig 6.0.0 MIT
babel-plugin-styled-components 2.1.4 MIT
babel-plugin-syntax-jsx 6.18.0 MIT
babel-runtime 6.26.0 MIT
- babel-runtime-jsx-style-transform 1.0.2 MIT
+ babel-runtime/node_modules/regenerator-runtime 0.11.1 MIT
balanced-match 1.0.2 MIT
bignumber.js 9.1.2 MIT
- binary-extensions 2.2.0 MIT
- bn.js 4.12.0 MIT
bn.js 5.2.1 MIT
brace-expansion 1.1.11 MIT
- braces 3.0.2 MIT
brorand 1.1.0 MIT
browserify-aes 1.2.0 MIT
browserify-rsa 4.1.0 MIT
+ browserify-sign/node_modules/hash-base 3.0.4 MIT
+ browserify-sign/node_modules/isarray 1.0.0 MIT
+ browserify-sign/node_modules/readable-stream 2.3.8 MIT
+ browserify-sign/node_modules/readable-stream/node_modules/safe-buffer
5.1.2 MIT
+ browserify-sign/node_modules/string_decoder 1.1.1 MIT
+ browserify-sign/node_modules/string_decoder/node_modules/safe-buffer 5.1.2
MIT
browserslist 4.23.0 MIT
buffer-xor 1.0.3 MIT
callsites 3.1.0 MIT
@@ -778,19 +694,18 @@ MIT licenses
combined-stream 1.0.8 MIT
component-event 0.2.1 MIT
concat-map 0.0.1 MIT
- convert-source-map 1.9.0 MIT
convert-source-map 2.0.0 MIT
core-js 2.6.12 MIT
cosmiconfig 6.0.0 MIT
+ core-util-is 1.0.3 MIT
create-hash 1.2.0 MIT
create-hmac 1.1.7 MIT
crelt 1.0.6 MIT
css-to-react-native 2.3.2 MIT
- csstype 2.6.21 MIT
+ css-to-react-native/node_modules/postcss-value-parser 3.3.1 MIT
csstype 3.1.3 MIT
dayjs 1.11.10 MIT
- debug 4.3.1 MIT
- debug 4.3.4 MIT
+ debug 4.3.6 MIT
decamelize 4.0.0 MIT
decode-uri-component 0.4.1 MIT
delayed-stream 1.0.0 MIT
@@ -803,9 +718,21 @@ MIT licenses
domify 1.4.2 MIT
dva 2.4.1 MIT
dva-core 1.4.0 MIT
- elliptic 6.5.4 MIT
- emoji-regex 8.0.0 MIT
+ dva-core/node_modules/@babel/runtime 7.0.0-beta.46 MIT
+ dva-core/node_modules/redux 3.7.2 MIT
+ dva-core/node_modules/regenerator-runtime 0.11.1 MIT
+ dva/node_modules/@babel/runtime 7.0.0-beta.46 MIT
+ dva/node_modules/@types/react-router-dom 4.3.5 MIT
+ dva/node_modules/react-redux 5.0.7 MIT
+ dva/node_modules/react-router 4.3.1 MIT
+ dva/node_modules/react-router-dom 4.3.1 MIT
+ dva/node_modules/react-router-redux 5.0.0-alpha.9 MIT
+ dva/node_modules/redux 3.7.2 MIT
+ dva/node_modules/regenerator-runtime 0.11.1 MIT
+ elliptic 6.5.7 MIT
+ elliptic/node_modules/bn.js 4.12.0 MIT
encoding 0.1.13 MIT
+ encoding/node_modules/iconv-lite 0.6.3 MIT
error-ex 1.3.2 MIT
escalade 3.1.2 MIT
escape-string-regexp 1.0.5 MIT
@@ -818,7 +745,7 @@ MIT licenses
find-up 5.0.0 MIT
flatten 1.0.3 MIT
focus-trap 7.5.4 MIT
- follow-redirects 1.15.5 MIT
+ follow-redirects 1.15.6 MIT
form-data 4.0.0 MIT
fsevents 2.3.3 MIT
function-bind 1.1.2 MIT
@@ -828,7 +755,6 @@ MIT licenses
growl 1.10.5 MIT
hammerjs 2.0.8 MIT
has-flag 3.0.0 MIT
- has-flag 4.0.0 MIT
hash-base 3.1.0 MIT
hash.js 1.1.7 MIT
hasown 2.0.1 MIT
@@ -855,7 +781,6 @@ MIT licenses
jquery 3.7.1 MIT
js-tokens 4.0.0 MIT
js-tokens 4.0.0 MIT
- js-yaml 4.0.0 MIT
jsesc 2.5.2 MIT
json-parse-even-better-errors 2.3.1 MIT
json5 2.2.3 MIT
@@ -883,7 +808,6 @@ MIT licenses
mocha 8.4.0 MIT
moment 2.30.1 MIT
ms 2.1.2 MIT
- ms 2.1.3 MIT
nanoid 3.1.31 MIT
node-fetch 2.6.7 MIT
node-releases 2.0.14 MIT
@@ -894,7 +818,9 @@ MIT licenses
omit.js 2.0.2 MIT
p-limit 3.1.0 MIT
p-locate 5.0.0 MIT
+ org.checkerframework:checker-qual 3.37.0 MIT
parent-module 1.0.1 MIT
+ parse-asn1/node_modules/hash-base 3.0.4 MIT
parse-json 5.2.0 MIT
path-exists 4.0.0 MIT
path-intersection 2.2.1 MIT
@@ -907,6 +833,7 @@ MIT licenses
postcss-value-parser 3.3.1 MIT
preact 10.19.3 MIT
process 0.11.10 MIT
+ process-nextick-args 2.0.1 MIT
prop-types 15.8.1 MIT
prop-types 15.8.1 MIT
proxy-from-env 1.1.0 MIT
@@ -916,12 +843,10 @@ MIT licenses
react-dom 16.14.0 MIT
react-is 16.13.1 MIT
react-is 16.13.1 MIT
- react-is 18.2.0 MIT
react-lifecycles-compat 3.0.4 MIT
react-loading-skeleton 2.2.0 MIT
- react-redux 5.0.7 MIT
react-redux 8.1.3 MIT
- react-router 4.3.1 MIT
+ react-redux/node_modules/react-is 18.2.0 MIT
react-router 5.3.4 MIT
react-router-dom 4.3.1 MIT
react-router-dom 5.3.4 MIT
@@ -933,7 +858,6 @@ MIT licenses
redux 5.0.1 MIT
redux-saga 0.16.2 MIT
redux-thunk 3.1.0 MIT
- regenerator-runtime 0.11.1 MIT
regenerator-runtime 0.14.1 MIT
require-directory 2.1.1 MIT
resize-observer-polyfill 1.5.1 MIT
@@ -988,6 +912,7 @@ MIT licenses
org.slf4j:jul-to-slf4j 1.7.36 MIT
org.slf4j:slf4j-api 1.7.36 MIT
redis.clients:jedis 3.8.0 MIT
+ org.checkerframework:checker-qual 3.37.0 MIT
========================================================================
Public Domain licenses
@@ -1024,9 +949,8 @@ Indiana University Extreme! Lab Software License
========================================================================
io.github.x-stream:mxparser 1.2.2 Indiana University Extreme! Lab Software
License
-
========================================================================
0BSD licenses
========================================================================
- tslib 2.6.2 0BSD
\ No newline at end of file
+ tslib 2.6.2 0BSD
diff --git a/distribution/NOTICE b/distribution/NOTICE
index b1163232a9..6cce1426b3 100644
--- a/distribution/NOTICE
+++ b/distribution/NOTICE
@@ -1033,4 +1033,16 @@ Apache ZooKeeper NOTICE
This Apache 2.0 licensed file:
./zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/com/nitido/utils/toaster/Toaster.java
+========================================================================
+
+Apache Curator NOTICE
+
+========================================================================
+
+Apache Curator
+Copyright 2013-2023 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
========================================================================
\ No newline at end of file
diff --git a/namingserver/pom.xml b/namingserver/pom.xml
index d424f3eb72..fba22f8f9a 100644
--- a/namingserver/pom.xml
+++ b/namingserver/pom.xml
@@ -33,7 +33,9 @@
<properties>
<java.version>1.8</java.version>
<spring-boot-for-server.version>2.7.18</spring-boot-for-server.version>
-
<spring-framework-for-server.version>5.3.37</spring-framework-for-server.version>
+
<spring-framework-for-server.version>5.3.39</spring-framework-for-server.version>
+ <snakeyaml-for-server.version>2.0</snakeyaml-for-server.version>
+ <tomcat-embed.version>9.0.90</tomcat-embed.version>
</properties>
<dependencyManagement>
@@ -68,14 +70,31 @@
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>commons-compiler</artifactId>
- <scope>compile</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>${snakeyaml-for-server.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ <version>${tomcat-embed.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-el</artifactId>
+ <version>${tomcat-embed.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-websocket</artifactId>
+ <version>${tomcat-embed.version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -86,7 +105,14 @@
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
@@ -101,6 +127,18 @@
<artifactId>log4j-to-slf4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-websocket</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-el</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git
a/namingserver/src/test/java/org/apache/seata/namingserver/NamingControllerTest.java
b/namingserver/src/test/java/org/apache/seata/namingserver/NamingControllerTest.java
index 74f921ae36..eb8666b383 100644
---
a/namingserver/src/test/java/org/apache/seata/namingserver/NamingControllerTest.java
+++
b/namingserver/src/test/java/org/apache/seata/namingserver/NamingControllerTest.java
@@ -56,16 +56,16 @@ class NamingControllerTest {
void mockRegister() {
String clusterName = "cluster1";
String namespace = "public1";
+ String vGroup = "mockRegister";
String unitName = String.valueOf(UUID.randomUUID());
NamingServerNode node = new NamingServerNode();
node.setTransaction(new Node.Endpoint("127.0.0.1", 8091, "netty"));
node.setControl(new Node.Endpoint("127.0.0.1", 7091, "http"));
Map<String, Object> meatadata = node.getMetadata();
Map<String,Object> vGroups = new HashMap<>();
- vGroups.put("vgroup1",unitName);
+ vGroups.put(vGroup,unitName);
meatadata.put(CONSTANT_GROUP, vGroups);
namingController.registerInstance(namespace, clusterName, unitName,
node);
- String vGroup = "vgroup1";
namingController.changeGroup(namespace, clusterName, unitName, vGroup);
MetaResponse metaResponse = namingController.discovery(vGroup,
namespace);
assertNotNull(metaResponse);
@@ -85,27 +85,27 @@ class NamingControllerTest {
@Test
void mockUnregisterGracefully() {
- String clusterName = "cluster1";
+ String clusterName = "cluster2";
String namespace = "public2";
+ String vGroup = "mockUnregisterGracefully";
String unitName = String.valueOf(UUID.randomUUID());
NamingServerNode node = new NamingServerNode();
- node.setTransaction(new Node.Endpoint("127.0.0.1", 8091, "netty"));
- node.setControl(new Node.Endpoint("127.0.0.1", 7091, "http"));
+ node.setTransaction(new Node.Endpoint("127.0.0.1", 8092, "netty"));
+ node.setControl(new Node.Endpoint("127.0.0.1", 7092, "http"));
Map<String, Object> meatadata = node.getMetadata();
Map<String,Object> vGroups = new HashMap<>();
- vGroups.put("vgroup1",unitName);
+ vGroups.put(vGroup,unitName);
meatadata.put(CONSTANT_GROUP, vGroups);
namingController.registerInstance(namespace, clusterName, unitName,
node);
NamingServerNode node2 = new NamingServerNode();
- node2.setTransaction(new Node.Endpoint("127.0.0.1", 8092, "netty"));
- node2.setControl(new Node.Endpoint("127.0.0.1", 7092, "http"));
+ node2.setTransaction(new Node.Endpoint("127.0.0.1", 8093, "netty"));
+ node2.setControl(new Node.Endpoint("127.0.0.1", 7093, "http"));
Map<String, Object> meatadata2 = node2.getMetadata();
Map<String,Object> vGroups2 = new HashMap<>();
String unitName2 = UUID.randomUUID().toString();
- vGroups2.put("vgroup2",unitName2);
+ vGroups2.put(UUID.randomUUID().toString(),unitName2);
meatadata2.put(CONSTANT_GROUP, vGroups2);
- namingController.registerInstance(namespace, "cluster1", unitName2,
node2);
- String vGroup = "vgroup1";
+ namingController.registerInstance(namespace,
UUID.randomUUID().toString(), unitName2, node2);
MetaResponse metaResponse = namingController.discovery(vGroup,
namespace);
assertNotNull(metaResponse);
assertNotNull(metaResponse.getClusterList());
@@ -118,28 +118,28 @@ class NamingControllerTest {
assertEquals(1, unit.getNamingInstanceList().size());
Node node1 = unit.getNamingInstanceList().get(0);
assertEquals("127.0.0.1", node1.getTransaction().getHost());
- assertEquals(8091, node1.getTransaction().getPort());
+ assertEquals(8092, node1.getTransaction().getPort());
namingController.unregisterInstance(namespace, clusterName, unitName,
node);
metaResponse = namingController.discovery(vGroup, namespace);
assertNotNull(metaResponse);
assertNotNull(metaResponse.getClusterList());
- assertEquals(1,
metaResponse.getClusterList().get(0).getUnitData().size());
+ assertEquals(0,
metaResponse.getClusterList().get(0).getUnitData().size());
}
@Test
void mockUnregisterUngracefully() throws InterruptedException {
- String clusterName = "cluster1";
+ String clusterName = "cluster3";
String namespace = "public3";
+ String vGroup = "mockUnregisterUngracefully";
String unitName = String.valueOf(UUID.randomUUID());
NamingServerNode node = new NamingServerNode();
- node.setTransaction(new Node.Endpoint("127.0.0.1", 8091, "netty"));
- node.setControl(new Node.Endpoint("127.0.0.1", 7091, "http"));
+ node.setTransaction(new Node.Endpoint("127.0.0.1", 8094, "netty"));
+ node.setControl(new Node.Endpoint("127.0.0.1", 7094, "http"));
Map<String, Object> meatadata = node.getMetadata();
Map<String,Object> vGroups = new HashMap<>();
- vGroups.put("vgroup1",unitName);
+ vGroups.put(vGroup,unitName);
meatadata.put(CONSTANT_GROUP, vGroups);
namingController.registerInstance(namespace, clusterName, unitName,
node);
- String vGroup = "vgroup1";
//namingController.changeGroup(namespace, clusterName, vGroup, vGroup);
MetaResponse metaResponse = namingController.discovery(vGroup,
namespace);
assertNotNull(metaResponse);
@@ -153,7 +153,7 @@ class NamingControllerTest {
assertEquals(1, unit.getNamingInstanceList().size());
Node node1 = unit.getNamingInstanceList().get(0);
assertEquals("127.0.0.1", node1.getTransaction().getHost());
- assertEquals(8091, node1.getTransaction().getPort());
+ assertEquals(8094, node1.getTransaction().getPort());
int timeGap = threshold + period;
Thread.sleep(timeGap);
metaResponse = namingController.discovery(vGroup, namespace);
@@ -164,27 +164,26 @@ class NamingControllerTest {
@Test
void mockDiscoveryMultiNode() {
- String clusterName = "cluster1";
+ String clusterName = "cluster4";
String namespace = "public4";
+ String vGroup = "mockDiscoveryMultiNode";
String unitName = String.valueOf(UUID.randomUUID());
NamingServerNode node = new NamingServerNode();
node.setTransaction(new Node.Endpoint("127.0.0.1", 8095, "netty"));
node.setControl(new Node.Endpoint("127.0.0.1", 7095, "http"));
Map<String, Object> meatadata = node.getMetadata();
Map<String,Object> vGroups = new HashMap<>();
- vGroups.put("vgroup1",unitName);
+ vGroups.put(vGroup,unitName);
meatadata.put(CONSTANT_GROUP, vGroups);
NamingServerNode node2 = new NamingServerNode();
String unitName2 = String.valueOf(UUID.randomUUID());
node2.setTransaction(new Node.Endpoint("127.0.0.1", 8096, "netty"));
node2.setControl(new Node.Endpoint("127.0.0.1", 7096, "http"));
vGroups = new HashMap<>();
- vGroups.put("vgroup1",unitName2);
+ vGroups.put(vGroup,unitName2);
node2.getMetadata().put(CONSTANT_GROUP, vGroups);
namingController.registerInstance(namespace, clusterName, unitName,
node);
namingController.registerInstance(namespace, clusterName, unitName2,
node2);
- String vGroup = "vgroup1";
- //namingController.changeGroup(namespace, clusterName, vGroup, vGroup);
MetaResponse metaResponse = namingController.discovery(vGroup,
namespace);
assertNotNull(metaResponse);
assertNotNull(metaResponse.getClusterList());
@@ -209,27 +208,27 @@ class NamingControllerTest {
@Test
void mockHeartbeat() throws InterruptedException {
- String clusterName = "cluster1";
+ String clusterName = "cluster5";
String namespace = "public5";
String unitName = String.valueOf(UUID.randomUUID());
+ String vGroup = "mockHeartbeat";
NamingServerNode node = new NamingServerNode();
- node.setTransaction(new Node.Endpoint("127.0.0.1", 8091, "netty"));
- node.setControl(new Node.Endpoint("127.0.0.1", 7091, "http"));
+ node.setTransaction(new Node.Endpoint("127.0.0.1", 8097, "netty"));
+ node.setControl(new Node.Endpoint("127.0.0.1", 7097, "http"));
Map<String, Object> meatadata = node.getMetadata();
Map<String,Object> vGroups = new HashMap<>();
- vGroups.put("vgroup1",unitName);
+ vGroups.put(vGroup,unitName);
meatadata.put(CONSTANT_GROUP, vGroups);
namingController.registerInstance(namespace, clusterName, unitName,
node);
NamingServerNode node2 = new NamingServerNode();
- node2.setTransaction(new Node.Endpoint("127.0.0.1", 8092, "netty"));
- node2.setControl(new Node.Endpoint("127.0.0.1", 7092, "http"));
+ node2.setTransaction(new Node.Endpoint("127.0.0.1", 8098, "netty"));
+ node2.setControl(new Node.Endpoint("127.0.0.1", 7098, "http"));
Map<String, Object> meatadata2 = node2.getMetadata();
Map<String,Object> vGroups2 = new HashMap<>();
String unitName2 = UUID.randomUUID().toString();
- vGroups2.put("vgroup1",unitName2);
+ vGroups2.put(vGroup,unitName2);
meatadata2.put(CONSTANT_GROUP, vGroups2);
namingController.registerInstance(namespace, clusterName, unitName2,
node2);
- String vGroup = "vgroup1";
Thread thread = new Thread(()->{
for (int i = 0; i < 5; i++) {
try {
@@ -260,7 +259,7 @@ class NamingControllerTest {
unit = metaResponse.getClusterList().get(0).getUnitData().get(0);
Node node1 = unit.getNamingInstanceList().get(0);
assertEquals("127.0.0.1", node1.getTransaction().getHost());
- assertEquals(8091, node1.getTransaction().getPort());
+ assertEquals(8097, node1.getTransaction().getPort());
}
}
\ No newline at end of file
diff --git a/script/client/conf/registry.conf b/script/client/conf/registry.conf
index d956abc4c3..1aabbc507f 100644
--- a/script/client/conf/registry.conf
+++ b/script/client/conf/registry.conf
@@ -19,9 +19,9 @@ registry {
# file 、nacos 、eureka、redis、zk、consul、etcd3、sofa、custom、raft、seata
type = "file"
- raft {
+ raft {
metadata-max-age-ms = 30000
- serverAddr = "127.0.0.1:8848"
+ serverAddr = "127.0.0.1:7091"
username = "seata"
password = "seata"
tokenValidityInMilliseconds = 1740000
diff --git a/server/pom.xml b/server/pom.xml
index 902095f26b..d74710fa61 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -33,7 +33,7 @@
<properties>
<spring-boot-for-server.version>2.7.18</spring-boot-for-server.version>
-
<spring-framework-for-server.version>5.3.37</spring-framework-for-server.version>
+
<spring-framework-for-server.version>5.3.39</spring-framework-for-server.version>
<snakeyaml-for-server.version>2.0</snakeyaml-for-server.version>
<tomcat-embed.version>9.0.90</tomcat-embed.version>
</properties>
@@ -64,6 +64,22 @@
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot-for-server.version}</version>
<exclusions>
+ <exclusion>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-websocket</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-el</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
@@ -86,6 +102,21 @@
</dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ <version>${tomcat-embed.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-el</artifactId>
+ <version>${tomcat-embed.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-websocket</artifactId>
+ <version>${tomcat-embed.version}</version>
+ </dependency>
<!-- springboot web -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -99,6 +130,14 @@
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-websocket</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-el</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
@@ -254,6 +293,12 @@
<dependency>
<groupId>com.github.danielwegener</groupId>
<artifactId>logback-kafka-appender</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
@@ -278,11 +323,6 @@
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-core</artifactId>
- </dependency>
-
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
diff --git a/test-mock-server/pom.xml b/test-mock-server/pom.xml
index 0ff11e1148..2c6eb9e419 100644
--- a/test-mock-server/pom.xml
+++ b/test-mock-server/pom.xml
@@ -56,8 +56,9 @@
<properties>
<spring-boot-for-server.version>2.7.18</spring-boot-for-server.version>
-
<spring-framework-for-server.version>5.3.37</spring-framework-for-server.version>
+
<spring-framework-for-server.version>5.3.39</spring-framework-for-server.version>
<snakeyaml-for-server.version>2.0</snakeyaml-for-server.version>
+ <tomcat-embed.version>9.0.90</tomcat-embed.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -106,6 +107,21 @@
</dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ <version>${tomcat-embed.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-el</artifactId>
+ <version>${tomcat-embed.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-websocket</artifactId>
+ <version>${tomcat-embed.version}</version>
+ </dependency>
<!-- The actual spring-related dependencies that take effect are from
the seata-dependencies module, not the seata-server module-->
<dependency>
<groupId>org.apache.seata</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@seata.apache.org
For additional commands, e-mail: notifications-h...@seata.apache.org
