Skip to content

Commit 4ddeaf8

Browse files
mosesnjenkins
authored and
jenkins
committed
3rdparty: Revert "Revert "3rdparty: jackson upgrade to 2.13.0"" & Upgrade to 2.13.1
Problem We're on an old version of jackson, and we'd like to upgrade to a new version. We tried in the past to upgrade to 2.13.0, but it introduced a regression, where they were double-serializing. We believe 2.13.1 no longer has that regression, so it should be safe to upgrade. Solution This reverts commit e27353b784543196b9f5fd572110e4b4fe04f4c4. JIRA Issues: CSL-11573 Differential Revision: https://phabricator.twitter.biz/D808049
1 parent a01c937 commit 4ddeaf8

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

CHANGELOG.rst

+12
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,22 @@ Note that ``PHAB_ID=#`` and ``RB_ID=#`` correspond to associated messages in com
77
Unreleased
88
----------
99

10+
Breaking API Changes
11+
~~~~~~~~~~~~~~~~~~~~
12+
13+
* util-jackson: The error message when failing to deserialize a character now correctly prints the non-character string. ``PHAB_ID=D808049``
14+
15+
Runtime Behavior Changes
16+
~~~~~~~~~~~~~~~~~~~~~~~~
17+
18+
* util: Bump version of Jackson to 2.13.1. ``PHAB_ID=D808049``
19+
1020
21.12.0
1121
-------
1222

1323
Breaking API Changes
1424
~~~~~~~~~~~~~~~~~~~~
25+
1526
* util-core: `Activity.collect*` and `Var.collect*` are now implemented in terms of known collection
1627
type `scala.collection.Seq` versus HKT `CC[X]` before. This allows for certain performance
1728
enhancements as well as makes it more aligned with the `Future.collect` APIs.
@@ -22,6 +33,7 @@ Breaking API Changes
2233

2334
Breaking API Changes
2435
~~~~~~~~~~~~~~~~~~~~
36+
2537
* util-security: Use snakeyaml to parse yaml instead of a buggy custom yaml
2638
parser. This means that thrown IOExceptions have been replaced by
2739
YAMLExceptions. Additionally, the parser member has been limited to private visibility. ``PHAB_ID=D617641``

build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Global / excludeLintKeys += scalacOptions // might be actually unused in util-do
77
val releaseVersion = "22.1.0-SNAPSHOT"
88

99
val slf4jVersion = "1.7.30"
10-
val jacksonVersion = "2.11.4"
10+
val jacksonVersion = "2.13.1"
1111
val json4sVersion = "4.0.3"
1212
val mockitoVersion = "3.3.3"
1313
val mockitoScalaVersion = "1.14.8"

util-jackson/src/test/scala/com/twitter/util/jackson/ScalaObjectMapperTest.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ class ScalaObjectMapperTest
823823
|}
824824
""".stripMargin,
825825
withErrors = Seq(
826-
"c: '' is not a valid Character"
826+
"c: '-1' is not a valid Character"
827827
)
828828
)
829829
}

0 commit comments

Comments
 (0)