From 277f2f25984da81a6bae98e3803ec5eb5ab07fbc940318ebf5736d9f0a0f9ae6 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 26 Apr 2024 19:31:11 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/junit5?expand=0&rev=24 --- ...ransitive-requirement-on-apiguardian.patch | 30 +++++++++--------- 0002-Add-missing-module-static-requires.patch | 8 ++--- ...Bump-open-test-reporting-to-0.1.0-M2.patch | 31 +++++++++++++++++++ aggregator.pom | 12 +++++++ junit5.spec | 13 ++++++-- 5 files changed, 72 insertions(+), 22 deletions(-) create mode 100644 0003-Bump-open-test-reporting-to-0.1.0-M2.patch diff --git a/0001-Drop-transitive-requirement-on-apiguardian.patch b/0001-Drop-transitive-requirement-on-apiguardian.patch index 7b36d31..4cc6b7b 100644 --- a/0001-Drop-transitive-requirement-on-apiguardian.patch +++ b/0001-Drop-transitive-requirement-on-apiguardian.patch @@ -1,7 +1,7 @@ -From 58cb1677c9e0f1bb77b66f5e304ba695678d510e Mon Sep 17 00:00:00 2001 +From 288fa4bafe414f26c99687b467feb25f512cb87d Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 27 Feb 2023 14:39:29 +0100 -Subject: [PATCH 1/2] Drop transitive requirement on apiguardian +Subject: [PATCH 1/3] Drop transitive requirement on apiguardian --- .../src/module/org.junit.jupiter.api/module-info.java | 2 +- @@ -18,7 +18,7 @@ Subject: [PATCH 1/2] Drop transitive requirement on apiguardian 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java b/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java -index b6856c7..25a1523 100644 +index b6856c78a1..25a1523e0f 100644 --- a/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java +++ b/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java @@ -12,7 +12,7 @@ @@ -31,7 +31,7 @@ index b6856c7..25a1523 100644 requires transitive org.opentest4j; diff --git a/junit-jupiter-migrationsupport/src/module/org.junit.jupiter.migrationsupport/module-info.java b/junit-jupiter-migrationsupport/src/module/org.junit.jupiter.migrationsupport/module-info.java -index 3ace009..25a86fa 100644 +index 3ace009eb0..25a86fabf4 100644 --- a/junit-jupiter-migrationsupport/src/module/org.junit.jupiter.migrationsupport/module-info.java +++ b/junit-jupiter-migrationsupport/src/module/org.junit.jupiter.migrationsupport/module-info.java @@ -15,7 +15,7 @@ @@ -44,7 +44,7 @@ index 3ace009..25a86fa 100644 requires org.junit.platform.commons; diff --git a/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java b/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java -index 7f3ea05..572e8ed 100644 +index 7f3ea0550c..572e8ed019 100644 --- a/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java +++ b/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java @@ -14,7 +14,7 @@ @@ -57,7 +57,7 @@ index 7f3ea05..572e8ed 100644 requires transitive org.junit.platform.commons; diff --git a/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java b/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java -index f33ffd3..c25315a 100644 +index f33ffd314f..c25315a6a2 100644 --- a/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java +++ b/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java @@ -16,7 +16,7 @@ @@ -70,7 +70,7 @@ index f33ffd3..c25315a 100644 exports org.junit.platform.commons; exports org.junit.platform.commons.annotation; diff --git a/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java b/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java -index 0b6336c..6931626 100644 +index 46c2069448..f359539a76 100644 --- a/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java +++ b/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java @@ -17,7 +17,7 @@ @@ -83,10 +83,10 @@ index 0b6336c..6931626 100644 requires transitive org.opentest4j; diff --git a/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java b/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java -index 9501caf..c2fef28 100644 +index 9d79f3f416..872e5bee3c 100644 --- a/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java +++ b/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java -@@ -21,7 +21,7 @@ +@@ -23,7 +23,7 @@ */ module org.junit.platform.launcher { requires transitive java.logging; @@ -96,7 +96,7 @@ index 9501caf..c2fef28 100644 requires transitive org.junit.platform.engine; diff --git a/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java b/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java -index 66c7494..2a6acd7 100644 +index 66c749470b..2a6acd7d7e 100644 --- a/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java +++ b/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java @@ -15,7 +15,7 @@ @@ -109,7 +109,7 @@ index 66c7494..2a6acd7 100644 requires transitive org.junit.platform.engine; requires transitive org.junit.platform.launcher; diff --git a/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java b/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java -index 47edeb1..4313c64 100644 +index 47edeb10e7..4313c642ee 100644 --- a/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java +++ b/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java @@ -16,7 +16,7 @@ @@ -122,7 +122,7 @@ index 47edeb1..4313c64 100644 requires transitive org.junit.platform.suite.api; requires org.junit.platform.suite.commons; diff --git a/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java b/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java -index 9af8dae..cf50c08 100644 +index 9af8daea9d..cf50c08f80 100644 --- a/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java +++ b/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java @@ -14,7 +14,7 @@ @@ -135,7 +135,7 @@ index 9af8dae..cf50c08 100644 exports org.junit.platform.suite.api; diff --git a/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java b/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java -index b810efc..ccb6756 100644 +index b810efc7f0..ccb6756022 100644 --- a/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java +++ b/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java @@ -14,7 +14,7 @@ @@ -148,7 +148,7 @@ index b810efc..ccb6756 100644 requires org.junit.platform.commons; requires org.junit.platform.engine; diff --git a/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java b/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java -index c0ae318..0d4cf42 100644 +index 2a53f5ad64..729efae46b 100644 --- a/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java +++ b/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java @@ -15,7 +15,7 @@ @@ -161,5 +161,5 @@ index c0ae318..0d4cf42 100644 requires org.junit.platform.commons; requires transitive org.junit.platform.engine; -- -2.39.2 +2.44.0 diff --git a/0002-Add-missing-module-static-requires.patch b/0002-Add-missing-module-static-requires.patch index db09234..4c147f8 100644 --- a/0002-Add-missing-module-static-requires.patch +++ b/0002-Add-missing-module-static-requires.patch @@ -1,14 +1,14 @@ -From 2f5ad4483784985a299e9ed28429bb52da21564d Mon Sep 17 00:00:00 2001 +From b0d01c205df1916202bbc874472bf6a973908b4d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 27 Mar 2023 16:55:13 +0200 -Subject: [PATCH 2/2] Add missing module static requires +Subject: [PATCH 2/3] Add missing module static requires --- .../src/module/org.junit.jupiter.params/module-info.java | 1 + 1 file changed, 1 insertion(+) diff --git a/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java b/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java -index 572e8ed..90a3c3b 100644 +index 572e8ed019..90a3c3b101 100644 --- a/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java +++ b/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java @@ -15,6 +15,7 @@ @@ -20,5 +20,5 @@ index 572e8ed..90a3c3b 100644 requires transitive org.junit.platform.commons; -- -2.39.2 +2.44.0 diff --git a/0003-Bump-open-test-reporting-to-0.1.0-M2.patch b/0003-Bump-open-test-reporting-to-0.1.0-M2.patch new file mode 100644 index 0000000..024086c --- /dev/null +++ b/0003-Bump-open-test-reporting-to-0.1.0-M2.patch @@ -0,0 +1,31 @@ +From c3d9035f7e39e17f8ee12336b2f4de9ad65e521d Mon Sep 17 00:00:00 2001 +From: Marc Philipp +Date: Sat, 20 Apr 2024 15:54:00 +0200 +Subject: [PATCH 3/3] Bump open-test-reporting to 0.1.0-M2 + +Resolves #3788. +--- + .../open/xml/OpenTestReportGeneratingListener.java | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java +index 05c452880a..35c995f3aa 100644 +--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java ++++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java +@@ -236,10 +236,9 @@ public class OpenTestReportGeneratingListener implements TestExecutionListener { + public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry entry) { + String id = inProgressIds.get(testIdentifier.getUniqueIdObject()); + eventsFileWriter.append(reported(id, Instant.now()), // +- reported -> reported.append(attachments(), attachments -> attachments.append(data(), data -> { +- data.withTime(entry.getTimestamp()); +- entry.getKeyValuePairs().forEach(data::addEntry); +- }))); ++ reported -> reported.append(attachments(), // ++ attachments -> attachments.append(data(entry.getTimestamp()), // ++ data -> entry.getKeyValuePairs().forEach(data::addEntry)))); + } + + @Override +-- +2.44.0 + diff --git a/aggregator.pom b/aggregator.pom index 52668af..c343e60 100644 --- a/aggregator.pom +++ b/aggregator.pom @@ -53,6 +53,18 @@ + + java9 + + compile + + + 9 + + ${project.basedir}/src/main/java9 + + + module-info diff --git a/junit5.spec b/junit5.spec index 4c11db1..3018aa4 100644 --- a/junit5.spec +++ b/junit5.spec @@ -58,6 +58,7 @@ Source400: https://repo1.maven.org/maven2/org/junit/vintage/junit-vintage-e Source500: https://repo1.maven.org/maven2/org/junit/junit-bom/%{version}/junit-bom-%{version}.pom Patch1: 0001-Drop-transitive-requirement-on-apiguardian.patch Patch2: 0002-Add-missing-module-static-requires.patch +Patch3: 0003-Bump-open-test-reporting-to-0.1.0-M2.patch BuildRequires: apiguardian BuildRequires: fdupes BuildRequires: opentest4j @@ -75,10 +76,13 @@ BuildRequires: %{base_name}-minimal BuildRequires: asciidoc BuildRequires: maven-local BuildRequires: mvn(com.univocity:univocity-parsers) +BuildRequires: mvn(info.picocli:picocli) BuildRequires: mvn(junit:junit) +BuildRequires: mvn(net.sf.jopt-simple:jopt-simple) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apiguardian:apiguardian-api) BuildRequires: mvn(org.assertj:assertj-core) +BuildRequires: mvn(org.opentest4j.reporting:open-test-reporting-events) BuildRequires: mvn(org.opentest4j:opentest4j) %endif @@ -112,6 +116,7 @@ JUnit 5 User Guide. %setup -q -n %{base_name}-r%{version} -a1 %patch -P 1 -p1 %patch -P 2 -p1 +%patch -P 3 -p1 find -name \*.jar -delete cp -p %{SOURCE100} pom.xml @@ -154,11 +159,13 @@ done # Add deps which are shaded by upstream and therefore not present in POMs. %pom_add_dep net.sf.jopt-simple:jopt-simple:5.0.4 junit-platform-console %pom_add_dep com.univocity:univocity-parsers:2.5.4 junit-jupiter-params +%pom_add_dep org.opentest4j.reporting:open-test-reporting-events:0.1.0-M2 junit-platform-reporting +%pom_add_dep info.picocli:picocli:4.7.5 junit-platform-console # Disable the console modules -%pom_disable_module junit-platform-console -%pom_disable_module junit-platform-console-standalone -%pom_disable_module junit-platform-reporting +#pom_disable_module junit-platform-console +#pom_disable_module junit-platform-console-standalone +#pom_disable_module junit-platform-reporting # Disable the modules built in -minimal package %pom_disable_module junit-platform-commons %pom_disable_module junit-jupiter-api