Make deploy script unconditional

.travis.yml

@@ -27,15 +27,6 @@ deploy:
 - provider: script
   script: ".travis/deploy.sh"
   skip_cleanup: true
-  on:
-    repo: trickl/assertj-json
-    branch: master
-- provider: script
-  script: ".travis/deploy.sh"
-  skip_cleanup: true
-  on:
-    repo: trickl/assertj-json
-    tags: true
 - provider: releases
   api_key:
     secure: IN+w9/eDXynx3EM4TgRj4IwMC0+s5Di+IBEG9no51hUiR2avPc72k+qHmxJWiN3of9CX0mCdwgm+KhD2uKSZLnw+HadWb2ZtSMADfzoffQQb9eLkmDsVQbgQ1C4FWxLKfGl3DfMiw2cDr7NsD75sLU07EYC3SMWPuGYCDrf5NVeYPhb8StCA61noKwBQh3W1NMy20XJYE+fuaV9e3Ehl20wtpVVF5DweQVsAcXMJ8uS0ndtUHZs3BNLULSNRa7Pm46trD/RoI1foRGTmXrBBtC/5RPoI85TUhgeYJp7MmoCLfLDKt6IvqnmL/UvgTL3Hr8v/0vvgVtR/I7RZ4B1vvyPsxRkMWkqqm2hEpmGkbYxO2UEBo3yTAob4aocG0YYwaHF/IHubV8cya+lRWbTvaoFoIFNUZgFlqyt0X9JBFQr7aaEI6LlhiSwsQpz7Lok4ofIQRKnAOtbyoDpB7oLZwYFS58ZqYar6yk7CuKnkoZSB9jqPzL+xxU1Ccf07T7E5YbDKvuJv/KFwD0xLALkWadeTxMLPVjoE4axzXiBXd/gl4QebpWT3eIBZAF9HrX2SkrKhquECOSaBTJNnXqM5B/jc6CkQwAcjycIZuPNoyk3r00OPWq5Li4xKkxKjATtTmwBf3XeTHqXwpuCeEBsbOpUkxhzv2GMK7R8nZtOAItU=

.travis/deploy.sh

@@ -1,9 +1,11 @@
-if [ ! -z "$TRAVIS_TAG" ]
-then
-    echo "on a tag -> set pom.xml <version> to $TRAVIS_TAG"
-    mvn --settings .travis/settings.xml org.codehaus.mojo:versions-maven-plugin:2.1:set -DnewVersion=$TRAVIS_TAG 1>/dev/null 2>/dev/null
-else
-    echo "not on a tag -> keep snapshot version in pom.xml"
-fi
+if [ "$TRAVIS_BRANCH" = 'master' ] && [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then
+  if [ ! -z "$TRAVIS_TAG" ]
+  then
+      echo "on a tag -> set pom.xml <version> to $TRAVIS_TAG"
+      mvn --settings .travis/settings.xml org.codehaus.mojo:versions-maven-plugin:2.1:set -DnewVersion=$TRAVIS_TAG 1>/dev/null 2>/dev/null
+  else
+      echo "not on a tag -> keep snapshot version in pom.xml"
+  fi
 
-mvn clean deploy --settings .travis/settings.xml -DskipTests=true -B -U
+  mvn clean deploy --settings .travis/settings.xml -DskipTests=true -B -U
+fi