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 BouncyCastle to 1.76 #10219

Merged
merged 1 commit into from
Sep 25, 2023
Merged

Conversation

willyborankin
Copy link
Contributor

Description

Bump BouncyCastle to 1.76

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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: Andrey Pleskach <ples@aiven.io>
@github-actions
Copy link
Contributor

github-actions bot commented Sep 25, 2023

Compatibility status:

Checks if related components are compatible with change 7e66e04

Incompatible components

Skipped components

Compatible components

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

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@codecov
Copy link

codecov bot commented Sep 25, 2023

Codecov Report

Merging #10219 (7e66e04) into main (19fa37c) will decrease coverage by 0.21%.
Report is 1 commits behind head on main.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main   #10219      +/-   ##
============================================
- Coverage     71.23%   71.03%   -0.21%     
+ Complexity    58301    58164     -137     
============================================
  Files          4830     4830              
  Lines        274435   274435              
  Branches      39992    39992              
============================================
- Hits         195492   194937     -555     
- Misses        62626    63176     +550     
- Partials      16317    16322       +5     

see 460 files with indirect coverage changes

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@reta reta merged commit f6646fb into opensearch-project:main Sep 25, 2023
13 checks passed
@reta reta added the backport 2.x Backport to 2.x branch label Sep 25, 2023
@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/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-10219-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f6646fbf134c62898926e6821e81f15e0dea4b51
# Push it to GitHub
git push --set-upstream origin backport/backport-10219-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-10219-to-2.x.

@reta
Copy link
Collaborator

reta commented Sep 25, 2023

@willyborankin please backport manually to 2.x, thank you

brusic pushed a commit to brusic/OpenSearch that referenced this pull request Sep 25, 2023
Signed-off-by: Andrey Pleskach <ples@aiven.io>
Signed-off-by: Ivan Brusic <ivan.brusic@flocksafety.com>
willyborankin added a commit to willyborankin/OpenSearch that referenced this pull request Sep 26, 2023
Signed-off-by: Andrey Pleskach <ples@aiven.io>
(cherry picked from commit f6646fb)
reta pushed a commit that referenced this pull request Sep 26, 2023
Signed-off-by: Andrey Pleskach <ples@aiven.io>
(cherry picked from commit f6646fb)
vikasvb90 pushed a commit to vikasvb90/OpenSearch that referenced this pull request Oct 10, 2023
Signed-off-by: Andrey Pleskach <ples@aiven.io>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
Signed-off-by: Andrey Pleskach <ples@aiven.io>
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
mwilso3 pushed a commit to mwilso3/OpenSearch-fork that referenced this pull request May 1, 2024
Signed-off-by: Milly Wilson <mwilson3@atlassian.com>
reta added a commit that referenced this pull request May 6, 2024
…0172, CVE-2024-30171 and CVE-2024-29857) (#13484)

* [Backport][1.3] Bump BouncyCastle to 1.76 (#10219)

Signed-off-by: Milly Wilson <mwilson3@atlassian.com>

* [Backport][1.3] Update BouncyCastle dependencies from jdk15to18 to jdk18on (#12317)

Signed-off-by: Milly Wilson <mwilson3@atlassian.com>

* [Backport][1.3] Bump bouncycastle from 1.77 to 1.78 (#13243)

Signed-off-by: Milly Wilson <mwilson3@atlassian.com>

* PR#13484 Re-work

* Update BC from 1.78 to 1.78.1 with latest fixes.
* Remove incorrect jdk15to18 module replacement definitions as artifacts are still supported.
* Add release notes.
* Remove unneccessary license additions.

Signed-off-by: Milly Wilson <mwilson3@atlassian.com>

* PR#13484 Re-work

* Rename licenses from jdk18on to jdk15to18 and 1.78 to 1.78.1.
* Update SHAs for BC 1.78.1 licenses.

Signed-off-by: Milly Wilson <mwilson3@atlassian.com>

* PR#13484 Re-work

Update Changelog and remove release notes file as this will be created upon release.

Signed-off-by: Milly Wilson <mwilson3@atlassian.com>

---------

Signed-off-by: Milly Wilson <mwilson3@atlassian.com>
Co-authored-by: Andrey Pleskach <ples@aiven.io>
Co-authored-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
Co-authored-by: Andriy Redko <andriy.redko@aiven.io>
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 backport-failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants