Skip to content

Commit eea478e

Browse files
liubao68liubao68
authored
prepare release of 1.5.0-Hoxton (#349)
* fix release docs error * prepare release of 1.5.0-Hoxton
1 parent 6fb55dd commit eea478e

File tree

63 files changed

+70
-68
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+70
-68
lines changed

‎coverage-reports/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.huaweicloud</groupId>
2323
<artifactId>spring-cloud-huawei-parents</artifactId>
24-
<version>1.5.0</version>
24+
<version>1.5.0-Hoxton</version>
2525
<relativePath>../spring-cloud-huawei-parents</relativePath>
2626
</parent>
2727

‎docs/release.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
mvn versions:set -DgenerateBackupPoms=false -DnewVersion=1.5.0
1616
17+
部分 Dockerfile 里面也引用了版本号，需要排查一定修改。
18+
1719
2. 下载项目代码。
1820

1921
git clone https://github.com/huaweicloud/spring-cloud-huawei.git
@@ -28,7 +30,7 @@
2830
2931
5. 发布
3032

31-
mvn clean deploy -Prelease
33+
mvn clean deploy -Prelease -DskipTests
3234

3335
6. 生成 release notes 。 在 github 页面打上 tag， 书写 release notes。
3436

‎governance/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>spring-cloud-huawei-parents</artifactId>
2323
<groupId>com.huaweicloud</groupId>
24-
<version>1.5.0</version>
24+
<version>1.5.0-Hoxton</version>
2525
<relativePath>../spring-cloud-huawei-parents</relativePath>
2626
</parent>
2727

‎integration-tests/discovery-tests/discovery-tests-client/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.huaweicloud</groupId>
2323
<artifactId>discovery-tests</artifactId>
24-
<version>1.5.0</version>
24+
<version>1.5.0-Hoxton</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727

‎integration-tests/discovery-tests/order-consumer/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.huaweicloud</groupId>
2323
<artifactId>discovery-tests</artifactId>
24-
<version>1.5.0</version>
24+
<version>1.5.0-Hoxton</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727

‎integration-tests/discovery-tests/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>integration-tests</artifactId>
2323
<groupId>com.huaweicloud</groupId>
24-
<version>1.5.0</version>
24+
<version>1.5.0-Hoxton</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727
<artifactId>discovery-tests</artifactId>

‎integration-tests/discovery-tests/price-provider/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.huaweicloud</groupId>
2323
<artifactId>discovery-tests</artifactId>
24-
<version>1.5.0</version>
24+
<version>1.5.0-Hoxton</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727

‎integration-tests/docker-build-config/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>integration-tests</artifactId>
2424
<groupId>com.huaweicloud</groupId>
25-
<version>1.5.0</version>
25+
<version>1.5.0-Hoxton</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

‎integration-tests/docker-run-config/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>integration-tests</artifactId>
2323
<groupId>com.huaweicloud</groupId>
24-
<version>1.5.0</version>
24+
<version>1.5.0-Hoxton</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727

‎integration-tests/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.huaweicloud</groupId>
2323
<artifactId>spring-cloud-huawei-parents</artifactId>
24-
<version>1.5.0</version>
24+
<version>1.5.0-Hoxton</version>
2525
<relativePath>../spring-cloud-huawei-parents</relativePath>
2626
</parent>
2727

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<groupId>com.huaweicloud</groupId>
3131
<artifactId>spring-cloud-huawei</artifactId>
32-
<version>1.5.0</version>
32+
<version>1.5.0-Hoxton</version>
3333
<packaging>pom</packaging>
3434
<name>Spring Cloud Huawei</name>
3535

‎scripts/build.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,21 @@
2020
## whenever commit to the repository, do Compilation and Installation
2121

2222
if [ "$1" == "install" ]; then
23-
mvn apache-rat:check -Pit
23+
mvn apache-rat:check -Pit -Psample
2424
if [ $? == 0 ]; then
2525
echo "${green}Rat Check success..${reset}"
2626
else
2727
echo "${red}Rat Check failed, please check the above logs for more details.${reset}"
2828
exit 1
2929
fi
3030

31-
mvn clean package findbugs:findbugs -Dmaven.test.skip=true -Dmaven.javadoc.skip=true
31+
mvn clean package findbugs:findbugs -Pit -Psample -Dmaven.test.skip=true -Dmaven.javadoc.skip=true
3232
if [ $? != 0 ]; then
3333
echo "${red}Execute find bugs failed.${reset}"
3434
exit 1
3535
fi
3636

37-
mvn clean install -Pit -Pdocker -Dmaven.javadoc.skip=true -Dcheckstyle.skip=false -Drat.skip=false
37+
mvn clean install -Pit -Psample -Pdocker -Dmaven.javadoc.skip=true -Dcheckstyle.skip=false -Drat.skip=false
3838
if [ $? == 0 ]; then
3939
echo "${green}Installation Success..${reset}"
4040
else

‎spring-cloud-huawei-bom/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
<parent>
2323
<groupId>com.huaweicloud</groupId>
2424
<artifactId>spring-cloud-huawei</artifactId>
25-
<version>1.5.0</version>
25+
<version>1.5.0-Hoxton</version>
2626
</parent>
2727

2828
<modelVersion>4.0.0</modelVersion>
2929

3030
<artifactId>spring-cloud-huawei-bom</artifactId>
3131
<packaging>pom</packaging>
32-
<version>1.5.0</version>
32+
<version>1.5.0-Hoxton</version>
3333
<name>Spring Cloud Huawei BOM</name>
3434

3535
<dependencyManagement>

‎spring-cloud-huawei-common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>com.huaweicloud</groupId>
2424
<artifactId>spring-cloud-huawei-parents</artifactId>
25-
<version>1.5.0</version>
25+
<version>1.5.0-Hoxton</version>
2626
<relativePath>../spring-cloud-huawei-parents</relativePath>
2727
</parent>
2828
<modelVersion>4.0.0</modelVersion>

‎spring-cloud-huawei-config/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.huaweicloud</groupId>
2323
<artifactId>spring-cloud-huawei-parents</artifactId>
24-
<version>1.5.0</version>
24+
<version>1.5.0-Hoxton</version>
2525
<relativePath>../spring-cloud-huawei-parents</relativePath>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>

‎spring-cloud-huawei-dependencies/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
<parent>
2323
<groupId>com.huaweicloud</groupId>
2424
<artifactId>spring-cloud-huawei</artifactId>
25-
<version>1.5.0</version>
25+
<version>1.5.0-Hoxton</version>
2626
</parent>
2727

2828
<modelVersion>4.0.0</modelVersion>
2929

3030
<artifactId>spring-cloud-huawei-dependencies</artifactId>
3131
<packaging>pom</packaging>
32-
<version>1.5.0</version>
32+
<version>1.5.0-Hoxton</version>
3333
<name>Spring Cloud Huawei Dependencies</name>
3434
<properties>
3535
<feign-core.version>11.0</feign-core.version>

‎spring-cloud-huawei-dtm/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.huaweicloud</groupId>
2323
<artifactId>spring-cloud-huawei-parents</artifactId>
24-
<version>1.5.0</version>
24+
<version>1.5.0-Hoxton</version>
2525
<relativePath>../spring-cloud-huawei-parents</relativePath>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>

‎spring-cloud-huawei-governance/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>spring-cloud-huawei-parents</artifactId>
2323
<groupId>com.huaweicloud</groupId>
24-
<version>1.5.0</version>
24+
<version>1.5.0-Hoxton</version>
2525
<relativePath>../spring-cloud-huawei-parents</relativePath>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>

‎spring-cloud-huawei-parents/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
<parent>
2222
<groupId>com.huaweicloud</groupId>
2323
<artifactId>spring-cloud-huawei-dependencies</artifactId>
24-
<version>1.5.0</version>
24+
<version>1.5.0-Hoxton</version>
2525
<relativePath>../spring-cloud-huawei-dependencies</relativePath>
2626
</parent>
2727

2828
<modelVersion>4.0.0</modelVersion>
2929

3030
<artifactId>spring-cloud-huawei-parents</artifactId>
3131
<packaging>pom</packaging>
32-
<version>1.5.0</version>
32+
<version>1.5.0-Hoxton</version>
3333
<name>Spring Cloud Huawei Dependencies</name>
3434

3535

‎spring-cloud-huawei-router-client/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.huaweicloud</groupId>
2323
<artifactId>spring-cloud-huawei-parents</artifactId>
24-
<version>1.5.0</version>
24+
<version>1.5.0-Hoxton</version>
2525
<relativePath>../spring-cloud-huawei-parents</relativePath>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>

‎spring-cloud-huawei-router-core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.huaweicloud</groupId>
2323
<artifactId>spring-cloud-huawei-parents</artifactId>
24-
<version>1.5.0</version>
24+
<version>1.5.0-Hoxton</version>
2525
<relativePath>../spring-cloud-huawei-parents</relativePath>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>

‎spring-cloud-huawei-sample/canary-demo/canary-consumer-feign-hytrix/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
FROM openjdk:8u181-jdk-alpine
1818

1919
WORKDIR /home/apps/
20-
ADD target/canary-consumer-feign-hytrix-1.5.0.jar .
20+
ADD target/canary-consumer-feign-hytrix-1.5.0-Hoxton.jar .
2121
ADD target/lib ./lib
2222
ADD start.sh .
2323

‎spring-cloud-huawei-sample/canary-demo/canary-consumer-feign-hytrix/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.huaweicloud</groupId>
2323
<artifactId>canary-demo</artifactId>
24-
<version>1.5.0</version>
24+
<version>1.5.0-Hoxton</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727

‎spring-cloud-huawei-sample/canary-demo/canary-consumer-feign-hytrix/start.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#
1717
#!/bin/bash
1818

19-
JAR=canary-consumer-feign-hytrix-1.5.0.jar
19+
JAR=canary-consumer-feign-hytrix-1.5.0-Hoxton.jar
2020
if [ ! -e $JAR ]; then
2121
JAR=target/$JAR
2222
if [ -e application.yaml ]; then

‎spring-cloud-huawei-sample/canary-demo/canary-consumer/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
FROM openjdk:8u181-jdk-alpine
1818

1919
WORKDIR /home/apps/
20-
ADD target/canary-consumer-1.5.0.jar .
20+
ADD target/canary-consumer-1.5.0-Hoxton.jar .
2121
ADD target/lib ./lib
2222
ADD start.sh .
2323

‎spring-cloud-huawei-sample/canary-demo/canary-consumer/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.huaweicloud</groupId>
2323
<artifactId>canary-demo</artifactId>
24-
<version>1.5.0</version>
24+
<version>1.5.0-Hoxton</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727

‎spring-cloud-huawei-sample/canary-demo/canary-consumer/start.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#
1717
#!/bin/bash
1818

19-
JAR=canary-consumer-1.5.0.jar
19+
JAR=canary-consumer-1.5.0-Hoxton.jar
2020
if [ ! -e $JAR ]; then
2121
JAR=target/$JAR
2222
if [ -e application.yaml ]; then

‎spring-cloud-huawei-sample/canary-demo/canary-provider-beta/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
FROM openjdk:8u181-jdk-alpine
1818

1919
WORKDIR /home/apps/
20-
ADD target/canary-provider-beta-1.5.0.jar .
20+
ADD target/canary-provider-beta-1.5.0-Hoxton.jar .
2121
ADD target/lib ./lib
2222
ADD start.sh .
2323

‎spring-cloud-huawei-sample/canary-demo/canary-provider-beta/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.huaweicloud</groupId>
2323
<artifactId>canary-demo</artifactId>
24-
<version>1.5.0</version>
24+
<version>1.5.0-Hoxton</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727

‎spring-cloud-huawei-sample/canary-demo/canary-provider-beta/start.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#
1717
#!/bin/bash
1818

19-
JAR=canary-provider-beta-1.5.0.jar
19+
JAR=canary-provider-beta-1.5.0-Hoxton.jar
2020
if [ ! -e $JAR ]; then
2121
JAR=target/$JAR
2222
if [ -e application.yaml ]; then

‎spring-cloud-huawei-sample/canary-demo/canary-provider/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
FROM openjdk:8u181-jdk-alpine
1818

1919
WORKDIR /home/apps/
20-
ADD target/canary-provider-1.5.0.jar .
20+
ADD target/canary-provider-1.5.0-Hoxton.jar .
2121
ADD target/lib ./lib
2222
ADD start.sh .
2323

‎spring-cloud-huawei-sample/canary-demo/canary-provider/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>canary-demo</artifactId>
2323
<groupId>com.huaweicloud</groupId>
24-
<version>1.5.0</version>
24+
<version>1.5.0-Hoxton</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727

‎spring-cloud-huawei-sample/canary-demo/canary-provider/start.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#
1717
#!/bin/bash
1818

19-
JAR=canary-provider-1.5.0.jar
19+
JAR=canary-provider-1.5.0-Hoxton.jar
2020
if [ ! -e $JAR ]; then
2121
JAR=target/$JAR
2222
if [ -e application.yaml ]; then

‎spring-cloud-huawei-sample/canary-demo/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.huaweicloud</groupId>
2323
<artifactId>spring-cloud-huawei-sample</artifactId>
24-
<version>1.5.0</version>
24+
<version>1.5.0-Hoxton</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727

‎spring-cloud-huawei-sample/config-demo/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>spring-cloud-huawei-sample</artifactId>
2323
<groupId>com.huaweicloud</groupId>
24-
<version>1.5.0</version>
24+
<version>1.5.0-Hoxton</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727
<artifactId>config-demo</artifactId>

‎spring-cloud-huawei-sample/discovery-demo/order-consumer/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.huaweicloud</groupId>
2323
<artifactId>discovery-demo</artifactId>
24-
<version>1.5.0</version>
24+
<version>1.5.0-Hoxton</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727

‎spring-cloud-huawei-sample/discovery-demo/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>spring-cloud-huawei-sample</artifactId>
2323
<groupId>com.huaweicloud</groupId>
24-
<version>1.5.0</version>
24+
<version>1.5.0-Hoxton</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727
<artifactId>discovery-demo</artifactId>

‎spring-cloud-huawei-sample/discovery-demo/price-provider/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.huaweicloud</groupId>
2323
<artifactId>discovery-demo</artifactId>
24-
<version>1.5.0</version>
24+
<version>1.5.0-Hoxton</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727

0 commit comments

Comments
 (0)