diff --git a/release-tools/src/main/java/org/springframework/data/release/build/ParentPom.java b/release-tools/src/main/java/org/springframework/data/release/build/ParentPom.java
index 44d8024..fc1fd22 100644
--- a/release-tools/src/main/java/org/springframework/data/release/build/ParentPom.java
+++ b/release-tools/src/main/java/org/springframework/data/release/build/ParentPom.java
@@ -21,12 +21,13 @@ import org.xmlbeam.annotation.XBWrite;
 
 /**
  * @author Oliver Gierke
+ * @author Mark Paluch
  */
 public interface ParentPom extends Pom {
 
 	@XBWrite("/project/properties/releasetrain")
 	void setReleaseTrain(@XBValue String releaseTrain);
 
-	@XBWrite("/project/profiles/profile[id=\"distribute\"]/dependencies/dependency/version")
+	@XBWrite("/project/profiles/profile[id=\"distribute\"]/dependencies/dependency[artifactId=\"spring-data-build-resources\"]/version")
 	void setSharedResourcesVersion(@XBValue ArtifactVersion value);
 }
diff --git a/release-tools/src/test/java/org/springframework/data/release/build/MavenIntegrationTests.java b/release-tools/src/test/java/org/springframework/data/release/build/MavenIntegrationTests.java
index aee20f2..cb61475 100644
--- a/release-tools/src/test/java/org/springframework/data/release/build/MavenIntegrationTests.java
+++ b/release-tools/src/test/java/org/springframework/data/release/build/MavenIntegrationTests.java
@@ -15,8 +15,10 @@
  */
 package org.springframework.data.release.build;
 
+import static org.assertj.core.api.Assertions.*;
 import static org.junit.Assume.*;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
@@ -31,10 +33,12 @@ import org.springframework.data.release.io.Workspace;
 import org.springframework.data.release.model.ArtifactVersion;
 import org.springframework.data.release.model.Projects;
 import org.xmlbeam.ProjectionFactory;
