diff --git a/parent/pom.xml b/parent/pom.xml
index 05fe46f4..949af8e8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -269,7 +269,7 @@
 								<goals>
 									<goal>unpack-dependencies</goal>
 								</goals>
-								<phase>generate-resources</phase>
+								<phase>prepare-package</phase>
 							</execution>
 						</executions>
 						<configuration>
@@ -296,6 +296,9 @@
 								<goals>
 									<goal>delombok</goal>
 								</goals>
+								<configuration>
+									<outputDirectory>${project.root}/target/generated-sources/delombok</outputDirectory>
+								</configuration>
 							</execution>
 						</executions>
 					</plugin>
@@ -310,6 +313,9 @@
 									<goal>aggregate</goal>
 								</goals>
 								<phase>package</phase>
+								<configuration>
+									<outputDirectory>${project.root}/target/site/apidocs</outputDirectory>
+								</configuration>
 							</execution>
 						</executions>
 					</plugin>
@@ -352,7 +358,7 @@
 
 							<execution>
 								<id>collect-schema-files</id>
-								<phase>process-resources</phase>
+								<phase>prepare-package</phase>
 								<configuration>
 									<target>
 										<copy todir="${project.build.directory}/schemas">
@@ -370,7 +376,7 @@
 
 							<execution>
 								<id>rename-reference-docs</id>
-								<phase>process-resources</phase>
+								<phase>package</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"/>
@@ -414,7 +420,7 @@
 
 								<execution>
 									<id>html</id>
-									<phase>generate-resources</phase>
+									<phase>prepare-package</phase>
 									<goals>
 										<goal>process-asciidoc</goal>
 									</goals>
@@ -432,9 +438,10 @@
 									</configuration>
 								</execution>
 
+<!--
 								<execution>
 									<id>epub</id>
-									<phase>generate-resources</phase>
+									<phase>prepare-package</phase>
 									<goals>
 										<goal>process-asciidoc</goal>
 									</goals>
@@ -446,7 +453,7 @@
 
 								<execution>
 									<id>pdf</id>
-									<phase>generate-resources</phase>
+									<phase>prepare-package</phase>
 									<goals>
 										<goal>process-asciidoc</goal>
 									</goals>
@@ -454,7 +461,7 @@
 										<backend>pdf</backend>
 										<sourceHighlighter>coderay</sourceHighlighter>
 									</configuration>
-								</execution>
+								</execution>-->
 
 							</executions>
 
@@ -803,7 +810,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>2.10.4</version>
+					<version>3.0.0</version>
 				</plugin>
 
 				<plugin>
@@ -929,7 +936,7 @@
 					<stylesheetfile>${shared.resources}/javadoc/spring-javadoc.css</stylesheetfile>
 					<!-- copies doc-files subdirectory which contains image resources -->
 					<docfilessubdirs>true</docfilessubdirs>
-					<additionalparam>-Xdoclint:none</additionalparam>
+					<additionalJOptions>-Xdoclint:none</additionalJOptions>
 					<links>
 						<link>https://docs.spring.io/spring/docs/4.3.x/javadoc-api/</link>
 						<link>https://docs.spring.io/spring-data/commons/docs/current/api/</link>