Skip to content

Commit 1dccb98

Browse files
erichaagdeverichaagdev
authored
Migrate build to Spring Develocity Conventions extension.
* Migrate build to Spring Develocity Conventions extension. * Adopt Develocity environment variables. Closes #4752
1 parent 4ec5439 commit 1dccb98

File tree

4 files changed

+4
-68
lines changed

4 files changed

+4
-68
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 & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ pipeline {
151151
options { timeout(time: 30, unit: 'MINUTES') }
152152
environment {
153153
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
154-
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
155154
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
156155
}
157156
steps {
@@ -164,9 +163,6 @@ pipeline {
164163
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
165164
sh 'sleep 15'
166165
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
167-
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
168-
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
169-
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
170166
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
171167
}
172168
}
@@ -190,7 +186,6 @@ pipeline {
190186
options { timeout(time: 30, unit: 'MINUTES') }
191187
environment {
192188
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
193-
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
194189
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
195190
}
196191
steps {
@@ -203,9 +198,6 @@ pipeline {
203198
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
204199
sh 'sleep 15'
205200
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
206-
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
207-
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
208-
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
209201
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
210202
}
211203
}
@@ -220,7 +212,6 @@ pipeline {
220212
options { timeout(time: 30, unit: 'MINUTES') }
221213
environment {
222214
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
223-
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
224215
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
225216
}
226217
steps {
@@ -233,9 +224,6 @@ pipeline {
233224
sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
234225
sh 'sleep 15'
235226
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
236-
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
237-
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
238-
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
239227
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
240228
}
241229
}
@@ -250,7 +238,6 @@ pipeline {
250238
options { timeout(time: 30, unit: 'MINUTES') }
251239
environment {
252240
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
253-
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
254241
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
255242
}
256243
steps {
@@ -263,9 +250,6 @@ pipeline {
263250
sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
264251
sh 'sleep 15'
265252
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
266-
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
267-
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
268-
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
269253
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
270254
}
271255
}
@@ -280,7 +264,6 @@ pipeline {
280264
options { timeout(time: 30, unit: 'MINUTES') }
281265
environment {
282266
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
283-
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
284267
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
285268
}
286269
steps {
@@ -293,9 +276,6 @@ pipeline {
293276
sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
294277
sh 'sleep 15'
295278
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
296-
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
297-
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
298-
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
299279
"./mvnw -s settings.xml -Pmongo-4.x clean dependency:list test -Dsort -U -B -Dgradle.cache.local.enabled=false -Dgradle.cache.remote.enabled=false"
300280
}
301281
}
@@ -310,7 +290,6 @@ pipeline {
310290
options { timeout(time: 30, unit: 'MINUTES') }
311291
environment {
312292
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
313-
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
314293
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
315294
}
316295
steps {
@@ -323,9 +302,6 @@ pipeline {
323302
sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
324303
sh 'sleep 15'
325304
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
326-
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
327-
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
328-
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
329305
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
330306
}
331307
}
@@ -349,17 +325,13 @@ pipeline {
349325
options { timeout(time: 20, unit: 'MINUTES') }
350326
environment {
351327
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
352-
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
353328
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
354329
}
355330
steps {
356331
script {
357332
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
358333
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
359334
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
360-
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
361-
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
362-
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
363335
"./mvnw -s settings.xml -Pci,artifactory " +
364336
"-Dartifactory.server=${p['artifactory.url']} " +
365337
"-Dartifactory.username=${ARTIFACTORY_USR} " +

0 commit comments

Comments
 (0)