SpringCloud/spring-cloud-core-tests
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

picking latest snapshots - I don't get what's going on

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-11-04 13:18:59 +01:00
parent b4cbfda0a5
commit d0e8293a06
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/runAcceptanceTests.sh
View File

@@ -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
}

6
zipkin/pom.xml
View File

@@ -48,7 +48,11 @@
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-zipkin</artifactId>
<artifactId>spring-cloud-starter-sleuth</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-zipkin</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>