Updates consul to 1.7.2

fixes gh-491

.circleci/config.yml

@@ -15,7 +15,7 @@ jobs:
       - restore_cache:
           key: sc-consul-{{ .Branch }}
       - run:
-          command: ./src/main/bash/travis_install_consul.sh
+          command: ./src/main/bash/ci_install_consul.sh
       - run:
           name: "Download dependencies"
           command: |
@@ -26,7 +26,7 @@ jobs:
             - ~/.m2
       - run:
           name: "Running Consul"
-          command: ./src/test/bash/travis_run_consul.sh
+          command: ./src/test/bash/ci_run_consul.sh
       - run:
           name: "Running build"
           command: ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn

scripts/build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
 trap 'pkill -9 consul; EXIT' 0
-./src/main/bash/travis_install_consul.sh
-./src/test/bash/travis_run_consul.sh
+./src/main/bash/ci_install_consul.sh
+./src/test/bash/ci_run_consul.sh
 ./mvnw clean install -B -Pdocs ${@}

scripts/compileOnly.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-./src/main/bash/travis_install_consul.sh
-./src/test/bash/travis_run_consul.sh
+./src/main/bash/ci_install_consul.sh
+./src/test/bash/ci_run_consul.sh
 ./mvnw clean install -B -Pdocs -DskipTests -fae

src/main/bash/ci_install_consul.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-CONSUL_VER="0.7.5"
+CONSUL_VER="1.7.2"
 CONSUL_ZIP="consul_${CONSUL_VER}_linux_amd64.zip"
 IGNORE_CERTS="${IGNORE_CERTS:-no}"
 

src/test/bash/ci_run_consul.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+ps -ef | grep consul
+killall consul
+BASEDIR=`dirname $0`/../../..
+#${BASEDIR}/consul agent -server -bootstrap-expect 1 -advertise 127.0.0.1 -data-dir /tmp/consul -ui-dir ${BASEDIR}/src/test/resources/consul_ui -config-dir ${BASEDIR}/src/test/resources/consul_config &
+${BASEDIR}/consul agent -server -bootstrap-expect 1 -advertise 127.0.0.1 -data-dir /tmp/consul -ui-dir ${BASEDIR}/src/test/resources/consul_ui -config-dir ${BASEDIR}/src/test/resources/empty_config &
+# wait for consul to elect a leader before sending acl
+sleep 5
+# FIXME: 2.2.3 consul acl rework see https://github.com/spring-cloud/spring-cloud-consul/issues/628
+#curl -X PUT -d @`dirname $0`/../../test/resources/consul_acl/consul_anonymous_acl.json http://localhost:8500/v1/acl/create?token=2ee647bd-bd69-4118-9f34-b9a6e9e60746
+#echo "consul_anonymous_acl installed"
+#curl -X PUT -d @`dirname $0`/../../test/resources/consul_acl/consul_discovery_client_acl.json http://localhost:8500/v1/acl/create?token=2ee647bd-bd69-4118-9f34-b9a6e9e60746
+#echo "consul_discovery_client_acl installed"

src/test/bash/travis_run_consul.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-ps -ef | grep consul
-killall consul
-BASEDIR=`dirname $0`/../../..
-${BASEDIR}/consul agent -server -bootstrap-expect 1 -advertise 127.0.0.1 -data-dir /tmp/consul -ui-dir ${BASEDIR}/src/test/resources/consul_ui -config-dir ${BASEDIR}/src/test/resources/consul_config &
-# wait for consul to elect a leader before sending acl
-sleep 5
-curl -X PUT -d @`dirname $0`/../../test/resources/consul_acl/consul_anonymous_acl.json http://localhost:8500/v1/acl/create?token=2ee647bd-bd69-4118-9f34-b9a6e9e60746
-echo "consul_anonymous_acl installed"
-curl -X PUT -d @`dirname $0`/../../test/resources/consul_acl/consul_discovery_client_acl.json http://localhost:8500/v1/acl/create?token=2ee647bd-bd69-4118-9f34-b9a6e9e60746
-echo "consul_discovery_client_acl installed"