From fcf30e57ab0a359217994d6bc961ebf54f9a4469 Mon Sep 17 00:00:00 2001
From: Stefano Cordio <stefano_cordio@epam.com>
Date: Sun, 28 Jul 2024 23:27:32 +0200
Subject: [PATCH] Improve cross-version testing

---
 .github/workflows/cross-version.yml | 32 +++++++++++++++---
 pom.xml                             | 52 +++++++++++++++++------------
 2 files changed, 59 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index 7d481ed..a3c366e 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -7,9 +7,13 @@ env:
 
 jobs:
 
-  java_17:
+  java:
 
-    name: Java 17
+    name: Java ${{ matrix.java }}
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [ 8, 11, 17 ]
     runs-on: ubuntu-latest
 
     steps:
@@ -17,13 +21,13 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: ${{ matrix.java }}
           distribution: 'zulu'
           cache: maven
       - name: Test
         run: ./mvnw $MAVEN_ARGS verify
 
-  java:
+  java-oracle:
 
     name: Java ${{ matrix.java }}
     strategy:
@@ -42,3 +46,23 @@ jobs:
           version: latest
       - name: Test
         run: ./mvnw $MAVEN_ARGS verify
+
+  junit:
+
+    name: JUnit Jupiter ${{ matrix.junit-jupiter }}
+    strategy:
+      fail-fast: false
+      matrix:
+        junit-jupiter: [5.10.0, 5.10.3, 5.11.0-M2]
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'zulu'
+          cache: maven
+      - name: Test
+        run: ./mvnw $MAVEN_ARGS -Djunit-jupiter.version=${{ matrix.junit-jupiter }} verify
diff --git a/pom.xml b/pom.xml
index 9eb0118..1bf7eaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,27 +129,6 @@
       </plugins>
     </pluginManagement>
     <plugins>
-      <plugin>
-        <groupId>com.diffplug.spotless</groupId>
-        <artifactId>spotless-maven-plugin</artifactId>
-        <version>2.43.0</version>
-        <configuration>
-          <java>
-            <googleJavaFormat/>
-            <includes>
-              <include>src/main/java/**/*.java</include>
-              <include>src/test/java/**/*.java</include>
-            </includes>
-          </java>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>com.mycila</groupId>
         <artifactId>license-maven-plugin</artifactId>
@@ -208,6 +187,37 @@
   </build>
 
   <profiles>
+    <profile>
+      <id>spotless</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.diffplug.spotless</groupId>
+            <artifactId>spotless-maven-plugin</artifactId>
+            <version>2.43.0</version>
+            <configuration>
+              <java>
+                <googleJavaFormat/>
+                <includes>
+                  <include>src/main/java/**/*.java</include>
+                  <include>src/test/java/**/*.java</include>
+                </includes>
+              </java>
+            </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>release</id>
       <properties>