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 to Gradle 8.4 #3638

Merged
merged 2 commits into from
Nov 2, 2023
Merged

Update to Gradle 8.4 #3638

merged 2 commits into from
Nov 2, 2023

Conversation

reta
Copy link
Collaborator

@reta reta commented Nov 2, 2023

Description

Update to Gradle 8.4

Issues Resolved

Testing

N/A

Check List

  • New functionality includes testing
  • New functionality has been documented
  • Commits are signed per the DCO using --signoff

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.

Signed-off-by: Andriy Redko <[email protected]>
cwperks
cwperks previously approved these changes Nov 2, 2023
@cwperks cwperks added the backport 2.x backport to 2.x branch label Nov 2, 2023
Copy link
Member

@peternied peternied left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the point where I'd normally ask if could you also update the bwc-test directory. However, I've got what I think is a better offer, want to merge [1] this change that removes the separate gradle install entirely?

@reta
Copy link
Collaborator Author

reta commented Nov 2, 2023

This is the point where I'd normally ask if could you also update the bwc-test directory.

Uh ... I am always forgetting about this one :( We could do 2 step: merge this and than your pull request, wdyt? thank you

Copy link
Member

@DarshitChanpura DarshitChanpura left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine moving forward either way.

@peternied peternied merged commit 5de9686 into opensearch-project:main Nov 2, 2023
56 checks passed
@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:

# 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/security/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security/backport-2.x
# Create a new branch
git switch --create backport/backport-3638-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5de968656d409c8bb0da23ad06f8308b0c9b1443
# Push it to GitHub
git push --set-upstream origin backport/backport-3638-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-2.x

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

reta added a commit to reta/security that referenced this pull request Nov 2, 2023
Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 5de9686)
reta added a commit to reta/security that referenced this pull request Nov 2, 2023
Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 5de9686)
Signed-off-by: Andriy Redko <[email protected]>
peternied pushed a commit that referenced this pull request Nov 2, 2023
Backport of #3638 to
`2.x`

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.

4 participants