From cb6dd55681b777665c2d8bec5af1c739be872c9f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 7 Feb 2023 23:11:58 +0100
Subject: [PATCH] Update dependency org.mockito:mockito-core to v5
 (release/4.2.x) (#3118)

* Update dependency org.mockito:mockito-core to v5

* Manage version of Byte Buddy to avoid conflicts with AssertJ and Mockito

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jochen Schalanda <jochen@schalanda.name>
---
 metrics-collectd/pom.xml         | 9 +++++++++
 metrics-core/pom.xml             | 9 +++++++++
 metrics-graphite/pom.xml         | 6 +++++-
 metrics-healthchecks/pom.xml     | 5 +++++
 metrics-httpasyncclient/pom.xml  | 5 +++++
 metrics-httpclient/pom.xml       | 5 +++++
 metrics-httpclient5/pom.xml      | 5 +++++
 metrics-jakarta-servlets/pom.xml | 5 +++++
 metrics-jdbi/pom.xml             | 5 +++++
 metrics-jdbi3/pom.xml            | 5 +++++
 metrics-jersey3/pom.xml          | 5 +++++
 metrics-jersey31/pom.xml         | 5 +++++
 metrics-jetty10/pom.xml          | 5 +++++
 metrics-jetty11/pom.xml          | 5 +++++
 metrics-jmx/pom.xml              | 5 +++++
 metrics-json/pom.xml             | 5 +++++
 metrics-jvm/pom.xml              | 5 +++++
 metrics-log4j2/pom.xml           | 5 +++++
 metrics-logback/pom.xml          | 5 +++++
 metrics-logback13/pom.xml        | 5 +++++
 metrics-logback14/pom.xml        | 5 +++++
 metrics-servlets/pom.xml         | 5 +++++
 pom.xml                          | 3 ++-
 23 files changed, 120 insertions(+), 2 deletions(-)

diff --git a/metrics-collectd/pom.xml b/metrics-collectd/pom.xml
index 0566bdd80f..267b246a1a 100644
--- a/metrics-collectd/pom.xml
+++ b/metrics-collectd/pom.xml
@@ -19,6 +19,15 @@
         <javaModuleName>com.codahale.metrics.collectd</javaModuleName>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
diff --git a/metrics-core/pom.xml b/metrics-core/pom.xml
index 33f2b6c0b5..c96d7e1744 100644
--- a/metrics-core/pom.xml
+++ b/metrics-core/pom.xml
@@ -21,6 +21,15 @@
         <javaModuleName>com.codahale.metrics</javaModuleName>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/metrics-graphite/pom.xml b/metrics-graphite/pom.xml
index 2c5f30ee6e..651071b964 100644
--- a/metrics-graphite/pom.xml
+++ b/metrics-graphite/pom.xml
@@ -29,9 +29,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
diff --git a/metrics-healthchecks/pom.xml b/metrics-healthchecks/pom.xml
index 4fdd08803e..fde390e5ff 100644
--- a/metrics-healthchecks/pom.xml
+++ b/metrics-healthchecks/pom.xml
@@ -29,6 +29,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/metrics-httpasyncclient/pom.xml b/metrics-httpasyncclient/pom.xml
index ec765bd204..255a597db7 100644
--- a/metrics-httpasyncclient/pom.xml
+++ b/metrics-httpasyncclient/pom.xml
@@ -45,6 +45,11 @@
                 <artifactId>httpcore-nio</artifactId>
                 <version>4.4.16</version>
             </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/metrics-httpclient/pom.xml b/metrics-httpclient/pom.xml
index 7d71e9291f..48e632f00f 100644
--- a/metrics-httpclient/pom.xml
+++ b/metrics-httpclient/pom.xml
@@ -35,6 +35,11 @@
                 <artifactId>httpcore</artifactId>
                 <version>4.4.16</version>
             </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/metrics-httpclient5/pom.xml b/metrics-httpclient5/pom.xml
index 591e458b5f..89924925bb 100644
--- a/metrics-httpclient5/pom.xml
+++ b/metrics-httpclient5/pom.xml
@@ -40,6 +40,11 @@
                 <artifactId>httpcore5</artifactId>
                 <version>5.2.1</version>
             </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/metrics-jakarta-servlets/pom.xml b/metrics-jakarta-servlets/pom.xml
index 44cc400239..d8e6862a28 100644
--- a/metrics-jakarta-servlets/pom.xml
+++ b/metrics-jakarta-servlets/pom.xml
@@ -40,6 +40,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/metrics-jdbi/pom.xml b/metrics-jdbi/pom.xml
index aff76b7b30..ec4b827792 100644
--- a/metrics-jdbi/pom.xml
+++ b/metrics-jdbi/pom.xml
@@ -29,6 +29,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/metrics-jdbi3/pom.xml b/metrics-jdbi3/pom.xml
index eaaa827a07..ac4245eac8 100644
--- a/metrics-jdbi3/pom.xml
+++ b/metrics-jdbi3/pom.xml
@@ -27,6 +27,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/metrics-jersey3/pom.xml b/metrics-jersey3/pom.xml
index 926fa9f3bc..062c01d859 100644
--- a/metrics-jersey3/pom.xml
+++ b/metrics-jersey3/pom.xml
@@ -47,6 +47,11 @@
                 <artifactId>jakarta.inject-api</artifactId>
                 <version>2.0.1</version>
             </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/metrics-jersey31/pom.xml b/metrics-jersey31/pom.xml
index 77f307701b..2fe7259bf8 100644
--- a/metrics-jersey31/pom.xml
+++ b/metrics-jersey31/pom.xml
@@ -47,6 +47,11 @@
                 <artifactId>jakarta.inject-api</artifactId>
                 <version>2.0.1</version>
             </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/metrics-jetty10/pom.xml b/metrics-jetty10/pom.xml
index 2ce2db1074..5bf4e244db 100644
--- a/metrics-jetty10/pom.xml
+++ b/metrics-jetty10/pom.xml
@@ -46,6 +46,11 @@
                 <artifactId>slf4j-api</artifactId>
                 <version>${slf4j.version}</version>
             </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/metrics-jetty11/pom.xml b/metrics-jetty11/pom.xml
index 4e1d9a568d..13a55806e1 100644
--- a/metrics-jetty11/pom.xml
+++ b/metrics-jetty11/pom.xml
@@ -46,6 +46,11 @@
                 <artifactId>slf4j-api</artifactId>
                 <version>${slf4j.version}</version>
             </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/metrics-jmx/pom.xml b/metrics-jmx/pom.xml
index 3b2c1777dc..b778e12a72 100644
--- a/metrics-jmx/pom.xml
+++ b/metrics-jmx/pom.xml
@@ -27,6 +27,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/metrics-json/pom.xml b/metrics-json/pom.xml
index ae9a984f20..30ec4f8ba1 100644
--- a/metrics-json/pom.xml
+++ b/metrics-json/pom.xml
@@ -30,6 +30,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/metrics-jvm/pom.xml b/metrics-jvm/pom.xml
index c20592e3f1..c2bc2cf6cf 100644
--- a/metrics-jvm/pom.xml
+++ b/metrics-jvm/pom.xml
@@ -29,6 +29,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/metrics-log4j2/pom.xml b/metrics-log4j2/pom.xml
index 075d3e78b1..5bb6bbae68 100644
--- a/metrics-log4j2/pom.xml
+++ b/metrics-log4j2/pom.xml
@@ -42,6 +42,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/metrics-logback/pom.xml b/metrics-logback/pom.xml
index 81632135b3..74d1d82408 100644
--- a/metrics-logback/pom.xml
+++ b/metrics-logback/pom.xml
@@ -29,6 +29,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/metrics-logback13/pom.xml b/metrics-logback13/pom.xml
index 3ecf2c9701..25ab582be8 100644
--- a/metrics-logback13/pom.xml
+++ b/metrics-logback13/pom.xml
@@ -30,6 +30,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/metrics-logback14/pom.xml b/metrics-logback14/pom.xml
index 8df3f13fad..c01a5f463a 100644
--- a/metrics-logback14/pom.xml
+++ b/metrics-logback14/pom.xml
@@ -32,6 +32,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/metrics-servlets/pom.xml b/metrics-servlets/pom.xml
index f44b5e3fd6..7be0ea5bc6 100644
--- a/metrics-servlets/pom.xml
+++ b/metrics-servlets/pom.xml
@@ -39,6 +39,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/pom.xml b/pom.xml
index 7765b88b04..92a8c4fadd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,8 @@
         <jetty11.version>11.0.13</jetty11.version>
         <slf4j.version>1.7.36</slf4j.version>
         <assertj.version>3.23.1</assertj.version>
-        <mockito.version>4.6.1</mockito.version>
+        <byte-buddy.version>1.12.23</byte-buddy.version>
+        <mockito.version>5.1.1</mockito.version>
         <junit.version>4.13.1</junit.version>
         <hamcrest.version>1.3</hamcrest.version>
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>