+import org.xmlbeam.evaluation.XPathEvaluator;
 import org.xmlbeam.io.XBFileIO;
 
 /**
  * @author Oliver Gierke
+ * @author Mark Paluch
  */
 public class MavenIntegrationTests extends AbstractIntegrationTests {
 
@@ -64,7 +68,12 @@ public class MavenIntegrationTests extends AbstractIntegrationTests {
 		ParentPom pom = io.read(ParentPom.class);
 		pom.setSharedResourcesVersion(ArtifactVersion.of("1.2.0.RELEASE"));
 
-		System.out.println(projection.asString(pom));
+		String xml = projection.asString(pom);
+		XPathEvaluator xPathEvaluator = projection.io().stream(new ByteArrayInputStream(xml.getBytes())).evalXPath(
+				"/project/profiles/profile[id=\"distribute\"]/dependencies/dependency[artifactId=\"spring-data-build-resources\"]/version");
+
+		assertThat(xPathEvaluator.asString()).isEqualToIgnoringCase("1.2.0.RELEASE");
+
 	}
 
 	@Test
diff --git a/release-tools/src/test/resources/parent-pom.xml b/release-tools/src/test/resources/parent-pom.xml
index ee13def..610ce8d 100644
--- a/release-tools/src/test/resources/parent-pom.xml
+++ b/release-tools/src/test/resources/parent-pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<!--
 
@@ -26,14 +27,14 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-build</artifactId>
-		<version>1.6.2.BUILD-SNAPSHOT</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<name>Spring Data Build - General parent module</name>
 	<description>Global parent pom.xml to be used by Spring Data modules</description>
 	<url>http://www.spring.io/spring-data</url>
-	<inceptionYear>2011-2015</inceptionYear>
+	<inceptionYear>2011</inceptionYear>
 
 	<organization>
 		<name>Pivotal Software, Inc.</name>
@@ -59,7 +60,7 @@
 			<name>Apache License, Version 2.0</name>
 			<url>http://www.apache.org/licenses/LICENSE-2.0</url>
 			<comments>
-			Copyright 2008-2013 the original author or authors.
+				Copyright 2008-2017 the original author or authors.
 
 			Licensed under the Apache License, Version 2.0 (the "License");
 			you may not use this file except in compliance with the License.
@@ -79,29 +80,45 @@
 
 	<properties>
 
-		<bundlor.enabled>true</bundlor.enabled>
-		<bundlor.failOnWarnings>true</bundlor.failOnWarnings>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.root>${basedir}</project.root>
-		<source.level>1.6</source.level>
+		<source.level>1.8</source.level>
 		<dist.id>${project.artifactId}</dist.id>
+		<jacoco.destfile>${project.build.directory}/jacoco.exec</jacoco.destfile>
 
 		<apt>1.1.3</apt>
-		<aspectj>1.8.5</aspectj>
+		<aspectj>1.9.1</aspectj>
+		<assertj>3.11.1</assertj>
 		<cdi>1.0</cdi>
+		<commons-io>2.5</commons-io>
+		<guava>19.0</guava>
 		<hamcrest>1.3</hamcrest>
-		<jackson>2.5.1</jackson>
-		<jodatime>2.7</jodatime>
+		<jackson>2.9.7</jackson>
+		<jacoco>0.8.0</jacoco>
+		<jodatime>2.10.1</jodatime>
+		<jsonpath>2.4.0</jsonpath>
 		<junit>4.12</junit>
-		<logback>1.1.2</logback>
-		<mockito>1.10.19</mockito>
-		<querydsl>3.6.3</querydsl>
-		<slf4j>1.7.10</slf4j>
-		<spring>4.0.9.RELEASE</spring>
-		<threetenbp>1.2</threetenbp>
-		<webbeans>1.2.7</webbeans>
+		<kotlin>1.3.0</kotlin>
+		<logback>1.2.3</logback>
+		<lombok>1.18.4</lombok>
+		<mockito>2.20.0</mockito>
+		<querydsl>4.2.1</querydsl>
+		<reactor>Californium-SR3</reactor>
+		<rxjava>1.3.8</rxjava>
+		<rxjava-reactive-streams>1.2.1</rxjava-reactive-streams>
+		<rxjava2>2.2.3</rxjava2>
+		<slf4j>1.7.25</slf4j>
+		<spring>5.1.3.RELEASE</spring>
+		<spring-hateoas>0.25.0.RELEASE</spring-hateoas>
+		<threetenbp>1.3.8</threetenbp>
+		<validation>1.1.0.Final</validation>
+		<webbeans>2.0.6</webbeans>
+		<javax-annotation-api>1.3</javax-annotation-api>
 
-		<releasetrain>Fowler-BUILD-SNAPSHOT</releasetrain>
+		<releasetrain>Moore-BUILD-SNAPSHOT</releasetrain>
+
+		<!-- To be overridden by individual modules -->
+		<java-module-name/>
 
 	</properties>
 
@@ -116,6 +133,21 @@
 			<build>
 				<plugins>
 
+					<!-- Delombok sources so that generated code shows up in JavaDoc -->
+
+					<plugin>
+						<groupId>org.projectlombok</groupId>
+						<artifactId>lombok-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<phase>generate-sources</phase>
+								<goals>
+									<goal>delombok</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
@@ -135,6 +167,71 @@
 
 		</profile>
 
+		<!--
+			Profile to be run before a release is executed, currently does the following:
+
+			- Prevents thrid-party snapshot dependencies in projects
+		-->
+
+		<profile>
+			<id>pre-release</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-enforcer-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>enforce-no-third-party-snapshots</id>
+								<goals>
+									<goal>enforce</goal>
+								</goals>
+								<configuration>
+									<rules>
+										<requireReleaseDeps>
+											<failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
+											<excludes>
+												<exclude>org.springframework.data.build:*</exclude>
+												<exclude>org.springframework.data:*</exclude>
+											</excludes>
+										</requireReleaseDeps>
+									</rules>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+		<profile>
+
+			<!-- Profile for SonarCube -->
+
+			<id>sonarcube</id>
+
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.jacoco</groupId>
+						<artifactId>jacoco-maven-plugin</artifactId>
+						<version>${jacoco}</version>
+						<configuration>
+							<destFile>${jacoco.destfile}</destFile>
+						</configuration>
+						<executions>
+							<execution>
+								<id>jacoco-initialize</id>
+								<goals>
+									<goal>prepare-agent</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
 		<profile>
 
 			<!--
@@ -148,17 +245,27 @@
 
 			<properties>
 				<shared.resources>${project.build.directory}/shared-resources</shared.resources>
+				<generated-asciidoc-sources.directory>${project.build.directory}/generated-asciidoc-sources/source/
+				</generated-asciidoc-sources.directory>
+				<generated-docs.directory>${project.build.directory}/generated-docs</generated-docs.directory>
 				<maven.install.skip>true</maven.install.skip>
 				<skipTests>true</skipTests>
 			</properties>
 
 			<dependencies>
+				<dependency>
+					<groupId>io.spring.docresources</groupId>
+					<artifactId>spring-doc-resources</artifactId>
+					<version>0.1.0-BUILD-SNAPSHOT</version>
+					<type>zip</type>
+					<optional>true</optional>
+				</dependency>
 				<dependency>
 					<groupId>org.springframework.data.build</groupId>
 					<artifactId>spring-data-build-resources</artifactId>
-					<version>1.6.2.BUILD-SNAPSHOT</version>
-					<scope>provided</scope>
+					<version>2.2.0.BUILD-SNAPSHOT</version>
 					<type>zip</type>
+					<optional>true</optional>
 				</dependency>
 			</dependencies>
 
@@ -180,14 +287,37 @@
 									<goal>unpack-dependencies</goal>
 								</goals>
 								<phase>generate-resources</phase>
+								<configuration>
+									<includeGroupIds>${project.groupId}</includeGroupIds>
+									<includeArtifactIds>spring-data-build-resources</includeArtifactIds>
+									<includeTypes>zip</includeTypes>
+									<excludeTransitive>true</excludeTransitive>
+									<outputDirectory>${shared.resources}</outputDirectory>
+								</configuration>
+							</execution>
+
+							<execution>
+								<id>unpack-doc-resources</id>
+								<goals>
+									<goal>unpack-dependencies</goal>
+								</goals>
+								<phase>generate-resources</phase>
+								<configuration>
+									<includeGroupIds>io.spring.docresources</includeGroupIds>
+									<includeArtifactIds>spring-doc-resources</includeArtifactIds>
+									<includeTypes>zip</includeTypes>
+									<excludeTransitive>true</excludeTransitive>
+									<outputDirectory>${generated-asciidoc-sources.directory}</outputDirectory>
+								</configuration>
 							</execution>
 						</executions>
+					</plugin>
+
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-compiler-plugin</artifactId>
 						<configuration>
-							<includeGroupIds>${project.groupId}</includeGroupIds>
-							<includeArtifacIds>spring-data-build-resources</includeArtifacIds>
-							<includeTypes>zip</includeTypes>
-							<excludeTransitive>true</excludeTransitive>
-							<outputDirectory>${shared.resources}</outputDirectory>
+							<skip>true</skip>
 						</configuration>
 					</plugin>
 
@@ -195,6 +325,24 @@
 						Configures JavaDoc generation.
 					-->
 
+					<!-- Delombok sources so that generated code shows up in JavaDoc -->
+
+					<plugin>
+						<groupId>org.projectlombok</groupId>
+						<artifactId>lombok-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<phase>generate-sources</phase>
+								<goals>
+									<goal>delombok</goal>
+								</goals>
+								<configuration>
+									<outputDirectory>${project.root}/target/generated-sources/delombok</outputDirectory>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
@@ -205,6 +353,9 @@
 									<goal>aggregate</goal>
 								</goals>
 								<phase>package</phase>
+								<configuration>
+									<outputDirectory>${project.root}/target/site/apidocs</outputDirectory>
+								</configuration>
 							</execution>
 						</executions>
 					</plugin>
@@ -215,8 +366,8 @@
 					-->
 
 					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
-						<version>1.7</version>
 						<executions>
 
 							<execution>
@@ -224,12 +375,6 @@
 								<phase>generate-resources</phase>
 								<configuration>
 									<target>
-										<copy todir="${project.root}/target/site/reference/html">
-											<fileset dir="${shared.resources}/asciidoc" erroronmissingdir="false">
-												<include name="**/*.css"/>
-											</fileset>
-											<flattenmapper/>
-										</copy>
 										<copy todir="${project.root}/target/site/reference/html/images">
 											<fileset dir="${basedir}/src/main/asciidoc" erroronmissingdir="false">
 												<include name="**/*.png"/>
@@ -247,7 +392,7 @@
 
 							<execution>
 								<id>collect-schema-files</id>
-								<phase>process-resources</phase>
+								<phase>prepare-package</phase>
 								<configuration>
 									<target>
 										<copy todir="${project.build.directory}/schemas">
@@ -264,12 +409,62 @@
 							</execution>
 
 							<execution>
-								<id>rename-reference-docs</id>
+								<id>create-generated-docs-resources</id>
 								<phase>process-resources</phase>
 								<configuration>
 									<target>
-										<copy failonerror="false" file="${project.build.directory}/generated-docs/index.pdf" tofile="${project.root}/target/site/reference/pdf/${dist.id}-reference.pdf"/>
-										<copy failonerror="false" file="${project.build.directory}/generated-docs/index.epub" tofile="${project.root}/target/site/reference/epub/${dist.id}-reference.epub"/>
+										<copy failonerror="false" todir="${generated-asciidoc-sources.directory}/">
+											<fileset dir="${project.root}/src/main/asciidoc" includes="**/*.adoc"/>
+										</copy>
+										<copy failonerror="false"
+											  todir="${generated-asciidoc-sources.directory}/images/">
+											<fileset dir="${project.root}/src/main/asciidoc/images"/>
+										</copy>
+
+										<copy todir="${generated-docs.directory}">
+											<fileset dir="${generated-asciidoc-sources.directory}">
+												<include name="css/**"/>
+												<include name="js/**"/>
+											</fileset>
+										</copy>
+									</target>
+								</configuration>
+								<goals>
+									<goal>run</goal>
+								</goals>
+							</execution>
+
+							<execution>
+								<id>rename-reference-docs</id>
+								<phase>prepare-package</phase>
+								<configuration>
+									<target>
+
+										<!-- Copy files for the single-file HTML version -->
+										<copy failonerror="false"
+											  todir="${project.root}/target/site/reference/html/images">
+											<fileset dir="${generated-docs.directory}/images"/>
+										</copy>
+
+										<copy failonerror="false" todir="${project.root}/target/site/reference/html/">
+											<fileset dir="${generated-asciidoc-sources.directory}">
+												<include name="css/**"/>
+												<include name="js/**"/>
+											</fileset>
+										</copy>
+
+										<copy failonerror="false" todir="${project.root}/target/site/reference/html/">
+											<fileset dir="${generated-docs.directory}" includes="*.html"/>
+										</copy>
+
+										<!-- Copy and rename the Epub file -->
+										<copy failonerror="false" file="${generated-docs.directory}/index.pdf"
+											  tofile="${project.root}/target/site/reference/pdf/${dist.id}-reference.pdf"/>
+
+										<!-- Copy and rename the PDF file -->
+										<copy failonerror="false" file="${generated-docs.directory}/index.epub"
+											  tofile="${project.root}/target/site/reference/epub/${dist.id}-reference.epub"/>
+
 									</target>
 								</configuration>
 								<goals>
@@ -293,72 +488,87 @@
 						<plugin>
 							<groupId>org.asciidoctor</groupId>
 							<artifactId>asciidoctor-maven-plugin</artifactId>
-							<version>1.5.2</version>
 							<dependencies>
 								<dependency>
 									<groupId>org.asciidoctor</groupId>
 									<artifactId>asciidoctorj-pdf</artifactId>
-									<version>1.5.0-alpha.6</version>
+									<version>1.5.0-alpha.16</version>
 								</dependency>
 								<dependency>
 									<groupId>org.asciidoctor</groupId>
 									<artifactId>asciidoctorj-epub3</artifactId>
-									<version>1.5.0-alpha.4</version>
+									<version>1.5.0-alpha.8.1</version>
 								</dependency>
 							</dependencies>
 							<executions>
 
 								<execution>
 									<id>html</id>
-									<phase>generate-resources</phase>
+									<phase>compile</phase>
 									<goals>
 										<goal>process-asciidoc</goal>
 									</goals>
 									<configuration>
+										<sourceDirectory>${generated-asciidoc-sources.directory}</sourceDirectory>
+										<sourceDocumentName>index.adoc</sourceDocumentName>
 										<backend>html5</backend>
-										<outputDirectory>${project.root}/target/site/reference/html</outputDirectory>
-										<sectids>false</sectids>
-										<sourceHighlighter>prettify</sourceHighlighter>
+										<outputDirectory>${generated-docs.directory}</outputDirectory>
+										<sourceHighlighter>highlight.js</sourceHighlighter>
 										<attributes>
+											<highlightjsdir>js/highlight</highlightjsdir>
+											<highlightjs-theme>atom-one-dark-reasonable</highlightjs-theme>
 											<linkcss>true</linkcss>
-											<icons>font</icons>
 											<sectanchors>true</sectanchors>
+											<stylesdir>./css</stylesdir>
 											<stylesheet>spring.css</stylesheet>
+											<toc>left</toc>
 										</attributes>
 									</configuration>
 								</execution>
 
+								<!-- Requires a fix to Lombok/Javadoc generation first otherwise build duration explodes
 								<execution>
 									<id>epub</id>
-									<phase>generate-resources</phase>
+									<phase>compile</phase>
 									<goals>
 										<goal>process-asciidoc</goal>
 									</goals>
 									<configuration>
+										<sourceDirectory>${generated-asciidoc-sources.directory}</sourceDirectory>
+										<sourceDocumentName>index.adoc</sourceDocumentName>
 										<backend>epub3</backend>
+										<outputDirectory>${generated-docs.directory}</outputDirectory>
 										<sourceHighlighter>coderay</sourceHighlighter>
 									</configuration>
 								</execution>
 
 								<execution>
 									<id>pdf</id>
-									<phase>generate-resources</phase>
+									<phase>compile</phase>
 									<goals>
 										<goal>process-asciidoc</goal>
 									</goals>
 									<configuration>
+										<sourceDirectory>${generated-asciidoc-sources.directory}</sourceDirectory>
+										<sourceDocumentName>index.adoc</sourceDocumentName>
 										<backend>pdf</backend>
+										<outputDirectory>${generated-docs.directory}</outputDirectory>
 										<sourceHighlighter>coderay</sourceHighlighter>
 									</configuration>
 								</execution>
 
+								 -->
+
 							</executions>
 
 							<configuration>
-								<sourceDirectory>${project.root}/src/main/asciidoc</sourceDirectory>
-								<sourceDocumentName>index.adoc</sourceDocumentName>
 								<doctype>book</doctype>
 								<attributes>
+									<doctype>book</doctype>
+									<docinfo>shared</docinfo>
+									<icons>font</icons>
+									<sectids>false</sectids>
+									<imagesdir>images</imagesdir>
 									<version>${project.version}</version>
 									<projectName>${project.name}</projectName>
 									<projectVersion>${project.version}</projectVersion>
@@ -367,7 +577,7 @@
 									<springVersion>${spring}</springVersion>
 									<releasetrainVersion>${releasetrain}</releasetrainVersion>
 									<allow-uri-read>true</allow-uri-read>
-									<toclevels>3</toclevels>
+									<toclevels>4</toclevels>
 									<numbered>true</numbered>
 								</attributes>
 							</configuration>
@@ -380,7 +590,6 @@
 						<plugin>
 							<groupId>org.apache.maven.plugins</groupId>
 							<artifactId>maven-assembly-plugin</artifactId>
-							<version>2.4</version>
 							<executions>
 								<execution>
 									<id>static</id>
@@ -402,9 +611,10 @@
 						<plugin>
 							<groupId>org.codehaus.mojo</groupId>
 							<artifactId>wagon-maven-plugin</artifactId>
-							<version>1.0-beta-5</version>
 							<configuration>
 								<fromDir>${project.build.directory}</fromDir>
+								<serverId>static-dot-s2</serverId>
+								<url>scp://docs.af.pivotal.io</url>
 							</configuration>
 							<executions>
 
@@ -419,9 +629,9 @@
 									<configuration>
 										<fromDir>${project.root}/target/schemas</fromDir>
 										<includes>*.xsd,.autoschemaln</includes>
-										<serverId>static-dot-s2</serverId>
-										<url>scp://static.springsource.org</url>
-										<toDir>/var/www/domains/springsource.org/www/htdocs/autorepo/schema/${dist.id}/${project.version}</toDir>
+										<toDir>
+											/var/www/domains/spring.io/www/htdocs/autorepo/schema/${dist.id}/${project.version}
+										</toDir>
 										<optimize>true</optimize>
 									</configuration>
 								</execution>
@@ -437,68 +647,75 @@
 									<configuration>
 										<fromDir>${project.build.directory}/static-resources</fromDir>
 										<includes>**</includes>
-										<serverId>static-dot-s2</serverId>
-										<url>scp://static.springsource.org</url>
-										<toDir>/var/www/domains/springsource.org/www/htdocs/autorepo/docs/${dist.id}/${project.version}</toDir>
+										<toDir>
+											/var/www/domains/spring.io/www/htdocs/autorepo/docs/${dist.id}/${project.version}
+										</toDir>
 										<optimize>true</optimize>
 									</configuration>
 								</execution>
+
+								<!-- Makes sure resources can be overriden by others -->
+								<execution>
+									<id>make-resources-group-writable</id>
+									<phase>deploy</phase>
+									<goals>
+										<goal>sshexec</goal>
+									</goals>
+									<configuration> <!-- Prevent reformatting, wrap with CDATA -->
+										<commands>
+											<command>
+												<![CDATA[
+													 if [ -d /var/www/domains/spring.io/www/htdocs/autorepo/schema/${dist.id}/${project.version}/ ]
+													 then
+														find /var/www/domains/spring.io/www/htdocs/autorepo/schema/${dist.id}/${project.version}/ ! -perm -g=w -exec chmod g+w {} \;
+													 fi
+													]]>
+											</command>
+											<command>
+												<![CDATA[
+													 if [ -d /var/www/domains/spring.io/www/htdocs/autorepo/docs/${dist.id}/${project.version}/ ]
+													 then
+														find /var/www/domains/spring.io/www/htdocs/autorepo/docs/${dist.id}/${project.version}/ ! -perm -g=w -exec chmod g+w {} \;
+													 fi
+													]]>
+											</command>
+										</commands>
+									</configuration>
+								</execution>
+
 							</executions>
 						</plugin>
 
+						<plugin>
+							<groupId>org.apache.maven.plugins</groupId>
+							<artifactId>maven-deploy-plugin</artifactId>
+							<configuration>
+								<skip>true</skip>
+							</configuration>
+						</plugin>
+
 					</plugins>
 				</pluginManagement>
 			</build>
 		</profile>
 
 		<profile>
-
-			<id>spring41</id>
-
+			<id>spring5-next</id>
 			<properties>
-				<spring>4.1.6.RELEASE</spring>
+				<spring>5.1.4.BUILD-SNAPSHOT</spring>
 			</properties>
-
-		</profile>
-
-		<profile>
-
-			<id>spring41-next</id>
-
-			<properties>
-				<spring>4.1.7.BUILD-SNAPSHOT</spring>
-			</properties>
-
 			<repositories>
 				<repository>
 					<id>spring-libs-snapshot</id>
-					<url>http://repo.spring.io/libs-snapshot</url>
+					<url>https://repo.spring.io/libs-snapshot</url>
 				</repository>
 			</repositories>
-
-		</profile>
-
-		<profile>
-
-			<id>spring42-next</id>
-
-			<properties>
-				<spring>4.2.0.BUILD-SNAPSHOT</spring>
-			</properties>
-
-			<repositories>
-				<repository>
-					<id>spring-libs-snapshot</id>
-					<url>http://repo.spring.io/libs-snapshot</url>
-				</repository>
-			</repositories>
-
 		</profile>
 
 		<profile>
 			<id>querydsl-next</id>
 			<properties>
-				<querydsl>3.6.2.BUILD-SNAPSHOT</querydsl>
+				<querydsl>4.1.4.BUILD-SNAPSHOT</querydsl>
 			</properties>
 			<repositories>
 				<repository>
@@ -512,6 +729,13 @@
 
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>io.projectreactor</groupId>
+				<artifactId>reactor-bom</artifactId>
+				<version>${reactor}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-framework-bom</artifactId>
@@ -519,6 +743,13 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>com.fasterxml.jackson</groupId>
+				<artifactId>jackson-bom</artifactId>
+				<version>${jackson}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
@@ -553,6 +784,13 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>${assertj}</version>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
@@ -566,13 +804,6 @@
 			<version>${slf4j}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<version>${slf4j}</version>
-			<scope>runtime</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
@@ -580,6 +811,14 @@
 			<scope>test</scope>
 		</dependency>
 
+		<!-- Lombok -->
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>${lombok}</version>
+			<optional>true</optional>
+		</dependency>
+
 	</dependencies>
 
 	<build>
@@ -588,7 +827,7 @@
 			<extension>
 				<groupId>org.apache.maven.wagon</groupId>
 				<artifactId>wagon-ssh</artifactId>
-				<version>2.5</version>
+				<version>2.12</version>
 			</extension>
 		</extensions>
 
@@ -605,15 +844,96 @@
 			<plugins>
 
 				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>wagon-maven-plugin</artifactId>
-					<version>1.0-beta-5</version>
+					<groupId>org.asciidoctor</groupId>
+					<artifactId>asciidoctor-maven-plugin</artifactId>
+					<version>1.5.7.1</version>
 				</plugin>
 
 				<plugin>
-					<groupId>org.asciidoctor</groupId>
-					<artifactId>asciidoctor-maven-plugin</artifactId>
-					<version>0.1.4</version>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-antrun-plugin</artifactId>
+					<version>1.8</version>
+				</plugin>
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-assembly-plugin</artifactId>
+					<version>3.0.0</version>
+				</plugin>
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>3.6.1</version>
+				</plugin>
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-dependency-plugin</artifactId>
+					<version>3.0.0</version>
+				</plugin>
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<version>2.8.2</version>
+				</plugin>
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-enforcer-plugin</artifactId>
+					<version>1.4.1</version>
+				</plugin>
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-failsafe-plugin</artifactId>
+					<version>2.19.1</version>
+				</plugin>
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-jar-plugin</artifactId>
+					<version>3.0.2</version>
+				</plugin>
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-javadoc-plugin</artifactId>
+					<version>3.0.0</version>
+				</plugin>
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-source-plugin</artifactId>
+					<version>3.0.1</version>
+				</plugin>
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.19.1</version>
+					<configuration>
+						<useSystemClassLoader>false</useSystemClassLoader>
+					</configuration>
+				</plugin>
+
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>build-helper-maven-plugin</artifactId>
+					<version>3.0.0</version>
+				</plugin>
+
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>wagon-maven-plugin</artifactId>
+					<version>1.0</version>
+				</plugin>
+
+				<plugin>
+					<groupId>org.projectlombok</groupId>
+					<artifactId>lombok-maven-plugin</artifactId>
+					<version>1.18.4.0</version>
 				</plugin>
 
 			</plugins>
@@ -625,24 +945,83 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.8</version>
+			</plugin>
+
+			<plugin>
+				<artifactId>kotlin-maven-plugin</artifactId>
+				<groupId>org.jetbrains.kotlin</groupId>
+				<version>${kotlin}</version>
+				<configuration>
+					<jvmTarget>${source.level}</jvmTarget>
+				</configuration>
+				<executions>
+					<execution>
+						<id>compile</id>
+						<phase>compile</phase>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+						<configuration>
+							<sourceDirs>
+								<sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
+								<sourceDir>${project.basedir}/src/main/java</sourceDir>
+							</sourceDirs>
+						</configuration>
+					</execution>
+					<execution>
+						<id>test-compile</id>
+						<phase>test-compile</phase>
+						<goals>
+							<goal>test-compile</goal>
+						</goals>
+						<configuration>
+							<sourceDirs>
+								<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
+								<sourceDir>${project.basedir}/src/test/java</sourceDir>
+							</sourceDirs>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
 				<configuration>
 					<source>${source.level}</source>
 					<target>${source.level}</target>
 				</configuration>
+				<executions>
+					<execution>
+						<id>default-compile</id>
+						<phase>none</phase>
+					</execution>
+					<execution>
+						<id>default-testCompile</id>
+						<phase>none</phase>
+					</execution>
+					<execution>
+						<id>java-compile</id>
+						<phase>compile</phase>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>java-test-compile</id>
+						<phase>test-compile</phase>
+						<goals>
+							<goal>testCompile</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.17</version>
 				<configuration>
+					<useSystemClassLoader>false</useSystemClassLoader>
 					<useFile>false</useFile>
 					<includes>
 						<include>**/*Tests.java</include>
@@ -653,15 +1032,20 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
 				<configuration>
-					<useDefaultManifestFile>true</useDefaultManifestFile>
+					<archive>
+						<manifestEntries>
+							<Implementation-Title>${project.name}</Implementation-Title>
+							<Implementation-Version>${project.version}</Implementation-Version>
+							<Automatic-Module-Name>${java-module-name}</Automatic-Module-Name>
+						</manifestEntries>
+					</archive>
 				</configuration>
 			</plugin>
 
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>2.2.1</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -673,27 +1057,36 @@
 			</plugin>
 
 			<plugin>
-				<groupId>com.springsource.bundlor</groupId>
-				<artifactId>com.springsource.bundlor.maven</artifactId>
-				<version>1.0.0.RELEASE</version>
-				<configuration>
-					<enabled>${bundlor.enabled}</enabled>
-					<failOnWarnings>${bundlor.failOnWarnings}</failOnWarnings>
-				</configuration>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>bundlor</id>
+						<id>add-kotlin-source</id>
+						<phase>prepare-package</phase>
 						<goals>
-							<goal>bundlor</goal>
+							<goal>add-source</goal>
 						</goals>
+						<configuration>
+							<sources>
+								<source>${project.basedir}/src/main/kotlin</source>
+							</sources>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
 
+			<plugin>
+				<groupId>org.projectlombok</groupId>
+				<artifactId>lombok-maven-plugin</artifactId>
+				<configuration>
+					<addOutputDirectory>false</addOutputDirectory>
+					<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
+				</configuration>
+			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.9.1</version>
 				<configuration>
 					<breakiterator>true</breakiterator>
 					<header>${project.name}</header>
@@ -704,22 +1097,36 @@
 					<stylesheetfile>${shared.resources}/javadoc/spring-javadoc.css</stylesheetfile>
 					<!-- copies doc-files subdirectory which contains image resources -->
 					<docfilessubdirs>true</docfilessubdirs>
-					<additionalparam>-Xdoclint:none</additionalparam>
+					<additionalJOptions>
+						<additionalJOption>-Xdoclint:none</additionalJOption>
+					</additionalJOptions>
+					<sourcepath>target/generated-sources/delombok</sourcepath>
 					<links>
-						<link>http://docs.spring.io/spring/docs/3.2.x/javadoc-api/</link>
-						<link>http://docs.spring.io/spring-data/data-commons/docs/current/api/</link>
-						<link>http://docs.oracle.com/javase/6/docs/api</link>
+						<link>https://docs.spring.io/spring/docs/5.0.x/javadoc-api/</link>
+						<link>https://docs.spring.io/spring-data/commons/docs/current/api/</link>
+						<link>https://docs.oracle.com/javase/8/docs/api/</link>
 					</links>
 				</configuration>
 			</plugin>
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8.1</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
+				<artifactId>maven-enforcer-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>enforce-maven-version</id>
+						<goals>
+							<goal>enforce</goal>
+						</goals>
+						<configuration>
+							<rules>
+								<requireMavenVersion>
+									<version>3.5.0</version>
+								</requireMavenVersion>
+							</rules>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 
 		</plugins>
@@ -727,11 +1134,8 @@
 
 	<repositories>
 		<repository>
-			<id>spring-libs-release</id>
-			<url>https://repo.spring.io/libs-release</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
+			<id>spring-libs-snapshot</id>
+			<url>https://repo.spring.io/libs-snapshot</url>
 		</repository>
 	</repositories>
 
@@ -740,6 +1144,10 @@
 			<id>spring-plugins-release</id>
 			<url>https://repo.spring.io/plugins-release</url>
 		</pluginRepository>
+		<pluginRepository>
+			<id>spring-libs-milestone</id>
+			<url>https://repo.spring.io/libs-milestone</url>
+		</pluginRepository>
 	</pluginRepositories>
 
 </project>