Skip to content

Commit a26aba7

Browse files
robberphexrobberphex
committed
update pom.xml
1 parent 39ab1e5 commit a26aba7

File tree

6 files changed

+165
-50
lines changed

6 files changed

+165
-50
lines changed

‎mse-simple-demo/A/pom.xml

+35-10
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,25 @@
1111
<name>A</name>
1212
<description>Demo project for Spring Boot</description>
1313

14-
<parent>
15-
<groupId>org.springframework.boot</groupId>
16-
<artifactId>spring-boot-starter-parent</artifactId>
17-
<version>2.6.1</version>
18-
<relativePath/> <!-- lookup parent from repository -->
19-
</parent>
20-
2114
<properties>
2215
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2316
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
24-
<java.version>8</java.version>
17+
<java.version>17</java.version>
18+
<spring-boot.version>2.6.1</spring-boot.version>
2519
<spring-cloud.version>2021.0.4</spring-cloud.version>
20+
<spring-cloud-alibaba.version>2.1.1.RELEASE</spring-cloud-alibaba.version>
2621
<dubbo.version>2.7.18</dubbo.version>
22+
<rocketmq.version>4.5.2</rocketmq.version>
2723
</properties>
2824

2925
<dependencies>
26+
<dependency>
27+
<groupId>org.springframework.boot</groupId>
28+
<artifactId>spring-boot-starter</artifactId>
29+
</dependency>
3030
<dependency>
3131
<groupId>com.alibaba.cloud</groupId>
3232
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
33-
<version>2.1.1.RELEASE</version>
3433
<exclusions>
3534
<exclusion>
3635
<groupId>org.springframework.cloud</groupId>
@@ -58,7 +57,7 @@
5857
<dependency>
5958
<groupId>org.apache.rocketmq</groupId>
6059
<artifactId>rocketmq-client</artifactId>
61-
<version>4.5.2</version>
60+
<version>${rocketmq.version}</version>
6261
</dependency>
6362

6463
<!-- Dubbo -->
@@ -118,13 +117,27 @@
118117

119118
<dependencyManagement>
120119
<dependencies>
120+
<dependency>
121+
<groupId>org.springframework.boot</groupId>
122+
<artifactId>spring-boot-dependencies</artifactId>
123+
<version>${spring-boot.version}</version>
124+
<type>pom</type>
125+
<scope>import</scope>
126+
</dependency>
121127
<dependency>
122128
<groupId>org.springframework.cloud</groupId>
123129
<artifactId>spring-cloud-dependencies</artifactId>
124130
<version>${spring-cloud.version}</version>
125131
<type>pom</type>
126132
<scope>import</scope>
127133
</dependency>
134+
<dependency>
135+
<groupId>com.alibaba.cloud</groupId>
136+
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
137+
<version>${spring-cloud-alibaba.version}</version>
138+
<type>pom</type>
139+
<scope>import</scope>
140+
</dependency>
128141
</dependencies>
129142
</dependencyManagement>
130143

@@ -133,6 +146,18 @@
133146
<plugin>
134147
<groupId>org.springframework.boot</groupId>
135148
<artifactId>spring-boot-maven-plugin</artifactId>
149+
<version>${spring-boot.version}</version>
150+
<configuration>
151+
<mainClass>com.alibabacloud.mse.demo.a.AApplication</mainClass>
152+
</configuration>
153+
<executions>
154+
<execution>
155+
<id>repackage</id>
156+
<goals>
157+
<goal>repackage</goal>
158+
</goals>
159+
</execution>
160+
</executions>
136161
</plugin>
137162
</plugins>
138163
<finalName>${project.artifactId}</finalName>

‎mse-simple-demo/B/pom.xml

+33-11
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,24 @@
1111
<name>B</name>
1212
<description>Demo project for Spring Boot</description>
1313

14-
<parent>
15-
<groupId>org.springframework.boot</groupId>
16-
<artifactId>spring-boot-starter-parent</artifactId>
17-
<version>2.2.0.RELEASE</version>
18-
<relativePath/> <!-- lookup parent from repository -->
19-
</parent>
20-
2114
<properties>
2215
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2316
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
24-
<java.version>8</java.version>
17+
<java.version>17</java.version>
18+
<spring-boot.version>2.2.0.RELEASE</spring-boot.version>
2519
<spring-cloud.version>Hoxton.SR1</spring-cloud.version>
20+
<spring-cloud-alibaba.version>2.1.1.RELEASE</spring-cloud-alibaba.version>
2621
<dubbo.version>2.7.18</dubbo.version>
2722
</properties>
2823

