From 1083d8533da0f79a9f07b661a7b193a220bd44b5 Mon Sep 17 00:00:00 2001
From: Matt Pavlovich <matt@hyte.io>
Date: Tue, 4 Apr 2023 09:43:05 -0500
Subject: [PATCH] [AMQ-9237] Add META-INF/services to activemq-client-jakarta
 (#995)

(cherry picked from commit f8695b59f37f561b90140045290bcac08333256d)
---
 activemq-client-jakarta/pom.xml | 35 ++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/activemq-client-jakarta/pom.xml b/activemq-client-jakarta/pom.xml
index a31256ffcc..a89b71dddd 100644
--- a/activemq-client-jakarta/pom.xml
+++ b/activemq-client-jakarta/pom.xml
@@ -88,7 +88,7 @@
                                     <classifier>sources</classifier>
                                     <type>jar</type>
                                     <outputDirectory>${project.build.directory}/copied-sources/activemq-client</outputDirectory>
-                                    <excludes>**/META-INF/**,**/zeroconf/**</excludes>
+                                    <excludes>**/META-INF/*,**/META-INF/maven/**,**/zeroconf/**</excludes>
                                     <includes>**/**</includes>
                                 </artifactItem>
                             </artifactItems>
@@ -122,7 +122,7 @@
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>copy-resources</id>
+                        <id>copy-java-source</id>
                         <phase>generate-sources</phase>
                         <goals>
                             <goal>copy-resources</goal>
@@ -131,7 +131,22 @@
                             <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>${project.build.directory}/copied-sources/activemq-client</directory>
+                                    <directory>${project.build.directory}/copied-sources/activemq-client/org</directory>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/generated-resources/META-INF</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${project.build.directory}/copied-sources/activemq-client/META-INF</directory>
                                 </resource>
                             </resources>
                         </configuration>
@@ -154,6 +169,20 @@
                             </sources>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>add-resource</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>add-resource</goal>
+                        </goals>
+                        <configuration>
+                          <resources>
+                            <resource>
+                              <directory>${project.build.directory}/generated-resources</directory>
+                            </resource>
+                          </resources>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>