From 2a081b0f26f97489dad24701225f5447f3ee2c9d Mon Sep 17 00:00:00 2001 From: Marc Philipp Date: Mon, 2 Dec 2024 08:47:06 +0100 Subject: [PATCH 1/2] Adapt to API change in open-test-reporting Related PR: ota4j-team/open-test-reporting#207 --- .../junit/platform/reporting/open/xml/JUnitContributor.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitContributor.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitContributor.java index 252900d5c645..4a18e53ee2f3 100644 --- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitContributor.java +++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/JUnitContributor.java @@ -24,7 +24,6 @@ import org.opentest4j.reporting.tooling.spi.htmlreport.Contributor; import org.opentest4j.reporting.tooling.spi.htmlreport.KeyValuePairs; import org.opentest4j.reporting.tooling.spi.htmlreport.Section; -import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -42,8 +41,8 @@ public JUnitContributor() { } @Override - public List
contributeSectionsForTestNode(Element testNodeElement) { - return findChild(testNodeElement, Namespace.REPORTING_CORE, "metadata") // + public List
contributeSectionsForTestNode(Context context) { + return findChild(context.element(), Namespace.REPORTING_CORE, "metadata") // .map(metadata -> { Map table = new LinkedHashMap<>(); findChild(metadata, JUnitFactory.NAMESPACE, "type") // From bdfb5da578d763316fac140b07f7b8722085fec8 Mon Sep 17 00:00:00 2001 From: Marc Philipp Date: Mon, 2 Dec 2024 08:47:27 +0100 Subject: [PATCH 2/2] Force checking for new snapshots on CI --- .github/actions/run-gradle/action.yml | 1 + gradle/scripts/checkBuildReproducibility.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/actions/run-gradle/action.yml b/.github/actions/run-gradle/action.yml index d2c704f5ef4c..e845130f49ec 100644 --- a/.github/actions/run-gradle/action.yml +++ b/.github/actions/run-gradle/action.yml @@ -29,5 +29,6 @@ runs: -Pjunit.develocity.predictiveTestSelection.enabled=true \ -Pjunit.develocity.predictiveTestSelection.selectRemainingTests=${{ github.event_name != 'pull_request' }} \ "-Dscan.value.GitHub job=${{ github.job }}" \ + --refresh-dependencies \ javaToolchains \ ${{ inputs.arguments }} diff --git a/gradle/scripts/checkBuildReproducibility.sh b/gradle/scripts/checkBuildReproducibility.sh index c434fc778a44..b9ede2c77cf4 100755 --- a/gradle/scripts/checkBuildReproducibility.sh +++ b/gradle/scripts/checkBuildReproducibility.sh @@ -12,6 +12,7 @@ function calculate_checksums() { --no-build-cache \ -Porg.gradle.java.installations.auto-download=false \ -Dscan.tag.Reproducibility \ + --refresh-dependencies \ clean \ assemble