-
Notifications
You must be signed in to change notification settings - Fork 25.6k
Upgrade jackson to 2.10.3 and GeoIP to 2.13.1 #53642
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
Merged
Merged
Conversation
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
…"" This reverts commit 060b4ee.
We had updated the test when upgrading jackson because yaml now supports binary. But json still doesn't. This updates the test to reflect that. Closes #53624
Jackson's YAML parser does weirdness with a custom base64 decoding when trying to "read" text (using `.text()` or `.textOrNull()`) from a YAML byte array. Because of this, we need to skip comparing these fields with `.textOrNull`, instead using the correct `.binaryValue()` comparison. Resolves #53622
Collaborator
|
Pinging @elastic/es-core-infra (:Core/Infra/Core) |
With the upgrade from Jackson 2.8.11 to 2.10.3 there is no longer a need to Base64 encode BytesArray for comparing YAML serializations. Fixes #53625
jakelandis
approved these changes
Mar 17, 2020
Contributor
jakelandis
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Member
Author
|
@elasticmachine run elasticsearch-ci/2 |
rjernst
added a commit
that referenced
this pull request
Mar 17, 2020
Re-applies the change from #53523 along with test fixes. closes #53626 closes #53624 closes #53622 closes #53625 Co-authored-by: Nik Everett <[email protected]> Co-authored-by: Lee Hinman <[email protected]> Co-authored-by: Jake Landis <[email protected]>
rjernst
added a commit
that referenced
this pull request
Mar 17, 2020
This fixes fallout from a bad backport of #53642
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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.
Re-applies the change from #53523 along with test fixes.