From e14ab71cbd361262f80e47a6a8da47a82b44a3e2 Mon Sep 17 00:00:00 2001
From: Piotr Findeisen <piotr.findeisen@gmail.com>
Date: Mon, 5 Feb 2024 14:11:24 +0100
Subject: [PATCH 1/2] Load junit-extensions for surefire tests

It is very useful when running JUnit tests, and harmless otherwise.
---
 CHANGES.md      |  4 ++++
 airbase/pom.xml | 15 +++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 9315bccc2..19e6d8148 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,7 @@
+Airbase 150
+
+* Verify JUnit tests with Airlift `junit-extensions` verifier.
+
 Airbase 149
 * Remove bval dependency
 * Plugin updates:
diff --git a/airbase/pom.xml b/airbase/pom.xml
index 8c104406f..17c28f69a 100644
--- a/airbase/pom.xml
+++ b/airbase/pom.xml
@@ -840,6 +840,7 @@
                             <user.timezone>${air.test.timezone}</user.timezone>
                             <java.awt.headless>true</java.awt.headless>
                             <java.util.logging.SimpleFormatter.format>%1$tY-%1$tm-%1$tdT%1$tH:%1$tM:%1$tS.%1$tL%1$tz %4$s %5$s%6$s%n</java.util.logging.SimpleFormatter.format>
+                            <junit.jupiter.extensions.autodetection.enabled>true</junit.jupiter.extensions.autodetection.enabled>
                         </systemPropertyVariables>
                         <trimStackTrace>false</trimStackTrace>
                         <runOrder>random</runOrder>
@@ -862,6 +863,20 @@
                             ${surefireEnablePreview}
                             ${air.test.jvm.additional-arguments}
                         </argLine>
+                        <additionalClasspathDependencies>
+                            <additionalClasspathDependency>
+                                <groupId>io.airlift</groupId>
+                                <artifactId>junit-extensions</artifactId>
+                                <version>3</version>
+                                <exclusions>
+                                    <!-- additionalClasspathDependencies does not support dependency resolution, so dependencies result in duplicate/conflicting classpath elements -->
+                                    <exclusion>
+                                        <groupId>*</groupId>
+                                        <artifactId>*</artifactId>
+                                    </exclusion>
+                                </exclusions>
+                            </additionalClasspathDependency>
+                        </additionalClasspathDependencies>
                     </configuration>
                 </plugin>
 

From a23bfd8698f8b10f3c09156759518437177e791b Mon Sep 17 00:00:00 2001
From: Piotr Findeisen <piotr.findeisen@gmail.com>
Date: Tue, 6 Feb 2024 10:08:35 +0100
Subject: [PATCH 2/2] Update junit to 5.10.2

JUnit 5.10.1 has this somewhat desired feature of not ignoring
overridden tests. This is important behavioral aspect changed back in
5.10.2. Worth updating if only to prevent becoming used to 5.10.1
behavior.
---
 CHANGES.md      | 2 ++
 airbase/pom.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 19e6d8148..be5f70f71 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,8 @@
 Airbase 150
 
 * Verify JUnit tests with Airlift `junit-extensions` verifier.
+* Dependency updates:
+  - junit 5.10.2 (from 5.10.1)
 
 Airbase 149
 * Remove bval dependency
diff --git a/airbase/pom.xml b/airbase/pom.xml
index 17c28f69a..4bd4e457c 100644
--- a/airbase/pom.xml
+++ b/airbase/pom.xml
@@ -176,7 +176,7 @@
         <dep.jmh.version>1.37</dep.jmh.version>
         <dep.jmxutils.version>1.25</dep.jmxutils.version>
         <dep.joda.version>2.12.6</dep.joda.version>
-        <dep.junit.version>5.10.1</dep.junit.version>
+        <dep.junit.version>5.10.2</dep.junit.version>
         <dep.kotlin.version>1.9.22</dep.kotlin.version>
         <dep.logback.version>1.4.14</dep.logback.version>
         <dep.modernizer.version>2.7.0</dep.modernizer.version>