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 97e84bb NO-JIRA Fix test security resources copy
97e84bb is described below
commit 97e84bb0d12cd2ce51571032ec3a946a97e6589d
Author: Domenico Francesco Bruscino <[email protected]>
AuthorDate: Wed Sep 1 18:35:11 2021 +0200
NO-JIRA Fix test security resources copy
---
tests/integration-tests/pom.xml | 24 +++++++++++++++++++++---
tests/pom.xml | 1 +
tests/smoke-tests/pom.xml | 26 +++++++++++++++++++++-----
tests/unit-tests/pom.xml | 26 +++++++++++++++++++++-----
4 files changed, 64 insertions(+), 13 deletions(-)
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index 11f43ab..6cca016 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -474,12 +474,30 @@
<exclude>**/rest/*.xml</exclude>
</excludes>
</testResource>
- <testResource>
- <directory>../security-resources</directory>
- </testResource>
</testResources>
<plugins>
<plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven-resources-plugin-version}</version>
+ <executions>
+ <execution>
+ <id>copy-security-resources</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${basedir}/target/test-classes</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../security-resources</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
diff --git a/tests/pom.xml b/tests/pom.xml
index 86cfcad..eb0a2de 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -29,6 +29,7 @@
<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 c1f22b7..bf17bee 100644
--- a/tests/smoke-tests/pom.xml
+++ b/tests/smoke-tests/pom.xml
@@ -200,13 +200,29 @@
</dependencies>
<build>
- <testResources>
- <testResource>
- <directory>../security-resources</directory>
- </testResource>
- </testResources>
<plugins>
<plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven-resources-plugin-version}</version>
+ <executions>
+ <execution>
+ <id>copy-security-resources</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${basedir}/target/test-classes</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../security-resources</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-maven-plugin</artifactId>
<executions>
diff --git a/tests/unit-tests/pom.xml b/tests/unit-tests/pom.xml
index 01a1657..788652f 100644
--- a/tests/unit-tests/pom.xml
+++ b/tests/unit-tests/pom.xml
@@ -178,13 +178,29 @@
</dependencies>
<build>
- <testResources>
- <testResource>
- <directory>../security-resources</directory>
- </testResource>
- </testResources>
<plugins>
<plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven-resources-plugin-version}</version>
+ <executions>
+ <execution>
+ <id>copy-security-resources</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${basedir}/target/test-classes</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../security-resources</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
