Skip to content

Commit 6e67d68

Browse files
erichaagdevmp911de
authored andcommitted
Migrate build to Spring Develocity Conventions extension.
* Migrate build to Spring Develocity Conventions extension. * Adopt Develocity environment variables. Closes #2399
1 parent d759a74 commit 6e67d68

File tree

4 files changed

+4
-52
lines changed

4 files changed

+4
-52
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ _site
1515
node_modules
1616
package-lock.json
1717
node
18-
.mvn/.gradle-enterprise
18+
.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 & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ pipeline {
3333
options { timeout(time: 30, unit: 'MINUTES') }
3434
environment {
3535
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
36-
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
3736
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
3837
}
3938
steps {
@@ -46,9 +45,6 @@ pipeline {
4645
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
4746
sh 'sleep 15'
4847
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
49-
'DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
50-
'DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
51-
'GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
5248
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B -Pit'
5349
}
5450
}
@@ -72,7 +68,6 @@ pipeline {
7268
options { timeout(time: 30, unit: 'MINUTES') }
7369
environment {
7470
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
75-
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
7671
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
7772
}
7873
steps {
@@ -85,9 +80,6 @@ pipeline {
8580
sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
8681
sh 'sleep 15'
8782
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
88-
'DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
89-
'DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
90-
'GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
9183
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B -Pit'
9284
}
9385
}
@@ -112,7 +104,6 @@ pipeline {
112104

113105
environment {
114106
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
115-
DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
116107
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
117108
}
118109

@@ -121,9 +112,6 @@ pipeline {
121112
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
122113
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
123114
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
124-
"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
125-
"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
126-
"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
127115
"./mvnw -s settings.xml -Pci,artifactory " +
128116
"-Dartifactory.server=${p['artifactory.url']} " +
129117
"-Dartifactory.username=${ARTIFACTORY_USR} " +

0 commit comments

Comments
 (0)