postgresql-jdbc.git / summary / log / commit / refs

commit    3db55daf2dccdd49555fd73b70be5c15609cccfa
Author:   Pavel Raiskup <praiskup@redhat.com>
Date:     Tue Jul 02 10:42:31 2019 +0000

    fix parent version in pgjdbc/pom.xml as well
    
    This should fix Travis build for FEDORA_CI.


.travis/travis_build.sh | 4 ++++ pgjdbc/pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis/travis_build.sh b/.travis/travis_build.sh index 0ccc6878..00ef433e 100755 --- a/.travis/travis_build.sh +++ b/.travis/travis_build.sh @@ -8,6 +8,10 @@ then python -c 'import os,sys,fcntl; flags = fcntl.fcntl(sys.stdout, fcntl.F_GETFL); fcntl.fcntl(sys.stdout, fcntl.F_SETFL, flags&~os.O_NONBLOCK);' export PROJECT_VERSION=$(mvn -B -N org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\[') export PARENT_VERSION=$(mvn -B -N org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.parent.version | grep -v '\[') + export CHECK_PARENT_VERSION=$(mvn help:evaluate -Dexpression=project.parent.version -q -DforceStdout -f pgjdbc/pom.xml) + # just make sure that pom.xml has the same value as pgjdbc/pom.xml + test "$PARENT_VERSION" = "$CHECK_PARENT_VERSION" + exec ./packaging/rpm_ci fi diff --git a/pgjdbc/pom.xml b/pgjdbc/pom.xml index 8a859c38..fc2ff119 100644 --- a/pgjdbc/pom.xml +++ b/pgjdbc/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.postgresql</groupId> <artifactId>pgjdbc-core-parent</artifactId> - <version>1.1.5</version> + <version>1.1.6</version> <relativePath /> </parent> [parent: d96ed59eba6a]