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.5 and Fixing CVE-2023-33202 #617

Merged
merged 1 commit into from
Feb 6, 2024

Conversation

psychbot
Copy link
Member

@psychbot psychbot commented Feb 6, 2024

Updating gradle to 8.5 and fixing CVE-2023-33202.

Signed-off-by: Dharmesh 💤 <[email protected]>
@ansjcy ansjcy merged commit bfab315 into opensearch-project:main Feb 6, 2024
3 of 6 checks passed
reta pushed a commit to reta/performance-analyzer that referenced this pull request Feb 7, 2024
reta pushed a commit to reta/performance-analyzer that referenced this pull request Feb 7, 2024
reta pushed a commit to reta/performance-analyzer that referenced this pull request Feb 7, 2024
reta pushed a commit to reta/performance-analyzer that referenced this pull request Feb 7, 2024
ansjcy pushed a commit that referenced this pull request Feb 7, 2024
Signed-off-by: Andriy Redko <[email protected]>
Co-authored-by: Dharmesh <[email protected]>
@gaiksaya
Copy link
Member

gaiksaya commented Feb 7, 2024

Do we need to backport this to 2.12? Looks like branch was cut. https://github.com/opensearch-project/performance-analyzer/tree/2.12

opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 7, 2024
Signed-off-by: Andriy Redko <[email protected]>
Co-authored-by: Dharmesh <[email protected]>
(cherry picked from commit f8666da)
ansjcy pushed a commit that referenced this pull request Feb 7, 2024
Signed-off-by: Andriy Redko <[email protected]>
Co-authored-by: Dharmesh <[email protected]>
(cherry picked from commit f8666da)

Co-authored-by: Andriy Redko <[email protected]>
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

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
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-617-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 bfab315f255bd86b27c1962fbccdcb4b5eb71e9a
# Push it to GitHub
git push --set-upstream origin backport/backport-617-to-2.x
# Go back to the original working tree
cd ../..
# 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-617-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.12 failed:

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

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

Then, create a pull request where the base branch is 2.12 and the compare/head branch is backport/backport-617-to-2.12.

shivamg2017 pushed a commit to shivamg2017/performance-analyzer that referenced this pull request Feb 8, 2024
shivamg2017 pushed a commit to shivamg2017/performance-analyzer that referenced this pull request Feb 8, 2024
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.

4 participants