diff --git a/.gitignore b/.gitignore
index 1162b7f60..ea0475e14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,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..f88a885d0
--- /dev/null
+++ b/.mvn/gradle-enterprise.xml
@@ -0,0 +1,31 @@
+
+
+
+ https://ge.spring.io
+
+
+ false
+ 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 845771109..685270466 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']}")
}
steps {
@@ -61,6 +63,8 @@ pipeline {
options { timeout(time: 30, unit: 'MINUTES') }
environment {
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+ DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
+ DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
}
steps {
script {
@@ -89,12 +93,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-elasticsearch-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-elasticsearch-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 c62648aae..d106098ef 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,6 +1,6 @@
image:https://spring.io/badges/spring-data-elasticsearch/ga.svg[Spring Data Elasticsearch,link=https://projects.spring.io/spring-data-elasticsearch#quick-start] image:https://spring.io/badges/spring-data-elasticsearch/snapshot.svg[Spring Data Elasticsearch,link=https://projects.spring.io/spring-data-elasticsearch#quick-start]
-= Spring Data for Elasticsearch image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2Fmain&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/] https://gitter.im/spring-projects/spring-data[image:https://badges.gitter.im/spring-projects/spring-data.svg[Gitter]]
+= Spring Data for Elasticsearch image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2Fmain&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/] 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 Elasticsearch"]
The primary goal of the https://projects.spring.io/spring-data[Spring Data] project is to make it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services.
diff --git a/ci/clean.sh b/ci/clean.sh
index e78b1e148..9f86e51eb 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-elasticsearch
diff --git a/ci/verify.sh b/ci/verify.sh
index e3ea30862..82734212b 100755
--- a/ci/verify.sh
+++ b/ci/verify.sh
@@ -5,6 +5,12 @@ set -euo pipefail
mkdir -p /tmp/jenkins-home/.m2/spring-data-elasticsearch
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-elasticsearch
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3d779e8ba..d57523fc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -391,6 +391,19 @@
org.apache.maven.plugins
maven-assembly-plugin
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+
+
+ org.apache.logging.log4j
+ log4j-core
+ ${log4j}
+
+
+
+