diff options
| author | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-07-20 18:57:41 -0700 |
|---|---|---|
| committer | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-07-20 18:57:41 -0700 |
| commit | fd097d404a23ca8bd44c8de97791e2f01ecd981d (patch) | |
| tree | 1040a3f9bcfee4a967577c76b728a512532decf1 | |
| parent | 7dbf6fe94c15f3e163dae48929ba1edbf0f06ba1 (diff) | |
| parent | 65d81901a08f2b208e55c2b1062754dfc144c5f7 (diff) | |
| download | jackson-databind-fd097d404a23ca8bd44c8de97791e2f01ecd981d.tar.gz | |
Merge branch '2.10' into 2.11
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | release-notes/VERSION-2.x | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index ecf614b2e..0e9095c2e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ git: # Since Jackson 2.10 build requires JDK 8 even if only JDK 7 runtime jdk: - openjdk8 - - oraclejdk11 + - openjdk11 # 2019-11-26, tatu: Let's try caching Maven dependencies cache: diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x index 22d91a7bf..d1182d17f 100644 --- a/release-notes/VERSION-2.x +++ b/release-notes/VERSION-2.x @@ -106,7 +106,7 @@ Project: jackson-databind (ObjectMapper.readerForListOf()) - Add `SerializerProvider.findContentValueSerializer()` methods -2.10.5 (not yet released) +2.10.5 (21-Jul-2020) #2787 (partial fix): NPE after add mixin for enum (reported by Denis K) |