SOLR-16346: Fix intermittent 'check' error #1043
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
A previous commit for SOLR-16346 introduced a usedUndeclared 'check' error that only showed up in some limited environments. This commit fixes that check error by declaring the correct dep: switching 'swagger-core' out for 'swagger-annotations'.
risdenk
approved these changes
Sep 23, 2022
madrob
reviewed
Sep 24, 2022
| @@ -415,5 +411,6 @@ org.springframework.boot:spring-boot-starter-jetty:2.3.12.RELEASE (1 constraints | |||
| org.springframework.boot:spring-boot-starter-json:2.3.12.RELEASE (1 constraints: 03178f4e) | |||
| org.springframework.boot:spring-boot-starter-logging:2.3.12.RELEASE (1 constraints: 98154deb) | |||
| org.springframework.boot:spring-boot-starter-web:2.3.12.RELEASE (1 constraints: 1d0d3137) | |||
| org.yaml:snakeyaml:1.26 (1 constraints: 0c13dd1f) | |||
There was a problem hiding this comment.
What still depends on this? Should we figure that out and upgrade
There was a problem hiding this comment.
./gradlew dependencies shows that it's pulled in transitively by the s3mock test dep in the s3-repository module.
So I guess s3-mock would be the thing to update if we're concerned about it? It looks like we used 1.30 prior to this PR.
There was a problem hiding this comment.
It existed previously. It moved with the previous commit from test only. This just puts it back.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
A previous commit for SOLR-16346 introduced a usedUndeclared 'check' error that only showed up in some limited environments.
Solution
This commit fixes that check error by declaring the correct dep: switching 'swagger-core' out for 'swagger-annotations'.
Tests
N/A - 'check' passes in all environments.
Checklist
Please review the following and check all that apply:
mainbranch../gradlew check.