Skip to content

Commit 36a0fcb

Browse files
authored
Merge pull request #106 from mercyblitz/dev-1.x
Refactor Maven properties and centralize Spring BOM versions
2 parents 726c1d6 + 5c45f6e commit 36a0fcb

2 files changed

Lines changed: 6 additions & 9 deletions

File tree

  • microsphere-spring-cloud-openfeign
  • microsphere-spring-cloud-parent

microsphere-spring-cloud-openfeign/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
<description>Microsphere Spring Cloud OpenFeign</description>
2020

2121
<properties>
22-
<maven.compiler.source>8</maven.compiler.source>
23-
<maven.compiler.target>8</maven.compiler.target>
2422
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2523
</properties>
2624

microsphere-spring-cloud-parent/pom.xml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,9 @@
2121
<properties>
2222
<!-- BOM versions -->
2323
<microsphere-spring-boot.version>0.1.6</microsphere-spring-boot.version>
24-
<spring-boot.version>2.6.15</spring-boot.version>
25-
<spring-cloud.version>2021.0.9</spring-cloud.version>
26-
<spring-cloud-alibaba.version>2021.0.6.1</spring-cloud-alibaba.version>
2724
<testcontainers.version>1.21.3</testcontainers.version>
2825
<!-- Testing -->
29-
<junit-jupiter.version>6.0.3</junit-jupiter.version>
26+
<junit-jupiter.version>5.14.3</junit-jupiter.version>
3027
</properties>
3128

3229
<dependencyManagement>
@@ -110,12 +107,14 @@
110107
</profile>
111108

112109
<profile>
113-
<id>java8-16</id>
110+
<id>spring-cloud-2021</id>
114111
<activation>
115-
<jdk>[1.8,17)</jdk>
112+
<activeByDefault>true</activeByDefault>
116113
</activation>
117114
<properties>
118-
<junit-jupiter.version>5.14.3</junit-jupiter.version>
115+
<spring-boot.version>2.6.15</spring-boot.version>
116+
<spring-cloud.version>2021.0.9</spring-cloud.version>
117+
<spring-cloud-alibaba.version>2021.0.6.1</spring-cloud-alibaba.version>
119118
</properties>
120119
</profile>
121120

0 commit comments

Comments
 (0)