This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git


The following commit(s) were added to refs/heads/main by this push:
     new 98a5efb3c8 Move license files to dedicated license directory in all 
shaded Spring JARs
98a5efb3c8 is described below

commit 98a5efb3c83786c39a2e43c1c7c3706d4dd44d2a
Author: James Netherton <[email protected]>
AuthorDate: Tue Mar 10 12:02:22 2026 +0000

    Move license files to dedicated license directory in all shaded Spring JARs
    
    Fixes #8405
---
 extensions-support/spring/shade/core/pom.xml | 27 ---------------------------
 extensions-support/spring/shade/pom.xml      | 27 +++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/extensions-support/spring/shade/core/pom.xml 
b/extensions-support/spring/shade/core/pom.xml
index 49ecf433c6..9da5524bc4 100644
--- a/extensions-support/spring/shade/core/pom.xml
+++ b/extensions-support/spring/shade/core/pom.xml
@@ -82,33 +82,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!--
-                 Workaround for 
https://github.com/apache/camel-quarkus/issues/7543.
-                 This module produces an artifact that does not include any 
compiled classes only license files, which causes tests to fail when the empty 
target/classes directory is detected.
-                 The workaround explicitly loads and installs the license 
files from the target/license directory.
-            -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>legal-resources</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            
<outputDirectory>${project.basedir}/target/license/</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    
<classesDirectory>${project.basedir}/target/license</classesDirectory>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/extensions-support/spring/shade/pom.xml 
b/extensions-support/spring/shade/pom.xml
index 37bcf08ff1..988407ae14 100644
--- a/extensions-support/spring/shade/pom.xml
+++ b/extensions-support/spring/shade/pom.xml
@@ -90,6 +90,33 @@
             </activation>
             <build>
                 <plugins>
+                    <!--
+                         The Spring shaded modules produce an artifact that 
does not include any compiled classes.
+                         Only license files, which causes tests to fail when 
the empty target/classes directory is detected.
+                         Hence, the license files are moved into a 
target/license directory to avoid this.
+                    -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>legal-resources</id>
+                                <phase>process-resources</phase>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <configuration>
+                                    
<outputDirectory>${project.basedir}/target/license/</outputDirectory>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <configuration>
+                            
<classesDirectory>${project.basedir}/target/license</classesDirectory>
+                        </configuration>
+                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-enforcer-plugin</artifactId>

Reply via email to