diff --git a/.gitignore b/.gitignore index 9c1e3d013d..0b836fe4ea 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ transaction-logs secrets.yml .gradletasknamecache .sts4-cache +.mvn/.gradle-enterprise/gradle-enterprise-workspace-id \ No newline at end of file diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml new file mode 100644 index 0000000000..4f01a30e01 --- /dev/null +++ b/.mvn/extensions.xml @@ -0,0 +1,12 @@ + + + com.gradle + gradle-enterprise-maven-extension + 1.5.3 + + + io.spring.ge.conventions + gradle-enterprise-conventions-maven-extension + 0.0.5 + + \ No newline at end of file diff --git a/.mvn/gradle-enterprise.xml b/.mvn/gradle-enterprise.xml new file mode 100644 index 0000000000..dd73b91676 --- /dev/null +++ b/.mvn/gradle-enterprise.xml @@ -0,0 +1,25 @@ + + + https://ge.spring.io + + + true + + + + true + + + true + + + + ${env.GRADLE_ENTERPRISE_CACHE_USERNAME} + ${env.GRADLE_ENTERPRISE_CACHE_PASSWORD} + + + + + diff --git a/ci/scripts/stage.sh b/ci/scripts/stage.sh index 2ff3a71bb3..fb4f97445d 100755 --- a/ci/scripts/stage.sh +++ b/ci/scripts/stage.sh @@ -35,10 +35,10 @@ git add pom.xml > /dev/null git commit -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} -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-integration-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} +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-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-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-deployment-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository} -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false git reset --hard HEAD^ > /dev/null if [[ $nextVersion != $snapshotVersion ]]; then diff --git a/pom.xml b/pom.xml index 3cc10f4c40..f2d6b16613 100644 --- a/pom.xml +++ b/pom.xml @@ -380,5 +380,38 @@ + + + com.gradle + gradle-enterprise-maven-extension + 1.5.2 + + + + + maven-checkstyle-plugin + + + + allowlist + + ${main.basedir}/src/checkstyle + + RELATIVE_PATH + + + + + propertyExpansion + ignoredValue + + + + + + + + + diff --git a/spring-boot-project/spring-boot-starters/.mvn/empty-file-for-mvn b/spring-boot-project/spring-boot-starters/.mvn/empty-file-for-mvn new file mode 100644 index 0000000000..6db7e363e9 --- /dev/null +++ b/spring-boot-project/spring-boot-starters/.mvn/empty-file-for-mvn @@ -0,0 +1 @@ +This file is empty so that the starters project does not generate multiple build scans. \ No newline at end of file diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-loader/pom.xml index 09f459c6ef..e8c17f65c8 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/pom.xml @@ -88,6 +88,9 @@ true ${skipTests} true + + false + diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml index d762ca4d46..ccb78b754f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml @@ -165,6 +165,9 @@ true ${skipTests} true + + false + diff --git a/spring-boot-tests/spring-boot-smoke-tests-invoker/pom.xml b/spring-boot-tests/spring-boot-smoke-tests-invoker/pom.xml index 9dc633c60c..a035b3dc76 100644 --- a/spring-boot-tests/spring-boot-smoke-tests-invoker/pom.xml +++ b/spring-boot-tests/spring-boot-smoke-tests-invoker/pom.xml @@ -29,6 +29,9 @@ pom.xml + + false +