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

[master] chore(deps): bump oauth2 resource am and generic to 3.0.0 #10187

Merged
merged 2 commits into from
Dec 20, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 19, 2024

This is an automatic copy of pull request #10156 done by Mergify.


Issue

https://gravitee.atlassian.net/browse/APIM-7792

Description

A small description of what you did in that PR.

Additional context


📚  View the storybook of this branch here


Cherry-pick of 6c6f980 has failed:

On branch mergify/bp/master/pr-10156
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit 6c6f9802a3.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pom.xml

no changes added to commit (use "git add" and/or "git commit -a")

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


📚  View the storybook of this branch here

@mergify mergify bot requested a review from a team as a code owner December 19, 2024 10:22
@mergify mergify bot added the conflicts label Dec 19, 2024
Copy link
Contributor Author

mergify bot commented Dec 19, 2024

Cherry-pick of 6c6f980 has failed:

On branch mergify/bp/master/pr-10156
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit 6c6f9802a3.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pom.xml

no changes added to commit (use "git add" and/or "git commit -a")

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

@skorda42 skorda42 force-pushed the mergify/bp/master/pr-10156 branch 2 times, most recently from 2a5945c to d257c6a Compare December 19, 2024 11:05
@skorda42 skorda42 force-pushed the mergify/bp/master/pr-10156 branch from d257c6a to 1f41efa Compare December 19, 2024 11:06
@wbabyte wbabyte merged commit a7252cf into master Dec 20, 2024
39 of 40 checks passed
@wbabyte wbabyte deleted the mergify/bp/master/pr-10156 branch December 20, 2024 07:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants