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 3737node_modules
3838node
3939package-lock.json
40- .mvn /.gradle-enterprise
40+ .mvn /.develocity
4141
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 @@ -99,7 +99,6 @@ pipeline {
9999
100100 environment {
101101 ARTIFACTORY = credentials(" ${ p['artifactory.credentials']} " )
102- DEVELOCITY_CACHE = credentials(" ${ p['develocity.cache.credentials']} " )
103102 DEVELOCITY_ACCESS_KEY = credentials(" ${ p['develocity.access-key']} " )
104103 }
105104
@@ -108,9 +107,6 @@ pipeline {
108107 docker. withRegistry(p[' docker.proxy.registry' ], p[' docker.proxy.credentials' ]) {
109108 docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
110109 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} " +
114110 " ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j-non-root " +
115111 " -Dartifactory.server=${ p['artifactory.url']} " +
116112 " -Dartifactory.username=${ ARTIFACTORY_USR} " +
Original file line number Diff line number Diff line change 22
33set -euo pipefail
44
5- export DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR}
6- export DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW}
75export JENKINS_USER=${JENKINS_USER_NAME}
86
9- # The environment variable to configure access key is still GRADLE_ENTERPRISE_ACCESS_KEY
10- export GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY}
11-
127MAVEN_OPTS=" -Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" \
138 ./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
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 @@ -5,14 +5,9 @@ set -euo pipefail
55mkdir -p /tmp/jenkins-home
66chown -R 1001:1001 .
77
8- export DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR}
9- export DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW}
108export JENKINS_USER=${JENKINS_USER_NAME}
119export SDN_FORCE_REUSE_OF_CONTAINERS=true
1210export SDN_NEO4J_VERSION=5.20
1311
14- # The environment variable to configure access key is still GRADLE_ENTERPRISE_ACCESS_KEY
15- export GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY}
16-
1712MAVEN_OPTS=" -Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home -Dscan=false" \
1813 ./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