From 325f55bd90c7673bb501c42af05969fc00fe3cb4 Mon Sep 17 00:00:00 2001
From: Julien Ponge <jponge@redhat.com>
Date: Fri, 13 Oct 2023 10:32:34 +0200
Subject: [PATCH 1/2] build(ci): build pull requests against Temurin 21

---
 .github/workflows/build-pull.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-pull.yml b/.github/workflows/build-pull.yml
index f7a2efcf9..3dc43af09 100644
--- a/.github/workflows/build-pull.yml
+++ b/.github/workflows/build-pull.yml
@@ -17,7 +17,7 @@ jobs:
         java: [
           { 'version': '11', opts: '' },
           { 'version': '17', 'opts': '' },
-          { 'version': '20', 'opts': '' }
+          { 'version': '21', 'opts': '' }
         ]
     name: Build with Java ${{ matrix.java.version }}
     steps:

From f014340d57667651417326936e9fdc908dcd41b5 Mon Sep 17 00:00:00 2001
From: Julien Ponge <jponge@redhat.com>
Date: Fri, 13 Oct 2023 12:25:13 +0200
Subject: [PATCH 2/2] build(maven): declare an explicit ByteBuddy version for
 Mockito

Mockito doesn't work on Java 21 with its default ByteBuddy version.
---
 pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index f9b5fa0f6..0fb85370b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,9 @@
         <version.surefire.plugin>3.1.2</version.surefire.plugin>
         <testng.version>7.8.0</testng.version>
         <testng-junit5-engine.version>1.0.4</testng-junit5-engine.version>
+
         <mockito-core.version>5.5.0</mockito-core.version>
+        <byte-buddy.version>1.14.9</byte-buddy.version>
 
         <revapi-maven-plugin.version>0.15.0</revapi-maven-plugin.version>
         <revapi-java.version>0.28.1</revapi-java.version>
@@ -173,6 +175,11 @@
                 <version>${mockito-core.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.smallrye</groupId>
                 <artifactId>smallrye-context-propagation</artifactId>