From 13a62bfc8a73c53e1b2cb5dc4f22228fd1e850da Mon Sep 17 00:00:00 2001
From: Piotrek Zygielo <piotr.zygielo@gmail.com>
Date: Sat, 16 Dec 2023 15:03:05 +0100
Subject: [PATCH] Use JDK21 in build

Reorder dependencies to let newer bytebuddy from mockito win over assert-j
---
 .github/workflows/maven.yml |  2 +-
 mq/main/pom.xml             | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 81a2d3e14..e9f8ea29f 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: [ 17 ]
+        java_version: [ 21 ]
 
     steps:
     - name: Checkout for build
diff --git a/mq/main/pom.xml b/mq/main/pom.xml
index 21d78e87e..a8c28d900 100644
--- a/mq/main/pom.xml
+++ b/mq/main/pom.xml
@@ -941,31 +941,31 @@
             </dependencies>
         </profile>
         <profile>
-            <id>add-test-dependencies:assertj-core</id>
+            <id>add-test-dependencies:mockito-core</id>
             <activation>
                 <file>
-                    <exists>${basedir}/src/test/needs.assertj-core</exists>
+                    <exists>${basedir}/src/test/needs.mockito-core</exists>
                 </file>
             </activation>
             <dependencies>
                 <dependency>
-                    <groupId>org.assertj</groupId>
-                    <artifactId>assertj-core</artifactId>
+                    <groupId>org.mockito</groupId>
+                    <artifactId>mockito-core</artifactId>
+                    <scope>test</scope>
                 </dependency>
             </dependencies>
         </profile>
         <profile>
-            <id>add-test-dependencies:mockito-core</id>
+            <id>add-test-dependencies:assertj-core</id>
             <activation>
                 <file>
-                    <exists>${basedir}/src/test/needs.mockito-core</exists>
+                    <exists>${basedir}/src/test/needs.assertj-core</exists>
                 </file>
             </activation>
             <dependencies>
                 <dependency>
-                    <groupId>org.mockito</groupId>
-                    <artifactId>mockito-core</artifactId>
-                    <scope>test</scope>
+                    <groupId>org.assertj</groupId>
+                    <artifactId>assertj-core</artifactId>
                 </dependency>
             </dependencies>
         </profile>