diff --git a/Jenkinsfile b/Jenkinsfile
index 6b7f6fcc..69da2e41 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,116 +1,118 @@
 pipeline {
-    agent none
+	agent none
 
-    triggers {
-        pollSCM 'H/10 * * * *'
-        upstream(upstreamProjects: "spring-data-commons/2.1.x", threshold: hudson.model.Result.SUCCESS)
-    }
+	triggers {
+		pollSCM 'H/10 * * * *'
+		upstream(upstreamProjects: "spring-data-commons/2.1.x", threshold: hudson.model.Result.SUCCESS)
+	}
 
-    options {
-        disableConcurrentBuilds()
-        buildDiscarder(logRotator(numToKeepStr: '14'))
-    }
+	options {
+		disableConcurrentBuilds()
+		buildDiscarder(logRotator(numToKeepStr: '14'))
+	}
 
-    stages {
-        stage("Test") {
-            when {
-                anyOf {
-                    branch '1.0.x'
-                    not { triggeredBy 'UpstreamCause' }
-                }
-            }
-            parallel {
-                stage("test: baseline") {
-                    agent {
-                        docker {
-                            image 'adoptopenjdk/openjdk8:latest'
-                            label 'data'
-                            args '-u root -v /var/run/docker.sock:/var/run/docker.sock' // root but with no maven caching
-                        }
-                    }
-                    options { timeout(time: 30, unit: 'MINUTES') }
-                    steps {
-                        sh 'rm -rf ?'
-                        sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,all-dbs clean dependency:list test -Dsort -U -B'
-                        sh "chown -R 1001:1001 target"
-                    }
-                }
-            }
-        }
-        stage('Release to artifactory') {
-            when {
-                branch 'issue/*'
-                not { triggeredBy 'UpstreamCause' }
-            }
-            agent {
-                docker {
-                    image 'adoptopenjdk/openjdk8:latest'
-                    label 'data'
-                    args '-v $HOME:/tmp/jenkins-home'
-                }
-            }
-            options { timeout(time: 20, unit: 'MINUTES') }
+	stages {
+		stage("Test") {
+			when {
+				anyOf {
+					branch '1.0.x'
+					not { triggeredBy 'UpstreamCause' }
+				}
+			}
+			parallel {
+				stage("test: baseline") {
+					agent {
+						docker {
+							image 'adoptopenjdk/openjdk8:latest'
+							label 'data'
+							args '-u root -v /var/run/docker.sock:/var/run/docker.sock'
+							// root but with no maven caching
+						}
+					}
+					options { timeout(time: 30, unit: 'MINUTES') }
+					steps {
+						sh 'mkdir -p /tmp/jenkins-home'
+						sh 'chown -R 1001:1001 .'
+						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,all-dbs clean dependency:list test -Dsort -U -B'
+						sh 'chown -R 1001:1001 .'
+					}
+				}
+			}
+		}
+		stage('Release to artifactory') {
+			when {
+				anyOf {
+					branch '1.0.x'
+					not { triggeredBy 'UpstreamCause' }
+				}
+			}
+			agent {
+				docker {
+					image 'adoptopenjdk/openjdk8:latest'
+					label 'data'
+					args '-v $HOME/.m2:/tmp/jenkins-home/.m2'
+				}
+			}
+			options { timeout(time: 20, unit: 'MINUTES') }
 
-            environment {
-                ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
-            }
+			environment {
+				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+			}
 
-            steps {
-                sh 'rm -rf ?'
-                sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
-                        '-Dartifactory.server=https://repo.spring.io ' +
-                        "-Dartifactory.username=${ARTIFACTORY_USR} " +
-                        "-Dartifactory.password=${ARTIFACTORY_PSW} " +
-                        "-Dartifactory.staging-repository=libs-snapshot-local " +
+			steps {
+				sh 'mkdir -p /tmp/jenkins-home'
+				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
+						'-Dartifactory.server=https://repo.spring.io ' +
+						"-Dartifactory.username=${ARTIFACTORY_USR} " +
+						"-Dartifactory.password=${ARTIFACTORY_PSW} " +
+						"-Dartifactory.staging-repository=libs-snapshot-local " +
                         "-Dartifactory.build-name=spring-data-jdbc-1.0 " +
-                        "-Dartifactory.build-number=${BUILD_NUMBER} " +
-                        '-Dmaven.test.skip=true clean deploy -U -B'
-            }
-        }
-        stage('Release to artifactory with docs') {
-            when {
-                branch '1.0.x'
-            }
-            agent {
-                docker {
-                    image 'adoptopenjdk/openjdk8:latest'
-                    label 'data'
-                    args '-v $HOME:/tmp/jenkins-home'
-                }
-            }
-            options { timeout(time: 20, unit: 'MINUTES') }
+						"-Dartifactory.build-number=${BUILD_NUMBER} " +
+						'-Dmaven.test.skip=true clean deploy -U -B'
+			}
+		}
+		stage('Publish documentation') {
+			when {
+				branch '1.0.x'
+			}
+			agent {
+				docker {
+					image 'adoptopenjdk/openjdk8:latest'
+					label 'data'
+					args '-v $HOME/.m2:/tmp/jenkins-home/.m2'
+				}
+			}
+			options { timeout(time: 20, unit: 'MINUTES') }
 
-            environment {
-                ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
-            }
+			environment {
+				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+			}
 
-            steps {
-                sh 'rm -rf ?'
-                sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
-                        '-Dartifactory.server=https://repo.spring.io ' +
-                        "-Dartifactory.username=${ARTIFACTORY_USR} " +
-                        "-Dartifactory.password=${ARTIFACTORY_PSW} " +
-                        "-Dartifactory.staging-repository=libs-snapshot-local " +
-                        "-Dartifactory.build-name=spring-data-jdbc-1.0 " +
-                        "-Dartifactory.build-number=${BUILD_NUMBER} " +
-                        '-Dmaven.test.skip=true clean deploy -U -B'
-            }
-        }
-    }
+			steps {
+				sh 'mkdir -p /tmp/jenkins-home'
+				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute ' +
+						'-Dartifactory.server=https://repo.spring.io ' +
+						"-Dartifactory.username=${ARTIFACTORY_USR} " +
+						"-Dartifactory.password=${ARTIFACTORY_PSW} " +
+						"-Dartifactory.distribution-repository=temp-private-local " +
+						'-Dmaven.test.skip=true clean deploy -U -B'
+			}
+		}
+	}
 
-    post {
-        changed {
-            script {
-                slackSend(
-                        color: (currentBuild.currentResult == 'SUCCESS') ? 'good' : 'danger',
-                        channel: '#spring-data-dev',
-                        message: "${currentBuild.fullDisplayName} - `${currentBuild.currentResult}`\n${env.BUILD_URL}")
-                emailext(
-                        subject: "[${currentBuild.fullDisplayName}] ${currentBuild.currentResult}",
-                        mimeType: 'text/html',
-                        recipientProviders: [[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']],
-                        body: "<a href=\"${env.BUILD_URL}\">${currentBuild.fullDisplayName} is reported as ${currentBuild.currentResult}</a>")
-            }
-        }
-    }
+	post {
+		changed {
+			script {
+				slackSend(
+						color: (currentBuild.currentResult == 'SUCCESS') ? 'good' : 'danger',
+						channel: '#spring-data-dev',
+						message: "${currentBuild.fullDisplayName} - `${currentBuild.currentResult}`\n${env.BUILD_URL}")
+				emailext(
+						subject: "[${currentBuild.fullDisplayName}] ${currentBuild.currentResult}",
+						mimeType: 'text/html',
+						recipientProviders: [[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']],
+						body: "<a href=\"${env.BUILD_URL}\">${currentBuild.fullDisplayName} is reported as ${currentBuild.currentResult}</a>")
+			}
+		}
+	}
 }