2924
<dependencies>
25+
<dependency>
26+
<groupId>org.springframework.boot</groupId>
27+
<artifactId>spring-boot-starter</artifactId>
28+
</dependency>
3029
<dependency>
3130
<groupId>com.alibaba.cloud</groupId>
3231
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
33-
<version>2.1.1.RELEASE</version>
3432
</dependency>
3533
<dependency>
3634
<groupId>org.springframework.boot</groupId>
@@ -117,13 +115,27 @@
117115

118116
<dependencyManagement>
119117
<dependencies>
118+
<dependency>
119+
<groupId>org.springframework.boot</groupId>
120+
<artifactId>spring-boot-dependencies</artifactId>
121+
<version>${spring-boot.version}</version>
122+
<type>pom</type>
123+
<scope>import</scope>
124+
</dependency>
120125
<dependency>
121126
<groupId>org.springframework.cloud</groupId>
122127
<artifactId>spring-cloud-dependencies</artifactId>
123128
<version>${spring-cloud.version}</version>
124129
<type>pom</type>
125130
<scope>import</scope>
126131
</dependency>
132+
<dependency>
133+
<groupId>com.alibaba.cloud</groupId>
134+
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
135+
<version>${spring-cloud-alibaba.version}</version>
136+
<type>pom</type>
137+
<scope>import</scope>
138+
</dependency>
127139
</dependencies>
128140
</dependencyManagement>
129141

@@ -132,11 +144,21 @@
132144
<plugin>
133145
<groupId>org.springframework.boot</groupId>
134146
<artifactId>spring-boot-maven-plugin</artifactId>
147+
<version>${spring-boot.version}</version>
148+
<configuration>
149+
<mainClass>com.alibabacloud.mse.demo.b.BApplication</mainClass>
150+
</configuration>
151+
<executions>
152+
<execution>
153+
<id>repackage</id>
154+
<goals>
155+
<goal>repackage</goal>
156+
</goals>
157+
</execution>
158+
</executions>
135159
</plugin>
136160
</plugins>
137161
<finalName>${project.artifactId}</finalName>
138162
</build>
139163

140-
141164
</project>
142-

‎mse-simple-demo/C/pom.xml

+35-10
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,25 @@
1111
<name>C</name>
1212
<description>Demo project for Spring Boot</description>
1313

14-
<parent>
15-
<groupId>org.springframework.boot</groupId>
16-
<artifactId>spring-boot-starter-parent</artifactId>
17-
<version>1.5.1.RELEASE</version>
18-
<relativePath/> <!-- lookup parent from repository -->
19-
</parent>
20-
2114
<properties>
2215
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2316
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
24-
<java.version>8</java.version>
17+
<java.version>17</java.version>
18+
<spring-boot.version>1.5.1.RELEASE</spring-boot.version>
2519
<spring-cloud.version>Edgware.SR2</spring-cloud.version>
20+
<spring-cloud-alibaba.version>1.5.0.RELEASE</spring-cloud-alibaba.version>
2621
<dubbo.version>2.7.18</dubbo.version>
22+
<rocketmq.version>4.5.2</rocketmq.version>
2723
</properties>
2824

2925
<dependencies>
26+
<dependency>
27+
<groupId>org.springframework.boot</groupId>
28+
<artifactId>spring-boot-starter</artifactId>
29+
</dependency>
3030
<dependency>
3131
<groupId>com.alibaba.cloud</groupId>
3232
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
33-
<version>1.5.0.RELEASE</version>
3433
</dependency>
3534
<dependency>
3635
<groupId>org.springframework.boot</groupId>
@@ -48,7 +47,7 @@
4847
<dependency>
4948
<groupId>org.apache.rocketmq</groupId>
5049
<artifactId>rocketmq-client</artifactId>
51-
<version>4.5.2</version>
50+
<version>${rocketmq.version}</version>
5251
</dependency>
5352

5453

@@ -112,13 +111,27 @@
112111

113112
<dependencyManagement>
114113
<dependencies>
114+
<dependency>
115+
<groupId>org.springframework.boot</groupId>
116+
<artifactId>spring-boot-dependencies</artifactId>
117+
<version>${spring-boot.version}</version>
118+
<type>pom</type>
119+
<scope>import</scope>
120+
</dependency>
115121
<dependency>
116122
<groupId>org.springframework.cloud</groupId>
117123
<artifactId>spring-cloud-dependencies</artifactId>
118124
<version>${spring-cloud.version}</version>
119125
<type>pom</type>
120126
<scope>import</scope>
121127
</dependency>
128+
<dependency>
129+
<groupId>com.alibaba.cloud</groupId>
130+
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
131+
<version>${spring-cloud-alibaba.version}</version>
132+
<type>pom</type>
133+
<scope>import</scope>
134+
</dependency>
122135
</dependencies>
123136
</dependencyManagement>
124137

