From 54249abf307fc130c29deb55ea0894cca17c777d Mon Sep 17 00:00:00 2001 From: Esta Nagy Date: Tue, 20 May 2025 22:42:28 +0200 Subject: [PATCH 1/2] fix: Cannot build quick perf from sources - Replace missing flight recorder dependency with latest version - Remove unused Maven repository - Update various dependencies - Update minimum JDK version to 17 - Fix code that broke because of the updates - Update CI pipeline to use valid JDK versions - Update build actions Resolves #220 Signed-off-by: Esta Nagy --- .github/workflows/CI.yml | 36 ++++++----- core/pom.xml | 3 - junit4/junit4-12-jvm-test/pom.xml | 3 - junit4/junit4-13-1-jvm-test/pom.xml | 3 - junit4/junit4-13-2-jvm-test/pom.xml | 3 - junit4/junit4-13-jvm-test/pom.xml | 3 - junit4/junit4-5-jvm-test/pom.xml | 3 - junit4/junit4-runner/pom.xml | 3 - junit4/junit4-sql-test/pom.xml | 3 - junit5/pom.xml | 3 - jvm/jfr-annotations/pom.xml | 4 +- .../jmcrule/HtmlToPlainTextTransformer.java | 4 +- .../jmcrule/JmcRuleCountMeasureExtractor.java | 29 +++++---- jvm/pom.xml | 3 - pom.xml | 60 +++++++++++-------- spring/junit4-spring-base-tests/pom.xml | 2 - spring/junit4-spring-boot-test/pom.xml | 11 ++-- spring/junit4-spring3/pom.xml | 10 ++-- .../spring/database/SpringConfig.java | 2 +- spring/junit4-spring4/pom.xml | 7 +-- .../spring/database/SpringConfig.java | 2 +- spring/junit4-spring5/pom.xml | 7 +-- .../spring/database/SpringConfig.java | 2 +- .../org/quickperf/spring/database/User.java | 2 +- spring/pom.xml | 4 +- spring/spring-boot-1-sql-starter/pom.xml | 3 - spring/spring-boot-2-sql-starter/pom.xml | 3 - spring/sql-spring4/pom.xml | 3 - spring/sql-spring5/pom.xml | 3 - sql/sql-annotations/pom.xml | 3 - sql/sql-hibernate-test-util/pom.xml | 3 - sql/sql-memory-test-util/pom.xml | 7 +-- .../sql/config/MemoryDataSourceBuilder.java | 6 +- sql/sql-memory-test/pom.xml | 3 - sql/sql-testcontainers-test/pom.xml | 3 - .../test-containers-test-util/pom.xml | 4 +- testng/pom.xml | 8 +-- testng/testng-jvm-test/pom.xml | 2 +- testng/testng-listener/pom.xml | 2 +- testng/testng-sql-listener/pom.xml | 5 +- testng/testng-sql-test/pom.xml | 2 +- testng/testng-test-util/pom.xml | 2 +- 42 files changed, 109 insertions(+), 165 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index c67c56ee..dd4fb7d3 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, 21] 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 @@ quick-perf-core - 1.7 - 1.7 - 1.7 org.quickperf.annotation,org.quickperf.config 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 @@ quick-perf-junit4-12-jvm-test - 1.7 - 1.7 - 1.7 true true true 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 @@ quick-perf-junit4-13-1-jvm-test - 1.7 - 1.7 - 1.7 true true true 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 @@ quick-perf-junit4-13-2-jvm-test - 1.7 - 1.7 - 1.7 true true true 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 @@ quick-perf-junit4-13-jvm-test - 1.7 - 1.7 - 1.7 true true true 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 @@ quick-perf-junit4-5-jvm-test - 1.7 - 1.7 - 1.7 true true true 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 @@ quick-perf-junit4 - 1.7 - 1.7 - 1.7 **\/\QuickPerfJUnitRunner.java 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 @@ quick-perf-junit4-sql-test - 1.8 - 1.8 - 1.8 true true true 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 @@ pom - 8 - 8 - 8 5.6.2 1.6.2 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 @@ org.openjdk.jmc flightrecorder.rules.jdk - 7.1.1 + 9.1.0 org.jsoup jsoup - 1.11.1 + 1.15.3 junit 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("
"); - 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 ruleEvaluations = evaluateJmcRules(jfrEvents); + List ruleEvaluations = evaluateJmcRules(jfrEvents); List jmcRules = buildJmcRuleCountsFrom(ruleEvaluations); @@ -47,12 +45,13 @@ public JmcRulesMeasure extractPerfMeasureFrom(JfrRecording jfrRecording) { } - private List evaluateJmcRules(IItemCollection jfrEvents) { - List ruleEvaluations = new ArrayList<>(); + private List evaluateJmcRules(IItemCollection jfrEvents) { + List ruleEvaluations = new ArrayList<>(); for (IRule rule : RuleRegistry.getRules()) { - RunnableFuture future = rule.evaluate(jfrEvents, IPreferenceValueProvider.DEFAULT_VALUES); + RunnableFuture 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 evaluateJmcRules(IItemCollection jfrEvents) { return ruleEvaluations; } - private List buildJmcRuleCountsFrom(List ruleEvaluations) { + private List buildJmcRuleCountsFrom(List ruleEvaluations) { List 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 @@ pom - 1.7 - 1.7 - 1.7 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. --> - + 4.0.0 - QuickPerf is a testing library for Java providing annotations to quickly evaluate some performance properties. + QuickPerf is a testing library for Java providing annotations to quickly evaluate some performance + properties. + https://github.com/quick-perf/quickperf @@ -42,19 +45,24 @@ UTF-8 UTF-8 - 1.7 - 4.12 - 2.25.0 - 1.4.198 - 1.4 - 3.2.0 - 2.22.2 - 1.1.0 - 1.7.25 - + 17 + 17 + 17 + 4.13.2 + 5.17.0 + 2.3.232 + 2.13.0 + 3.4.2 + 3.5.3 + 3.5.0 + 1.5.18 + 2.0.17 + 9.1.0 + **\/\*.java 2023-11-21T21:44:04Z true + 7.5.1 @@ -66,6 +74,16 @@ + + + + org.openjdk.jmc + flightrecorder.rules.jdk + ${flightrecorder-rules-jdk.version} + + + + @@ -112,8 +130,9 @@ + org.apache.maven.plugins maven-enforcer-plugin - 1.4.1 + ${maven-enforcer-plugin.version} enforce-bytecode-version @@ -122,7 +141,7 @@ - + ${dependencies.max.jdk.version} @@ -138,7 +157,7 @@ org.codehaus.mojo extra-enforcer-rules - 1.2 + 1.9.0 @@ -260,7 +279,8 @@ maven-release-plugin 3.0.0-M1 - true + true + true false release @@ -292,14 +312,6 @@ false - - AdoptOpenJDK - AdoptOpenJDK - https://adoptopenjdk.jfrog.io/adoptopenjdk/jmc-libs - - false - - diff --git a/spring/junit4-spring-base-tests/pom.xml b/spring/junit4-spring-base-tests/pom.xml index ca70071e..2dd50c16 100644 --- a/spring/junit4-spring-base-tests/pom.xml +++ b/spring/junit4-spring-base-tests/pom.xml @@ -21,8 +21,6 @@ quick-perf-junit4-spring-base-tests - 1.7 - 1.7 true true true 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 @@ quick-perf-junit4-spring-boot-test - 1.8 - 1.8 - 1.8 true true true @@ -37,7 +34,7 @@ org.springframework.boot spring-boot-dependencies - 2.1.3.RELEASE + 2.7.18 pom import @@ -125,6 +122,12 @@ 2.4.0 + + junit + junit + 4.13.2 + test + 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. --> - + org.quickperf quick-perf-spring @@ -22,9 +23,6 @@ 1.1.2-SNAPSHOT - 1.7 - 1.7 - 1.7 3.2.18.RELEASE @@ -129,8 +127,8 @@ - commons-dbcp - commons-dbcp + org.apache.commons + commons-dbcp2 ${commons-dbcp.version} test 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 @@ 1.1.2-SNAPSHOT - 1.7 - 1.7 - 1.7 @@ -114,8 +111,8 @@ - commons-dbcp - commons-dbcp + org.apache.commons + commons-dbcp2 ${commons-dbcp.version} test 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 @@ 1.1.2-SNAPSHOT - 1.8 - 1.8 - 1.8 @@ -100,8 +97,8 @@ - commons-dbcp - commons-dbcp + org.apache.commons + commons-dbcp2 ${commons-dbcp.version} test 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 @@ pom - 1.7 - 1.7 4.3.22.RELEASE - 5.1.8.RELEASE + 5.3.39 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 @@ quick-perf-springboot1-sql-starter - 1.7 - 1.7 - 1.7 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 @@ quick-perf-springboot2-sql-starter - 1.8 - 1.8 - 1.8 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 @@ quick-perf-sql-spring4 - 1.7 - 1.7 - 1.7 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 @@ quick-perf-sql-spring5 - 1.8 - 1.8 - 1.8 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 @@ quick-perf-sql-annotations - 1.7 - 1.7 - 1.7 org.quickperf.sql.annotation,org.quickperf.sql.config diff --git a/sql/sql-hibernate-test-util/pom.xml b/sql/sql-hibernate-test-util/pom.xml index 31e9dc3c..129464f3 100644 --- a/sql/sql-hibernate-test-util/pom.xml +++ b/sql/sql-hibernate-test-util/pom.xml @@ -20,9 +20,6 @@ quick-perf-sql-hibernate-test-util - 1.8 - 1.8 - 1.8 true true true diff --git a/sql/sql-memory-test-util/pom.xml b/sql/sql-memory-test-util/pom.xml index 3c2d9b1b..784a1f4a 100644 --- a/sql/sql-memory-test-util/pom.xml +++ b/sql/sql-memory-test-util/pom.xml @@ -21,9 +21,6 @@ quick-perf-sql-memory-test-util - 1.8 - 1.8 - 1.8 true true true @@ -31,8 +28,8 @@ - commons-dbcp - commons-dbcp + org.apache.commons + commons-dbcp2 ${commons-dbcp.version} 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 @@ quick-perf-sql-memory-test - 1.8 - 1.8 - 1.8 true true true 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 @@ - 1.8 - 1.8 - 1.8 1.17.3 true true 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 @@ ${testcontainers.version} - commons-dbcp - commons-dbcp + org.apache.commons + commons-dbcp2 ${commons-dbcp.version} 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 @@ pom - 8 - 8 - 8 @@ -43,8 +40,9 @@ maven-surefire-plugin ${maven-surefire-plugin.version} - all - 5 + + classes + 1 **/*Test.java 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 @@ org.testng testng - 7.0.0 + ${testng.version} test 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 @@ org.testng testng - 7.0.0 + ${testng.version} provided 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 @@ quick-perf-testng-sql-listener - 1.8 - 1.8 - 1.8 org.testng testng - 7.0.0 + ${testng.version} provided 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 @@ org.testng testng - 7.0.0 + ${testng.version} test diff --git a/testng/testng-test-util/pom.xml b/testng/testng-test-util/pom.xml index d210abc6..0ba1d1b8 100644 --- a/testng/testng-test-util/pom.xml +++ b/testng/testng-test-util/pom.xml @@ -32,7 +32,7 @@ org.testng testng - 7.0.0 + ${testng.version} test From f5b30b0fb7da13b81f859455add1a2c79e6c3dea Mon Sep 17 00:00:00 2001 From: Esta Nagy Date: Tue, 20 May 2025 23:12:31 +0200 Subject: [PATCH 2/2] fix: Cannot build quick perf from sources - Attempt to fix broken build Resolves #220 Signed-off-by: Esta Nagy --- .github/workflows/CI.yml | 2 +- junit5/junit5-test-util/pom.xml | 1 + spring/junit4-spring-base-tests/pom.xml | 1 + sql/sql-hibernate-test-util/pom.xml | 1 + sql/sql-memory-test-util/pom.xml | 1 + .../java/org/quickperf/sql/TcEntityManagerFactoryBuilder.java | 4 ++-- testng/testng-test-util/pom.xml | 1 + 7 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index dd4fb7d3..f6313f84 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -8,7 +8,7 @@ jobs: name: Java ${{ matrix.java }} strategy: matrix: - java: [17, 21] + java: [17] env: REPO_SLUG: ${{ github.repository }} BRANCH: ${{ github.head_ref }} 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 @@ true true true + true diff --git a/spring/junit4-spring-base-tests/pom.xml b/spring/junit4-spring-base-tests/pom.xml index 2dd50c16..10bc6b98 100644 --- a/spring/junit4-spring-base-tests/pom.xml +++ b/spring/junit4-spring-base-tests/pom.xml @@ -24,6 +24,7 @@ true true true + true diff --git a/sql/sql-hibernate-test-util/pom.xml b/sql/sql-hibernate-test-util/pom.xml index 129464f3..0c8e1797 100644 --- a/sql/sql-hibernate-test-util/pom.xml +++ b/sql/sql-hibernate-test-util/pom.xml @@ -23,6 +23,7 @@ true true true + true diff --git a/sql/sql-memory-test-util/pom.xml b/sql/sql-memory-test-util/pom.xml index 784a1f4a..6700b2b1 100644 --- a/sql/sql-memory-test-util/pom.xml +++ b/sql/sql-memory-test-util/pom.xml @@ -24,6 +24,7 @@ true true true + true 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/testng-test-util/pom.xml b/testng/testng-test-util/pom.xml index 0ba1d1b8..c903f648 100644 --- a/testng/testng-test-util/pom.xml +++ b/testng/testng-test-util/pom.xml @@ -26,6 +26,7 @@ true true true + true