From 59ba968cb013e25e94f9a88f22545f17374bbd86 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Tue, 9 Jan 2018 10:58:40 +0100
Subject: [PATCH] #481 - Moved JavaDoc generation to ci and distribution
 profiles.

We now refrain from creating any JavaDoc during the standard build run and rather explicitly create it when wither the ci or distribution profiles are active. Generating JavaDoc now follows the delombok step to make sure that the code generated by Lombok appears in JavaDoc.

Moved version declaration of the Lombok Maven plugin into plugin managament section, only declare the configuration globally and explicitly declare executions in the aforementioned build profiles. Tie the Lombok Maven plugin version to 1.16.18.1 in preparation of the coming upgrade to Lombok 1.16.20.
---
 parent/pom.xml | 45 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index f3eb3751..226b46a1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -132,6 +132,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>
@@ -276,6 +291,21 @@
 						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>
+							</execution>
+						</executions>
+					</plugin>
+
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
@@ -761,6 +791,12 @@
 					<version>1.4.1</version>
 				</plugin>
 
+				<plugin>
+					<groupId>org.projectlombok</groupId>
+					<artifactId>lombok-maven-plugin</artifactId>
+					<version>1.16.18.1</version>
+				</plugin>
+
 			</plugins>
 
 		</pluginManagement>
@@ -883,19 +919,10 @@
 			<plugin>
 				<groupId>org.projectlombok</groupId>
 				<artifactId>lombok-maven-plugin</artifactId>
-				<version>${lombok}.0</version>
 				<configuration>
 					<addOutputDirectory>false</addOutputDirectory>
 					<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
 				</configuration>
-				<executions>
-					<execution>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>delombok</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
 
 			<plugin>