Merge branch '2.11' into 2.12

Author: cowtowncoder

.travis.yml

@@ -14,16 +14,10 @@ branches:
     - master
     - "2.12"
 
-# 2019-11-26, tatu: Let's try caching Maven dependencies
-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: