diff --git a/.gitignore b/.gitignore
index efba2c00a..fe57cbd17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,4 +38,5 @@ node_modules
node
package.json
package-lock.json
+.mvn/.gradle-enterprise
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
new file mode 100644
index 000000000..ebd761025
--- /dev/null
+++ b/.mvn/extensions.xml
@@ -0,0 +1,13 @@
+
+
+
+ com.gradle
+ gradle-enterprise-maven-extension
+ 1.19.2
+
+
+ com.gradle
+ common-custom-user-data-maven-extension
+ 1.12.4
+
+
diff --git a/.mvn/gradle-enterprise.xml b/.mvn/gradle-enterprise.xml
new file mode 100644
index 000000000..bbe439e12
--- /dev/null
+++ b/.mvn/gradle-enterprise.xml
@@ -0,0 +1,31 @@
+
+
+
+ https://ge.spring.io
+
+
+ #{isFalse(env['CI'])}
+ true
+ true
+
+ #{{'0.0.0.0'}}
+
+
+
+
+ true
+
+
+
+
+ ${env.GRADLE_ENTERPRISE_CACHE_USERNAME}
+ ${env.GRADLE_ENTERPRISE_CACHE_PASSWORD}
+
+
+ true
+ #{env['GRADLE_ENTERPRISE_CACHE_USERNAME'] != null and env['GRADLE_ENTERPRISE_CACHE_PASSWORD'] != null}
+
+
+
diff --git a/Jenkinsfile b/Jenkinsfile
index 8d4a45306..d12d8f88d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,6 +33,8 @@ pipeline {
environment {
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+ DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
+ DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.neo4j.support.ProxyImageNameSubstitutor'
}
@@ -62,6 +64,8 @@ pipeline {
options { timeout(time: 60, unit: 'MINUTES') }
environment {
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+ DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
+ DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.neo4j.support.ProxyImageNameSubstitutor'
}
steps {
@@ -91,12 +95,18 @@ pipeline {
environment {
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+ DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
+ DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
}
steps {
script {
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j-non-root ' +
+ sh 'MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ' +
+ 'DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} ' +
+ 'DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} ' +
+ 'GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} ' +
+ './mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j-non-root ' +
'-Dartifactory.server=https://repo.spring.io ' +
"-Dartifactory.username=${ARTIFACTORY_USR} " +
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
diff --git a/README.adoc b/README.adoc
index b2717bb10..a3a12d5c2 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,4 +1,4 @@
-= Spring Data Neo4j image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-neo4j%2Fmain&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-neo4j/] https://gitter.im/spring-projects/spring-data[image:https://badges.gitter.im/spring-projects/spring-data.svg[Gitter]]
+= Spring Data Neo4j image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-neo4j%2Fmain&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-neo4j/] https://gitter.im/spring-projects/spring-data[image:https://badges.gitter.im/spring-projects/spring-data.svg[Gitter]] image:https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Gradle Enterprise", link="https://ge.spring.io/scans?search.rootProjectNames=Spring Data Neo4j"]
:sectanchors:
// tag::properties[]
diff --git a/ci/clean.sh b/ci/clean.sh
index 83640b3a8..db26b4e7e 100755
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -2,5 +2,11 @@
set -euo pipefail
-MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" \
+export DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR}
+export DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW}
+
+# The environment variable to configure access key is still GRADLE_ENTERPRISE_ACCESS_KEY
+export GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY}
+
+MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" \
./mvnw -s settings.xml clean -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j
diff --git a/ci/test.sh b/ci/test.sh
index 336b88d5d..e1da181aa 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -4,5 +4,12 @@ set -euo pipefail
mkdir -p /tmp/jenkins-home
chown -R 1001:1001 .
-MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home " \
+
+export DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR}
+export DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW}
+
+# The environment variable to configure access key is still GRADLE_ENTERPRISE_ACCESS_KEY
+export GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY}
+
+MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home " \
./mvnw -s settings.xml -P${PROFILE} clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j