From bd23fef5daed7e955485ea656a71c7d8a79e444e Mon Sep 17 00:00:00 2001
From: Robbie Gemmell <robbie@apache.org>
Date: Thu, 17 Feb 2022 18:04:25 +0000
Subject: [PATCH] AMQ-7442: resolve immediate build warnings due to duplicate
 plugin config.

Combines duplicate plugin entries following fc80b86ac68432f71a1015ee9588a0b6fcb5fbae changes.
---
 activemq-karaf/pom.xml | 46 +++++++++++++++++++-----------------------
 activemq-osgi/pom.xml  | 24 +++++++---------------
 2 files changed, 28 insertions(+), 42 deletions(-)

diff --git a/activemq-karaf/pom.xml b/activemq-karaf/pom.xml
index e6b637309e..7f21cc4af7 100644
--- a/activemq-karaf/pom.xml
+++ b/activemq-karaf/pom.xml
@@ -149,6 +149,27 @@
         <artifactId>maven-bundle-plugin</artifactId>
         <inherited>true</inherited>
         <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+            <Export-Package>org.apache.activemq.karaf*;version=${project.version};-split-package:=merge-first</Export-Package>
+            <Import-Package>
+              !com.google.errorprone.annotations,
+              !com.google.errorprone.annotations.concurrent,
+              org.apache.felix.gogo.commands,
+              org.apache.karaf.shell.console;version="[2,4)",
+              org.apache.karaf.shell.console.commands;version="[2,4)",
+              *
+            </Import-Package>
+            <Private-Package>
+              com.google.errorprone.annotations,
+              com.google.errorprone.annotations.concurrent
+            </Private-Package>
+            <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+            <Embed-Transitive>true</Embed-Transitive>
+            <_noee>true</_noee>
+          </instructions>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -205,31 +226,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.apache.activemq.karaf*;version=${project.version};-split-package:=merge-first</Export-Package>
-            <Import-Package>
-              !com.google.errorprone.annotations,
-              !com.google.errorprone.annotations.concurrent,
-              org.apache.felix.gogo.commands,
-              org.apache.karaf.shell.console;version="[2,4)",
-              org.apache.karaf.shell.console.commands;version="[2,4)",
-              *
-            </Import-Package>
-            <Private-Package>
-              com.google.errorprone.annotations,
-              com.google.errorprone.annotations.concurrent
-            </Private-Package>
-            <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
-            <Embed-Transitive>true</Embed-Transitive>
-            <_noee>true</_noee>
-          </instructions>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 76468d9213..821e055c84 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -140,6 +140,13 @@
         <inherited>true</inherited>
         <configuration>
           <instructions>
+            <Bundle-Activator>org.apache.activemq.util.osgi.Activator</Bundle-Activator>
+            <Embed-Dependency>
+              *;groupId=org.apache.activemq;inline=META-INF/services/*,
+              *;groupId=org.apache.qpid;inline=META-INF/services/*,
+              *;groupId=org.apache.xbean;inline=true
+            </Embed-Dependency>
+            <Embed-Transitive>true</Embed-Transitive>
             <Export-Package>
               org.apache.activemq*;version=${project.version};-noimport:=true;-split-package:=merge-first,
               org.apache.activemq.web*;version=${project.version};-noimport:=true;-split-package:=merge-first
@@ -284,23 +291,6 @@
           </execution>
         </executions>
       </plugin>
-
-
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-Activator>org.apache.activemq.util.osgi.Activator</Bundle-Activator>
-            <Embed-Dependency>
-              *;groupId=org.apache.activemq;inline=META-INF/services/*,
-              *;groupId=org.apache.qpid;inline=META-INF/services/*,
-              *;groupId=org.apache.xbean;inline=true
-            </Embed-Dependency>
-            <Embed-Transitive>true</Embed-Transitive>
-         </instructions>
-        </configuration>
-      </plugin>
     </plugins>
     <pluginManagement>
     	<plugins>