Merge branch '2.1.x' into 2.2.x

Closes gh-22547
spring-projects · Jul 24, 2020 · f4508b4 · f4508b4
2 parents 652712b + 7d825ce
commit f4508b4
Show file tree

Hide file tree

Showing 9 changed files with 85 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,3 +38,4 @@ transaction-logs
 secrets.yml
 .gradletasknamecache
 .sts4-cache
+.mvn/.gradle-enterprise/gradle-enterprise-workspace-id
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -0,0 +1,12 @@
+<extensions>
+    <extension>
+        <groupId>com.gradle</groupId>
+        <artifactId>gradle-enterprise-maven-extension</artifactId>
+        <version>1.5.3</version>
+    </extension>
+    <extension>
+        <groupId>io.spring.ge.conventions</groupId>
+        <artifactId>gradle-enterprise-conventions-maven-extension</artifactId>
+        <version>0.0.5</version>
+    </extension>
+</extensions>
diff --git a/.mvn/gradle-enterprise.xml b/.mvn/gradle-enterprise.xml
@@ -0,0 +1,25 @@
+<gradleEnterprise
+        xmlns="https://www.gradle.com/gradle-enterprise-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="https://www.gradle.com/gradle-enterprise-maven https://www.gradle.com/schema/gradle-enterprise-maven.xsd">
+	<server>
+		<url>https://ge.spring.io</url>
+	</server>
+	<buildScan>
+		<publishIfAuthenticated>true</publishIfAuthenticated>
+	</buildScan>
+	<buildCache>
+		<local>
+			<enabled>true</enabled>
+		</local>
+		<remote>
+			<enabled>true</enabled>
+			<storeEnabled><![CDATA[#{env['GRADLE_ENTERPRISE_CACHE_USERNAME'] != null && env['GRADLE_ENTERPRISE_CACHE_USERNAME'] != null}]]></storeEnabled>
+			<server>
+				<credentials>
+					<username>${env.GRADLE_ENTERPRISE_CACHE_USERNAME}</username>
+					<password>${env.GRADLE_ENTERPRISE_CACHE_PASSWORD}</password>
+				</credentials>
+			</server>
+		</remote>
+	</buildCache>
+</gradleEnterprise>
diff --git 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
@@ -380,5 +380,38 @@
 				</plugin>
 			</plugins>
 		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>com.gradle</groupId>
+				<artifactId>gradle-enterprise-maven-extension</artifactId>
+				<version>1.5.2</version>
+				<configuration>
+					<gradleEnterprise>
+						<plugins>
+							<plugin>
+								<artifactId>maven-checkstyle-plugin</artifactId>
+								<inputs>
+									<fileSets>
+										<fileSet>
+											<name>allowlist</name>
+											<paths>
+												<path>${main.basedir}/src/checkstyle</path>
+											</paths>
+											<normalization>RELATIVE_PATH</normalization>
+										</fileSet>
+									</fileSets>
+									<properties>
+										<property>
+											<name>propertyExpansion</name>
+											<value>ignoredValue</value>
+										</property>
+									</properties>
+								</inputs>
+							</plugin>
+						</plugins>
+					</gradleEnterprise>
+				</configuration>
+			</plugin>
+		</plugins>
 	</build>
 </project>
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
@@ -0,0 +1 @@
+This file is empty so that the starters project does not generate multiple build scans.
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
@@ -88,6 +88,9 @@
 									<addTestClassPath>true</addTestClassPath>
 									<skipInvocation>${skipTests}</skipInvocation>
 									<streamLogs>true</streamLogs>
+									<properties>
+										<scan>false</scan>
+									</properties>
 								</configuration>
 							</execution>
 						</executions>

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
@@ -165,6 +165,9 @@
 									<addTestClassPath>true</addTestClassPath>
 									<skipInvocation>${skipTests}</skipInvocation>
 									<streamLogs>true</streamLogs>
+									<properties>
+										<scan>false</scan>
+									</properties>
 								</configuration>
 							</execution>
 						</executions>

diff --git 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 @@
 					<pomIncludes>
 						<pomInclude>pom.xml</pomInclude>
 					</pomIncludes>
+					<properties>
+						<scan>false</scan>
+					</properties>
 				</configuration>
 				<executions>
 					<execution>