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 grgit-core from 5.2.0 to 5.2.1 #11565

Merged
merged 1 commit into from
Dec 11, 2023
Merged

Bump grgit-core from 5.2.0 to 5.2.1 #11565

merged 1 commit into from
Dec 11, 2023

Conversation

mch2
Copy link
Member

@mch2 mch2 commented Dec 11, 2023

Description

Remove manual override of jgit and bump grgit-core from 5.2.0 to 5.2.1 that includes patched version of jgit for https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-4759.
Also removes redundant declaration of the grgit-core depenedency.

Related Issues

N/A

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Failing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)
  • Public documentation issue/PR created

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: Marc Handalian <marc.handalian@gmail.com>
@mch2 mch2 added the backport 2.x Backport to 2.x branch label Dec 11, 2023
Copy link
Contributor

Compatibility status:

Checks if related components are compatible with change dac99d8

Incompatible components

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/performance-analyzer.git]

Copy link
Contributor

✅ Gradle check result for dac99d8: SUCCESS

@mch2 mch2 merged commit a2f792d into opensearch-project:main Dec 11, 2023
66 of 124 checks passed
@mch2 mch2 deleted the jgit branch December 11, 2023 18:54
@opensearch-trigger-bot
Copy link
Contributor

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

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

@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:

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

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

mch2 added a commit to mch2/OpenSearch that referenced this pull request Dec 11, 2023
Signed-off-by: Marc Handalian <marc.handalian@gmail.com>
(cherry picked from commit a2f792d)
mch2 added a commit to mch2/OpenSearch that referenced this pull request Dec 11, 2023
Signed-off-by: Marc Handalian <marc.handalian@gmail.com>
(cherry picked from commit a2f792d)
Signed-off-by: Marc Handalian <marc.handalian@gmail.com>
mch2 added a commit to mch2/OpenSearch that referenced this pull request Dec 11, 2023
Signed-off-by: Marc Handalian <marc.handalian@gmail.com>
(cherry picked from commit a2f792d)
mch2 added a commit that referenced this pull request Dec 11, 2023
Signed-off-by: Marc Handalian <marc.handalian@gmail.com>
(cherry picked from commit a2f792d)
deshsidd pushed a commit to deshsidd/OpenSearch that referenced this pull request Dec 11, 2023
Signed-off-by: Marc Handalian <marc.handalian@gmail.com>
@dblock
Copy link
Member

dblock commented Dec 13, 2023

This might be relevant: opensearch-project/opensearch-java#767 (comment)

rayshrey pushed a commit to rayshrey/OpenSearch that referenced this pull request Mar 18, 2024
Signed-off-by: Marc Handalian <marc.handalian@gmail.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
Signed-off-by: Marc Handalian <marc.handalian@gmail.com>
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
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.

3 participants