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 xContent dependencies due to OSCore changes #721

Merged
merged 4 commits into from
Mar 31, 2023

Conversation

Angie-Zhang
Copy link
Contributor

@Angie-Zhang Angie-Zhang commented Mar 30, 2023

Issue #, if available:

opensearch-project/OpenSearch#6841

Description of changes:

  1. Bump version of 2.x to 2.7;
  2. Update gradle.build;
  3. Fix xContent dependencies change.

CheckList:

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

Angie Zhang added 2 commits March 28, 2023 18:45
Signed-off-by: Angie Zhang <langelzh@amazon.com>
…ependencies change.

Signed-off-by: Angie Zhang <langelzh@amazon.com>
@Angie-Zhang
Copy link
Contributor Author

Angie-Zhang commented Mar 30, 2023

Security test workflows fail as security plugin has not been updated yet.

@Angie-Zhang Angie-Zhang marked this pull request as ready for review March 30, 2023 06:42
@Angie-Zhang Angie-Zhang requested a review from a team March 30, 2023 06:42
AWSHurneyt
AWSHurneyt previously approved these changes Mar 30, 2023
Signed-off-by: Angie Zhang <langelzh@amazon.com>
Signed-off-by: Angie Zhang <langelzh@amazon.com>
@codecov-commenter
Copy link

codecov-commenter commented Mar 30, 2023

Codecov Report

Merging #721 (205f2b4) into 2.x (1e278d0) will increase coverage by 0.45%.
The diff coverage is 60.00%.

❗ Current head 205f2b4 differs from pull request most recent head 532869a. Consider uploading reports for the commit 532869a to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@             Coverage Diff              @@
##                2.x     #721      +/-   ##
============================================
+ Coverage     75.27%   75.73%   +0.45%     
- Complexity     2636     2660      +24     
============================================
  Files           333      333              
  Lines         15398    15398              
  Branches       2386     2388       +2     
============================================
+ Hits          11591    11661      +70     
+ Misses         2435     2377      -58     
+ Partials       1372     1360      -12     
Impacted Files Coverage Δ
...pensearch/indexmanagement/IndexManagementPlugin.kt 90.07% <ø> (ø)
...management/common/model/dimension/DateHistogram.kt 78.02% <ø> (ø)
...ndexmanagement/common/model/dimension/Dimension.kt 95.23% <ø> (ø)
...ndexmanagement/common/model/dimension/Histogram.kt 69.56% <ø> (ø)
...ch/indexmanagement/common/model/dimension/Terms.kt 77.77% <ø> (ø)
...dexmanagement/common/model/notification/Channel.kt 48.38% <ø> (ø)
...anagement/indexstatemanagement/ISMActionsParser.kt 91.80% <ø> (ø)
...ndexstatemanagement/IndexStateManagementHistory.kt 77.24% <ø> (ø)
...agement/indexstatemanagement/ManagedIndexRunner.kt 47.13% <ø> (ø)
...agement/indexstatemanagement/action/AliasAction.kt 63.63% <ø> (ø)
... and 122 more

... and 5 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@Angie-Zhang
Copy link
Contributor Author

Angie-Zhang commented Mar 31, 2023

Multi node test workflow failed for known flaky tests. Cases passed in local.

Copy link
Member

@bowenlan-amzn bowenlan-amzn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@Angie-Zhang Angie-Zhang merged commit ee97858 into opensearch-project:2.x Mar 31, 2023
@Angie-Zhang Angie-Zhang deleted the 2.x-xContent-fix branch April 6, 2023 18:11
ronnaksaxena pushed a commit to ronnaksaxena/index-management that referenced this pull request Jul 19, 2023
…#721)

* Fixed xContent dependencies due to OSCore changes

Signed-off-by: Angie Zhang <langelzh@amazon.com>

* 1.Bump version of 2.x to 2.7; 2.Update gradle.build; 3.Fix xContent dependencies change.

Signed-off-by: Angie Zhang <langelzh@amazon.com>

* Add bwcBundleTest back

Signed-off-by: Angie Zhang <langelzh@amazon.com>

* Add bwcBundleTest back

Signed-off-by: Angie Zhang <langelzh@amazon.com>

---------

Signed-off-by: Angie Zhang <langelzh@amazon.com>
Signed-off-by: Ronnak Saxena <ronsax@amazon.com>
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.

4 participants