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

patch CVE and sync versioning #44

Merged
merged 7 commits into from
Jan 4, 2023
Merged

Conversation

YANG-DB
Copy link
Member

@YANG-DB YANG-DB commented Jan 4, 2023

sync build version number

Signed-off-by: YANGDB yang.db.dev@gmail.com

Description

Patch CVE and sync version declarations

Issues Resolved

#43

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • 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.

sync build version number

Signed-off-by: YANGDB <yang.db.dev@gmail.com>
@YANG-DB YANG-DB requested a review from a team as a code owner January 4, 2023 19:31
@YANG-DB YANG-DB self-assigned this Jan 4, 2023
@YANG-DB YANG-DB added Mend: dependency security vulnerability Security vulnerability detected by Mend backport main labels Jan 4, 2023
@YANG-DB YANG-DB added this to the 2.5 milestone Jan 4, 2023
Signed-off-by: YANGDB <yang.db.dev@gmail.com>

Signed-off-by: YANGDB <yang.db.dev@gmail.com>
build.gradle Outdated Show resolved Hide resolved
@YANG-DB YANG-DB requested review from penghuo and joshuali925 January 4, 2023 20:29
@YANG-DB YANG-DB merged commit 3e21e5a into opensearch-project:main Jan 4, 2023
@YANG-DB YANG-DB deleted the CVE-patch branch January 4, 2023 20:31
@opensearch-trigger-bot
Copy link

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport main Mend: dependency security vulnerability Security vulnerability detected by Mend
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants