Merge pull request #36 from zalando/postgres-9.5.4

Postgres 9.5.4

Author: valgog

.gitignore

@@ -1,3 +1,4 @@
+*.swp
 *.iml
 .vagrant
 .DS_Store

.travis.yml

@@ -1,18 +1,20 @@
 language: java
+
 jdk:
     - openjdk7
     - oraclejdk7
     - oraclejdk8
+
 addons:
-    postgresql: "9.3"
+    postgresql: "9.5"
 
 # go faster on travis
 sudo: false
 
 # stop mvn install from running
 install: true
 
-script: mvn -B -V package javadoc:javadoc test
+script: mvn -B -V package $( [[ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ]] && echo javadoc:javadoc ) test
 
 after_success:
-    - mvn clean test jacoco:report coveralls:report
+    - mvn -B -V clean test jacoco:report coveralls:report

pom.xml

@@ -71,7 +71,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>3.5.1</version>
                 <configuration>
                     <source>1.7</source>
                     <target>1.7</target>
@@ -80,12 +80,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.6</version>
+                <version>3.0.1</version>
             </plugin>
             <plugin>
                 <groupId>org.eluder.coveralls</groupId>
                 <artifactId>coveralls-maven-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>4.2.0</version>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>

test.sh

@@ -1,12 +1,22 @@
 #!/bin/bash
 
+if ! which docker &> /dev/null ; then
+    echo 'Ensure that docker is installed and is in PATH'
+    exit 1
+fi
+
+if ! docker info | grep -q 'Server Version' ; then
+    echo 'Ensure that docker service is running'
+    echo 1
+fi
+
 if nc -w 5 -z localhost 5432; then
     echo 'There is already some process listening on port 5432.'
     echo 'Please shutdown any existing PostgreSQL instance and re-run this script.'
     exit 1
 fi
 
-PGVERSION=9.4.5
+PGVERSION=9.5.4
 
 container=$(docker ps | grep postgres:$PGVERSION)
 if [ -z "$container" ]; then