@@ -127,6 +140,18 @@
127140
<plugin>
128141
<groupId>org.springframework.boot</groupId>
129142
<artifactId>spring-boot-maven-plugin</artifactId>
143+
<version>${spring-boot.version}</version>
144+
<configuration>
145+
<mainClass>com.alibabacloud.mse.demo.c.CApplication</mainClass>
146+
</configuration>
147+
<executions>
148+
<execution>
149+
<id>repackage</id>
150+
<goals>
151+
<goal>repackage</goal>
152+
</goals>
153+
</execution>
154+
</executions>
130155
</plugin>
131156
</plugins>
132157
<finalName>${project.artifactId}</finalName>

‎mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/c/CApplication.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.alibabacloud.mse.demo.c;
22

3-
import com.alibaba.nacos.common.utils.StringUtils;
43
import org.springframework.boot.SpringApplication;
54
import org.springframework.boot.autoconfigure.SpringBootApplication;
65
import org.springframework.boot.web.client.RestTemplateBuilder;
@@ -37,7 +36,7 @@ RestTemplate restTemplate() {
3736
@Bean(name = "serviceTag")
3837
String serviceTag() {
3938
String tag = parseServiceTag("/etc/podinfo/labels");
40-
if (StringUtils.isNotEmpty(tag)) {
39+
if (tag != null && !tag.isEmpty()) {
4140
return tag;
4241
}
4342
return parseServiceTag("/etc/podinfo/annotations");

‎mse-simple-demo/SpringCloudGateway/pom.xml

+33-9
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,23 @@
77
<version>3.0.8</version>
88
<packaging>jar</packaging>
99

10-
<parent>
11-
<groupId>org.springframework.boot</groupId>
12-
<artifactId>spring-boot-starter-parent</artifactId>
13-
<version>2.1.0.RELEASE</version>
14-
<relativePath/> <!-- lookup parent from repository -->
15-
</parent>
16-
1710
<properties>
1811
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1912
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
20-
<java.version>8</java.version>
13+
<java.version>17</java.version>
14+
<spring-boot.version>2.1.0.RELEASE</spring-boot.version>
2115
<spring-cloud.version>Greenwich.SR3</spring-cloud.version>
16+
<spring-cloud-alibaba.version>2.1.1.RELEASE</spring-cloud-alibaba.version>
2217
</properties>
2318

2419
<dependencies>
20+
<dependency>
21+
<groupId>org.springframework.boot</groupId>
22+
<artifactId>spring-boot-starter</artifactId>
23+
</dependency>
2524
<dependency>
2625
<groupId>com.alibaba.cloud</groupId>
2726
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
28-
<version>2.1.1.RELEASE</version>
2927
</dependency>
3028
<dependency>
3129
<groupId>org.springframework.boot</groupId>
@@ -54,13 +52,27 @@
5452

5553
<dependencyManagement>
5654
<dependencies>
55+
<dependency>
56+
<groupId>org.springframework.boot</groupId>
57+
<artifactId>spring-boot-dependencies</artifactId>
58+
<version>${spring-boot.version}</version>
59+
<type>pom</type>
60+
<scope>import</scope>
61+
</dependency>
5762
<dependency>
5863
<groupId>org.springframework.cloud</groupId>
5964
<artifactId>spring-cloud-dependencies</artifactId>
6065
<version>${spring-cloud.version}</version>
6166
<type>pom</type>
6267
<scope>import</scope>
6368
</dependency>
69+
<dependency>
70+
<groupId>com.alibaba.cloud</groupId>
71+
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
72+
<version>${spring-cloud-alibaba.version}</version>
73+
<type>pom</type>
74+
<scope>import</scope>
75+
</dependency>
6476
</dependencies>
6577
</dependencyManagement>
6678

@@ -69,6 +81,18 @@
6981
<plugin>
7082
<groupId>org.springframework.boot</groupId>
7183
<artifactId>spring-boot-maven-plugin</artifactId>
84+
<version>${spring-boot.version}</version>
85+
<configuration>
86+
<mainClass>com.alibabcloud.mse.demo.SpringCloudGatewayApplication</mainClass>
87+
</configuration>
88+
<executions>
89+
<execution>
90+
<id>repackage</id>
91+
<goals>
92+
<goal>repackage</goal>
93+
</goals>
94+
</execution>
95+
</executions>
7296
</plugin>
7397
</plugins>
7498
<finalName>${project.artifactId}</finalName>

0 commit comments

Comments
 (0)