File tree Expand file tree Collapse file tree 7 files changed +4
-55
lines changed Expand file tree Collapse file tree 7 files changed +4
-55
lines changed Original file line number Diff line number Diff line change 37
37
node_modules
38
38
node
39
39
package-lock.json
40
- .mvn /.gradle-enterprise
40
+ .mvn /.develocity
41
41
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 @@ -99,7 +99,6 @@ pipeline {
99
99
100
100
environment {
101
101
ARTIFACTORY = credentials(" ${ p['artifactory.credentials']} " )
102
- DEVELOCITY_CACHE = credentials(" ${ p['develocity.cache.credentials']} " )
103
102
DEVELOCITY_ACCESS_KEY = credentials(" ${ p['develocity.access-key']} " )
104
103
}
105
104
@@ -108,9 +107,6 @@ pipeline {
108
107
docker. withRegistry(p[' docker.proxy.registry' ], p[' docker.proxy.credentials' ]) {
109
108
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
110
109
sh ' MAVEN_OPTS="-Duser.name=' + " ${ p['jenkins.user.name']} " + ' -Duser.home=/tmp/jenkins-home" ' +
111
- " DEVELOCITY_CACHE_USERNAME=${ DEVELOCITY_CACHE_USR} " +
112
- " DEVELOCITY_CACHE_PASSWORD=${ DEVELOCITY_CACHE_PSW} " +
113
- " GRADLE_ENTERPRISE_ACCESS_KEY=${ DEVELOCITY_ACCESS_KEY} " +
114
110
" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j-non-root " +
115
111
" -Dartifactory.server=${ p['artifactory.url']} " +
116
112
" -Dartifactory.username=${ ARTIFACTORY_USR} " +
Original file line number Diff line number Diff line change 2
2
3
3
set -euo pipefail
4
4
5
- export DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR}
6
- export DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW}
7
5
export JENKINS_USER=${JENKINS_USER_NAME}
8
6
9
- # The environment variable to configure access key is still GRADLE_ENTERPRISE_ACCESS_KEY
10
- export GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY}
11
-
12
7
MAVEN_OPTS=" -Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" \
13
8
./mvnw -s settings.xml clean -Dscan=false -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j
Original file line number Diff line number Diff line change @@ -31,6 +31,5 @@ docker.proxy.credentials=usw1_packages_broadcom_com-jenkins-token
31
31
artifactory.credentials =02bd1690-b54f-4c9f-819d-a77cb7a9822c
32
32
artifactory.url =https://repo.spring.io
33
33
artifactory.repository.snapshot =libs-snapshot-local
34
- develocity.cache.credentials =gradle_enterprise_cache_user
35
34
develocity.access-key =gradle_enterprise_secret_access_key
36
35
jenkins.user.name =spring-builds+jenkins
Original file line number Diff line number Diff line change @@ -5,14 +5,9 @@ set -euo pipefail
5
5
mkdir -p /tmp/jenkins-home
6
6
chown -R 1001:1001 .
7
7
8
- export DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR}
9
- export DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW}
10
8
export JENKINS_USER=${JENKINS_USER_NAME}
11
9
export SDN_FORCE_REUSE_OF_CONTAINERS=true
12
10
export SDN_NEO4J_VERSION=5.20
13
11
14
- # The environment variable to configure access key is still GRADLE_ENTERPRISE_ACCESS_KEY
15
- export GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY}
16
-
17
12
MAVEN_OPTS=" -Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home -Dscan=false" \
18
13
./mvnw -s settings.xml -P${PROFILE} clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j
You can’t perform that action at this time.
0 commit comments