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

Fixed changelog for BC update #10233

Merged
merged 1 commit into from
Sep 28, 2023

Conversation

willyborankin
Copy link
Contributor

@willyborankin willyborankin commented Sep 26, 2023

Description

Fixed changelong deps since versions.bouncycastle uses for 3 dependencies:

  • org.bouncycastle:bcmail-jdk15to18:${versions.bouncycastle}
  • org.bouncycastle:bcprov-jdk15to18:${versions.bouncycastle}
  • org.bouncycastle:bcpkix-jdk15to18:${versions.bouncycastle}

Note: #10232 fixed already

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.

@github-actions
Copy link
Contributor

github-actions bot commented Sep 26, 2023

Compatibility status:

Checks if related components are compatible with change 3a7ed90

Incompatible components

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/custom-codecs.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, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/neural-search.git]

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.search.SearchWeightedRoutingIT.testMultiGetWithNetworkDisruption_FailOpenEnabled
      1 org.opensearch.remotestore.SegmentReplicationUsingRemoteStoreIT.testRestartPrimary

@codecov
Copy link

codecov bot commented Sep 26, 2023

Codecov Report

Merging #10233 (3a7ed90) into main (a8969cb) will increase coverage by 0.02%.
Report is 3 commits behind head on main.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main   #10233      +/-   ##
============================================
+ Coverage     71.11%   71.13%   +0.02%     
- Complexity    58188    58230      +42     
============================================
  Files          4830     4830              
  Lines        274440   274440              
  Branches      39993    39993              
============================================
+ Hits         195175   195233      +58     
+ Misses        62897    62875      -22     
+ Partials      16368    16332      -36     

see 455 files with indirect coverage changes

@reta
Copy link
Collaborator

reta commented Sep 26, 2023

@willyborankin could you please fix DCO check?

Signed-off-by: Andrey Pleskach <ples@aiven.io>
@willyborankin
Copy link
Contributor Author

@reta done

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

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

rayshrey pushed a commit to rayshrey/OpenSearch that referenced this pull request Oct 3, 2023
Signed-off-by: Andrey Pleskach <ples@aiven.io>
deshsidd pushed a commit to deshsidd/OpenSearch that referenced this pull request Oct 9, 2023
Signed-off-by: Andrey Pleskach <ples@aiven.io>
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>
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.

3 participants