Skip to content

Commit

Permalink
prepare the snapshot version (#1046)
Browse files Browse the repository at this point in the history
  • Loading branch information
@liubao68
liubao68 authored May 30, 2023
1 parent 51c91d9 commit 465bf0e
Show file tree
Hide file tree
Showing 82 changed files with 131 additions and 125 deletions.
2 changes: 1 addition & 1 deletion coverage-reports/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.huaweicloud</groupId>
<artifactId>spring-cloud-huawei-parents</artifactId>
<version>1.11.0-2021.0.x-SNAPSHOT</version>
<version>1.12.0-2022.0.x-SNAPSHOT</version>
<relativePath>../spring-cloud-huawei-parents</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/canary-nacos-tests/nacos-canary-consumer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>canary-nacos-tests</artifactId>
<groupId>com.huaweicloud</groupId>
<version>1.11.0-2021.0.x-SNAPSHOT</version>
<version>1.12.0-2022.0.x-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/canary-nacos-tests/nacos-canary-gateway/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>canary-nacos-tests</artifactId>
<groupId>com.huaweicloud</groupId>
<version>1.11.0-2021.0.x-SNAPSHOT</version>
<version>1.12.0-2022.0.x-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/canary-nacos-tests/nacos-canary-provider-beta/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>canary-nacos-tests</artifactId>
<groupId>com.huaweicloud</groupId>
<version>1.11.0-2021.0.x-SNAPSHOT</version>
<version>1.12.0-2022.0.x-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/canary-nacos-tests/nacos-canary-provider/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>canary-nacos-tests</artifactId>
<groupId>com.huaweicloud</groupId>
<version>1.11.0-2021.0.x-SNAPSHOT</version>
<version>1.12.0-2022.0.x-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
45 changes: 24 additions & 21 deletions integration-tests/canary-nacos-tests/nacos-canary-tests-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>canary-nacos-tests</artifactId>
<groupId>com.huaweicloud</groupId>
<version>1.11.0-2021.0.x-SNAPSHOT</version>
<version>1.12.0-2022.0.x-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -56,7 +56,7 @@
<PREFER_HOST_MODE>hostname</PREFER_HOST_MODE>
</env>
<wait>
<log>Tomcat started on port</log>
<log>.* Tomcat started on port .*</log>
<tcp>
<ports>
<port>8848</port>
Expand All @@ -71,61 +71,62 @@
</image>

<image>
<name>nacos-canary-consumer-test:${project.version}</name>
<alias>nacos-canary-consumer-test</alias>
<name>nacos-canary-provider-test:${project.version}</name>
<alias>nacos-canary-provider-test</alias>
<run>
<env>
<JAVA_OPTS>
-Dspring.cloud.nacos.discovery.server-addr=http://nacos-server:8848
-Dspring.cloud.nacos.config.server-addr=http://nacos-server:8848
</JAVA_OPTS>
<JAR_PATH>/maven/nacos-canary-consumer-test-${project.version}.jar</JAR_PATH>
<JAR_PATH>/maven/nacos-canary-provider-test-${project.version}.jar</JAR_PATH>
</env>
<links>
<link>nacos-server:nacos-server</link>
</links>
<wait>
<log>Started PriceApplication</log>
<log>.* Started ProviderApplication .*</log>
<tcp>
<ports>
<port>9098</port>
<port>9091</port>
</ports>
</tcp>
<time>120000</time>
</wait>
<ports>
<port>9098:9098</port>
<port>9091:9091</port>
</ports>
<dependsOn>
<container>nacos-server</container>
</dependsOn>
</run>
</image>

<image>
<name>nacos-canary-provider-test:${project.version}</name>
<alias>nacos-canary-provider-test</alias>
<name>nacos-canary-provider-beta-test:${project.version}</name>
<alias>nacos-canary-provider-beta-test</alias>
<run>
<env>
<JAVA_OPTS>
-Dspring.cloud.nacos.discovery.server-addr=http://nacos-server:8848
-Dspring.cloud.nacos.config.server-addr=http://nacos-server:8848
</JAVA_OPTS>
<JAR_PATH>/maven/nacos-canary-provider-test-${project.version}.jar</JAR_PATH>
<JAR_PATH>/maven/nacos-canary-provider-beta-test-${project.version}.jar</JAR_PATH>
</env>
<links>
<link>nacos-server:nacos-server</link>
</links>
<wait>
<log>Started PriceApplication</log>
<log>.* Started ProviderApplication .*</log>
<tcp>
<ports>
<port>9091</port>
<port>9092</port>
</ports>
</tcp>
<time>120000</time>
</wait>
<ports>
<port>9091:9091</port>
<port>9092:9092</port>
</ports>
<dependsOn>
<container>nacos-server</container>
Expand All @@ -134,33 +135,35 @@
</image>

<image>
<name>nacos-canary-provider-beta-test:${project.version}</name>
<alias>nacos-canary-provider-beta-test</alias>
<name>nacos-canary-consumer-test:${project.version}</name>
<alias>nacos-canary-consumer-test</alias>
<run>
<env>
<JAVA_OPTS>
-Dspring.cloud.nacos.discovery.server-addr=http://nacos-server:8848
-Dspring.cloud.nacos.config.server-addr=http://nacos-server:8848
</JAVA_OPTS>
<JAR_PATH>/maven/nacos-canary-provider-beta-test-${project.version}.jar</JAR_PATH>
<JAR_PATH>/maven/nacos-canary-consumer-test-${project.version}.jar</JAR_PATH>
</env>
<links>
<link>nacos-server:nacos-server</link>
</links>
<wait>
<log>Started PriceApplication</log>
<log>.* Started ConsumerApplication .*</log>
<tcp>
<ports>
<port>9092</port>
<port>9098</port>
</ports>
</tcp>
<time>120000</time>
</wait>
<ports>
<port>9092:9092</port>
<port>9098:9098</port>
</ports>
<dependsOn>
<container>nacos-server</container>
<container>nacos-canary-provider-beta-test</container>
<container>nacos-canary-provider-test</container>
</dependsOn>
</run>
</image>
Expand All @@ -180,7 +183,7 @@
<link>nacos-server:nacos-server</link>
</links>
<wait>
<log>Started PriceApplication</log>
<log>.* Started GatewayApplication .*</log>
<tcp>
<ports>
<port>10088</port>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/canary-nacos-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>integration-tests</artifactId>
<groupId>com.huaweicloud</groupId>
<version>1.11.0-2021.0.x-SNAPSHOT</version>
<version>1.12.0-2022.0.x-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>Integration Tests::Canary Nacos Tests</name>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/canary-serivcecomb-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>integration-tests</artifactId>
<groupId>com.huaweicloud</groupId>
<version>1.11.0-2021.0.x-SNAPSHOT</version>
<version>1.12.0-2022.0.x-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>Integration Tests::Canary ServiceComb Tests</name>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/canary-serivcecomb-tests/servicecomb-canary-consumer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>canary-servicecomb-tests</artifactId>
<groupId>com.huaweicloud</groupId>
<version>1.11.0-2021.0.x-SNAPSHOT</version>
<version>1.12.0-2022.0.x-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/canary-serivcecomb-tests/servicecomb-canary-gateway/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>canary-servicecomb-tests</artifactId>
<groupId>com.huaweicloud</groupId>
<version>1.11.0-2021.0.x-SNAPSHOT</version>
<version>1.12.0-2022.0.x-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/canary-serivcecomb-tests/servicecomb-canary-provider-beta/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>canary-servicecomb-tests</artifactId>
<groupId>com.huaweicloud</groupId>
<version>1.11.0-2021.0.x-SNAPSHOT</version>
<version>1.12.0-2022.0.x-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/canary-serivcecomb-tests/servicecomb-canary-provider/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>canary-servicecomb-tests</artifactId>
<groupId>com.huaweicloud</groupId>
<version>1.11.0-2021.0.x-SNAPSHOT</version>
<version>1.12.0-2022.0.x-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
43 changes: 23 additions & 20 deletions integration-tests/canary-serivcecomb-tests/servicecomb-canary-tests-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>canary-servicecomb-tests</artifactId>
<groupId>com.huaweicloud</groupId>
<version>1.11.0-2021.0.x-SNAPSHOT</version>
<version>1.12.0-2022.0.x-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -67,59 +67,60 @@
</image>

<image>
<name>servicecomb-canary-consumer-test:${project.version}</name>
<alias>servicecomb-canary-consumer-test</alias>
<name>servicecomb-canary-provider-test:${project.version}</name>
<alias>servicecomb-canary-provider-test</alias>
<run>
<env>
<JAVA_OPTS>
-Dspring.cloud.servicecomb.discovery.address=http://sc.servicecomb.io:30100
</JAVA_OPTS>
<JAR_PATH>/maven/servicecomb-canary-consumer-test-${project.version}.jar</JAR_PATH>
<JAR_PATH>/maven/servicecomb-canary-provider-test-${project.version}.jar</JAR_PATH>
</env>
<links>
<link>service-center:sc.servicecomb.io</link>
</links>
<wait>
<log>Started PriceApplication</log>
<log>.* Started ProviderApplication .*</log>
<tcp>
<ports>
<port>9098</port>
<port>9091</port>
</ports>
</tcp>
<time>120000</time>
</wait>
<ports>
<port>9098:9098</port>
<port>9091:9091</port>
</ports>
<dependsOn>
<container>service-center</container>
</dependsOn>
</run>
</image>

<image>
<name>servicecomb-canary-provider-test:${project.version}</name>
<alias>servicecomb-canary-provider-test</alias>
<name>servicecomb-canary-provider-beta-test:${project.version}</name>
<alias>servicecomb-canary-provider-beta-test</alias>
<run>
<env>
<JAVA_OPTS>
-Dspring.cloud.servicecomb.discovery.address=http://sc.servicecomb.io:30100
</JAVA_OPTS>
<JAR_PATH>/maven/servicecomb-canary-provider-test-${project.version}.jar</JAR_PATH>
<JAR_PATH>/maven/servicecomb-canary-provider-beta-test-${project.version}.jar</JAR_PATH>
</env>
<links>
<link>service-center:sc.servicecomb.io</link>
</links>
<wait>
<log>Started PriceApplication</log>
<log>.* Started ProviderApplication .*</log>
<tcp>
<ports>
<port>9091</port>
<port>9092</port>
</ports>
</tcp>
<time>120000</time>
</wait>
<ports>
<port>9091:9091</port>
<port>9092:9092</port>
</ports>
<dependsOn>
<container>service-center</container>
Expand All @@ -128,32 +129,34 @@
</image>

<image>
<name>servicecomb-canary-provider-beta-test:${project.version}</name>
<alias>servicecomb-canary-provider-beta-test</alias>
<name>servicecomb-canary-consumer-test:${project.version}</name>
<alias>servicecomb-canary-consumer-test</alias>
<run>
<env>
<JAVA_OPTS>
-Dspring.cloud.servicecomb.discovery.address=http://sc.servicecomb.io:30100
</JAVA_OPTS>
<JAR_PATH>/maven/servicecomb-canary-provider-beta-test-${project.version}.jar</JAR_PATH>
<JAR_PATH>/maven/servicecomb-canary-consumer-test-${project.version}.jar</JAR_PATH>
</env>
<links>
<link>service-center:sc.servicecomb.io</link>
</links>
<wait>
<log>Started PriceApplication</log>
<log>.* Started ConsumerApplication .*</log>
<tcp>
<ports>
<port>9092</port>
<port>9098</port>
</ports>
</tcp>
<time>120000</time>
</wait>
<ports>
<port>9092:9092</port>
<port>9098:9098</port>
</ports>
<dependsOn>
<container>service-center</container>
<container>servicecomb-canary-provider-beta-test</container>
<container>servicecomb-canary-provider-test</container>
</dependsOn>
</run>
</image>
Expand All @@ -172,7 +175,7 @@
<link>service-center:sc.servicecomb.io</link>
</links>
<wait>
<log>Started PriceApplication</log>
<log>.* Started GatewayApplication .*</log>
<tcp>
<ports>
<port>10088</port>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/cse-v1/consumer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.huaweicloud</groupId>
<artifactId>cse-v1-test</artifactId>
<version>1.11.0-2021.0.x-SNAPSHOT</version>
<version>1.12.0-2022.0.x-SNAPSHOT</version>
</parent>

<name>Integration Tests::CSE V1::Consumer</name>
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/cse-v1/gateway/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.huaweicloud</groupId>
<artifactId>cse-v1-test</artifactId>
<version>1.11.0-2021.0.x-SNAPSHOT</version>
<version>1.12.0-2022.0.x-SNAPSHOT</version>
</parent>

<name>Integration Tests::CSE V1::Gateway</name>
Expand Down
Loading

0 comments on commit 465bf0e

Please sign in to comment.