This is an automated email from the ASF dual-hosted git repository. snuyanzin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push: new 1e9e848fae9 [FLINK-36966][tests] Bump mockito to 5.14.2 1e9e848fae9 is described below commit 1e9e848fae9b989f1503bc073bee98b1ae490ede Author: Sergey Nuyanzin <snuyan...@gmail.com> AuthorDate: Fri Dec 27 19:36:05 2024 +0100 [FLINK-36966][tests] Bump mockito to 5.14.2 --- flink-runtime/pom.xml | 2 +- .../mockito-extensions/org.mockito.plugins.MockMaker | 16 ++++++++++++++++ pom.xml | 8 ++++---- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml index 2e2eed854ac..5d51ca63f8b 100644 --- a/flink-runtime/pom.xml +++ b/flink-runtime/pom.xml @@ -301,7 +301,7 @@ under the License. <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-inline</artifactId> + <artifactId>mockito-subclass</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/flink-runtime/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/flink-runtime/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker new file mode 100644 index 00000000000..f0f52e3a7ae --- /dev/null +++ b/flink-runtime/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker @@ -0,0 +1,16 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +mock-maker-inline diff --git a/pom.xml b/pom.xml index 57d6d619877..3610dd1b23a 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ under the License. <junit4.version>4.13.2</junit4.version> <junit5.version>5.10.1</junit5.version> <archunit.version>1.2.0</archunit.version> - <mockito.version>4.11.0</mockito.version> + <mockito.version>5.14.2</mockito.version> <hamcrest.version>1.3</hamcrest.version> <assertj.version>3.23.1</assertj.version> <py4j.version>0.10.9.7</py4j.version> @@ -586,13 +586,13 @@ under the License. <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.14.4</version> + <version>1.15.11</version> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.14.4</version> + <version>1.15.11</version> </dependency> <!-- For dependency convergence --> @@ -919,7 +919,7 @@ under the License. <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-inline</artifactId> + <artifactId>mockito-subclass</artifactId> <version>${mockito.version}</version> <scope>test</scope> </dependency>