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

chore(dependencies): pin version of com.github.tomakehurst:wiremock (backport #5845) #5857

Merged
merged 1 commit into from
Jan 20, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 20, 2023

This is an automatic backport of pull request #5845 done by Mergify.
Cherry-pick of 6c30c18 has failed:

On branch mergify/bp/release-1.27.x/pr-5845
Your branch is up to date with 'origin/release-1.27.x'.

You are currently cherry-picking commit 6c30c181b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   clouddriver-cloudfoundry/clouddriver-cloudfoundry.gradle

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   clouddriver-artifacts/clouddriver-artifacts.gradle

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…5845)

for more predictable builds, and to avoid failures like:

org.junit.jupiter.api.extension.ParameterResolutionException: Failed to resolve parameter [com.github.tomakehurst.wiremock.WireMockServer arg0] in method [void com.netflix.spinnaker.clouddriver.artifacts.http.HttpArtifactCredentialsTest.downloadWithBasicAuth(com.github.tomakehurst.wiremock.WireMockServer) throws java.io.IOException]: jakarta/servlet/DispatcherType

that come with version 3.0.0-beta2 of com.github.tomakehurst:wiremock released on 30-dec-22.

Use com.github.tomakehurst:wiremock-jre8-standalone as it's the more modern version of wiremock, and has fewer dependencies than wiremock-jre8.

Currently, we end up with version 2.31.0 via spring-cloud-dependencies.  See https://github.com/spring-cloud/spring-cloud-release/blob/v2020.0.5/spring-cloud-dependencies/pom.xml#L25 and https://github.com/spring-cloud/spring-cloud-contract/blob/v3.0.5/spring-cloud-contract-dependencies/pom.xml#L18.

(cherry picked from commit 6c30c18)

# Conflicts:
#	clouddriver-artifacts/clouddriver-artifacts.gradle
@dbyron-sf dbyron-sf force-pushed the mergify/bp/release-1.27.x/pr-5845 branch from a6e462e to 00646a9 Compare January 20, 2023 17:55
@dbyron-sf dbyron-sf added the ready to merge Approved and ready for a merge label Jan 20, 2023
@mergify mergify bot added the auto merged Merged automatically by a bot label Jan 20, 2023
@mergify mergify bot merged commit b6a03ba into release-1.27.x Jan 20, 2023
@mergify mergify bot deleted the mergify/bp/release-1.27.x/pr-5845 branch January 20, 2023 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto merged Merged automatically by a bot conflicts ready to merge Approved and ready for a merge target-release/1.27
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants