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

Revert "Remove jackson-databind and jackson-annotations dependencies now coming from core (#652)" #684

Merged
merged 2 commits into from
Jan 10, 2023

Conversation

ryanbogan
Copy link
Member

This reverts commit 26435de.

Description

Jackson is no longer in core, so reverting changes made for #634

Issues Resolved

[List any issues this PR will resolve]

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

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.

@ryanbogan ryanbogan requested a review from a team January 10, 2023 20:46
@codecov-commenter
Copy link

codecov-commenter commented Jan 10, 2023

Codecov Report

Merging #684 (0ad8d4c) into 2.x (bbe6ef8) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##                2.x     #684   +/-   ##
=========================================
  Coverage     83.46%   83.46%           
  Complexity      996      996           
=========================================
  Files            93       93           
  Lines          3660     3660           
  Branches        342      342           
=========================================
  Hits           3055     3055           
  Misses          460      460           
  Partials        145      145           
Flag Coverage Δ
ml-commons 83.46% <ø> (ø)

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.

@ylwu-amzn
Copy link
Collaborator

DCO check failed, please signoff your commit @ryanbogan

ylwu-amzn and others added 2 commits January 10, 2023 21:10
* disable prebuilt model

Signed-off-by: Yaliang Wu <[email protected]>

* add volatile for trusted url regex

Signed-off-by: Yaliang Wu <[email protected]>

Signed-off-by: Yaliang Wu <[email protected]>
Signed-off-by: Ryan Bogan <[email protected]>
…now coming from core (opensearch-project#652)"

This reverts commit 26435de.

Signed-off-by: Ryan Bogan <[email protected]>
@b4sjoo b4sjoo merged commit d169568 into opensearch-project:2.x Jan 10, 2023
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jan 10, 2023
…now coming from core (#652)" (#684)

* disable prebuilt model (#682)

* disable prebuilt model

Signed-off-by: Yaliang Wu <[email protected]>

* add volatile for trusted url regex

Signed-off-by: Yaliang Wu <[email protected]>

Signed-off-by: Yaliang Wu <[email protected]>
Signed-off-by: Ryan Bogan <[email protected]>

* Revert "Remove jackson-databind and jackson-annotations dependencies now coming from core (#652)"

This reverts commit 26435de.

Signed-off-by: Ryan Bogan <[email protected]>

Signed-off-by: Yaliang Wu <[email protected]>
Signed-off-by: Ryan Bogan <[email protected]>
Co-authored-by: Yaliang Wu <[email protected]>
(cherry picked from commit d169568)
@ryanbogan ryanbogan deleted the revert_jackson branch January 10, 2023 22:02
ylwu-amzn added a commit to ylwu-amzn/ml-commons that referenced this pull request Feb 17, 2023
…now coming from core (opensearch-project#652)" (opensearch-project#684)

* disable prebuilt model (opensearch-project#682)

* disable prebuilt model

Signed-off-by: Yaliang Wu <[email protected]>

* add volatile for trusted url regex

Signed-off-by: Yaliang Wu <[email protected]>

Signed-off-by: Yaliang Wu <[email protected]>
Signed-off-by: Ryan Bogan <[email protected]>

* Revert "Remove jackson-databind and jackson-annotations dependencies now coming from core (opensearch-project#652)"

This reverts commit 26435de.

Signed-off-by: Ryan Bogan <[email protected]>

Signed-off-by: Yaliang Wu <[email protected]>
Signed-off-by: Ryan Bogan <[email protected]>
Co-authored-by: Yaliang Wu <[email protected]>
ylwu-amzn added a commit to ylwu-amzn/ml-commons that referenced this pull request Mar 2, 2023
…now coming from core (opensearch-project#652)" (opensearch-project#684)

* disable prebuilt model (opensearch-project#682)

* disable prebuilt model

Signed-off-by: Yaliang Wu <[email protected]>

* add volatile for trusted url regex

Signed-off-by: Yaliang Wu <[email protected]>

Signed-off-by: Yaliang Wu <[email protected]>
Signed-off-by: Ryan Bogan <[email protected]>

* Revert "Remove jackson-databind and jackson-annotations dependencies now coming from core (opensearch-project#652)"

This reverts commit 26435de.

Signed-off-by: Ryan Bogan <[email protected]>

Signed-off-by: Yaliang Wu <[email protected]>
Signed-off-by: Ryan Bogan <[email protected]>
Co-authored-by: Yaliang Wu <[email protected]>
ylwu-amzn added a commit that referenced this pull request Mar 2, 2023
…now coming from core (#652)" (#684) (#774)

* disable prebuilt model (#682)

* disable prebuilt model



* add volatile for trusted url regex






* Revert "Remove jackson-databind and jackson-annotations dependencies now coming from core (#652)"

This reverts commit 26435de.

Signed-off-by: Yaliang Wu <[email protected]>
Signed-off-by: Ryan Bogan <[email protected]>
Co-authored-by: Ryan Bogan <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants