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

Update to account for XContent refactor in 2.x #1485

Merged
merged 3 commits into from
Mar 29, 2023

Conversation

MaxKsyunz
Copy link
Collaborator

Description

Cherry pick of cd95bc5 plus fixes for 2.x-only changes.

Issues Resolved

#1475

Check List

  • All tests pass, including unit test, integration test and doctest
  • 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.

Max Ksyunz added 2 commits March 29, 2023 09:36
Xcontent classes were moved in this PR opensearch-project/OpenSearch#5902 causing builds to fail.

---------

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>
(cherry picked from commit cd95bc5)
Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>
@MaxKsyunz MaxKsyunz requested a review from a team as a code owner March 29, 2023 17:21
@MaxKsyunz MaxKsyunz changed the title Update to account for XContent Refactor in 2.x Update to account for XContent refactor in 2.x Mar 29, 2023
@codecov-commenter
Copy link

codecov-commenter commented Mar 29, 2023

Codecov Report

Merging #1485 (092f718) into 2.x (1aa1861) will decrease coverage by 1.50%.
The diff coverage is n/a.

📣 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    #1485      +/-   ##
============================================
- Coverage     99.96%   98.46%   -1.50%     
- Complexity     2593     3867    +1274     
============================================
  Files           220      345     +125     
  Lines          6205     9600    +3395     
  Branches        378      616     +238     
============================================
+ Hits           6203     9453    +3250     
- Misses            2      142     +140     
- Partials          0        5       +5     
Flag Coverage Δ
sql-engine 98.46% <ø> (-1.50%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

see 125 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.

Yury-Fridlyand
Yury-Fridlyand previously approved these changes Mar 29, 2023
Copy link
Collaborator

@Yury-Fridlyand Yury-Fridlyand left a comment

Choose a reason for hiding this comment

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

Import reorder may be needed to satisfy the checkstyle.

rupal-bq
rupal-bq previously approved these changes Mar 29, 2023
build.gradle Outdated
@@ -98,6 +98,8 @@ subprojects {
mavenLocal()
maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" }
mavenCentral()
// todo. remove this when lucene 9.4.0 is released
maven { url "https://d1nvenhzbhpy0q.cloudfront.net/snapshots/lucene/" }
Copy link
Collaborator

Choose a reason for hiding this comment

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

why was this added?

Copy link
Collaborator Author

@MaxKsyunz MaxKsyunz Mar 29, 2023

Choose a reason for hiding this comment

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

Good catch! I'll remove it -- it does not apply to 2.x branch.
It was added when main was bumped to 3.0.

The PR to main moved that line because the build was picking up dependencies from that random repository instead of sonatype and failing.
image

derek-ho
derek-ho previously approved these changes Mar 29, 2023
Copy link
Collaborator

@derek-ho derek-ho left a comment

Choose a reason for hiding this comment

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

mostly LGTM

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>
Copy link
Collaborator

@dai-chen dai-chen left a comment

Choose a reason for hiding this comment

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

Thanks for the fix!

@Yury-Fridlyand Yury-Fridlyand merged commit 56eea47 into opensearch-project:2.x Mar 29, 2023
@Yury-Fridlyand Yury-Fridlyand deleted the 2.x-build-fixes branch March 29, 2023 20:52
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.

None yet

6 participants