This is an automated email from the ASF dual-hosted git repository.
hefengen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 4800386d9 [type:release] polish pom and license (#4933)
4800386d9 is described below
commit 4800386d91fe3fd24c905437fc85fef6acf580b7
Author: moremind <[email protected]>
AuthorDate: Tue Aug 1 11:12:07 2023 +0800
[type:release] polish pom and license (#4933)
* [type:release] polish pom and license
* [type:release] polish pom and license
* [type:release] polish pom and license
* [type:release] fix ci
* change apache dubbo e2e
---------
Co-authored-by: dragon-zhang <[email protected]>
---
RELEASE-NOTES.md | 11 ++++--
pom.xml | 43 ++++++++++----------
shenyu-admin/pom.xml | 3 +-
.../src/main/resources/mybatis/mybatis-config.xml | 1 -
.../src/main/release-docs/LICENSE | 33 ++++++++++------
.../src/main/release-docs/LICENSE | 46 +++++++++++-----------
.../src/test/resources/docker-compose.mysql.yml | 12 +++---
.../pom.xml | 1 +
8 files changed, 82 insertions(+), 68 deletions(-)
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index b562ee109..2186112f9 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -19,7 +19,7 @@
15. Add naocs discovery sync
16. Add apollo discovery sync
17. Add HttpLongPolling discovery sync
-18. Add consul discove sync
+18. Add consul discovery sync
19. Add huawei cloud lts loging plugin
20. Support openGauss database for shenyu admin
21. Support polaris config sync and register center
@@ -64,7 +64,11 @@
34. Update apollo client register repository active offline
35. Storage adjustment for swagger type API documents, change from local cache
to database
36. Support nacos client offline
-37. Add e2e alibaba dubbo case
+37. Add e2e alibaba dubbo test case
+38. Add e2e apache dubbo test case
+39. Add shenyu-spring-sdk test cases
+40. Add e2e sofa test cases
+41. Add apollo config sync test case
### Refactor
@@ -119,7 +123,7 @@
49. Refactor shenyu log observability
50. Add bootstrap start log
51. Refactor api document for swagger
-52. Upgrade grpc version to 1.48.0
+52. Upgrade grpc version to 1.53.0
### Bug Fix
@@ -175,6 +179,7 @@
50. Fix http registration metadata
51. Fix websocket lost the user-defined clost status
52. Fix consul register lose the prop of meta-path when special symbol
+53. Fix etcd sync error
## 2.5.1
diff --git a/pom.xml b/pom.xml
index 107b03af7..b336e38dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,6 +81,25 @@
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <!-- maven plugin version start -->
+ <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+ <jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
+
<nexus-staging-maven-plugin.version>1.6.3</nexus-staging-maven-plugin.version>
+ <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
+ <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
+ <maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
+ <maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
+ <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
+ <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
+ <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
+ <versions-maven-plugin.version>2.5</versions-maven-plugin.version>
+
<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
+ <apache-rat-plugin.version>0.13</apache-rat-plugin.version>
+ <frontend-maven-plugin.version>1.6</frontend-maven-plugin.version>
+
<frontend-maven-plugin.node.version>v12.14.1</frontend-maven-plugin.node.version>
+ <!-- maven plugin version end -->
+
+ <!-- dependency version start -->
<jasypt.version>1.9.2</jasypt.version>
<springfox.version>2.6.1</springfox.version>
<mybatis.starter.version>2.2.2</mybatis.starter.version>
@@ -139,22 +158,6 @@
<javatuples.version>1.2</javatuples.version>
<k8s-client.version>17.0.2</k8s-client.version>
<polaris.version>1.13.0</polaris.version>
- <!--maven plugin version-->
- <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
- <jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
-
<nexus-staging-maven-plugin.version>1.6.3</nexus-staging-maven-plugin.version>
- <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
- <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
- <maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
- <maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
- <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
- <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
- <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
- <versions-maven-plugin.version>2.5</versions-maven-plugin.version>
-
<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
- <apache-rat-plugin.version>0.13</apache-rat-plugin.version>
- <frontend-maven-plugin.version>1.6</frontend-maven-plugin.version>
-
<frontend-maven-plugin.node.version>v12.14.1</frontend-maven-plugin.node.version>
<bytebuddy.version>1.12.6</bytebuddy.version>
<spring-ldap.version>2.3.4.RELEASE</spring-ldap.version>
<jaxb.api.version>2.3.1</jaxb.api.version>
@@ -180,6 +183,8 @@
<jsonpath.version>2.4.0</jsonpath.version>
<casdoor-java-sdk.version>1.9.0</casdoor-java-sdk.version>
<huawei-log-sdk.version>1.0.1</huawei-log-sdk.version>
+ <opengauss-jdbc.version>5.0.0-og</opengauss-jdbc.version>
+ <!-- dependency version end -->
</properties>
<dependencyManagement>
@@ -340,12 +345,6 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>druid</artifactId>
- <version>${druid.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
diff --git a/shenyu-admin/pom.xml b/shenyu-admin/pom.xml
index 6c410450b..5a154b5e3 100644
--- a/shenyu-admin/pom.xml
+++ b/shenyu-admin/pom.xml
@@ -257,7 +257,8 @@
<dependency>
<groupId>org.opengauss</groupId>
<artifactId>opengauss-jdbc</artifactId>
- <version>5.0.0-og</version>
+ <version>${opengauss-jdbc.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git a/shenyu-admin/src/main/resources/mybatis/mybatis-config.xml
b/shenyu-admin/src/main/resources/mybatis/mybatis-config.xml
index fa755c73b..5232045b6 100644
--- a/shenyu-admin/src/main/resources/mybatis/mybatis-config.xml
+++ b/shenyu-admin/src/main/resources/mybatis/mybatis-config.xml
@@ -43,7 +43,6 @@
<setting name="defaultExecutorType" value="SIMPLE"/>
<!-- Sets the number of seconds the driver will wait for a response
from the database. -->
<setting name="defaultStatementTimeout" value="25000"/>
- <setting name="logImpl" value="STDOUT_LOGGING"/>
</settings>
<typeAliases>
diff --git a/shenyu-dist/shenyu-admin-dist/src/main/release-docs/LICENSE
b/shenyu-dist/shenyu-admin-dist/src/main/release-docs/LICENSE
index 82a071ade..df6f837cf 100644
--- a/shenyu-dist/shenyu-admin-dist/src/main/release-docs/LICENSE
+++ b/shenyu-dist/shenyu-admin-dist/src/main/release-docs/LICENSE
@@ -217,6 +217,7 @@ The text of each license is the standard Apache 2.0 license.
accessors-smart 2.4.11: https://www.minidev.net, Apache 2.0
annotations 13.0: http://source.android.com, Apache 2.0
+ annotations 4.1.1.4: http://source.android.com, Apache 2.0
attoparser 2.0.5.RELEASE: http://www.attoparser.org, Apache 2.0
audience-annotations 0.5.0: https://yetus.apache.org/audience-annotations,
Apache 2.0
byte-buddy 1.12.6: https://bytebuddy.net/byte-buddy, Apache 2.0
@@ -232,14 +233,15 @@ The text of each license is the standard Apache 2.0
license.
error_prone_annotations 2.11.0: https://github.com/google/error-prone,
Apache 2.0
failsafe 2.4.4: https://github.com/jhalterman/failsafe, Apache 2.0
failureaccess 1.0.1:https://github.com/google/guava, Apache 2.0
- grpc-api 1.48.0: https://github.com/grpc/grpc, Apache 2.0
- grpc-context 1.48.0: https://github.com/grpc/grpc, Apache 2.0
- grpc-core 1.48.0: https://github.com/grpc/grpc, Apache 2.0
+ grpc-api 1.53.0: https://github.com/grpc/grpc, Apache 2.0
+ grpc-context 1.53.0: https://github.com/grpc/grpc, Apache 2.0
+ grpc-core 1.53.0: https://github.com/grpc/grpc, Apache 2.0
+ grpc-grpclb 1.53.0: https://github.com/grpc/grpc, Apache 2.0
grpc-grpclb 1.48.0: https://github.com/grpc/grpc, Apache 2.0
- grpc-netty 1.48.0: https://github.com/grpc/grpc, Apache 2.0
- grpc-protobuf 1.48.0: https://github.com/grpc/grpc, Apache 2.0
- grpc-protobuf-lite 1.48.0: https://github.com/grpc/grpc, Apache 2.0
- grpc-stub 1.48.0: https://github.com/grpc/grpc, Apache 2.0
+ grpc-netty 1.53.0: https://github.com/grpc/grpc, Apache 2.0
+ grpc-protobuf 1.53.0: https://github.com/grpc/grpc, Apache 2.0
+ grpc-protobuf-lite 1.53.0: https://github.com/grpc/grpc, Apache 2.0
+ grpc-stub 1.53.0: https://github.com/grpc/grpc, Apache 2.0
gson 2.9.0: https://github.com/google/gson, Apache 2.0
guava 31.1-jre: https://github.com/google/guava, Apache 2.0
hessian 4.0.38: http://github.com/alipay/sofa-hessian, Apache 2.0
@@ -265,7 +267,7 @@ The text of each license is the standard Apache 2.0 license.
jetcd-grpc 0.7.3: https://github.com/etcd-io/jetcd, Apache 2.0
json-path 2.7.0: https://github.com/jayway/JsonPath, Apache 2.0
json-smart 2.4.11: https://www.minidev.net/, Apache 2.0
- jsqlparser 4.2: https://github.com/JSQLParser/JSqlParser, Apache 2.0
+ jsqlparser 4.5: https://github.com/JSQLParser/JSqlParser, Apache 2.0
jsr305 3.0.2: http://findbugs.sourceforge.net/, Apache 2.0
listenablefuture 9999.0-empty-to-avoid-conflict-with-guava:
https://github.com/google/guava, Apache 2.0
log4j-api 2.17.2: https://logging.apache.org/log4j/2.x/log4j-api, Apache
2.0
@@ -300,7 +302,7 @@ The text of each license is the standard Apache 2.0 license.
okhttp 4.9.3: https://github.com/square/okhttp, Apache 2.0
okio 2.8.0: https://github.com/square/okio, Apache 2.0
perfmark-api 0.25.0: https://github.com/perfmark/perfmark, Apache 2.0
- proto-google-common-protos 1.17.0:
https://github.com/googleapis/common-protos-java, Apache 2.0
+ proto-google-common-protos 2.9.0:
https://github.com/googleapis/common-protos-java, Apache 2.0
protostuff-core 1.0.8:
https://github.com/protostuff/protostuff/protostuff-core, Apache-2.0
protostuff-runtime 1.0.8:
https://github.com/protostuff/protostuff/protostuff-core, Apache-2.0
protostuff-api 1.0.8:
https://github.com/protostuff/protostuff/protostuff-api, Apache-2.0
@@ -392,7 +394,7 @@ The text of each license is the standard Apache 2.0 license.
kotlin-stdlib 1.6.21 https://kotlinlang.org, Apache 2.0
kotlin-stdlib-common 1.6.21 https://kotlinlang.org, Apache 2.0
reactor-core 3.4.30
https://github.com/reactor/reactor-core/blob/main/LICENSE, Apache 2.0
- simpleclient_common 0.12.0
https://github.com/micrometer-metrics/micrometer/blob/main/LICENSE, Apache 2.0
+ simpleclient_common 0.15.0
https://github.com/micrometer-metrics/micrometer/blob/main/LICENSE, Apache 2.0
guice 5.0.1 https://github.com/google/guice/blob/master/COPYING, Apache 2.0
========================================================================
@@ -412,7 +414,6 @@ The text of each license is also included at
licenses/LICENSE-[project].txt.
postgresql 42.3.8: https://github.com/pgjdbc/pgjdbc, BSD 2-Clause
protobuf-java 3.21.12: https://github.com/protocolbuffers/protobuf/, BSD
3-Clause
protobuf-java-util 3.21.1: https://github.com/protocolbuffers/protobuf/,
BSD 3-Clause
- openGauss-connector-jdbc 5.0.0-og
https://github.com/opengauss-mirror/openGauss-connector-jdbc
polaris-all 1.13.0: https://github.com/polarismesh/polaris-java, BSD
3-Clause
========================================================================
@@ -445,7 +446,7 @@ MIT licenses
The following components are provided under the MIT License. See project link
for details.
The text of each license is also included at licenses/LICENSE-[project].txt.
- animal-sniffer-annotations 1.18:
https://github.com/mojohaus/animal-sniffer, MIT
+ animal-sniffer-annotations 1.21:
https://github.com/mojohaus/animal-sniffer, MIT
checker-qual 3.12.0:
https://github.com/typetools/checker-framework/blob/master/checker-qual, MIT
java-jwt 3.12.0: https://mvnrepository.com/artifact/com.auth0/java-jwt, MIT
jcl-over-slf4j 1.7.36: https://www.slf4j.org, MIT
@@ -565,4 +566,10 @@ The text of each license is also included at
licenses/LICENSE-[project].txt.
jaxb-api 2.3.1: https://javaee.github.io/jaxb-v2, CDDL 1.1 and GPLv2
javax.activation-api 1.2.0:
https://github.com/slcorp/javax.activation-api-1.2.0-sources, CDDL and GPL 2.0
- javax.annotation-api 1.3.2: https://github.com/javaee/javax.annotation,
CDDL and GPL 2.0
\ No newline at end of file
+ javax.annotation-api 1.3.2: https://github.com/javaee/javax.annotation,
CDDL and GPL 2.0
+
+========================================================================
+Public Domain licenses
+========================================================================
+
+ aopalliance 1.0:
https://mvnrepository.com/artifact/aopalliance/aopalliance, Public Domain
diff --git a/shenyu-dist/shenyu-bootstrap-dist/src/main/release-docs/LICENSE
b/shenyu-dist/shenyu-bootstrap-dist/src/main/release-docs/LICENSE
index 2cbc7e6a1..502b3afac 100644
--- a/shenyu-dist/shenyu-bootstrap-dist/src/main/release-docs/LICENSE
+++ b/shenyu-dist/shenyu-bootstrap-dist/src/main/release-docs/LICENSE
@@ -267,22 +267,22 @@ The text of each license is the standard Apache 2.0
license.
fastjson2 2.0.14: https://github.com/alibaba/fastjson2, Apache 2.0
google-http-client 1.34.0:
https://github.com/googleapis/google-http-java-client/google-http-client,
Apache 2.0
google-http-client-jackson2 1.34.0:
https://github.com/googleapis/google-http-java-client/google-http-client-jackson2,
Apache 2.0
- grpc-all 1.48.0 https://github.com/grpc/grpc, Apache 2.0
- grpc-alts 1.48.0 https://github.com/grpc/grpc, Apache 2.0
- grpc-api 1.48.0 https://github.com/grpc/grpc, Apache 2.0
- grpc-auth 1.48.0: https://github.com/grpc/grpc, Apache 2.0
- grpc-context 1.48.0: https://github.com/grpc/grpc, Apache 2.0
- grpc-core 1.48.0: https://github.com/grpc/grpc, Apache 2.0
- grpc-grpclb 1.48.0: https://github.com/grpc/grpc, Apache 2.0
- grpc-netty 1.48.0: https://github.com/grpc/grpc, Apache 2.0
- grpc-netty-shaded 1.48.0: https://github.com/grpc/grpc, Apache 2.0
- grpc-okhttp 1.48.0: https://github.com/grpc/grpc, Apache 2.0
- grpc-protobuf 1.48.0: https://github.com/grpc/grpc, Apache 2.0
- grpc-protobuf-lite 1.48.0: https://github.com/grpc/grpc, Apache 2.0
- grpc-services 1.48.0: https://github.com/grpc/grpc, Apache 2.0
- grpc-stub 1.48.0: https://github.com/grpc/grpc, Apache 2.0
- grpc-testing 1.48.0: https://github.com/grpc/grpc, Apache 2.0
- grpc-xds 1.48.0: https://github.com/grpc/grpc, Apache 2.0
+ grpc-all 1.53.0 https://github.com/grpc/grpc, Apache 2.0
+ grpc-alts 1.53.0 https://github.com/grpc/grpc, Apache 2.0
+ grpc-api 1.53.0 https://github.com/grpc/grpc, Apache 2.0
+ grpc-auth 1.53.0: https://github.com/grpc/grpc, Apache 2.0
+ grpc-context 1.53.0: https://github.com/grpc/grpc, Apache 2.0
+ grpc-core 1.53.0: https://github.com/grpc/grpc, Apache 2.0
+ grpc-grpclb 1.53.0: https://github.com/grpc/grpc, Apache 2.0
+ grpc-netty 1.53.0: https://github.com/grpc/grpc, Apache 2.0
+ grpc-netty-shaded 1.53.0: https://github.com/grpc/grpc, Apache 2.0
+ grpc-okhttp 1.53.0: https://github.com/grpc/grpc, Apache 2.0
+ grpc-protobuf 1.53.0: https://github.com/grpc/grpc, Apache 2.0
+ grpc-protobuf-lite 1.53.0: https://github.com/grpc/grpc, Apache 2.0
+ grpc-services 1.53.0: https://github.com/grpc/grpc, Apache 2.0
+ grpc-stub 1.53.0: https://github.com/grpc/grpc, Apache 2.0
+ grpc-testing 1.53.0: https://github.com/grpc/grpc, Apache 2.0
+ grpc-xds 1.53.0: https://github.com/grpc/grpc, Apache 2.0
gson 2.9.0: https://github.com/google/gson, Apache 2.0
guava 31.1-jre: https://github.com/google/guava, Apache 2.0
hessian 3.3.7: http://github.com/alipay/sofa-hessian, Apache 2.0
@@ -396,8 +396,8 @@ The text of each license is the standard Apache 2.0 license.
opentracing-mock 0.22.0: https://github.com/opentracing/opentracing-java,
Apache 2.0
opentracing-noop 0.22.0: https://github.com/opentracing/opentracing-java,
Apache 2.0
opentracing-util 0.22.0: https://github.com/opentracing/opentracing-java,
Apache 2.0
- perfmark-api 0.19.0: https://github.com/perfmark/perfmark, Apache 2.0
- proto-google-common-protos 1.17.0:
https://github.com/googleapis/common-protos-java, Apache 2.0
+ perfmark-api 0.25.0: https://github.com/perfmark/perfmark, Apache 2.0
+ proto-google-common-protos 2.9.0:
https://github.com/googleapis/common-protos-java, Apache 2.0
reactor-core 3.4.30: https://github.com/reactor/reactor-core, Apache 2.0
reactor-extra 3.4.10: https://github.com/reactor/reactor-addons, Apache 2.0
reactor-netty 1.0.33: https://github.com/reactor/reactor-netty, Apache 2.0
@@ -546,7 +546,7 @@ The text of each license is the standard Apache 2.0 license.
pulsar-client-api 2.10.1:
https://mvnrepository.com/artifact/org.apache.pulsar/pulsar-client-api, Apache
2.0
aliyun-log 0.6.57: https://github.com/aliyun/aliyun-log-java-producer,
Apache 2.0
aliyun-log-producer 0.3.10:
https://github.com/aliyun/aliyun-log-java-producer, Apache 2.0
- tencentcloud-cls-sdk-java 1.0.9:
https://github.com/TencentCloud/tencentcloud-cls-sdk-java, Apache 2.0
+ tencentcloud-cls-sdk-java 1.0.14:
https://github.com/TencentCloud/tencentcloud-cls-sdk-java, Apache 2.0
casdoor-java-sdk 1.9.0: https://github.com/casdoor/casdoor-java-sdk,
Apache 2.0
nimbus-jose-jwt 9.10: https://connect2id.com/products/nimbus-jose-jwt,
Apache 2.0
oltu 1.0.2: https://oltu.apache.org/, Apache 2.0
@@ -561,6 +561,8 @@ The text of each license is the standard Apache 2.0 license.
kotlin-stdlib 1.6.21 https://kotlinlang.org, Apache 2.0
kotlin-stdlib-common 1.6.21 https://kotlinlang.org, Apache 2.0
lts-sdk-java 1.0.1:
https://github.com/huaweicloud/huaweicloud-lts-sdk-java, Apache 2.0
+ lts-sdk-common 1.0.1:
https://github.com/huaweicloud/huaweicloud-lts-sdk-java, Apache 2.0
+
========================================================================
BSD licenses
========================================================================
@@ -575,8 +577,8 @@ The text of each license is also included at
licenses/LICENSE-[project].txt.
google-auth-library-oauth2-http 0.20.0:
https://github.com/googleapis/google-auth-library-java/google-auth-library-oauth2-http,
BSD 3-Clause
jakarta.activation-api 1.2.2: https://github.com/eclipse-ee4j/jaf, BSD
3-Clause
jakarta.xml.bind-api 2.3.3: https://github.com/eclipse-ee4j/jaxb-api, BSD
3-Clause
- protobuf-java 3.11.0: https://github.com/protocolbuffers/protobuf/, BSD
3-Clause
- protobuf-java-util 3.15.3: https://github.com/protocolbuffers/protobuf/,
BSD 3-Clause
+ protobuf-java 3.21.12: https://github.com/protocolbuffers/protobuf/, BSD
3-Clause
+ protobuf-java-util 3.23.3: https://github.com/protocolbuffers/protobuf/,
BSD 3-Clause
tars-client 1.7.2: https://github.com/TarsCloud/Tars/tars-client, BSD
3-Clause
tars-context 1.7.2: https://github.com/TarsCloud/Tars/tars-context, BSD
3-Clause
tars-net 1.7.2: https://github.com/TarsCloud/Tars/tars-net, BSD 3-Clause
@@ -650,7 +652,7 @@ MIT licenses
The following components are provided under the MIT License. See project link
for details.
The text of each license is also included at licenses/LICENSE-[project].txt.
- animal-sniffer-annotations 1.18:
https://github.com/mojohaus/animal-sniffer, MIT
+ animal-sniffer-annotations 1.21:
https://github.com/mojohaus/animal-sniffer, MIT
bcpkix-jdk15on 1.68: http://www.bouncycastle.org/licence.html , MIT
bcprov-jdk15on 1.69: http://www.bouncycastle.org/licence.html , MIT
bcprov-ext-jdk15on 1.69: http://www.bouncycastle.org/licence.html , MIT
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/resources/docker-compose.mysql.yml
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/resources/docker-compose.mysql.yml
index 92a305fe6..849d1149a 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/resources/docker-compose.mysql.yml
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/resources/docker-compose.mysql.yml
@@ -19,7 +19,7 @@ version: '2.3'
services:
zookeeper:
- image: zookeeper:3.5
+ image: zookeeper:3.8
restart: always
nacos:
@@ -61,7 +61,7 @@ services:
restart: always
healthcheck:
test: [ "CMD-SHELL", "wget -q -O - http://dubbo:8011/actuator/health |
grep UP || exit 1" ]
- timeout: 2s
+ timeout: 3s
retries: 3
start_period: 5s
ports:
@@ -71,7 +71,7 @@ services:
- dubbo.registry.address=zookeeper://zookeeper:2181
- shenyu.register.serverLists=http://admin:9095
depends_on:
- gateway:
+ admin:
condition: service_healthy
gateway:
@@ -99,8 +99,8 @@ services:
- MYSQL_PASSWORD=123456
healthcheck:
test: "/usr/bin/mysql --user=root --password=123123 --execute \"SHOW
DATABASES;\""
- interval: 2s
- timeout: 20s
- retries: 10
+ interval: 3s
+ timeout: 30s
+ retries: 5
volumes:
- /tmp/shenyu-e2e/mysql/schema.sql:/docker-entrypoint-initdb.d/schema.sql
\ No newline at end of file
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-polaris/pom.xml
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-polaris/pom.xml
index 23acd7210..77be4cf52 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-polaris/pom.xml
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-polaris/pom.xml
@@ -30,6 +30,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.shenyu</groupId>
