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

[Backport 2.x] Bumps jetty version to 9.4.52.v20230823 to fix GMS-2023-1857 (#9822) #10539

Merged

Conversation

DarshitChanpura
Copy link
Member

Backports #9822 via commit 0c4e950

Manual backport was required due to conflicts in CHANGELOG

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)
  • 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.

…rch-project#9822)

* Bumps jetty version to 12.0.1 to fix GMS-2023-1857

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Adds this PR to changelog

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Updates javax websocket server version

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Updates jetty version to match jetty websocket version

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

---------

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
(cherry picked from commit 0c4e950)
@github-actions
Copy link
Contributor

Compatibility status:

Checks if related components are compatible with change 2d4208b

Incompatible components

Incompatible components: [https://github.com/opensearch-project/performance-analyzer.git]

Skipped components

Compatible components

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

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@codecov
Copy link

codecov bot commented Oct 10, 2023

Codecov Report

Merging #10539 (2d4208b) into 2.x (42f10d5) will increase coverage by 0.11%.
Report is 6 commits behind head on 2.x.
The diff coverage is 50.00%.

@@             Coverage Diff              @@
##                2.x   #10539      +/-   ##
============================================
+ Coverage     70.82%   70.94%   +0.11%     
- Complexity    58462    58544      +82     
============================================
  Files          4829     4829              
  Lines        276380   276384       +4     
  Branches      40579    40579              
============================================
+ Hits         195747   196073     +326     
+ Misses        63970    63571     -399     
- Partials      16663    16740      +77     
Files Coverage Δ
...ibs/core/src/main/java/org/opensearch/Version.java 83.62% <100.00%> (+0.50%) ⬆️
...c/main/java/org/opensearch/index/IndexService.java 75.65% <ø> (+0.21%) ⬆️
.../org/opensearch/index/remote/RemoteStoreUtils.java 96.55% <ø> (-0.12%) ⬇️
...earch/index/store/RemoteSegmentStoreDirectory.java 89.86% <100.00%> (+0.03%) ⬆️
...ex/translog/transfer/TranslogTransferMetadata.java 85.00% <100.00%> (+0.38%) ⬆️
...in/java/org/opensearch/index/shard/IndexShard.java 68.67% <0.00%> (-0.44%) ⬇️

... and 483 files with indirect coverage changes

@dblock dblock merged commit d68123f into opensearch-project:2.x Oct 10, 2023
63 of 64 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants