[activemq-artemis] branch main updated: NO-JIRA: undo addition of module-specific resources-plugin version from 97e84bb0d12cd2ce51571032ec3a946a97e6589d

[clebertsuconic]

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

clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
     new f82cd79  NO-JIRA: undo addition of module-specific resources-plugin 
version from 97e84bb0d12cd2ce51571032ec3a946a97e6589d
f82cd79 is described below

commit f82cd797cb5019356b7c8b564b2d2c3a7e82e625
Author: Robbie Gemmell <rob...@apache.org>
AuthorDate: Fri Sep 3 12:49:59 2021 +0100

    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 6cca016..e2426dc 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 eb0a2de..86cfcad 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 bf17bee..1199697 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 788652f..d56f758 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>