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

Bump org.ajoberstar.grgit:grgit-gradle from 5.2.0 to 5.2.1 #695

Merged

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Oct 30, 2023

Bumps org.ajoberstar.grgit:grgit-gradle from 5.2.0 to 5.2.1.

Release notes

Sourced from org.ajoberstar.grgit:grgit-gradle's releases.

5.2.1

Small patch to pick up new dependencies.

Breaking Changes

None

Enhancements

None

Fixes

  • #394 Update dependencies to resolve JGit vulnerability

Deprecations

None

Compatibility

Tested on the following version:

Java Version Gradle Versions
11 7.0.2, 7.6.1, 8.0.2, 8.4
17 7.3.3, 7.6.1, 8.0.2, 8.4
21 8.4
Commits

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Bumps [org.ajoberstar.grgit:grgit-gradle](https://github.com/ajoberstar/grgit) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/ajoberstar/grgit/releases)
- [Commits](ajoberstar/grgit@5.2.0...5.2.1)

---
updated-dependencies:
- dependency-name: org.ajoberstar.grgit:grgit-gradle
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot requested review from reta and Bukhtawar as code owners October 30, 2023 09:46
@dependabot dependabot bot added dependabot dependencies Pull requests that update a dependency file labels Oct 30, 2023
Signed-off-by: dependabot[bot] <[email protected]>
@VachaShah VachaShah added the backport 2.x Backport to 2.x branch label Oct 31, 2023
@VachaShah VachaShah merged commit 59bb4db into main Oct 31, 2023
55 of 56 checks passed
@dependabot dependabot bot deleted the dependabot/gradle/org.ajoberstar.grgit-grgit-gradle-5.2.1 branch October 31, 2023 19:32
@VachaShah VachaShah added backport 2.x Backport to 2.x branch and removed backport 2.x Backport to 2.x branch labels Oct 31, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-695-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 59bb4dbf5baabb01ca1e39978e3763cad5dbd1e1
# Push it to GitHub
git push --set-upstream origin backport/backport-695-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-695-to-2.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch dependabot dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants