From 4eb2d60aa9f1a0eef1ee591dbaccb81c061f1ee0 Mon Sep 17 00:00:00 2001
From: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
Date: Wed, 15 May 2024 12:17:07 +0200
Subject: [PATCH 1/2] 4.x: helidon-common sources JAR contains absolute paths
 #8761

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
---
 common/common/pom.xml | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/common/common/pom.xml b/common/common/pom.xml
index 19137590ee6..530af8e6115 100644
--- a/common/common/pom.xml
+++ b/common/common/pom.xml
@@ -42,17 +42,6 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>src/main/templates</directory>
-                <filtering>true</filtering>
-                <targetPath>${project.build.directory}/generated-sources/templates</targetPath>
-            </resource>
-        </resources>
-
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -66,7 +55,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>${project.build.directory}/generated-sources/templates</source>
+                                <source>src/main/java</source>
+                                <source>src/main/templates</source>
                             </sources>
                         </configuration>
                     </execution>

From 0f5cc15a2792d737976ac46a04ca6317e5ec1de8 Mon Sep 17 00:00:00 2001
From: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
Date: Thu, 16 May 2024 07:09:21 +0200
Subject: [PATCH 2/2] Find other solution

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
---
 common/common/pom.xml | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/common/common/pom.xml b/common/common/pom.xml
index 530af8e6115..c415ee7680a 100644
--- a/common/common/pom.xml
+++ b/common/common/pom.xml
@@ -43,6 +43,27 @@
 
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/generated-sources/templates</outputDirectory>
+                            <resources>          
+                                <resource>
+                                    <directory>src/main/templates</directory>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>              
+                        </configuration>            
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
@@ -55,13 +76,12 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>src/main/java</source>
-                                <source>src/main/templates</source>
+                                <source>${project.build.directory}/generated-sources/templates</source>
                             </sources>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-        </plugins>
+      </plugins>
     </build>
 </project>