root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch '2.1.x' into 2.2.x

Browse Source
pull/23053/head
Andy Wilkinson 4 years ago
parent 1dfa21c99f 5d776f2a8b
commit 750777db24
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

2
ci/scripts/build-deployment-tests.sh
Unescape Escape View File

@ -5,5 +5,5 @@ source $(dirname $0)/common.sh
repository=$(pwd)/distribution-repository repository=$(pwd)/distribution-repository
pushd git-repo > /dev/null pushd git-repo > /dev/null
run_maven -f spring-boot-tests/spring-boot-deployment-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository} run_maven -f spring-boot-tests/spring-boot-deployment-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository} -Duser.name=concourse
popd > /dev/null popd > /dev/null

2
ci/scripts/build-integration-tests.sh
Unescape Escape View File

@ -5,5 +5,5 @@ source $(dirname $0)/common.sh
repository=$(pwd)/distribution-repository repository=$(pwd)/distribution-repository
pushd git-repo > /dev/null pushd git-repo > /dev/null
run_maven -f spring-boot-tests/spring-boot-integration-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository} run_maven -f spring-boot-tests/spring-boot-integration-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository} -Duser.name=concourse
popd > /dev/null popd > /dev/null

2
ci/scripts/build-project-windows.bat
Unescape Escape View File

@ -3,4 +3,4 @@ SET PATH=%PATH%;C:\Program Files\Git\usr\bin
cd git-repo cd git-repo
echo ".\mvnw clean install" > build.log echo ".\mvnw clean install" > build.log
.\mvnw clean install -U >> build.log 2>&1 || (sleep 1 && tail -n 3000 build.log && exit 1) .\mvnw clean install -U -Duser.name=concourse >> build.log 2>&1 || (sleep 1 && tail -n 3000 build.log && exit 1)

2
ci/scripts/build-project.sh
Unescape Escape View File

@ -6,5 +6,5 @@ repository=$(pwd)/distribution-repository
pushd git-repo > /dev/null pushd git-repo > /dev/null
run_maven -N clean verify -Dscan=false run_maven -N clean verify -Dscan=false
run_maven -f spring-boot-project/pom.xml clean deploy -U -Dfull -DaltDeploymentRepository=distribution::default::file://${repository} run_maven -f spring-boot-project/pom.xml clean deploy -U -Dfull -DaltDeploymentRepository=distribution::default::file://${repository} -Duser.name=concourse
popd > /dev/null popd > /dev/null

2
ci/scripts/build-smoke-tests.sh
Unescape Escape View File

@ -5,5 +5,5 @@ source $(dirname $0)/common.sh
repository=$(pwd)/distribution-repository repository=$(pwd)/distribution-repository
pushd git-repo > /dev/null pushd git-repo > /dev/null
run_maven -f spring-boot-tests/spring-boot-smoke-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository} run_maven -f spring-boot-tests/spring-boot-smoke-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository} -Duser.name=concourse
popd > /dev/null popd > /dev/null

8
ci/scripts/stage.sh
Unescape Escape View File

@ -35,10 +35,10 @@ git add pom.xml > /dev/null
git commit -m"Release v$stageVersion" > /dev/null git commit -m"Release v$stageVersion" > /dev/null
git tag -a "v$stageVersion" -m"Release v$stageVersion" > /dev/null git tag -a "v$stageVersion" -m"Release v$stageVersion" > /dev/null
run_maven -f spring-boot-project/pom.xml clean deploy -U -Dfull -DaltDeploymentRepository=distribution::default::file://${repository} -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false run_maven -f spring-boot-project/pom.xml clean deploy -U -Dfull -DaltDeploymentRepository=distribution::default::file://${repository} -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false -Duser.name=concourse
run_maven -f spring-boot-tests/spring-boot-smoke-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository} -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false run_maven -f spring-boot-tests/spring-boot-smoke-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository} -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false -Duser.name=concourse
run_maven -f spring-boot-tests/spring-boot-integration-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository} -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false run_maven -f spring-boot-tests/spring-boot-integration-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository} -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false -Duser.name=concourse
run_maven -f spring-boot-tests/spring-boot-deployment-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository} -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false run_maven -f spring-boot-tests/spring-boot-deployment-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository} -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false -Duser.name=concourse
git reset --hard HEAD^ > /dev/null git reset --hard HEAD^ > /dev/null
if [[ $nextVersion != $snapshotVersion ]]; then if [[ $nextVersion != $snapshotVersion ]]; then

Write Preview
Loading…
Cancel
Save