Skip to content

Conversation

beatbrot
Copy link
Contributor

@beatbrot beatbrot commented Aug 31, 2025

Mostly regular maintenance.

The most interesting change is the setup of the Spring Boot 2 Gradle plugin (see 61dff17). Instead of applying it (which would lead to various compatibility issues), we just put it on the classpath and use the dependency-management plugin in isolation
as described here. This way we get proper test execution without even needing to apply the plugin.

Copy link

codecov bot commented Aug 31, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 81.92%. Comparing base (3493297) to head (fcd90e6).
⚠️ Report is 1 commits behind head on master.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #2202      +/-   ##
============================================
- Coverage     81.92%   81.92%   -0.01%     
+ Complexity     4732     4729       -3     
============================================
  Files           463      463              
  Lines         14764    14764              
  Branches       1869     1869              
============================================
- Hits          12096    12095       -1     
- Misses         1980     1982       +2     
+ Partials        688      687       -1     

see 4 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

renovate bot and others added 5 commits August 31, 2025 22:02
Normally, the Spring Boot 2 Gradle Plugin would not be compatible with Gradle 9+
To get around this issue, we use the dependency-management plugin in isolation
as described here: https://docs.spring.io/spring-boot/docs/2.7.7/gradle-plugin/reference/htmlsingle/#managing-dependencies.dependency-management-plugin.using-in-isolation
This way, we get proper test execution and realistic version resolution on Gradle 9
@beatbrot beatbrot marked this pull request as ready for review August 31, 2025 20:16
@beatbrot beatbrot mentioned this pull request Aug 31, 2025
1 task
// as described here: https://docs.spring.io/spring-boot/docs/2.7.7/gradle-plugin/reference/htmlsingle/#managing-dependencies.dependency-management-plugin.using-in-isolation
// This way, we get proper test execution and realistic version resolution on Gradle 9
id 'org.springframework.boot' version "2.7.18" apply false
id "io.spring.dependency-management" version "1.1.7"
Copy link
Member

Choose a reason for hiding this comment

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

How about instead removing the plugin from both places?
It is a relict from times when Gradle did not have built-in BOM support, by now does more harm than good, and even its maintainer recommends not to use it anymore, but instead the built-in BOM support using platform(...).
@leonard84 what do you think?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I initially wanted this PR to be as non-invasive as possible which is why I opted for this variant.

I agree however that the bom variant would be much simpler.

@AndreasTu
Copy link
Member

@Vampire Can you have another look if your findings are fixed, or shall I review that?

Copy link
Member

Vampire commented Oct 20, 2025

Ah, sorry for the delay, I'll have another look now.

@beatbrot beatbrot requested a review from Vampire October 20, 2025 19:55
Copy link
Member

@Vampire Vampire left a comment

Choose a reason for hiding this comment

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

LGTM, thx

Copy link
Member

Vampire commented Oct 21, 2025

Merge activity

  • Oct 21, 9:49 AM UTC: A user started a stack merge that includes this pull request via Graphite.
  • Oct 21, 9:50 AM UTC: Graphite couldn't merge this PR because it failed for an unknown reason (Stack merges are not currently supported for forked repositories. Please create a branch in the target repository in order to merge).

@Vampire Vampire enabled auto-merge (squash) October 21, 2025 09:51
@Vampire Vampire merged commit 4639fff into spockframework:master Oct 21, 2025
28 of 29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants