You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2023/04/16 10:49:46 UTC
[maven] branch MNG-7766 updated (d2a8306cf -> 90f5a35ec)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MNG-7766
in repository https://gitbox.apache.org/repos/asf/maven.git
discard d2a8306cf [MNG-7766] - Migrate to use mockito-bom
new 90f5a35ec [MNG-7766] - Migrate to use mockito-bom 4.11.0
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d2a8306cf)
\
N -- N -- N refs/heads/MNG-7766 (90f5a35ec)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
[maven] 01/01: [MNG-7766] - Migrate to use mockito-bom 4.11.0
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MNG-7766
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 90f5a35ec7110eb7ec48c204bbe6d45eeb388b95
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Apr 15 18:43:30 2023 +0200
[MNG-7766] - Migrate to use mockito-bom 4.11.0
---
.../maven/toolchain/DefaultToolchainManagerTest.java | 2 +-
pom.xml | 15 ++++++++-------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java
index 9bb2568fc..6f003ef9a 100644
--- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java
@@ -37,7 +37,7 @@ import org.mockito.MockitoAnnotations;
import org.slf4j.Logger;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
diff --git a/pom.xml b/pom.xml
index 836600abb..cc8d2b177 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,7 +154,7 @@ under the License.
<commonsIoVersion>2.11.0</commonsIoVersion>
<commonsLangVersion>3.12.0</commonsLangVersion>
<junitVersion>5.9.1</junitVersion>
- <mockitoVersion>3.2.0</mockitoVersion>
+ <mockitoVersion>4.11.0</mockitoVersion>
<plexusVersion>2.1.0</plexusVersion>
<plexusInterpolationVersion>1.26</plexusInterpolationVersion>
<plexusUtilsVersion>4.0.0-alpha-6-SNAPSHOT</plexusUtilsVersion>
@@ -417,12 +417,6 @@ under the License.
<artifactId>plexus-cipher</artifactId>
<version>${cipherVersion}</version>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>${mockitoVersion}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-assertj</artifactId>
@@ -466,6 +460,13 @@ under the License.
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-bom</artifactId>
+ <version>${mockitoVersion}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
</dependencies>
<!--bootstrap-start-comment-->
</dependencyManagement>