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
The following commit(s) were added to refs/heads/4.1.x-fixes by this push:
new 93c0ece5a95 Fix tests (post merge issue)
93c0ece5a95 is described below
commit 93c0ece5a952a4b1112dacf020de35e563a053f2
Author: Andriy Redko <[email protected]>
AuthorDate: Thu Jun 11 19:39:27 2026 -0400
Fix tests (post merge issue)
---
rt/rs/security/oauth-parent/oauth2/pom.xml | 29 ++++++++++++++---------------
rt/rs/security/sso/oidc/pom.xml | 2 +-
2 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml
b/rt/rs/security/oauth-parent/oauth2/pom.xml
index c45fa45cd8b..1ac69c6c75c 100644
--- a/rt/rs/security/oauth-parent/oauth2/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2/pom.xml
@@ -41,7 +41,7 @@
<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>
+
<cxf.surefire.fork.vmargs.extra>-javaagent:${org.apache.openjpa:openjpa:jar:jakarta}
-javaagent:${org.mockito:mockito-core:jar}</cxf.surefire.fork.vmargs.extra>
</properties>
<dependencies>
<dependency>
@@ -246,20 +246,19 @@
</execution>
</executions>
</plugin>
- <!-- this tells maven to set a property pointing to the openjpa agent
jar -->
- <!-- where surefire can see it -->
- <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>
+ <!-- this tells maven to set a property pointing to the openjpa agent
jar -->
+ <!-- where surefire can see it -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>properties</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/rt/rs/security/sso/oidc/pom.xml b/rt/rs/security/sso/oidc/pom.xml
index 12d57c51c58..0929188106d 100644
--- a/rt/rs/security/sso/oidc/pom.xml
+++ b/rt/rs/security/sso/oidc/pom.xml
@@ -38,7 +38,7 @@
</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>
+
<cxf.surefire.fork.vmargs.extra>-javaagent:${org.apache.openjpa:openjpa:jar:jakarta}</cxf.surefire.fork.vmargs.extra>
</properties>
<dependencies>
<dependency>
