Merge branch '2.12'

Author: cowtowncoder

.travis.yml

@@ -13,16 +13,15 @@ branches:
     - master
     - "3.0"
 
-# 2019-11-26, tatu: Let's try caching Maven dependencies
+# 2020-08-02, tatu: Let's try caching Maven dependencies (but remove if snapshot builds fail)
 cache:
   directories:
     - $HOME/.m2
 
 # Below this line is configuration for deploying to the Sonatype OSS repo
 # https://knowm.org/configure-travis-ci-to-deploy-snapshots/
 before_install: "git clone -b travis `git config --get remote.origin.url` target/travis"
-after_success:
-  - "mvn -B source:jar javadoc:jar deploy --settings target/travis/settings.xml"
+script: "[ ${TRAVIS_PULL_REQUEST} = 'false' ] && mvn clean deploy --settings target/travis/settings.xml || mvn clean verify --settings target/travis/settings.xml"
 
 env:
   global:

release-notes/VERSION-2.x

@@ -16,7 +16,7 @@ Project: jackson-datatypes-binaryModules:
  (contributed by Michael L)
 - Add Gradle Module Metadata (https://blog.gradle.org/alignment-with-gradle-module-metadata)
 
-2.11.2 (not yet released)
+2.11.2 (02-Aug-2020)
 
 #216: (avro) Avro null deserialization
  (fix contributed by Marcos P)