You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2026/05/09 13:34:35 UTC
(cayenne) 03/03: Mockito upgrade for J25 compat
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 79fc26473b109b7ed4749f855008bc13ea3d0bf4
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Sat May 9 09:11:53 2026 -0400
Mockito upgrade for J25 compat
... need to add Mockito agent to avoid warnings ... too invasive, sigh
---
cayenne-crypto/pom.xml | 1 +
cayenne/pom.xml | 2 +-
pom.xml | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/cayenne-crypto/pom.xml b/cayenne-crypto/pom.xml
index df6bfd44b..3d54a44b2 100644
--- a/cayenne-crypto/pom.xml
+++ b/cayenne-crypto/pom.xml
@@ -19,6 +19,7 @@
<artifactId>cayenne-crypto</artifactId>
<name>cayenne-crypto: Cayenne Cryptography Extensions</name>
<packaging>jar</packaging>
+
<dependencies>
<!-- Compile dependencies -->
diff --git a/cayenne/pom.xml b/cayenne/pom.xml
index 16ab83617..8986177e5 100644
--- a/cayenne/pom.xml
+++ b/cayenne/pom.xml
@@ -28,7 +28,7 @@
<name>cayenne: Cayenne Core</name>
<description>Apache Cayenne core module</description>
<packaging>jar</packaging>
-
+
<dependencies>
<!-- Compile dependencies -->
diff --git a/pom.xml b/pom.xml
index f4a2e33c0..4b884e2e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,7 @@
<!-- Dependency versions -->
<ant.version>1.10.15</ant.version>
<junit.version>5.14.4</junit.version>
+ <mockito.version>5.23.0</mockito.version>
<mysql.connector.version>9.5.0</mysql.connector.version>
<slf4j.version>1.7.36</slf4j.version>
<testcontainers.version>1.21.4</testcontainers.version>
@@ -414,7 +415,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.23.0</version>
+ <version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -684,6 +685,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
+ -javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar
-DcayenneTestConnection=${cayenneTestConnection} -Djava.net.preferIPv4Stack=true
-Dcayenne.runtime.db.collation.assume.ci=${collationCi}
</argLine>
@@ -718,6 +720,7 @@
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<argLine>
+ -javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar
-Dhsqldb.method_class_names=org.apache.cayenne.unit.HSQLProcedures.*
</argLine>
<systemPropertyVariables>