Merge branch '2.10' into 2.11

cowtowncoder · cowtowncoder · commit fd097d404a23 · 2020-07-20T18:57:41.000-07:00
diff --git 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
@@ -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)
