Update to account for XContent refactor in 2.x#1485
Merged
Yury-Fridlyand merged 3 commits intoopensearch-project:2.xfrom Mar 29, 2023
Merged
Update to account for XContent refactor in 2.x#1485Yury-Fridlyand merged 3 commits intoopensearch-project:2.xfrom
Yury-Fridlyand merged 3 commits intoopensearch-project:2.xfrom
Conversation
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>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ 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
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Yury-Fridlyand
previously approved these changes
Mar 29, 2023
Collaborator
Yury-Fridlyand
left a comment
There was a problem hiding this comment.
Import reorder may be needed to satisfy the checkstyle.
integ-test/src/test/java/org/opensearch/sql/legacy/RestIntegTestCase.java
Show resolved
Hide resolved
rupal-bq
previously approved these changes
Mar 29, 2023
derek-ho
reviewed
Mar 29, 2023
build.gradle
Outdated
| 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/" } |
Collaborator
Author
There was a problem hiding this comment.
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.

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>
7d3793b
Yury-Fridlyand
approved these changes
Mar 29, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Cherry pick of cd95bc5 plus fixes for 2.x-only changes.
Issues Resolved
#1475
Check List
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.