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 Jackson to 2.14.1 and fix dependency resolution issues #1159

Closed
wants to merge 1 commit into from

Conversation

reta
Copy link
Contributor

@reta reta commented Dec 12, 2022

Signed-off-by: Andriy Redko andriy.redko@aiven.io

Description

Port #1150 to main

Issues Resolved

N/A

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • 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.

@reta reta requested a review from a team as a code owner December 12, 2022 13:43
@codecov-commenter
Copy link

codecov-commenter commented Dec 12, 2022

Codecov Report

Merging #1159 (19dee45) into main (6c0d7c6) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main    #1159   +/-   ##
=========================================
  Coverage     94.83%   94.83%           
  Complexity     2916     2916           
=========================================
  Files           291      291           
  Lines          7795     7795           
  Branches        568      568           
=========================================
  Hits           7392     7392           
  Misses          349      349           
  Partials         54       54           
Flag Coverage Δ
query-workbench 62.76% <ø> (ø)
sql-engine 97.78% <ø> (ø)

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

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

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@@ -77,7 +79,7 @@ dependencies {
include '*.jar'
builtBy 'compileJdbc'
}
testImplementation group: 'com.h2database', name: 'h2', version: '2.1.210'
testImplementation group: 'com.h2database', name: 'h2', version: '2.1.214'
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@reta
Copy link
Contributor Author

reta commented Dec 12, 2022

The test failures are not related and caused by opensearch-project/OpenSearch#5515

api "com.fasterxml.jackson.core:jackson-databind:${jackson_version}"
api "com.fasterxml.jackson.core:jackson-annotations:${jackson_version}"
// Bundled with the OpenSearch (https://github.com/opensearch-project/OpenSearch/pull/5366)
compileOnly "com.fasterxml.jackson.core:jackson-databind:${jackson_version}"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changing the dependency scope because of opensearch-project/OpenSearch@c6663fd

@penghuo
Copy link
Collaborator

penghuo commented Dec 12, 2022

@reta, thanks for PR. SQL plugin does not working on main currently. Our plan is

  1. Merge 2.x to main. Merge 2.x to main after 2.4 release #1063. Pending on Change LIKE operator case-insensitive match #1160
  2. Switch to main.

With merge 2.x to main, We will merge everything from 2.x to main, and will pickup #1150 automatically.

@reta
Copy link
Contributor Author

reta commented Dec 12, 2022

@reta, thanks for PR. SQL plugin does not working on main currently. Our plan is

1. Merge 2.x to main. [Merge 2.x to main after 2.4 release #1063](https://github.com/opensearch-project/sql/pull/1063). Pending on [change case-insensitive to false #1160](https://github.com/opensearch-project/sql/pull/1160)

2. Switch to main.

With merge 2.x to main, We will merge everything from 2.x to main, and will pickup #1150 automatically.

Thanks @penghuo , I will create a pull request for opensearch-project/OpenSearch@c6663fd only

@reta reta closed this Dec 13, 2022
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.

3 participants