From f82cd797cb5019356b7c8b564b2d2c3a7e82e625 Mon Sep 17 00:00:00 2001
From: Robbie Gemmell <robbie@apache.org>
Date: Fri, 3 Sep 2021 12:49:59 +0100
Subject: [PATCH] NO-JIRA: undo addition of module-specific resources-plugin
 version from 97e84bb0d12cd2ce51571032ec3a946a97e6589d

Also consolidates plugin configuration to fix warning from having plugin defined multiple times
---
 tests/integration-tests/pom.xml | 15 +++++----------
 tests/pom.xml                   |  1 -
 tests/smoke-tests/pom.xml       |  1 -
 tests/unit-tests/pom.xml        |  1 -
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index 6cca016d11..e2426dc720 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -478,7 +478,11 @@
       <plugins>
          <plugin>
             <artifactId>maven-resources-plugin</artifactId>
-            <version>${maven-resources-plugin-version}</version>
+            <configuration>
+               <nonFilteredFileExtensions>
+                  <nonFilteredFileExtension>jks</nonFilteredFileExtension>
+               </nonFilteredFileExtensions>
+            </configuration>
             <executions>
                <execution>
                   <id>copy-security-resources</id>
@@ -570,15 +574,6 @@
                </execution>
             </executions>
          </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-resources-plugin</artifactId>
-            <configuration>
-               <nonFilteredFileExtensions>
-                  <nonFilteredFileExtension>jks</nonFilteredFileExtension>
-               </nonFilteredFileExtensions>
-            </configuration>
-         </plugin>
       </plugins>
    </build>
    <profiles>
diff --git a/tests/pom.xml b/tests/pom.xml
index eb0a2dea36..86cfcadbac 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -29,7 +29,6 @@
 
    <properties>
       <activemq.basedir>${project.basedir}/..</activemq.basedir>
-      <maven-resources-plugin-version>2.6</maven-resources-plugin-version>
    </properties>
 
    <dependencyManagement>
diff --git a/tests/smoke-tests/pom.xml b/tests/smoke-tests/pom.xml
index bf17bee343..1199697240 100644
--- a/tests/smoke-tests/pom.xml
+++ b/tests/smoke-tests/pom.xml
@@ -203,7 +203,6 @@
       <plugins>
          <plugin>
             <artifactId>maven-resources-plugin</artifactId>
-            <version>${maven-resources-plugin-version}</version>
             <executions>
                <execution>
                   <id>copy-security-resources</id>
diff --git a/tests/unit-tests/pom.xml b/tests/unit-tests/pom.xml
index 788652fde8..d56f7589ef 100644
--- a/tests/unit-tests/pom.xml
+++ b/tests/unit-tests/pom.xml
@@ -181,7 +181,6 @@
       <plugins>
          <plugin>
             <artifactId>maven-resources-plugin</artifactId>
-            <version>${maven-resources-plugin-version}</version>
             <executions>
                <execution>
                   <id>copy-security-resources</id>