Skip to content

Commit 60ff871

Browse files
committed
Polish "Add Gradle Enterprise Extension"
See gh-22089
1 parent e41a53c commit 60ff871

File tree

3 files changed

+27
-15
lines changed

3 files changed

+27
-15
lines changed

.mvn/gradle-enterprise.xml

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
11
<gradleEnterprise
22
xmlns="https://www.gradle.com/gradle-enterprise-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
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><enabled>true</enabled></local>
12-
</buildCache>
13-
</gradleEnterprise>
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-samples/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-samples/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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@
254254
<plugin>
255255
<groupId>com.gradle</groupId>
256256
<artifactId>gradle-enterprise-maven-extension</artifactId>
257-
<!-- There is a build warning because we don't specify the version here. We do this instead of specifying the verison number twice -->
257+
<version>1.5.2</version>
258258
<configuration>
259259
<gradleEnterprise>
260260
<plugins>

0 commit comments

Comments
 (0)