From 53c3bdc71ee5cc9bb58803c148ab0c312c9c6aac Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Fri, 22 Dec 2017 11:24:44 -0500 Subject: [PATCH] Backporting changes for releaser --- docker-compose.yml | 8 +------- docs/pom.xml | 8 ++++++++ scripts/build.sh | 5 +++++ 3 files changed, 14 insertions(+), 7 deletions(-) create mode 100755 scripts/build.sh diff --git a/docker-compose.yml b/docker-compose.yml index ff2e9712..42873f74 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,13 +1,7 @@ -# Work in Progress consul: - image: progrium/consul - volumes: - - /data - - /config - - ./src/test/resources/consul_ui:/ui + image: library/consul ports: - "8300:8300" - "8400:8400" - "8500:8500" - "8600:8600" - command: -server -bootstrap -data-dir /data -ui-dir /ui diff --git a/docs/pom.xml b/docs/pom.xml index 83226ee2..c354fc84 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -22,11 +22,19 @@ docs + + org.apache.maven.plugins + maven-dependency-plugin + org.asciidoctor asciidoctor-maven-plugin false + + com.agilejava.docbkx + docbkx-maven-plugin + org.apache.maven.plugins maven-antrun-plugin diff --git a/scripts/build.sh b/scripts/build.sh new file mode 100755 index 00000000..47399467 --- /dev/null +++ b/scripts/build.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +./src/main/bash/travis_install_consul.sh +./src/test/bash/travis_run_consul.sh +./mvnw clean install -B -Pdocs ${@}