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.2 to 5.3.0 #1237

Merged

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Oct 21, 2024

Bumps org.ajoberstar.grgit:grgit-gradle from 5.2.2 to 5.3.0.

Release notes

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

5.3.0

Small release to resolve outstanding issues that I still felt were in scope (given feature freeze, see README for more background).

Breaking Changes

None

Enhancements

  • #362 Add GrgitService#findGrgit() which returns an Optional<Grgit> allowing accessing whether a repo is present or not, rather than throwing like getGrgit() does.

Fixes

  • #391 initIfNoTExists on GrgitService works now
  • Update dependencies

Deprecations

None

Compatibility

Tested on the following version:

Java Version Gradle Versions
11 7.0.2, 7.6.4, 8.0.2, 8.10.2
17 7.3.3, 7.6.4, 8.0.2, 8.10.2
21 8.4, 8.10.2
Commits
  • 9f2f8d0 Revert "chore: Revert build to 8.6 to avoid signing issue"
  • 127d2fb chore: Fix signing
  • d57ef9f chore: Revert build to 8.6 to avoid signing issue
  • 414faa1 minor: Allow safely checking for repo in GrgitService
  • 3f40370 patch: Fix initIfNotExists handling
  • 9269110 chore: Test for multi project service plugin
  • f7ded15 Merge pull request #401 from johnjohndoe/patch-1
  • afbc737 chore: Document Kotlin issue
  • 41046ec chore: Typo
  • c0957bc chore: Strengthen cautions in readme
  • Additional commits viewable in compare view

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.2 to 5.3.0.
- [Release notes](https://github.com/ajoberstar/grgit/releases)
- [Commits](ajoberstar/grgit@5.2.2...5.3.0)

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

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot requested a review from reta as a code owner October 21, 2024 09:30
@dependabot dependabot bot requested a review from Bukhtawar as a code owner October 21, 2024 09:30
@dependabot dependabot bot added the dependencies Pull requests that update a dependency file label Oct 21, 2024
Signed-off-by: dependabot[bot] <[email protected]>
@Xtansia Xtansia merged commit 48220eb into main Oct 21, 2024
93 of 99 checks passed
@dependabot dependabot bot deleted the dependabot/gradle/org.ajoberstar.grgit-grgit-gradle-5.3.0 branch October 21, 2024 20:36
@Xtansia Xtansia added the backport 2.x Backport to 2.x branch label Oct 21, 2024
@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-1237-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 48220eb01db7b2b2881b6c5697395d35c0ad77c9
# Push it to GitHub
git push --set-upstream origin backport/backport-1237-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-1237-to-2.x.

Xtansia pushed a commit to Xtansia/opensearch-java that referenced this pull request Oct 22, 2024
…h-project#1237)

* Bump org.ajoberstar.grgit:grgit-gradle from 5.2.2 to 5.3.0

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

Signed-off-by: Thomas Farr <[email protected]>

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

Signed-off-by: dependabot[bot] <[email protected]>

* Update changelog

Signed-off-by: dependabot[bot] <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 48220eb)
reta pushed a commit that referenced this pull request Oct 22, 2024
…1239)

* Bump org.ajoberstar.grgit:grgit-gradle from 5.2.2 to 5.3.0

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

Signed-off-by: Thomas Farr <[email protected]>

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

Signed-off-by: dependabot[bot] <[email protected]>

* Update changelog

Signed-off-by: dependabot[bot] <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 48220eb)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
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.

1 participant