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

Update Gradle to 8.9 #94

Merged
merged 1 commit into from
Jul 14, 2024
Merged

Update Gradle to 8.9 #94

merged 1 commit into from
Jul 14, 2024

Conversation

reta
Copy link
Collaborator

@reta reta commented Jul 12, 2024

Description

Update main to 3.0.0 baseline

Issues Resolved

N/A

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@reta reta added backport 2.x Backport to 2.x branch and removed backport 2.x Backport to 2.x branch labels Jul 12, 2024
@reta reta changed the title Update main to 3.0.0 baseline Update Gradle to 8.9 Jul 12, 2024
Signed-off-by: Andriy Redko <[email protected]>
@dblock dblock merged commit 05df728 into opensearch-project:main Jul 14, 2024
8 checks passed
@reta reta added the backport 2.x Backport to 2.x branch label Jul 14, 2024
@opensearch-trigger-bot
Copy link

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:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/opensearch-plugin-template-java/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/opensearch-plugin-template-java/backport-2.x
# Create a new branch
git switch --create backport/backport-94-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 05df728ce67086299448ad10b862d57b212e26a6
# Push it to GitHub
git push --set-upstream origin backport/backport-94-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/opensearch-plugin-template-java/backport-2.x

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

reta added a commit to reta/opensearch-plugin-template-java that referenced this pull request Jul 15, 2024
Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 05df728)
reta added a commit to reta/opensearch-plugin-template-java that referenced this pull request Jul 15, 2024
Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 05df728)
Signed-off-by: Andriy Redko <[email protected]>
reta added a commit to reta/opensearch-plugin-template-java that referenced this pull request Jul 15, 2024
Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 05df728)
Signed-off-by: Andriy Redko <[email protected]>
dblock pushed a commit that referenced this pull request Jul 15, 2024
(cherry picked from commit 05df728)

Signed-off-by: Andriy Redko <[email protected]>
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants