Skip to content

Commit 33e63b3

Browse files
erichaagdevmp911de
authored andcommitted
Migrate build to Spring Develocity Conventions extension.
* Migrate build to Spring Develocity Conventions extension. * Adopt Develocity environment variables. Closes #2947
1 parent ff3ac7b commit 33e63b3

File tree

6 files changed

+4
-50
lines changed

6 files changed

+4
-50
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ build/
2020
node_modules
2121
node
2222
package-lock.json
23-
.mvn/.gradle-enterprise
23+
.mvn/.develocity

.mvn/extensions.xml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<extensions>
33
<extension>
4-
<groupId>com.gradle</groupId>
5-
<artifactId>gradle-enterprise-maven-extension</artifactId>
6-
<version>1.19.2</version>
7-
</extension>
8-
<extension>
9-
<groupId>com.gradle</groupId>
10-
<artifactId>common-custom-user-data-maven-extension</artifactId>
11-
<version>1.12.4</version>
4+
<groupId>io.spring.develocity.conventions</groupId>
5+
<artifactId>develocity-conventions-maven-extension</artifactId>
6+
<version>0.0.19</version>
127
</extension>
138
</extensions>

.mvn/gradle-enterprise.xml

Lines changed: 0 additions & 31 deletions
This file was deleted.

Jenkinsfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ pipeline {
158158

159159
environment {
160160
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
161-
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
162161
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
163162
}
164163

@@ -167,9 +166,6 @@ pipeline {
167166
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
168167
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
169168
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
170-
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
171-
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
172-
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
173169
"./mvnw -s settings.xml -Pci,artifactory " +
174170
"-Dartifactory.server=${p['artifactory.url']} " +
175171
"-Dartifactory.username=${ARTIFACTORY_USR} " +

ci/pipeline.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,5 @@ docker.proxy.credentials=usw1_packages_broadcom_com-jenkins-token
3030
artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
3131
artifactory.url=https://repo.spring.io
3232
artifactory.repository.snapshot=libs-snapshot-local
33-
develocity.cache.credentials=gradle_enterprise_cache_user
3433
develocity.access-key=gradle_enterprise_secret_access_key
3534
jenkins.user.name=spring-builds+jenkins

ci/test.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,8 @@ cwd=$(pwd)
1010
# Launch Redis in proper configuration
1111
pushd /tmp && ln -s /work && make -f $cwd/Makefile start && popd
1212

13-
export DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR}
14-
export DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW}
1513
export JENKINS_USER=${JENKINS_USER_NAME}
1614

17-
# The environment variable to configure access key is still GRADLE_ENTERPRISE_ACCESS_KEY
18-
export GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY}
19-
2015
# Execute maven test
2116
MAVEN_OPTS="-Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean test -P${PROFILE} -DrunLongTests=${LONG_TESTS:-false} -U -B
2217

0 commit comments

Comments
 (0)