This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 4.1.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 98479ca1441ac3eedbe627bad339bd8b2850f42e Author: Andriy Redko <[email protected]> AuthorDate: Thu Jun 11 12:39:22 2026 -0400 Fix Mockito agent warnings (#3200) (cherry picked from commit 767e7614c2ee24542dcb51ba5a374b8232327f52) # Conflicts: # parent/pom.xml # rt/rs/security/oauth-parent/oauth2/pom.xml --- core/pom.xml | 13 ++++++++ .../release/samples/jax_rs/spring_boot/pom.xml | 19 +++++++++++ .../jax_rs/spring_boot_scan/application/pom.xml | 19 +++++++++++ .../main/release/samples/jaxws_spring_boot/pom.xml | 20 +++++++++++- integration/cdi/pom.xml | 17 ++++++++++ integration/jca/pom.xml | 17 ++++++++++ integration/spring-boot/autoconfigure/pom.xml | 13 ++++++++ parent/pom.xml | 3 +- rt/bindings/coloc/pom.xml | 17 ++++++++++ rt/bindings/corba/pom.xml | 13 ++++++++ rt/bindings/soap/pom.xml | 17 ++++++++++ rt/databinding/aegis/pom.xml | 13 ++++++++ rt/databinding/jaxb/pom.xml | 13 ++++++++ rt/features/metrics/pom.xml | 17 ++++++++++ rt/frontend/jaxrs/pom.xml | 15 +++++++++ rt/frontend/jaxws/pom.xml | 17 ++++++++++ rt/frontend/js/pom.xml | 17 ++++++++++ rt/management/pom.xml | 13 ++++++++ rt/rs/description/pom.xml | 13 ++++++++ rt/rs/extensions/providers/pom.xml | 17 ++++++++++ rt/rs/microprofile-client/pom.xml | 13 ++++++++ rt/rs/security/http-signature/pom.xml | 19 ++++++++++- rt/rs/security/oauth-parent/oauth2/pom.xml | 13 ++------ rt/rs/security/sso/oidc/pom.xml | 38 +++++----------------- rt/rs/sse/pom.xml | 17 ++++++++++ rt/transports/http-jetty/pom.xml | 13 ++++++++ rt/transports/http-netty/netty-server/pom.xml | 13 ++++++++ rt/transports/http-undertow/pom.xml | 13 ++++++++ rt/transports/http/pom.xml | 13 ++++++++ rt/transports/jms/pom.xml | 27 ++++++++------- rt/transports/websocket/pom.xml | 13 ++++++++ rt/ws/addr/pom.xml | 17 ++++++++++ rt/ws/policy/pom.xml | 13 ++++++++ rt/ws/rm/pom.xml | 13 ++++++++ rt/ws/security/pom.xml | 13 ++++++++ rt/ws/transfer/pom.xml | 13 ++++++++ rt/wsdl/pom.xml | 13 ++++++++ services/wsn/wsn-core/pom.xml | 14 ++------ services/xkms/xkms-x509-handlers/pom.xml | 17 ++++++++++ systests/cdi/cdi-owb/cdi-producers-owb/pom.xml | 17 ++++++++++ systests/jaxrs/pom.xml | 13 ++++++++ systests/jaxws/pom.xml | 13 ++++++++ systests/spring-boot/pom.xml | 13 ++++++++ systests/transport-hc5/pom.xml | 13 ++++++++ systests/transport-jms/pom.xml | 14 ++------ systests/transports/pom.xml | 15 +++++++-- systests/ws-transfer/pom.xml | 14 ++------ 47 files changed, 632 insertions(+), 88 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 19a431893e4..5b18bdc7a78 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -65,6 +65,7 @@ <cxf.osgi.dynamic.import> org.apache.cxf.bus,org.apache.cxf.*,com.ctc.wstx.* </cxf.osgi.dynamic.import> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -293,6 +294,18 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> <pluginManagement> <plugins> diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml index 12d986a7cc3..31733954f14 100644 --- a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml @@ -93,6 +93,25 @@ </rules> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>-javaagent:${org.mockito:mockito-core:jar}</argLine> + </configuration> + </plugin> </plugins> </build> <profiles> diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml index c69d9747440..ebc60972878 100644 --- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml @@ -107,6 +107,25 @@ </rules> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>-javaagent:${org.mockito:mockito-core:jar}</argLine> + </configuration> + </plugin> </plugins> </build> <profiles> diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml index ff47ed53dc3..90ac670d581 100644 --- a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml +++ b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml @@ -104,7 +104,6 @@ </resources> </configuration> </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> @@ -116,6 +115,25 @@ </rules> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>-javaagent:${org.mockito:mockito-core:jar}</argLine> + </configuration> + </plugin> </plugins> </build> </project> diff --git a/integration/cdi/pom.xml b/integration/cdi/pom.xml index 6dcc24ce3ef..6d72c241d3c 100644 --- a/integration/cdi/pom.xml +++ b/integration/cdi/pom.xml @@ -42,6 +42,7 @@ <cxf.osgi.export> org.apache.cxf.cdi </cxf.osgi.export> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> @@ -87,4 +88,20 @@ <scope>test</scope> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/integration/jca/pom.xml b/integration/jca/pom.xml index 1fdb564f5d0..9462a2e32e5 100644 --- a/integration/jca/pom.xml +++ b/integration/jca/pom.xml @@ -32,6 +32,7 @@ </parent> <properties> <cxf.module.name>org.apache.cxf.jca</cxf.module.name> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -126,4 +127,20 @@ <scope>test</scope> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/integration/spring-boot/autoconfigure/pom.xml b/integration/spring-boot/autoconfigure/pom.xml index 087cfde9a96..7778140d008 100644 --- a/integration/spring-boot/autoconfigure/pom.xml +++ b/integration/spring-boot/autoconfigure/pom.xml @@ -32,6 +32,7 @@ </parent> <properties> <cxf.module.name>org.apache.cxf.spring.boot.autoconfigure</cxf.module.name> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <build> <plugins> @@ -46,6 +47,18 @@ </instructions> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> <dependencies> diff --git a/parent/pom.xml b/parent/pom.xml index b37ffc63749..fd59c5775d0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -37,7 +37,8 @@ <cxf.surefire.usefile>false</cxf.surefire.usefile> <org.apache.cxf.transport.websocket.atmosphere.disabled>false</org.apache.cxf.transport.websocket.atmosphere.disabled> <cxf.surefire.parallel.mode /> - <cxf.surefire.fork.vmargs>-ea --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/sun.net.www.protocol.https=ALL-UNNAMED</cxf.surefire.fork.vmargs> + <cxf.surefire.fork.vmargs.extra /> + <cxf.surefire.fork.vmargs>-ea --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/sun.net.www.protocol.https=ALL-UNNAMED ${cxf.surefire.fork.vmargs.extra}</cxf.surefire.fork.vmargs> <cxf.server.launcher.vmargs>-ea</cxf.server.launcher.vmargs> <cxf.surefire.enable.assertions>true</cxf.surefire.enable.assertions> <cxf.surefire.rerun.count>3</cxf.surefire.rerun.count> diff --git a/rt/bindings/coloc/pom.xml b/rt/bindings/coloc/pom.xml index 3cc49239020..74aa6d6b4b2 100644 --- a/rt/bindings/coloc/pom.xml +++ b/rt/bindings/coloc/pom.xml @@ -36,6 +36,7 @@ org.springframework*;resolution:=optional;version="${cxf.osgi.spring.version}", jakarta.xml.ws*;version="${cxf.osgi.jakarta.xml.ws.version}" </cxf.osgi.import> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -77,4 +78,20 @@ <scope>test</scope> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/rt/bindings/corba/pom.xml b/rt/bindings/corba/pom.xml index 99712d9b4fe..2faf20178b8 100644 --- a/rt/bindings/corba/pom.xml +++ b/rt/bindings/corba/pom.xml @@ -39,6 +39,7 @@ jakarta.xml.bind*;version="${cxf.osgi.jakarta.bind.version}", org.apache.yoko.orb.*;resolution:=optional </cxf.osgi.import> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -138,6 +139,18 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> diff --git a/rt/bindings/soap/pom.xml b/rt/bindings/soap/pom.xml index 7b3086aadee..9b2d9c0b816 100644 --- a/rt/bindings/soap/pom.xml +++ b/rt/bindings/soap/pom.xml @@ -39,6 +39,7 @@ org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}", jakarta.xml.bind*;version="${cxf.osgi.jakarta.bind.version}" </cxf.osgi.import> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -107,4 +108,20 @@ <scope>test</scope> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/rt/databinding/aegis/pom.xml b/rt/databinding/aegis/pom.xml index 08d3edd1dfa..9d8e335e90d 100644 --- a/rt/databinding/aegis/pom.xml +++ b/rt/databinding/aegis/pom.xml @@ -38,6 +38,7 @@ jakarta.xml.bind*;version="${cxf.osgi.jakarta.bind.version}", jakarta.activation;version="${cxf.osgi.jakarta.activation.version}" </cxf.osgi.import> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -154,6 +155,18 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> diff --git a/rt/databinding/jaxb/pom.xml b/rt/databinding/jaxb/pom.xml index d5625a9bb00..7c0cfe709af 100644 --- a/rt/databinding/jaxb/pom.xml +++ b/rt/databinding/jaxb/pom.xml @@ -36,6 +36,7 @@ jakarta.activation;version="${cxf.osgi.jakarta.activation.version}", jakarta.xml.bind*;version="${cxf.osgi.jakarta.bind.version}" </cxf.osgi.import> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <build> <plugins> @@ -81,6 +82,18 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> <dependencies> diff --git a/rt/features/metrics/pom.xml b/rt/features/metrics/pom.xml index 72f12b506a4..62b411f859f 100644 --- a/rt/features/metrics/pom.xml +++ b/rt/features/metrics/pom.xml @@ -13,6 +13,7 @@ <properties> <cxf.module.name>org.apache.cxf.metrics</cxf.module.name> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> @@ -61,4 +62,20 @@ <scope>test</scope> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/rt/frontend/jaxrs/pom.xml b/rt/frontend/jaxrs/pom.xml index 045330ff05c..592d6af1f6d 100644 --- a/rt/frontend/jaxrs/pom.xml +++ b/rt/frontend/jaxrs/pom.xml @@ -45,6 +45,7 @@ <cxf.osgi.export> org.apache.cxf.jaxrs* </cxf.osgi.export> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -216,5 +217,19 @@ </plugin> </plugins> </pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </build> </project> diff --git a/rt/frontend/jaxws/pom.xml b/rt/frontend/jaxws/pom.xml index d0e4983cb72..8a3cbe35fc6 100644 --- a/rt/frontend/jaxws/pom.xml +++ b/rt/frontend/jaxws/pom.xml @@ -48,6 +48,7 @@ org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace="http://cxf.apache.org/blueprint/jaxws"; </cxf.export.service> <cxf.bundle.activator>org.apache.cxf.jaxws.blueprint.Activator</cxf.bundle.activator> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -193,4 +194,20 @@ <scope>test</scope> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/rt/frontend/js/pom.xml b/rt/frontend/js/pom.xml index 2d68a9888eb..130adc203dc 100644 --- a/rt/frontend/js/pom.xml +++ b/rt/frontend/js/pom.xml @@ -35,6 +35,7 @@ <cxf.osgi.import> jakarta.xml.ws*;version="${cxf.osgi.jakarta.xml.ws.version}", </cxf.osgi.import> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -63,4 +64,20 @@ <scope>test</scope> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/rt/management/pom.xml b/rt/management/pom.xml index bbc2912feaf..555b9488779 100644 --- a/rt/management/pom.xml +++ b/rt/management/pom.xml @@ -36,6 +36,7 @@ jakarta.xml.bind*;version="${cxf.osgi.jakarta.bind.version}", jakarta.annotation*;version="${cxf.osgi.jakarta.annotation.version}" </cxf.osgi.import> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -124,6 +125,18 @@ </extensions> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> diff --git a/rt/rs/description/pom.xml b/rt/rs/description/pom.xml index a1e09d71f92..f082efc5032 100644 --- a/rt/rs/description/pom.xml +++ b/rt/rs/description/pom.xml @@ -36,6 +36,7 @@ jakarta.servlet*;version="${cxf.osgi.jakarta.servlet.version}", jakarta.xml.bind*;version="${cxf.osgi.jakarta.bind.version}" </cxf.osgi.import> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -87,6 +88,18 @@ </dependencies> <build> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> diff --git a/rt/rs/extensions/providers/pom.xml b/rt/rs/extensions/providers/pom.xml index 09133a14923..c1e6c48a104 100644 --- a/rt/rs/extensions/providers/pom.xml +++ b/rt/rs/extensions/providers/pom.xml @@ -36,6 +36,7 @@ jakarta.servlet*;version="${cxf.osgi.jakarta.servlet.version}", jakarta.xml.bind*;version="${cxf.osgi.jakarta.bind.version}" </cxf.osgi.import> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -146,4 +147,20 @@ <scope>test</scope> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/rt/rs/microprofile-client/pom.xml b/rt/rs/microprofile-client/pom.xml index 963caaec518..6cbf39cc37f 100644 --- a/rt/rs/microprofile-client/pom.xml +++ b/rt/rs/microprofile-client/pom.xml @@ -35,6 +35,7 @@ <cxf.osgi.import> jakarta.annotation*;version="${cxf.osgi.jakarta.annotation.version}" </cxf.osgi.import> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -208,6 +209,18 @@ </instructions> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> diff --git a/rt/rs/security/http-signature/pom.xml b/rt/rs/security/http-signature/pom.xml index c4ee11e6845..3376c364ed2 100644 --- a/rt/rs/security/http-signature/pom.xml +++ b/rt/rs/security/http-signature/pom.xml @@ -19,6 +19,7 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> + <artifactId>cxf-rt-rs-security-http-signature</artifactId> <packaging>bundle</packaging> <name>Apache CXF Runtime Http-Signature</name> <description> @@ -33,9 +34,9 @@ <relativePath>../../../../parent/pom.xml</relativePath> </parent> - <artifactId>cxf-rt-rs-security-http-signature</artifactId> <properties> <cxf.module.name>org.apache.cxf.rs.security.http.signature</cxf.module.name> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> @@ -77,4 +78,20 @@ <scope>test</scope> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml b/rt/rs/security/oauth-parent/oauth2/pom.xml index 414bc7dedcd..c45fa45cd8b 100644 --- a/rt/rs/security/oauth-parent/oauth2/pom.xml +++ b/rt/rs/security/oauth-parent/oauth2/pom.xml @@ -39,6 +39,9 @@ jakarta.persistence*;resolution:=optional </cxf.osgi.import> <compilerArguments>-Aopenjpa.source=8 -Aopenjpa.metamodel=true</compilerArguments> + <!-- this configures the surefire plugin to run your tests with the javaagent enabled --> + <!-- (openJPA loadtime weaving) --> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.apache.openjpa:openjpa:jar} -javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -257,16 +260,6 @@ </execution> </executions> </plugin> - <!-- this configures the surefire plugin to run your tests with the javaagent enabled --> - <!-- (openJPA loadtime weaving) --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-javaagent:${org.apache.openjpa:openjpa:jar:jakarta} ${cxf.surefire.fork.vmargs}</argLine> - <workingDirectory>${project.build.directory}</workingDirectory> - </configuration> - </plugin> </plugins> </build> </project> diff --git a/rt/rs/security/sso/oidc/pom.xml b/rt/rs/security/sso/oidc/pom.xml index cd9d4be95ce..12d57c51c58 100644 --- a/rt/rs/security/sso/oidc/pom.xml +++ b/rt/rs/security/sso/oidc/pom.xml @@ -36,6 +36,9 @@ <cxf.osgi.import> jakarta.annotation*;version="${cxf.osgi.jakarta.annotation.version}" </cxf.osgi.import> + <!-- this configures the surefire plugin to run your tests with the javaagent enabled --> + <!-- (openJPA loadtime weaving) --> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.apache.openjpa:openjpa:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -201,38 +204,15 @@ </execution> </executions> </plugin> - <!-- this configures the surefire plugin to run your tests with the javaagent enabled --> - <!-- (openJPA loadtime weaving) --> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-javaagent:${project.basedir}/target/openjpa-${cxf.openjpa.version}.jar ${cxf.surefire.fork.vmargs}</argLine> - <workingDirectory>${project.basedir}/target</workingDirectory> - </configuration> - </plugin> - <!-- this tells maven to copy the openjpa agent jar into your target/ directory --> - <!-- where surefire can see it --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> + <artifactId>maven-dependency-plugin</artifactId> + <executions> <execution> - <id>copy</id> - <phase>process-resources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> - <version>${cxf.openjpa.version}</version> - <outputDirectory>${project.build.directory}</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> </execution> </executions> </plugin> diff --git a/rt/rs/sse/pom.xml b/rt/rs/sse/pom.xml index 9b3c4928aae..1123b26c2e1 100644 --- a/rt/rs/sse/pom.xml +++ b/rt/rs/sse/pom.xml @@ -35,6 +35,7 @@ <cxf.osgi.import> jakarta.servlet*;version="${cxf.osgi.jakarta.servlet.version}", </cxf.osgi.import> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -81,4 +82,20 @@ <scope>test</scope> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/rt/transports/http-jetty/pom.xml b/rt/transports/http-jetty/pom.xml index c7d1a74c36f..62948c3f36c 100644 --- a/rt/transports/http-jetty/pom.xml +++ b/rt/transports/http-jetty/pom.xml @@ -42,6 +42,7 @@ <cxf.osgi.dynamic.import> org.eclipse.jetty.jmx </cxf.osgi.dynamic.import> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -200,6 +201,18 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> diff --git a/rt/transports/http-netty/netty-server/pom.xml b/rt/transports/http-netty/netty-server/pom.xml index 37022831d8c..ee368bc43bb 100644 --- a/rt/transports/http-netty/netty-server/pom.xml +++ b/rt/transports/http-netty/netty-server/pom.xml @@ -42,6 +42,7 @@ <cxf.osgi.export> org.apache.cxf.*, </cxf.osgi.export> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -163,6 +164,18 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> diff --git a/rt/transports/http-undertow/pom.xml b/rt/transports/http-undertow/pom.xml index ef1254efecd..8249c9d6052 100644 --- a/rt/transports/http-undertow/pom.xml +++ b/rt/transports/http-undertow/pom.xml @@ -40,6 +40,7 @@ jakarta.annotation*;version="${cxf.osgi.jakarta.annotation.version}", org.xnio*;version="${cxf.undertow.xnio.osgi.version}", </cxf.osgi.import> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -166,6 +167,18 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> diff --git a/rt/transports/http/pom.xml b/rt/transports/http/pom.xml index 559486a67f7..79fbf8956fb 100644 --- a/rt/transports/http/pom.xml +++ b/rt/transports/http/pom.xml @@ -49,6 +49,7 @@ <cxf.public.suffix.list.url> https://publicsuffix.org/list/effective_tld_names.dat </cxf.public.suffix.list.url> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -176,6 +177,18 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> <pluginManagement> <plugins> diff --git a/rt/transports/jms/pom.xml b/rt/transports/jms/pom.xml index c6d39012b57..17db1725bd1 100644 --- a/rt/transports/jms/pom.xml +++ b/rt/transports/jms/pom.xml @@ -30,6 +30,7 @@ jakarta.xml.bind*;version="${cxf.osgi.jakarta.bind.version}" </cxf.osgi.import> <cxf.module.name>org.apache.cxf.transport.jms</cxf.module.name> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -165,6 +166,18 @@ </extensions> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> @@ -174,17 +187,9 @@ <activation> <jdk>[23,24)</jdk> </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${cxf.surefire.fork.vmargs} -Djava.security.manager=allow</argLine> - </configuration> - </plugin> - </plugins> - </build> + <properties> + <cxf.surefire.fork.vmargs.extra>-Djava.security.manager=allow</cxf.surefire.fork.vmargs.extra> + </properties> </profile> </profiles> </project> diff --git a/rt/transports/websocket/pom.xml b/rt/transports/websocket/pom.xml index e2c902a0ef9..d7d44a113d8 100644 --- a/rt/transports/websocket/pom.xml +++ b/rt/transports/websocket/pom.xml @@ -41,6 +41,7 @@ <cxf.osgi.dynamic.import> org.eclipse.jetty.jmx </cxf.osgi.dynamic.import> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -206,6 +207,18 @@ </dependencies> <build> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> diff --git a/rt/ws/addr/pom.xml b/rt/ws/addr/pom.xml index 350911aa25b..742ed0f68d3 100644 --- a/rt/ws/addr/pom.xml +++ b/rt/ws/addr/pom.xml @@ -37,6 +37,7 @@ jakarta.xml.ws*;version="${cxf.osgi.jakarta.xml.ws.version}", jakarta.xml.bind*;version="${cxf.osgi.jakarta.bind.version}" </cxf.osgi.import> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -76,4 +77,20 @@ <version>${project.version}</version> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/rt/ws/policy/pom.xml b/rt/ws/policy/pom.xml index 5e48f25caef..424fd8923e0 100644 --- a/rt/ws/policy/pom.xml +++ b/rt/ws/policy/pom.xml @@ -37,6 +37,7 @@ jakarta.xml.bind*;version="${cxf.osgi.jakarta.bind.version}", jakarta.annotation*;version="${cxf.osgi.jakarta.annotation.version}" </cxf.osgi.import> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -196,6 +197,18 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> diff --git a/rt/ws/rm/pom.xml b/rt/ws/rm/pom.xml index 9bde1289390..d33ccb8cda6 100644 --- a/rt/ws/rm/pom.xml +++ b/rt/ws/rm/pom.xml @@ -38,6 +38,7 @@ jakarta.xml.bind*;version="${cxf.osgi.jakarta.bind.version}", jakarta.annotation*;version="${cxf.osgi.jakarta.annotation.version}" </cxf.osgi.import> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -218,6 +219,18 @@ </extensions> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml index ab12c673bf9..d94cdfbe33c 100644 --- a/rt/ws/security/pom.xml +++ b/rt/ws/security/pom.xml @@ -42,6 +42,7 @@ jakarta.xml.bind*;version="${cxf.osgi.jakarta.bind.version}", jakarta.annotation*;version="${cxf.osgi.jakarta.annotation.version}" </cxf.osgi.import> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -249,6 +250,18 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> diff --git a/rt/ws/transfer/pom.xml b/rt/ws/transfer/pom.xml index c9f307550a9..84570c7c1f3 100644 --- a/rt/ws/transfer/pom.xml +++ b/rt/ws/transfer/pom.xml @@ -16,6 +16,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <cxf.module.name>org.apache.cxf.ws.transfer</cxf.module.name> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> @@ -95,6 +96,18 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> diff --git a/rt/wsdl/pom.xml b/rt/wsdl/pom.xml index 5e9dcc6a2b5..f71f748aab7 100644 --- a/rt/wsdl/pom.xml +++ b/rt/wsdl/pom.xml @@ -36,6 +36,7 @@ jakarta.xml.bind*;version="${cxf.osgi.jakarta.bind.version}", jakarta.annotation*;version="${cxf.osgi.jakarta.annotation.version}" </cxf.osgi.import> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -119,6 +120,18 @@ </extensions> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml index ebf4cc8c227..cffc2ec7ece 100644 --- a/services/wsn/wsn-core/pom.xml +++ b/services/wsn/wsn-core/pom.xml @@ -165,17 +165,9 @@ <activation> <jdk>[23,24)</jdk> </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${cxf.surefire.fork.vmargs} -Djava.security.manager=allow</argLine> - </configuration> - </plugin> - </plugins> - </build> + <properties> + <cxf.surefire.fork.vmargs.extra>-Djava.security.manager=allow</cxf.surefire.fork.vmargs.extra> + </properties> </profile> </profiles> </project> diff --git a/services/xkms/xkms-x509-handlers/pom.xml b/services/xkms/xkms-x509-handlers/pom.xml index 77dc1f8b356..b621ac3c088 100644 --- a/services/xkms/xkms-x509-handlers/pom.xml +++ b/services/xkms/xkms-x509-handlers/pom.xml @@ -35,6 +35,7 @@ <cxf.osgi.import> jakarta.xml.bind*;version="${cxf.osgi.jakarta.bind.version}" </cxf.osgi.import> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -63,4 +64,20 @@ <scope>test</scope> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/systests/cdi/cdi-owb/cdi-producers-owb/pom.xml b/systests/cdi/cdi-owb/cdi-producers-owb/pom.xml index d652a174f88..2db15aebc0c 100644 --- a/systests/cdi/cdi-owb/cdi-producers-owb/pom.xml +++ b/systests/cdi/cdi-owb/cdi-producers-owb/pom.xml @@ -33,6 +33,7 @@ <properties> <cxf.module.name>org.apache.cxf.systests.cdi.owb.producers</cxf.module.name> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> @@ -48,4 +49,20 @@ <scope>test</scope> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml index 0be7f7a8071..a695f9ec321 100644 --- a/systests/jaxrs/pom.xml +++ b/systests/jaxrs/pom.xml @@ -32,6 +32,7 @@ <url>https://cxf.apache.org</url> <properties> <cxf.module.name>org.apache.cxf.systests.jaxrs</cxf.module.name> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <dependencies> <dependency> @@ -588,6 +589,18 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> <profiles> diff --git a/systests/jaxws/pom.xml b/systests/jaxws/pom.xml index d0e4b519f1e..bb3cb78d094 100644 --- a/systests/jaxws/pom.xml +++ b/systests/jaxws/pom.xml @@ -33,6 +33,7 @@ <properties> <cxf.module.name>org.apache.cxf.systests.jaxws</cxf.module.name> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <build> @@ -95,6 +96,18 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> <dependencies> diff --git a/systests/spring-boot/pom.xml b/systests/spring-boot/pom.xml index 39fc929560f..bc8548bd99d 100644 --- a/systests/spring-boot/pom.xml +++ b/systests/spring-boot/pom.xml @@ -33,6 +33,7 @@ <properties> <cxf.module.name>org.apache.cxf.systests.spring.boot</cxf.module.name> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <build> @@ -55,6 +56,18 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> <dependencies> diff --git a/systests/transport-hc5/pom.xml b/systests/transport-hc5/pom.xml index ddb986aad48..cc26eed2644 100644 --- a/systests/transport-hc5/pom.xml +++ b/systests/transport-hc5/pom.xml @@ -33,6 +33,7 @@ <properties> <cxf.module.name>org.apache.cxf.systests.transport.hc5</cxf.module.name> + <cxf.surefire.fork.vmargs.extra>-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> </properties> <build> @@ -95,6 +96,18 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> <dependencies> diff --git a/systests/transport-jms/pom.xml b/systests/transport-jms/pom.xml index 428e195f130..56df50f1853 100644 --- a/systests/transport-jms/pom.xml +++ b/systests/transport-jms/pom.xml @@ -274,17 +274,9 @@ <activation> <jdk>[23,24)</jdk> </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${cxf.surefire.fork.vmargs} -Djava.security.manager=allow</argLine> - </configuration> - </plugin> - </plugins> - </build> + <properties> + <cxf.surefire.fork.vmargs.extra>-Djava.security.manager=allow</cxf.surefire.fork.vmargs.extra> + </properties> </profile> </profiles> </project> diff --git a/systests/transports/pom.xml b/systests/transports/pom.xml index a008cc330ba..887f7756a50 100644 --- a/systests/transports/pom.xml +++ b/systests/transports/pom.xml @@ -31,8 +31,7 @@ <description>Apache CXF Transport System Tests</description> <url>https://cxf.apache.org</url> <properties> - <cxf.surefire.fork.vmargs>-Djdk.http.auth.tunneling.disabledSchemes=""</cxf.surefire.fork.vmargs> - <cxf.surefire.fork.vmargs>--add-opens java.xml/com.sun.org.apache.xerces.internal.dom=ALL-UNNAMED -Djdk.http.auth.tunneling.disabledSchemes=""</cxf.surefire.fork.vmargs> + <cxf.surefire.fork.vmargs.extra>--add-opens java.xml/com.sun.org.apache.xerces.internal.dom=ALL-UNNAMED -Djdk.http.auth.tunneling.disabledSchemes="" -javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra> <cxf.module.name>org.apache.cxf.systests.transport</cxf.module.name> </properties> <build> @@ -114,6 +113,18 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-test-resources</phase> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> <dependencies> diff --git a/systests/ws-transfer/pom.xml b/systests/ws-transfer/pom.xml index 8b6f78e13c2..8008b420a25 100644 --- a/systests/ws-transfer/pom.xml +++ b/systests/ws-transfer/pom.xml @@ -73,17 +73,9 @@ <activation> <jdk>[17,)</jdk> </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${cxf.surefire.fork.vmargs} -Djdk.xml.enableExtensionFunctions=true</argLine> - </configuration> - </plugin> - </plugins> - </build> + <properties> + <cxf.surefire.fork.vmargs.extra>-Djdk.xml.enableExtensionFunctions=true</cxf.surefire.fork.vmargs.extra> + </properties> </profile> </profiles> </project>
