File tree Expand file tree Collapse file tree 6 files changed +4
-50
lines changed Expand file tree Collapse file tree 6 files changed +4
-50
lines changed Original file line number Diff line number Diff line change 20
20
node_modules
21
21
node
22
22
package-lock.json
23
- .mvn /.gradle-enterprise
23
+ .mvn /.develocity
Original file line number Diff line number Diff line change 1
1
<?xml version =" 1.0" encoding =" UTF-8" ?>
2
2
<extensions >
3
3
<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 >
12
7
</extension >
13
8
</extensions >
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -158,7 +158,6 @@ pipeline {
158
158
159
159
environment {
160
160
ARTIFACTORY = credentials(" ${ p['artifactory.credentials']} " )
161
- DEVELOCITY_CACHE = credentials(" ${ p['develocity.cache.credentials']} " )
162
161
DEVELOCITY_ACCESS_KEY = credentials(" ${ p['develocity.access-key']} " )
163
162
}
164
163
@@ -167,9 +166,6 @@ pipeline {
167
166
docker. withRegistry(p[' docker.proxy.registry' ], p[' docker.proxy.credentials' ]) {
168
167
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
169
168
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} " +
173
169
" ./mvnw -s settings.xml -Pci,artifactory " +
174
170
" -Dartifactory.server=${ p['artifactory.url']} " +
175
171
" -Dartifactory.username=${ ARTIFACTORY_USR} " +
Original file line number Diff line number Diff line change @@ -30,6 +30,5 @@ docker.proxy.credentials=usw1_packages_broadcom_com-jenkins-token
30
30
artifactory.credentials =02bd1690-b54f-4c9f-819d-a77cb7a9822c
31
31
artifactory.url =https://repo.spring.io
32
32
artifactory.repository.snapshot =libs-snapshot-local
33
- develocity.cache.credentials =gradle_enterprise_cache_user
34
33
develocity.access-key =gradle_enterprise_secret_access_key
35
34
jenkins.user.name =spring-builds+jenkins
Original file line number Diff line number Diff line change @@ -10,13 +10,8 @@ cwd=$(pwd)
10
10
# Launch Redis in proper configuration
11
11
pushd /tmp && ln -s /work && make -f $cwd /Makefile start && popd
12
12
13
- export DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR}
14
- export DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW}
15
13
export JENKINS_USER=${JENKINS_USER_NAME}
16
14
17
- # The environment variable to configure access key is still GRADLE_ENTERPRISE_ACCESS_KEY
18
- export GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY}
19
-
20
15
# Execute maven test
21
16
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
22
17
You can’t perform that action at this time.
0 commit comments