Skip to content

Commit f4508b4

Browse files
wilkinsonawilkinsona
committed
Merge branch '2.1.x' into 2.2.x
Closes gh-22547
2 parents 652712b + 7d825ce commit f4508b4

File tree

9 files changed

+85
-4
lines changed

9 files changed

+85
-4
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,4 @@ transaction-logs
3838
secrets.yml
3939
.gradletasknamecache
4040
.sts4-cache
41+
.mvn/.gradle-enterprise/gradle-enterprise-workspace-id

‎.mvn/extensions.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<extensions>
2+
<extension>
3+
<groupId>com.gradle</groupId>
4+
<artifactId>gradle-enterprise-maven-extension</artifactId>
5+
<version>1.5.3</version>
6+
</extension>
7+
<extension>
8+
<groupId>io.spring.ge.conventions</groupId>
9+
<artifactId>gradle-enterprise-conventions-maven-extension</artifactId>
10+
<version>0.0.5</version>
11+
</extension>
12+
</extensions>

‎.mvn/gradle-enterprise.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<gradleEnterprise
2+
xmlns="https://www.gradle.com/gradle-enterprise-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="https://www.gradle.com/gradle-enterprise-maven https://www.gradle.com/schema/gradle-enterprise-maven.xsd">
4+
<server>
5+
<url>https://ge.spring.io</url>
6+
</server>
7+
<buildScan>
8+
<publishIfAuthenticated>true</publishIfAuthenticated>
9+
</buildScan>
10+
<buildCache>
11+
<local>
12+
<enabled>true</enabled>
13+
</local>
14+
<remote>
15+
<enabled>true</enabled>
16+
<storeEnabled><![CDATA[#{env['GRADLE_ENTERPRISE_CACHE_USERNAME'] != null && env['GRADLE_ENTERPRISE_CACHE_USERNAME'] != null}]]></storeEnabled>
17+
<server>
18+
<credentials>
19+
<username>${env.GRADLE_ENTERPRISE_CACHE_USERNAME}</username>
20+
<password>${env.GRADLE_ENTERPRISE_CACHE_PASSWORD}</password>
21+
</credentials>
22+
</server>
23+
</remote>
24+
</buildCache>
25+
</gradleEnterprise>

‎ci/scripts/stage.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ git add pom.xml > /dev/null
3535
git commit -m"Release v$stageVersion" > /dev/null
3636
git tag -a "v$stageVersion" -m"Release v$stageVersion" > /dev/null
3737

38-
run_maven -f spring-boot-project/pom.xml clean deploy -U -Dfull -DaltDeploymentRepository=distribution::default::file://${repository}
39-
run_maven -f spring-boot-tests/spring-boot-smoke-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository}
40-
run_maven -f spring-boot-tests/spring-boot-integration-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository}
41-
run_maven -f spring-boot-tests/spring-boot-deployment-tests/pom.xml clean install -U -Dfull -Drepository=file://${repository}
38+
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
39+
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
40+
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
41+
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
4242

4343
git reset --hard HEAD^ > /dev/null
4444
if [[ $nextVersion != $snapshotVersion ]]; then

‎pom.xml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,5 +380,38 @@
380380
</plugin>
381381
</plugins>
382382
</pluginManagement>
383+
<plugins>
384+
<plugin>
385+
<groupId>com.gradle</groupId>
386+
<artifactId>gradle-enterprise-maven-extension</artifactId>
387+
<version>1.5.2</version>
388+
<configuration>
389+
<gradleEnterprise>
390+
<plugins>
391+
<plugin>
392+
<artifactId>maven-checkstyle-plugin</artifactId>
393+
<inputs>
394+
<fileSets>
395+
<fileSet>
396+
<name>allowlist</name>
397+
<paths>
398+
<path>${main.basedir}/src/checkstyle</path>
399+
</paths>
400+
<normalization>RELATIVE_PATH</normalization>
401+
</fileSet>
402+
</fileSets>
403+
<properties>
404+
<property>
405+
<name>propertyExpansion</name>
406+
<value>ignoredValue</value>
407+
</property>
408+
</properties>
409+
</inputs>
410+
</plugin>
411+
</plugins>
412+
</gradleEnterprise>
413+
</configuration>
414+
</plugin>
415+
</plugins>
383416
</build>
384417
</project>

‎spring-boot-project/spring-boot-starters/.mvn/empty-file-for-mvn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This file is empty so that the starters project does not generate multiple build scans.

‎spring-boot-project/spring-boot-tools/spring-boot-loader/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,9 @@
8888
<addTestClassPath>true</addTestClassPath>
8989
<skipInvocation>${skipTests}</skipInvocation>
9090
<streamLogs>true</streamLogs>
91+
<properties>
92+
<scan>false</scan>
93+
</properties>
9194
</configuration>
9295
</execution>
9396
</executions>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,9 @@
165165
<addTestClassPath>true</addTestClassPath>
166166
<skipInvocation>${skipTests}</skipInvocation>
167167
<streamLogs>true</streamLogs>
168+
<properties>
169+
<scan>false</scan>
170+
</properties>
168171
</configuration>
169172
</execution>
170173
</executions>

‎spring-boot-tests/spring-boot-smoke-tests-invoker/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
<pomIncludes>
3030
<pomInclude>pom.xml</pomInclude>
3131
</pomIncludes>
32+
<properties>
33+
<scan>false</scan>
34+
</properties>
3235
</configuration>
3336
<executions>
3437
<execution>

0 commit comments

Comments
 (0)