This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 719d1948df Revert Mockito downgrade from CASSANDRA-17750 patch by
Ekaterina Dimitrova; reviewed by Michael Semb Wever and Abe Ratnofsky for
CASSANDRA-17946
719d1948df is described below
commit 719d1948df827e864ff66e44e22c7fad334c3100
Author: Ekaterina Dimitrova <[email protected]>
AuthorDate: Mon Oct 3 16:37:00 2022 -0400
Revert Mockito downgrade from CASSANDRA-17750
patch by Ekaterina Dimitrova; reviewed by Michael Semb Wever and Abe
Ratnofsky for CASSANDRA-17946
---
.build/parent-pom-template.xml | 2 +-
CHANGES.txt | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/.build/parent-pom-template.xml b/.build/parent-pom-template.xml
index 73a6431408..b288221e49 100644
--- a/.build/parent-pom-template.xml
+++ b/.build/parent-pom-template.xml
@@ -452,7 +452,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>3.2.4</version>
+ <version>4.7.0</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/CHANGES.txt b/CHANGES.txt
index f35e0fe599..7674033702 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
4.2
+ * Revert Mockito downgrade from CASSANDRA-17750 (CASSANDRA-17496)
* Add --older-than and --older-than-timestamp options for nodetool
clearsnapshots (CASSANDRA-16860)
* Fix "open RT bound as its last item" exception (CASSANDRA-17810)
* Fix leak of non-standard Java types in JMX MBeans
`org.apache.cassandra.db:type=StorageService`
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
