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 2020node_modules
2121node
2222package-lock.json
23- .mvn /.gradle-enterprise
23+ .mvn /.develocity
Original file line number Diff line number Diff line change 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 >
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -239,7 +239,6 @@ pipeline {
239239
240240 environment {
241241 ARTIFACTORY = credentials(" ${ p['artifactory.credentials']} " )
242- DEVELOCITY_CACHE = credentials(" ${ p['develocity.cache.credentials']} " )
243242 DEVELOCITY_ACCESS_KEY = credentials(" ${ p['develocity.access-key']} " )
244243 }
245244
@@ -248,9 +247,6 @@ pipeline {
248247 docker. withRegistry(p[' docker.proxy.registry' ], p[' docker.proxy.credentials' ]) {
249248 docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
250249 sh ' MAVEN_OPTS="-Duser.name=' + " ${ p['jenkins.user.name']} " + ' -Duser.home=/tmp/jenkins-home" ' +
251- " DEVELOCITY_CACHE_USERNAME=${ DEVELOCITY_CACHE_USR} " +
252- " DEVELOCITY_CACHE_PASSWORD=${ DEVELOCITY_CACHE_PSW} " +
253- " GRADLE_ENTERPRISE_ACCESS_KEY=${ DEVELOCITY_ACCESS_KEY} " +
254250 " ./mvnw -s settings.xml -Pci,artifactory " +
255251 " -Dartifactory.server=${ p['artifactory.url']} " +
256252 " -Dartifactory.username=${ ARTIFACTORY_USR} " +
Original file line number Diff line number Diff line change @@ -31,6 +31,5 @@ docker.proxy.credentials=usw1_packages_broadcom_com-jenkins-token
3131artifactory.credentials =02bd1690-b54f-4c9f-819d-a77cb7a9822c
3232artifactory.url =https://repo.spring.io
3333artifactory.repository.snapshot =libs-snapshot-local
34- develocity.cache.credentials =gradle_enterprise_cache_user
3534develocity.access-key =gradle_enterprise_secret_access_key
3635jenkins.user.name =spring-builds+jenkins
Original file line number Diff line number Diff line change @@ -10,13 +10,8 @@ cwd=$(pwd)
1010# Launch Redis in proper configuration
1111pushd /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}
1513export 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
2116MAVEN_OPTS=" -Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean test -P${PROFILE} -DrunLongTests=${LONG_TESTS:- false} -Dredis.server.version=${REDIS_VERSION:- unknown} -U -B
2217
You can’t perform that action at this time.
0 commit comments