Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove spring-cloud-build dependency; add spring-boot BOM explicitly #804

Merged
merged 3 commits into from
Dec 16, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Remove spring-cloud-build dependency; add spring-boot BOM explicitly
  • Loading branch information
elefeint committed Dec 15, 2021
commit ee0993115212639d1dac15bb0dd1d52ee5f19dc6
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
<skipTests>false</skipTests>
<spring-cloud-build.version>3.0.4</spring-cloud-build.version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should you remove this then?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, we are still using it for the checkstyle plugin. This will go away soon -- I am thinking the best time to do the checkstyle changes is right before forking off Spring Cloud GCP 2.x (with Spring Boot 2.5 support) and leaving the main branch to be Spring Cloud GCP 3.x (with Spring Boot 2.6 support).

<spring-cloud-dependencies.version>2020.0.4</spring-cloud-dependencies.version>
<spring-boot-dependencies.version>2.5.7</spring-boot-dependencies.version>
<spring-javaformat-checkstyle.version>0.0.29</spring-javaformat-checkstyle.version>
<zipkin-gcp.version>1.0.2</zipkin-gcp.version>
<spring-native.version>0.10.5</spring-native.version>
Expand All @@ -80,9 +81,9 @@
</dependency>

<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build-dependencies</artifactId>
<version>${spring-cloud-build.version}</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot-dependencies.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -171,7 +172,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<!-- Needed to run JUnit4 tests while inheriting from spring-cloud-build parent pom -->
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
Expand Down