Skip to content

Revert "Remove jackson-databind and jackson-annotations dependencies …#774

Merged
ylwu-amzn merged 1 commit intoopensearch-project:mainfrom
ylwu-amzn:backport_to_main
Mar 2, 2023
Merged

Revert "Remove jackson-databind and jackson-annotations dependencies …#774
ylwu-amzn merged 1 commit intoopensearch-project:mainfrom
ylwu-amzn:backport_to_main

Conversation

@ylwu-amzn
Copy link
Copy Markdown
Collaborator

Description

Backport PR #684 to main branch

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.

…now coming from core (opensearch-project#652)" (opensearch-project#684)

* disable prebuilt model (opensearch-project#682)

* disable prebuilt model

Signed-off-by: Yaliang Wu <ylwu@amazon.com>

* add volatile for trusted url regex

Signed-off-by: Yaliang Wu <ylwu@amazon.com>

Signed-off-by: Yaliang Wu <ylwu@amazon.com>
Signed-off-by: Ryan Bogan <rbogan@amazon.com>

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

This reverts commit 26435de.

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

Signed-off-by: Yaliang Wu <ylwu@amazon.com>
Signed-off-by: Ryan Bogan <rbogan@amazon.com>
Co-authored-by: Yaliang Wu <ylwu@amazon.com>
@ylwu-amzn ylwu-amzn requested a review from a team March 2, 2023 19:30
@ylwu-amzn ylwu-amzn merged commit 1fa2d98 into opensearch-project:main Mar 2, 2023
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