From 185f88e19bed36dd40c47169b03f761964324d68 Mon Sep 17 00:00:00 2001
From: Peter Vigier <peter.vigier@bosch-si.com>
Date: Tue, 5 Mar 2019 17:49:10 +0100
Subject: [PATCH] Added `/target/generated-sources/apt` to resources for maven
 and m2e (#802)

* Added `/target/generated-sources/apt` to resources for maven and m2e

Additionally it was needed to use the `build-helper-maven-plugin`, as
m2e would otherwise exclude by default all sources from the additional
source folder (s. https://stackoverflow.com/a/7759911 )

Signed-off-by: Peter Vigier <Peter.Vigier@bosch-si.com>

* Removed resource plugin configuration

For adding the apt "source" folders the build-helper plugin is enough.

Signed-off-by: Peter Vigier <Peter.Vigier@bosch-si.com>
---
 .../hawkbit-repository-jpa/pom.xml            | 33 +++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/hawkbit-repository/hawkbit-repository-jpa/pom.xml b/hawkbit-repository/hawkbit-repository-jpa/pom.xml
index ae690a44e..86e543cee 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/pom.xml
+++ b/hawkbit-repository/hawkbit-repository-jpa/pom.xml
@@ -23,8 +23,9 @@
       <javassist.version>3.20.0-GA</javassist.version>
       <jaxb.api.version>2.3.0</jaxb.api.version>
       <javax.annotation.version>1.3.1</javax.annotation.version>
+      <apt.source.dir>${project.build.directory}/generated-sources/apt/</apt.source.dir>
    </properties>
-   
+
    <dependencies>
       <!-- Hawkbit -->
       <dependency>
@@ -61,7 +62,7 @@
       <dependency>
          <groupId>cz.jirutka.rsql</groupId>
          <artifactId>rsql-parser</artifactId>
-      </dependency>      
+      </dependency>
       <dependency>
          <groupId>com.google.guava</groupId>
          <artifactId>guava</artifactId>
@@ -117,9 +118,9 @@
             </configuration>
             <dependencies>
                <dependency>
-                   <groupId>javax.xml.bind</groupId>
-                   <artifactId>jaxb-api</artifactId>
-                   <version>${jaxb.api.version}</version>
+                  <groupId>javax.xml.bind</groupId>
+                  <artifactId>jaxb-api</artifactId>
+                  <version>${jaxb.api.version}</version>
                </dependency>
                <dependency>
                   <groupId>org.eclipse.persistence</groupId>
@@ -138,7 +139,27 @@
                </dependency>
             </dependencies>
          </plugin>
+         <plugin>
+            <!-- Should be placed here below 'eclipselink-maven-plugin' as the plugin should be executed -->
+            <!-- after the code generation and the order of the plugins in the pom is relevant for maven -->
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>add-source</id>
+                  <phase>generate-sources</phase>
+                  <goals>
+                     <goal>add-source</goal>
+                  </goals>
+                  <configuration>
+                     <sources>
+                        <source>${apt.source.dir}</source>
+                     </sources>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
       </plugins>
    </build>
-   
+
 </project>