diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index c67c56ee..f6313f84 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -8,18 +8,19 @@ jobs:
     name: Java ${{ matrix.java }}
     strategy:
       matrix:
-        java: [8, 11, 12, 13, 14, 15, 16, 17]
+        java: [17]
     env:
       REPO_SLUG: ${{ github.repository }}
       BRANCH: ${{ github.head_ref }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java }}
+        distribution: temurin
     - name: Cache Maven dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/.m2
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -32,18 +33,19 @@ jobs:
     name: Java ${{ matrix.java }}
     strategy:
       matrix:
-        java: [11]
+        java: [17]
     env:
       REPO_SLUG: ${{ github.repository }}
       BRANCH: ${{ github.head_ref }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java }}
+        distribution: temurin
     - name: Cache Maven dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/.m2
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -56,18 +58,19 @@ jobs:
     name: Java ${{ matrix.java }}
     strategy:
       matrix:
-        java: [11]
+        java: [17]
     env:
       REPO_SLUG: ${{ github.repository }}
       BRANCH: ${{ github.head_ref }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java }}
+        distribution: temurin
     - name: Cache Maven dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/.m2
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -80,18 +83,19 @@ jobs:
     name: Java ${{ matrix.java }}
     strategy:
       matrix:
-        java: [11]
+        java: [17]
     env:
       REPO_SLUG: ${{ github.repository }}
       BRANCH: ${{ github.head_ref }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
+          distribution: temurin
       - name: Cache Maven dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
diff --git a/core/pom.xml b/core/pom.xml
index db63193c..49bf9469 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,9 +21,6 @@
     <artifactId>quick-perf-core</artifactId>
 
     <properties>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-        <dependencies.max.jdk.version>1.7</dependencies.max.jdk.version>
         <javadoc-subpackages>org.quickperf.annotation,org.quickperf.config</javadoc-subpackages>
     </properties>
 
diff --git a/junit4/junit4-12-jvm-test/pom.xml b/junit4/junit4-12-jvm-test/pom.xml
index 4235287c..71d099fc 100644
--- a/junit4/junit4-12-jvm-test/pom.xml
+++ b/junit4/junit4-12-jvm-test/pom.xml
@@ -21,9 +21,6 @@
     <artifactId>quick-perf-junit4-12-jvm-test</artifactId>
 
     <properties>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-        <dependencies.max.jdk.version>1.7</dependencies.max.jdk.version>
         <jar.skipIfEmpty>true</jar.skipIfEmpty>
         <gpg.skip>true</gpg.skip>
         <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
diff --git a/junit4/junit4-13-1-jvm-test/pom.xml b/junit4/junit4-13-1-jvm-test/pom.xml
index b69e99fc..c685ff1b 100644
--- a/junit4/junit4-13-1-jvm-test/pom.xml
+++ b/junit4/junit4-13-1-jvm-test/pom.xml
@@ -22,9 +22,6 @@
     <artifactId>quick-perf-junit4-13-1-jvm-test</artifactId>
 
     <properties>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-        <dependencies.max.jdk.version>1.7</dependencies.max.jdk.version>
         <jar.skipIfEmpty>true</jar.skipIfEmpty>
         <gpg.skip>true</gpg.skip>
         <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
diff --git a/junit4/junit4-13-2-jvm-test/pom.xml b/junit4/junit4-13-2-jvm-test/pom.xml
index e8077bbb..41cb6e47 100644
--- a/junit4/junit4-13-2-jvm-test/pom.xml
+++ b/junit4/junit4-13-2-jvm-test/pom.xml
@@ -22,9 +22,6 @@
     <artifactId>quick-perf-junit4-13-2-jvm-test</artifactId>
 
     <properties>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-        <dependencies.max.jdk.version>1.7</dependencies.max.jdk.version>
         <jar.skipIfEmpty>true</jar.skipIfEmpty>
         <gpg.skip>true</gpg.skip>
         <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
diff --git a/junit4/junit4-13-jvm-test/pom.xml b/junit4/junit4-13-jvm-test/pom.xml
index daf653cb..50d34d48 100644
--- a/junit4/junit4-13-jvm-test/pom.xml
+++ b/junit4/junit4-13-jvm-test/pom.xml
@@ -22,9 +22,6 @@
     <artifactId>quick-perf-junit4-13-jvm-test</artifactId>
 
     <properties>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-        <dependencies.max.jdk.version>1.7</dependencies.max.jdk.version>
         <jar.skipIfEmpty>true</jar.skipIfEmpty>
         <gpg.skip>true</gpg.skip>
         <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
diff --git a/junit4/junit4-5-jvm-test/pom.xml b/junit4/junit4-5-jvm-test/pom.xml
index b00e5d5a..88390603 100644
--- a/junit4/junit4-5-jvm-test/pom.xml
+++ b/junit4/junit4-5-jvm-test/pom.xml
@@ -22,9 +22,6 @@
     <artifactId>quick-perf-junit4-5-jvm-test</artifactId>
 
     <properties>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-        <dependencies.max.jdk.version>1.7</dependencies.max.jdk.version>
         <jar.skipIfEmpty>true</jar.skipIfEmpty>
         <gpg.skip>true</gpg.skip>
         <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
diff --git a/junit4/junit4-runner/pom.xml b/junit4/junit4-runner/pom.xml
index 1bc668c2..91ca7d76 100644
--- a/junit4/junit4-runner/pom.xml
+++ b/junit4/junit4-runner/pom.xml
@@ -21,9 +21,6 @@
     <artifactId>quick-perf-junit4</artifactId>
 
     <properties>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-        <dependencies.max.jdk.version>1.7</dependencies.max.jdk.version>
         <javadoc-sourceFileIncludes>**\/\QuickPerfJUnitRunner.java</javadoc-sourceFileIncludes>
     </properties>
 
diff --git a/junit4/junit4-sql-test/pom.xml b/junit4/junit4-sql-test/pom.xml
index abd02c11..2ca9e7d4 100644
--- a/junit4/junit4-sql-test/pom.xml
+++ b/junit4/junit4-sql-test/pom.xml
@@ -21,9 +21,6 @@
     <artifactId>quick-perf-junit4-sql-test</artifactId>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <dependencies.max.jdk.version>1.8</dependencies.max.jdk.version>
         <jar.skipIfEmpty>true</jar.skipIfEmpty>
         <gpg.skip>true</gpg.skip>
         <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
diff --git a/junit5/junit5-test-util/pom.xml b/junit5/junit5-test-util/pom.xml
index 5ff6d16d..2d4c79d2 100644
--- a/junit5/junit5-test-util/pom.xml
+++ b/junit5/junit5-test-util/pom.xml
@@ -24,6 +24,7 @@
         <maven.deploy.skip>true</maven.deploy.skip>
         <gpg.skip>true</gpg.skip>
         <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+        <allowIncompleteProjects>true</allowIncompleteProjects>
     </properties>
 
     <build>
diff --git a/junit5/pom.xml b/junit5/pom.xml
index c7e58913..9dc4c7b5 100644
--- a/junit5/pom.xml
+++ b/junit5/pom.xml
@@ -23,9 +23,6 @@
     <packaging>pom</packaging>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-        <dependencies.max.jdk.version>8</dependencies.max.jdk.version>
         <junit5.jupiter.version>5.6.2</junit5.jupiter.version>
         <junit5.platform.version>1.6.2</junit5.platform.version>
     </properties>
diff --git a/jvm/jfr-annotations/pom.xml b/jvm/jfr-annotations/pom.xml
index 1116c6d7..7ead4015 100644
--- a/jvm/jfr-annotations/pom.xml
+++ b/jvm/jfr-annotations/pom.xml
@@ -39,12 +39,12 @@
         <dependency>
             <groupId>org.openjdk.jmc</groupId>
             <artifactId>flightrecorder.rules.jdk</artifactId>
-            <version>7.1.1</version>
+            <version>9.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
-            <version>1.11.1</version>
+            <version>1.15.3</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/jvm/jfr-annotations/src/main/java/org/quickperf/jvm/jmcrule/HtmlToPlainTextTransformer.java b/jvm/jfr-annotations/src/main/java/org/quickperf/jvm/jmcrule/HtmlToPlainTextTransformer.java
index d158ee70..32c6277d 100644
--- a/jvm/jfr-annotations/src/main/java/org/quickperf/jvm/jmcrule/HtmlToPlainTextTransformer.java
+++ b/jvm/jfr-annotations/src/main/java/org/quickperf/jvm/jmcrule/HtmlToPlainTextTransformer.java
@@ -13,7 +13,6 @@
 package org.quickperf.jvm.jmcrule;
 
 import org.jsoup.Jsoup;
-import org.jsoup.examples.HtmlToPlainText;
 import org.jsoup.nodes.Document;
 
 class HtmlToPlainTextTransformer {
@@ -21,10 +20,9 @@ class HtmlToPlainTextTransformer {
     public static final HtmlToPlainTextTransformer INSTANCE = new HtmlToPlainTextTransformer();
 
     public String convertHtmlToPlainText(String html) {
-        HtmlToPlainText htmlToPlainText = new HtmlToPlainText();
         Document jsoupDocument = Jsoup.parse(html);
         jsoupDocument.select("p").prepend("<br>");
-        return htmlToPlainText.getPlainText(jsoupDocument);
+        return jsoupDocument.text();
     }
 
 }
diff --git a/jvm/jfr-annotations/src/main/java/org/quickperf/jvm/jmcrule/JmcRuleCountMeasureExtractor.java b/jvm/jfr-annotations/src/main/java/org/quickperf/jvm/jmcrule/JmcRuleCountMeasureExtractor.java
index 161ceb0e..17f6a72a 100644
--- a/jvm/jfr-annotations/src/main/java/org/quickperf/jvm/jmcrule/JmcRuleCountMeasureExtractor.java
+++ b/jvm/jfr-annotations/src/main/java/org/quickperf/jvm/jmcrule/JmcRuleCountMeasureExtractor.java
@@ -14,10 +14,8 @@
 
 import org.openjdk.jmc.common.item.IItemCollection;
 import org.openjdk.jmc.common.util.IPreferenceValueProvider;
-import org.openjdk.jmc.flightrecorder.rules.IRule;
-import org.openjdk.jmc.flightrecorder.rules.Result;
-import org.openjdk.jmc.flightrecorder.rules.RuleRegistry;
-import org.openjdk.jmc.flightrecorder.rules.Severity;
+import org.openjdk.jmc.flightrecorder.rules.*;
+
 import org.quickperf.ExtractablePerformanceMeasure;
 import org.quickperf.jvm.jfr.JfrRecording;
 import org.quickperf.unit.Count;
@@ -39,7 +37,7 @@ private JmcRuleCountMeasureExtractor() {}
     public JmcRulesMeasure extractPerfMeasureFrom(JfrRecording jfrRecording) {
 
         IItemCollection jfrEvents = jfrRecording.getJfrEvents();
-        List<Result> ruleEvaluations = evaluateJmcRules(jfrEvents);
+        List<IResult> ruleEvaluations = evaluateJmcRules(jfrEvents);
 
         List<Count> jmcRules = buildJmcRuleCountsFrom(ruleEvaluations);
 
@@ -47,12 +45,13 @@ public JmcRulesMeasure extractPerfMeasureFrom(JfrRecording jfrRecording) {
 
     }
 
-    private List<Result> evaluateJmcRules(IItemCollection jfrEvents) {
-        List<Result> ruleEvaluations = new ArrayList<>();
+    private List<IResult> evaluateJmcRules(IItemCollection jfrEvents) {
+        List<IResult> ruleEvaluations = new ArrayList<>();
         for (IRule rule : RuleRegistry.getRules()) {
-            RunnableFuture<Result> future = rule.evaluate(jfrEvents, IPreferenceValueProvider.DEFAULT_VALUES);
+            RunnableFuture<IResult> future = rule.createEvaluation(jfrEvents,
+                    IPreferenceValueProvider.DEFAULT_VALUES, new ResultProvider());
             future.run();
-            Result result;
+            IResult result;
             try {
                 result = future.get();
             } catch (InterruptedException | ExecutionException e) {
@@ -63,9 +62,9 @@ private List<Result> evaluateJmcRules(IItemCollection jfrEvents) {
         return ruleEvaluations;
     }
 
-    private List<Count> buildJmcRuleCountsFrom(List<Result> ruleEvaluations) {
+    private List<Count> buildJmcRuleCountsFrom(List<IResult> ruleEvaluations) {
         List<Count> jmcRules = new ArrayList<>();
-        for (Result ruleEvaluation : ruleEvaluations) {
+        for (IResult ruleEvaluation : ruleEvaluations) {
             Count ruleScore = buildJmcRuleCountFrom(ruleEvaluation);
             if(!ruleToExclude(ruleScore)) {
                 jmcRules.add(ruleScore);
@@ -82,15 +81,15 @@ private boolean ruleToExclude(Count ruleScore) {
                 || ruleDescription.contains("Rule: Metaspace Live Set Trend");
     }
 
-    private Count buildJmcRuleCountFrom(Result result) {
+    private Count buildJmcRuleCountFrom(IResult result) {
         StringWriter stringWriter = new StringWriter();
 
         PrintWriter printWriter = new PrintWriter(stringWriter);
         printWriter.println("Rule: " + result.getRule().getName());
-        printWriter.println("Severity: " + Severity.get(result.getScore()));
-        long score = (long) result.getScore();
+        printWriter.println("Severity: " + result.getSeverity());
+        long score = (long) result.getSeverity().getLimit();
         printWriter.println("Score: " + score);
-        String longDescriptionAsHtml = result.getLongDescription();
+        String longDescriptionAsHtml = result.getExplanation();
         String textDesc = HtmlToPlainTextTransformer.INSTANCE.convertHtmlToPlainText(longDescriptionAsHtml);
         printWriter.println("Message: " + textDesc);
 
diff --git a/jvm/pom.xml b/jvm/pom.xml
index 9b1fc220..f0ed1dbe 100644
--- a/jvm/pom.xml
+++ b/jvm/pom.xml
@@ -23,9 +23,6 @@
     <packaging>pom</packaging>
 
     <properties>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-        <dependencies.max.jdk.version>1.7</dependencies.max.jdk.version>
     </properties>
 
     <modules>
diff --git a/pom.xml b/pom.xml
index ff8205ee..0d5db1da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,10 +10,13 @@
   ~ Copyright 2019-2022 the original author or authors.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <description>QuickPerf is a testing library for Java providing annotations to quickly evaluate some performance properties.</description>
+    <description>QuickPerf is a testing library for Java providing annotations to quickly evaluate some performance
+        properties.
+    </description>
 
     <url>https://github.com/quick-perf/quickperf</url>
 
@@ -42,19 +45,24 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <dependencies.max.jdk.version>1.7</dependencies.max.jdk.version>
-        <junit4.test.version>4.12</junit4.test.version>
-        <mockito.core.version>2.25.0</mockito.core.version>
-        <h2.version>1.4.198</h2.version>
-        <commons-dbcp.version>1.4</commons-dbcp.version>
-        <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
-        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
-        <logback-classic.version>1.1.0</logback-classic.version>
-        <jcl-over-slf4j.version>1.7.25</jcl-over-slf4j.version>
-        <javadoc-subpackages />
+        <dependencies.max.jdk.version>17</dependencies.max.jdk.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <junit4.test.version>4.13.2</junit4.test.version>
+        <mockito.core.version>5.17.0</mockito.core.version>
+        <h2.version>2.3.232</h2.version>
+        <commons-dbcp.version>2.13.0</commons-dbcp.version>
+        <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
+        <maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
+        <maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
+        <logback-classic.version>1.5.18</logback-classic.version>
+        <jcl-over-slf4j.version>2.0.17</jcl-over-slf4j.version>
+        <flightrecorder-rules-jdk.version>9.1.0</flightrecorder-rules-jdk.version>
+        <javadoc-subpackages/>
         <javadoc-sourceFileIncludes>**\/\*.java</javadoc-sourceFileIncludes>
         <project.build.outputTimestamp>2023-11-21T21:44:04Z</project.build.outputTimestamp>
         <jar.skipIfEmpty>true</jar.skipIfEmpty>
+        <testng.version>7.5.1</testng.version>
     </properties>
 
     <dependencies>
@@ -66,6 +74,16 @@
         </dependency>
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.openjdk.jmc</groupId>
+                <artifactId>flightrecorder.rules.jdk</artifactId>
+                <version>${flightrecorder-rules-jdk.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <pluginManagement>
             <plugins>
@@ -112,8 +130,9 @@
                 </configuration>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.4.1</version>
+                <version>${maven-enforcer-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>enforce-bytecode-version</id>
@@ -122,7 +141,7 @@
                         </goals>
                         <configuration>
                             <rules>
-                                <banCircularDependencies />
+                                <banCircularDependencies/>
                                 <enforceBytecodeVersion>
                                     <maxJdkVersion>${dependencies.max.jdk.version}</maxJdkVersion>
                                     <ignoreClasses>
@@ -138,7 +157,7 @@
                     <dependency>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>extra-enforcer-rules</artifactId>
-                        <version>1.2</version>
+                        <version>1.9.0</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -260,7 +279,8 @@
                         <artifactId>maven-release-plugin</artifactId>
                         <version>3.0.0-M1</version>
                         <configuration>
-                            <allowTimestampedSnapshots>true</allowTimestampedSnapshots> <!--Because of junit4-spring-base-tests-->
+                            <allowTimestampedSnapshots>true
+                            </allowTimestampedSnapshots> <!--Because of junit4-spring-base-tests-->
                             <autoVersionSubmodules>true</autoVersionSubmodules>
                             <useReleaseProfile>false</useReleaseProfile>
                             <releaseProfiles>release</releaseProfiles>
@@ -292,14 +312,6 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
-        <repository>
-            <id>AdoptOpenJDK</id>
-            <name>AdoptOpenJDK</name>
-            <url>https://adoptopenjdk.jfrog.io/adoptopenjdk/jmc-libs</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
     </repositories>
 
     <developers>
diff --git a/spring/junit4-spring-base-tests/pom.xml b/spring/junit4-spring-base-tests/pom.xml
index ca70071e..10bc6b98 100644
--- a/spring/junit4-spring-base-tests/pom.xml
+++ b/spring/junit4-spring-base-tests/pom.xml
@@ -21,11 +21,10 @@
     <artifactId>quick-perf-junit4-spring-base-tests</artifactId>
 
     <properties>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
         <maven.deploy.skip>true</maven.deploy.skip>
         <gpg.skip>true</gpg.skip>
         <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+        <allowIncompleteProjects>true</allowIncompleteProjects>
     </properties>
 
     <dependencies>
diff --git a/spring/junit4-spring-boot-test/pom.xml b/spring/junit4-spring-boot-test/pom.xml
index 132e14e9..59e9581c 100644
--- a/spring/junit4-spring-boot-test/pom.xml
+++ b/spring/junit4-spring-boot-test/pom.xml
@@ -23,9 +23,6 @@
     <artifactId>quick-perf-junit4-spring-boot-test</artifactId>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <dependencies.max.jdk.version>1.8</dependencies.max.jdk.version>
         <maven.install.skip>true</maven.install.skip>
         <maven.deploy.skip>true</maven.deploy.skip>
         <gpg.skip>true</gpg.skip>
@@ -37,7 +34,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.1.3.RELEASE</version>
+                <version>2.7.18</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -125,6 +122,12 @@
             <version>2.4.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/spring/junit4-spring3/pom.xml b/spring/junit4-spring3/pom.xml
index f8c51afd..6d7a4487 100644
--- a/spring/junit4-spring3/pom.xml
+++ b/spring/junit4-spring3/pom.xml
@@ -10,7 +10,8 @@
   ~ Copyright 2019-2022 the original author or authors.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.quickperf</groupId>
         <artifactId>quick-perf-spring</artifactId>
@@ -22,9 +23,6 @@
     <version>1.1.2-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-        <dependencies.max.jdk.version>1.7</dependencies.max.jdk.version>
         <spring-version>3.2.18.RELEASE</spring-version>
     </properties>
 
@@ -129,8 +127,8 @@
         </dependency>
 
         <dependency>
-            <groupId>commons-dbcp</groupId>
-            <artifactId>commons-dbcp</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-dbcp2</artifactId>
             <version>${commons-dbcp.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/spring/junit4-spring3/src/test/java/org/quickperf/spring/database/SpringConfig.java b/spring/junit4-spring3/src/test/java/org/quickperf/spring/database/SpringConfig.java
index 402afb0c..b052d357 100644
--- a/spring/junit4-spring3/src/test/java/org/quickperf/spring/database/SpringConfig.java
+++ b/spring/junit4-spring3/src/test/java/org/quickperf/spring/database/SpringConfig.java
@@ -12,7 +12,7 @@
  */
 package org.quickperf.spring.database;
 
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
 import org.quickperf.spring.sql.QuickPerfProxyBeanPostProcessor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
diff --git a/spring/junit4-spring4/pom.xml b/spring/junit4-spring4/pom.xml
index 9f87da8c..b8f6cc30 100644
--- a/spring/junit4-spring4/pom.xml
+++ b/spring/junit4-spring4/pom.xml
@@ -22,9 +22,6 @@
     <version>1.1.2-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-        <dependencies.max.jdk.version>1.7</dependencies.max.jdk.version>
     </properties>
 
     <dependencies>
@@ -114,8 +111,8 @@
         </dependency>
 
         <dependency>
-            <groupId>commons-dbcp</groupId>
-            <artifactId>commons-dbcp</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-dbcp2</artifactId>
             <version>${commons-dbcp.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/spring/junit4-spring4/src/test/java/org/quickperf/spring/database/SpringConfig.java b/spring/junit4-spring4/src/test/java/org/quickperf/spring/database/SpringConfig.java
index 301452ff..e59fc11d 100644
--- a/spring/junit4-spring4/src/test/java/org/quickperf/spring/database/SpringConfig.java
+++ b/spring/junit4-spring4/src/test/java/org/quickperf/spring/database/SpringConfig.java
@@ -12,7 +12,7 @@
  */
 package org.quickperf.spring.database;
 
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
 import org.quickperf.spring.sql.QuickPerfProxyBeanPostProcessor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
diff --git a/spring/junit4-spring5/pom.xml b/spring/junit4-spring5/pom.xml
index 016fe7b1..4e480941 100644
--- a/spring/junit4-spring5/pom.xml
+++ b/spring/junit4-spring5/pom.xml
@@ -22,9 +22,6 @@
     <version>1.1.2-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <dependencies.max.jdk.version>1.8</dependencies.max.jdk.version>
     </properties>
 
     <dependencies>
@@ -100,8 +97,8 @@
         </dependency>
 
         <dependency>
-            <groupId>commons-dbcp</groupId>
-            <artifactId>commons-dbcp</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-dbcp2</artifactId>
             <version>${commons-dbcp.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/spring/junit4-spring5/src/test/java/org/quickperf/spring/database/SpringConfig.java b/spring/junit4-spring5/src/test/java/org/quickperf/spring/database/SpringConfig.java
index 9fcbd9d0..c46b67e2 100644
--- a/spring/junit4-spring5/src/test/java/org/quickperf/spring/database/SpringConfig.java
+++ b/spring/junit4-spring5/src/test/java/org/quickperf/spring/database/SpringConfig.java
@@ -12,7 +12,7 @@
  */
 package org.quickperf.spring.database;
 
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
 import org.quickperf.spring.sql.QuickPerfProxyBeanPostProcessor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
diff --git a/spring/junit4-spring5/src/test/java/org/quickperf/spring/database/User.java b/spring/junit4-spring5/src/test/java/org/quickperf/spring/database/User.java
index ca2d1724..ad3e94fb 100644
--- a/spring/junit4-spring5/src/test/java/org/quickperf/spring/database/User.java
+++ b/spring/junit4-spring5/src/test/java/org/quickperf/spring/database/User.java
@@ -19,7 +19,7 @@
 import java.io.Serializable;
 
 @Entity
-@Table
+@Table(name = "`User`")
 public class User implements Serializable {
 
 	private static final long serialVersionUID = -4060739788760795254L;
diff --git a/spring/pom.xml b/spring/pom.xml
index b757804d..2e715508 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -22,10 +22,8 @@
     <packaging>pom</packaging>
 
     <properties>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
         <spring4-version>4.3.22.RELEASE</spring4-version>
-        <spring5-version>5.1.8.RELEASE</spring5-version>
+        <spring5-version>5.3.39</spring5-version>
     </properties>
 
     <modules>
diff --git a/spring/spring-boot-1-sql-starter/pom.xml b/spring/spring-boot-1-sql-starter/pom.xml
index dd6dd483..b81e2e71 100644
--- a/spring/spring-boot-1-sql-starter/pom.xml
+++ b/spring/spring-boot-1-sql-starter/pom.xml
@@ -22,9 +22,6 @@
     <artifactId>quick-perf-springboot1-sql-starter</artifactId>
 
     <properties>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-        <dependencies.max.jdk.version>1.7</dependencies.max.jdk.version>
     </properties>
 
     <dependencies>
diff --git a/spring/spring-boot-2-sql-starter/pom.xml b/spring/spring-boot-2-sql-starter/pom.xml
index 47d1df3e..c5140744 100644
--- a/spring/spring-boot-2-sql-starter/pom.xml
+++ b/spring/spring-boot-2-sql-starter/pom.xml
@@ -22,9 +22,6 @@
     <artifactId>quick-perf-springboot2-sql-starter</artifactId>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <dependencies.max.jdk.version>1.8</dependencies.max.jdk.version>
     </properties>
 
     <dependencies>
diff --git a/spring/sql-spring4/pom.xml b/spring/sql-spring4/pom.xml
index dca42e88..48a2b38a 100644
--- a/spring/sql-spring4/pom.xml
+++ b/spring/sql-spring4/pom.xml
@@ -22,9 +22,6 @@
     <artifactId>quick-perf-sql-spring4</artifactId>
 
     <properties>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-        <dependencies.max.jdk.version>1.7</dependencies.max.jdk.version>
     </properties>
 
     <dependencies>
diff --git a/spring/sql-spring5/pom.xml b/spring/sql-spring5/pom.xml
index 0f6c56ac..eaa9200a 100644
--- a/spring/sql-spring5/pom.xml
+++ b/spring/sql-spring5/pom.xml
@@ -22,9 +22,6 @@
     <artifactId>quick-perf-sql-spring5</artifactId>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <dependencies.max.jdk.version>1.8</dependencies.max.jdk.version>
     </properties>
 
     <dependencies>
diff --git a/sql/sql-annotations/pom.xml b/sql/sql-annotations/pom.xml
index ae8eb7e4..f5c3415d 100644
--- a/sql/sql-annotations/pom.xml
+++ b/sql/sql-annotations/pom.xml
@@ -21,9 +21,6 @@
     <artifactId>quick-perf-sql-annotations</artifactId>
 
     <properties>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-        <dependencies.max.jdk.version>1.7</dependencies.max.jdk.version>
         <javadoc-subpackages>org.quickperf.sql.annotation,org.quickperf.sql.config</javadoc-subpackages>
     </properties>
 
diff --git a/sql/sql-hibernate-test-util/pom.xml b/sql/sql-hibernate-test-util/pom.xml
index 31e9dc3c..0c8e1797 100644
--- a/sql/sql-hibernate-test-util/pom.xml
+++ b/sql/sql-hibernate-test-util/pom.xml
@@ -20,12 +20,10 @@
     <artifactId>quick-perf-sql-hibernate-test-util</artifactId>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <dependencies.max.jdk.version>1.8</dependencies.max.jdk.version>
         <maven.deploy.skip>true</maven.deploy.skip>
         <gpg.skip>true</gpg.skip>
         <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+        <allowIncompleteProjects>true</allowIncompleteProjects>
     </properties>
 
     <dependencies>
diff --git a/sql/sql-memory-test-util/pom.xml b/sql/sql-memory-test-util/pom.xml
index 3c2d9b1b..6700b2b1 100644
--- a/sql/sql-memory-test-util/pom.xml
+++ b/sql/sql-memory-test-util/pom.xml
@@ -21,18 +21,16 @@
     <artifactId>quick-perf-sql-memory-test-util</artifactId>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <dependencies.max.jdk.version>1.8</dependencies.max.jdk.version>
         <maven.deploy.skip>true</maven.deploy.skip>
         <gpg.skip>true</gpg.skip>
         <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+        <allowIncompleteProjects>true</allowIncompleteProjects>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>commons-dbcp</groupId>
-            <artifactId>commons-dbcp</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-dbcp2</artifactId>
             <version>${commons-dbcp.version}</version>
         </dependency>
         <dependency>
diff --git a/sql/sql-memory-test-util/src/test/java/org/quickperf/sql/config/MemoryDataSourceBuilder.java b/sql/sql-memory-test-util/src/test/java/org/quickperf/sql/config/MemoryDataSourceBuilder.java
index ccaaed5d..ab0ec4dd 100644
--- a/sql/sql-memory-test-util/src/test/java/org/quickperf/sql/config/MemoryDataSourceBuilder.java
+++ b/sql/sql-memory-test-util/src/test/java/org/quickperf/sql/config/MemoryDataSourceBuilder.java
@@ -12,7 +12,9 @@
  */
 package org.quickperf.sql.config;
 
-import org.apache.commons.dbcp.BasicDataSource;
+
+
+import org.apache.commons.dbcp2.BasicDataSource;
 
 import javax.sql.DataSource;
 import java.util.concurrent.ThreadLocalRandom;
@@ -33,7 +35,7 @@ public DataSource build() {
         dataSource.setUrl(url);
         dataSource.setUsername("qp");
         dataSource.setPassword("");
-        dataSource.setMaxActive(4);
+        dataSource.setMaxTotal(4);
         dataSource.setPoolPreparedStatements(true);
         return dataSource;
     }
diff --git a/sql/sql-memory-test/pom.xml b/sql/sql-memory-test/pom.xml
index d57c7658..16afe570 100644
--- a/sql/sql-memory-test/pom.xml
+++ b/sql/sql-memory-test/pom.xml
@@ -21,9 +21,6 @@
     <artifactId>quick-perf-sql-memory-test</artifactId>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <dependencies.max.jdk.version>1.8</dependencies.max.jdk.version>
         <jar.skipIfEmpty>true</jar.skipIfEmpty>
         <gpg.skip>true</gpg.skip>
         <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
diff --git a/sql/sql-testcontainers-test/pom.xml b/sql/sql-testcontainers-test/pom.xml
index 847c3b52..7b3f2e54 100644
--- a/sql/sql-testcontainers-test/pom.xml
+++ b/sql/sql-testcontainers-test/pom.xml
@@ -29,9 +29,6 @@
     </modules>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <dependencies.max.jdk.version>1.8</dependencies.max.jdk.version>
         <testcontainers.version>1.17.3</testcontainers.version>
         <maven.deploy.skip>true</maven.deploy.skip>
         <gpg.skip>true</gpg.skip>
diff --git a/sql/sql-testcontainers-test/test-containers-test-util/pom.xml b/sql/sql-testcontainers-test/test-containers-test-util/pom.xml
index 67bd9041..5f704cd5 100644
--- a/sql/sql-testcontainers-test/test-containers-test-util/pom.xml
+++ b/sql/sql-testcontainers-test/test-containers-test-util/pom.xml
@@ -46,8 +46,8 @@
             <version>${testcontainers.version}</version>
         </dependency>
         <dependency>
-            <groupId>commons-dbcp</groupId>
-            <artifactId>commons-dbcp</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-dbcp2</artifactId>
             <version>${commons-dbcp.version}</version>
         </dependency>
         <dependency>
diff --git a/sql/sql-testcontainers-test/test-containers-test-util/src/test/java/org/quickperf/sql/TcEntityManagerFactoryBuilder.java b/sql/sql-testcontainers-test/test-containers-test-util/src/test/java/org/quickperf/sql/TcEntityManagerFactoryBuilder.java
index 2f305b1f..d31766ab 100644
--- a/sql/sql-testcontainers-test/test-containers-test-util/src/test/java/org/quickperf/sql/TcEntityManagerFactoryBuilder.java
+++ b/sql/sql-testcontainers-test/test-containers-test-util/src/test/java/org/quickperf/sql/TcEntityManagerFactoryBuilder.java
@@ -13,7 +13,7 @@
 package org.quickperf.sql;
 
 import net.ttddyy.dsproxy.support.ProxyDataSource;
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
 import org.hibernate.jpa.HibernatePersistenceProvider;
 import org.quickperf.sql.config.HibernateConfigBuilder;
 import org.quickperf.sql.config.PersistenceUnitInfoBuilder;
@@ -63,7 +63,7 @@ public DataSource buildFrom(JdbcDatabaseContainer jdbc) {
             dataSource.setUrl(jdbc.getJdbcUrl());
             dataSource.setUsername(jdbc.getUsername());
             dataSource.setPassword(jdbc.getPassword());
-            dataSource.setMaxActive(4);
+            dataSource.setMaxTotal(4);
             dataSource.setPoolPreparedStatements(true);
             return dataSource;
         }
diff --git a/testng/pom.xml b/testng/pom.xml
index 0e3fecaf..69b6cd0e 100644
--- a/testng/pom.xml
+++ b/testng/pom.xml
@@ -24,9 +24,6 @@
     <packaging>pom</packaging>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-        <dependencies.max.jdk.version>8</dependencies.max.jdk.version>
     </properties>
 
     <modules>
@@ -43,8 +40,9 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${maven-surefire-plugin.version}</version>
                 <configuration>
-                    <parallel>all</parallel>
-                    <threadCount>5</threadCount>
+                    <!-- TODO: tests must have some kind of isolation issue because they break in parallel -->
+                    <parallel>classes</parallel>
+                    <threadCount>1</threadCount>
                     <includes>
                         <include>**/*Test.java</include>
                     </includes>
diff --git a/testng/testng-jvm-test/pom.xml b/testng/testng-jvm-test/pom.xml
index ab6d5e76..2a0998c4 100644
--- a/testng/testng-jvm-test/pom.xml
+++ b/testng/testng-jvm-test/pom.xml
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>7.0.0</version>
+            <version>${testng.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/testng/testng-listener/pom.xml b/testng/testng-listener/pom.xml
index 7377d83a..709a8c03 100644
--- a/testng/testng-listener/pom.xml
+++ b/testng/testng-listener/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>7.0.0</version>
+            <version>${testng.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/testng/testng-sql-listener/pom.xml b/testng/testng-sql-listener/pom.xml
index d14e30fd..36f62c32 100644
--- a/testng/testng-sql-listener/pom.xml
+++ b/testng/testng-sql-listener/pom.xml
@@ -21,16 +21,13 @@
     <artifactId>quick-perf-testng-sql-listener</artifactId>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <dependencies.max.jdk.version>1.8</dependencies.max.jdk.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>7.0.0</version>
+            <version>${testng.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/testng/testng-sql-test/pom.xml b/testng/testng-sql-test/pom.xml
index 460be399..285594fb 100644
--- a/testng/testng-sql-test/pom.xml
+++ b/testng/testng-sql-test/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>7.0.0</version>
+            <version>${testng.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/testng/testng-test-util/pom.xml b/testng/testng-test-util/pom.xml
index d210abc6..c903f648 100644
--- a/testng/testng-test-util/pom.xml
+++ b/testng/testng-test-util/pom.xml
@@ -26,13 +26,14 @@
         <gpg.skip>true</gpg.skip>
         <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
         <maven.deploy.skip>true</maven.deploy.skip>
+        <allowIncompleteProjects>true</allowIncompleteProjects>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>7.0.0</version>
+            <version>${testng.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>