From acaf1a60a0bbddf7e8679c39de050bcceaa9a8a7 Mon Sep 17 00:00:00 2001
From: Gunnar Morling <gunnar.morling@googlemail.com>
Date: Thu, 27 Nov 2014 20:43:58 +0100
Subject: [PATCH] Configuring all executions of dependency plug-in in one
 block; Making sure JavaDoc can reference FreeMarker classes

---
 distribution/pom.xml |  5 +++++
 processor/pom.xml    | 40 +++++++++++++++++-----------------------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/distribution/pom.xml b/distribution/pom.xml
index 651f735af..0f74b32b9 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -46,6 +46,11 @@
             <groupId>org.mapstruct</groupId>
             <artifactId>mapstruct-processor</artifactId>
         </dependency>
+        <!-- Needed here so references to FreeMarker classes can be resolved during JavaDoc generation -->
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/processor/pom.xml b/processor/pom.xml
index 8e8ed6635..3581c58f3 100644
--- a/processor/pom.xml
+++ b/processor/pom.xml
@@ -99,29 +99,6 @@
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>unpack-freemarker-license</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.freemarker</groupId>
-                                    <artifactId>freemarker</artifactId>
-                                    <outputDirectory>${project.build.directory}/classes/META-INF/freemarker</outputDirectory>
-                                    <includes>META-INF/LICENSE.txt,META-INF/NOTICE.txt</includes>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
@@ -179,6 +156,23 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
+                    <execution>
+                        <id>unpack-freemarker-license</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.freemarker</groupId>
+                                    <artifactId>freemarker</artifactId>
+                                    <outputDirectory>${project.build.directory}/classes/META-INF/freemarker</outputDirectory>
+                                    <includes>META-INF/LICENSE.txt,META-INF/NOTICE.txt</includes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
                     <execution>
                         <id>copy</id>
                         <phase>generate-test-resources</phase>