diff --git a/.travis.yml b/.travis.yml index 3080129..5d27fcd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ script: - mvn verify after_success: - mvn coveralls:report -- test "${TRAVIS_PULL_REQUEST}" == "false" && test "${TRAVIS_TAG}" != "" && mvn deploy --settings travis/settings.xml +- test "${TRAVIS_PULL_REQUEST}" == "false" && test "${TRAVIS_BRANCH}" != "master" && mvn deploy --settings travis/settings.xml cache: directories: - "~/.m2" diff --git a/Makefile b/Makefile index caa6a4a..f6abe17 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ jar: mvn clean package release: - mvn -B release:prepare release:clean + mvn -B release:prepare release:clean && git checkout `git describe --abbrev=0` -b `git describe --abbrev=0` && git push -u origin HEAD && git checkout master && git pull coverage: mvn clean scoverage:report diff --git a/pom.xml b/pom.xml index 62b6e79..04a29d3 100644 --- a/pom.xml +++ b/pom.xml @@ -38,10 +38,10 @@ 2.12 1.3.0 3.0.1 - 1.2.0 - 1.0.1 + 1.2.1 + 1.1.3 1.9.2 - 2.3.0 + 2.6.0 2.2.1