From d0e8293a06d6db914d624792003f965452a60047 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 4 Nov 2020 13:18:59 +0100 Subject: [PATCH] picking latest snapshots - I don't get what's going on --- scripts/runAcceptanceTests.sh | 10 +++++----- zipkin/pom.xml | 6 +++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/runAcceptanceTests.sh b/scripts/runAcceptanceTests.sh index 9fd30bf..12300a4 100755 --- a/scripts/runAcceptanceTests.sh +++ b/scripts/runAcceptanceTests.sh @@ -20,13 +20,13 @@ function cloudVersion() { CURRENT_BOOT_VERSION="${CURRENT_BOOT_VERSION:-}" CURRENT_CLOUD_VERSION="${CURRENT_CLOUD_VERSION:-}" -#[[ -z "${CURRENT_BOOT_VERSION}" ]] && CURRENT_BOOT_VERSION="$( bootVersion "2.4" )" -#[[ -z "${CURRENT_CLOUD_VERSION}" ]] && CURRENT_CLOUD_VERSION="$( cloudVersion "2020.0.0" )" +[[ -z "${CURRENT_BOOT_VERSION}" ]] && CURRENT_BOOT_VERSION="$( bootVersion "2.4" )" +[[ -z "${CURRENT_CLOUD_VERSION}" ]] && CURRENT_CLOUD_VERSION="$( cloudVersion "2020.0.0" )" function build() { - #echo "Updating parent boot to [${CURRENT_BOOT_VERSION}]" - #./mvnw versions:update-parent "-DparentVersion=(,${CURRENT_BOOT_VERSION}]" -DgenerateBackupPoms=false -DallowSnapshots=true - #echo "Running the build with cloud version [${CURRENT_CLOUD_VERSION}]" + echo "Updating parent boot to [${CURRENT_BOOT_VERSION}]" + ./mvnw versions:update-parent "-DparentVersion=(,${CURRENT_BOOT_VERSION}]" -DgenerateBackupPoms=false -DallowSnapshots=true + echo "Running the build with cloud version [${CURRENT_CLOUD_VERSION}]" ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -Dspring-cloud.version="${CURRENT_CLOUD_VERSION}" -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --fail-at-end } diff --git a/zipkin/pom.xml b/zipkin/pom.xml index c26a22c..401a52c 100644 --- a/zipkin/pom.xml +++ b/zipkin/pom.xml @@ -48,7 +48,11 @@ org.springframework.cloud - spring-cloud-starter-zipkin + spring-cloud-starter-sleuth + + + org.springframework.cloud + spring-cloud-sleuth-zipkin org.springframework.boot