diff --git a/.travis.yml b/.travis.yml index ddce6941a3..37f9362538 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,9 @@ matrix: - jdk: oraclejdk8 addons: postgresql: "9.4" - env: PG_VERSION=9.4 + env: + - PG_VERSION=9.4 + - COVERAGE=Y - jdk: openjdk7 addons: postgresql: "9.4" @@ -60,7 +62,9 @@ matrix: - jdk: openjdk7 addons: postgresql: "9.3" - env: PG_VERSION=9.3 + env: + - PG_VERSION=9.3 + - COVERAGE=Y - jdk: openjdk6 addons: postgresql: "9.3" @@ -76,11 +80,15 @@ matrix: - jdk: openjdk6 addons: postgresql: "9.2" - env: PG_VERSION=9.2 + env: + - PG_VERSION=9.2 + - COVERAGE=Y - jdk: oraclejdk8 addons: postgresql: "9.1" - env: PG_VERSION=9.1 + env: + - PG_VERSION=9.1 + - COVERAGE=Y - jdk: openjdk7 addons: postgresql: "9.1" diff --git a/pgjdbc/pom.xml b/pgjdbc/pom.xml index 6ec48d822c..588f34b684 100644 --- a/pgjdbc/pom.xml +++ b/pgjdbc/pom.xml @@ -5,7 +5,7 @@ org.postgresql pgjdbc-core-parent - 1.0.2 + 1.0.4 diff --git a/pom.xml b/pom.xml index 73ec203e18..4c62743dbc 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.postgresql pgjdbc-versions - 1.0.2 + 1.0.4 pgjdbc-aggregate diff --git a/travis_build.sh b/travis_build.sh index 76038c4d73..f08416550f 100755 --- a/travis_build.sh +++ b/travis_build.sh @@ -3,21 +3,33 @@ set -x -e # Build project MVN_ARGS="clean package -B -V" +MVN_PROFILES="release" + +if [[ "${COVERAGE}" == *"Y"* ]]; +then + MVN_PROFILES="$MVN_PROFILES,coverage" +fi if [[ "${TRAVIS_JDK_VERSION}" == *"jdk6"* ]]; then git clone --depth=50 https://github.com/pgjdbc/pgjdbc-jre6.git pgjdbc-jre6 cd pgjdbc-jre6 - mvn ${MVN_ARGS} -P release,skip-unzip-jdk + mvn ${MVN_ARGS} -P ${MVN_PROFILES},skip-unzip-jdk elif [[ "${TRAVIS_JDK_VERSION}" == *"jdk7"* ]]; then git clone --depth=50 https://github.com/pgjdbc/pgjdbc-jre7.git pgjdbc-jre7 cd pgjdbc-jre7 - mvn ${MVN_ARGS} -P release,skip-unzip-jdk + mvn ${MVN_ARGS} -P ${MVN_PROFILES},skip-unzip-jdk elif [ "${PG_VERSION}" == "9.4" ]; then # Build javadocs for Java 8 and PG 9.4 only - mvn ${MVN_ARGS} -P release-artifacts,release + mvn ${MVN_ARGS} -P ${MVN_PROFILES},release-artifacts else - mvn ${MVN_ARGS} -P release + mvn ${MVN_ARGS} -P ${MVN_PROFILES} +fi + +if [[ "${COVERAGE}" == "Y" ]]; +then + pip install --user codecov + codecov fi