From fdb9ee18f3529abb67d4fdba36d318aae29e9706e44ddb2ad4b3c98e5ab16c56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 31 May 2024 14:46:23 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main junit5 revision ac7fdc71a9311a4cdc27d8f3e72ce2f2 --- ...ransitive-requirement-on-apiguardian.patch | 165 ++++++++++++++++++ 0002-Add-missing-module-static-requires.patch | 24 +++ ...Bump-open-test-reporting-to-0.1.0-M2.patch | 31 ++++ _multibuild | 3 + aggregator.pom | 69 ++++++-- junit-bom-5.8.2.pom => junit-bom-5.10.2.pom | 38 ++-- ...iter-5.8.2.pom => junit-jupiter-5.10.2.pom | 10 +- ...-5.8.2.pom => junit-jupiter-api-5.10.2.pom | 8 +- ...8.2.pom => junit-jupiter-engine-5.10.2.pom | 8 +- ... junit-jupiter-migrationsupport-5.10.2.pom | 6 +- ...8.2.pom => junit-jupiter-params-5.10.2.pom | 6 +- ...2.pom => junit-platform-commons-1.10.2.pom | 4 +- ...2.pom => junit-platform-console-1.10.2.pom | 6 +- ...nit-platform-console-standalone-1.10.2.pom | 2 +- ....2.pom => junit-platform-engine-1.10.2.pom | 8 +- ....pom => junit-platform-launcher-1.10.2.pom | 6 +- ...pom => junit-platform-reporting-1.10.2.pom | 6 +- ....2.pom => junit-platform-runner-1.10.2.pom | 10 +- ...pom => junit-platform-suite-api-1.10.2.pom | 6 +- ...=> junit-platform-suite-commons-1.10.2.pom | 10 +- junit-platform-testkit-1.10.2.pom | 101 +++++++++++ ...8.2.pom => junit-vintage-engine-5.10.2.pom | 6 +- junit5-5.10.2.tar.gz | 3 + junit5-5.8.2.tar.gz | 3 - junit5-build.tar.xz | 3 + junit5.changes | 66 +++++++ junit5.spec | 130 ++++++++++---- unreported-exception.patch | 11 -- 28 files changed, 622 insertions(+), 127 deletions(-) create mode 100644 0001-Drop-transitive-requirement-on-apiguardian.patch create mode 100644 0002-Add-missing-module-static-requires.patch create mode 100644 0003-Bump-open-test-reporting-to-0.1.0-M2.patch create mode 100644 _multibuild rename junit-bom-5.8.2.pom => junit-bom-5.10.2.pom (88%) rename junit-jupiter-5.8.2.pom => junit-jupiter-5.10.2.pom (95%) rename junit-jupiter-api-5.8.2.pom => junit-jupiter-api-5.10.2.pom (96%) rename junit-jupiter-engine-5.8.2.pom => junit-jupiter-engine-5.10.2.pom (96%) rename junit-jupiter-migrationsupport-5.8.2.pom => junit-jupiter-migrationsupport-5.10.2.pom (97%) rename junit-jupiter-params-5.8.2.pom => junit-jupiter-params-5.10.2.pom (96%) rename junit-platform-commons-1.8.2.pom => junit-platform-commons-1.10.2.pom (97%) rename junit-platform-console-1.8.2.pom => junit-platform-console-1.10.2.pom (96%) rename junit-platform-console-standalone-1.8.2.pom => junit-platform-console-standalone-1.10.2.pom (98%) rename junit-platform-engine-1.8.2.pom => junit-platform-engine-1.10.2.pom (96%) rename junit-platform-launcher-1.8.2.pom => junit-platform-launcher-1.10.2.pom (96%) rename junit-platform-reporting-1.8.2.pom => junit-platform-reporting-1.10.2.pom (96%) rename junit-platform-runner-1.8.2.pom => junit-platform-runner-1.10.2.pom (95%) rename junit-platform-suite-api-1.8.2.pom => junit-platform-suite-api-1.10.2.pom (96%) rename junit-platform-suite-commons-1.8.2.pom => junit-platform-suite-commons-1.10.2.pom (95%) create mode 100644 junit-platform-testkit-1.10.2.pom rename junit-vintage-engine-5.8.2.pom => junit-vintage-engine-5.10.2.pom (97%) create mode 100644 junit5-5.10.2.tar.gz delete mode 100644 junit5-5.8.2.tar.gz create mode 100644 junit5-build.tar.xz delete mode 100644 unreported-exception.patch diff --git a/0001-Drop-transitive-requirement-on-apiguardian.patch b/0001-Drop-transitive-requirement-on-apiguardian.patch new file mode 100644 index 0000000..4cc6b7b --- /dev/null +++ b/0001-Drop-transitive-requirement-on-apiguardian.patch @@ -0,0 +1,165 @@ +From 288fa4bafe414f26c99687b467feb25f512cb87d Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Mon, 27 Feb 2023 14:39:29 +0100 +Subject: [PATCH 1/3] Drop transitive requirement on apiguardian + +--- + .../src/module/org.junit.jupiter.api/module-info.java | 2 +- + .../module/org.junit.jupiter.migrationsupport/module-info.java | 2 +- + .../src/module/org.junit.jupiter.params/module-info.java | 2 +- + .../src/module/org.junit.platform.commons/module-info.java | 2 +- + .../src/module/org.junit.platform.engine/module-info.java | 2 +- + .../src/module/org.junit.platform.launcher/module-info.java | 2 +- + .../src/module/org.junit.platform.reporting/module-info.java | 2 +- + .../src/module/org.junit.platform.runner/module-info.java | 2 +- + .../src/module/org.junit.platform.suite.api/module-info.java | 2 +- + .../module/org.junit.platform.suite.commons/module-info.java | 2 +- + .../src/module/org.junit.platform.testkit/module-info.java | 2 +- + 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 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 @@ + * Defines JUnit Jupiter API for writing tests. + */ + module org.junit.jupiter.api { +- requires static transitive org.apiguardian.api; ++ requires static org.apiguardian.api; + requires transitive org.junit.platform.commons; + 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 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 @@ + */ + module org.junit.jupiter.migrationsupport { + requires transitive junit; // 4 +- requires static transitive org.apiguardian.api; ++ requires static org.apiguardian.api; + requires transitive org.junit.jupiter.api; + 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 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 @@ + * @since 5.0 + */ + module org.junit.jupiter.params { +- requires static transitive org.apiguardian.api; ++ requires static org.apiguardian.api; + requires transitive org.junit.jupiter.api; + 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 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 @@ + module org.junit.platform.commons { + requires java.logging; + requires java.management; // needed by RuntimeUtils to determine input arguments +- requires static transitive org.apiguardian.api; ++ requires static org.apiguardian.api; + + 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 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 @@ + * @since 1.0 + */ + module org.junit.platform.engine { +- requires static transitive org.apiguardian.api; ++ requires static org.apiguardian.api; + requires transitive org.junit.platform.commons; + 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 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 +@@ -23,7 +23,7 @@ + */ + module org.junit.platform.launcher { + requires transitive java.logging; +- requires static transitive org.apiguardian.api; ++ requires static org.apiguardian.api; + requires transitive org.junit.platform.commons; + 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 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 @@ + */ + module org.junit.platform.reporting { + requires java.xml; +- requires static transitive org.apiguardian.api; ++ requires static org.apiguardian.api; + requires org.junit.platform.commons; + 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 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 @@ + */ + module org.junit.platform.runner { + requires transitive junit; // 4 +- requires static transitive org.apiguardian.api; ++ requires static org.apiguardian.api; + requires transitive org.junit.platform.launcher; + 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 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 @@ + * @since 1.0 + */ + module org.junit.platform.suite.api { +- requires static transitive org.apiguardian.api; ++ requires static org.apiguardian.api; + requires transitive org.junit.platform.commons; + + 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 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 @@ + * @since 1.8 + */ + module org.junit.platform.suite.commons { +- requires static transitive org.apiguardian.api; ++ requires static org.apiguardian.api; + requires org.junit.platform.suite.api; + 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 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 @@ + * @uses org.junit.platform.engine.TestEngine + */ + module org.junit.platform.testkit { +- requires static transitive org.apiguardian.api; ++ requires static org.apiguardian.api; + requires transitive org.assertj.core; + requires org.junit.platform.commons; + requires transitive org.junit.platform.engine; +-- +2.44.0 + diff --git a/0002-Add-missing-module-static-requires.patch b/0002-Add-missing-module-static-requires.patch new file mode 100644 index 0000000..4c147f8 --- /dev/null +++ b/0002-Add-missing-module-static-requires.patch @@ -0,0 +1,24 @@ +From b0d01c205df1916202bbc874472bf6a973908b4d Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 27 Mar 2023 16:55:13 +0200 +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 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 @@ + */ + module org.junit.jupiter.params { + requires static org.apiguardian.api; ++ requires static univocity.parsers; + requires transitive org.junit.jupiter.api; + requires transitive org.junit.platform.commons; + +-- +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/_multibuild b/_multibuild new file mode 100644 index 0000000..93032d2 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + bootstrap + diff --git a/aggregator.pom b/aggregator.pom index 9100cae..c343e60 100644 --- a/aggregator.pom +++ b/aggregator.pom @@ -1,11 +1,21 @@ - + + 4.0.0 org.fedoraproject.xmvn.junit5 aggregator - 1.0.0 + any pom + + UTF-8 + junit-bom + junit-jupiter + junit-jupiter-api + junit-jupiter-engine + junit-jupiter-migrationsupport + junit-jupiter-params junit-platform-commons junit-platform-console junit-platform-console-standalone @@ -15,22 +25,59 @@ junit-platform-runner junit-platform-suite-api junit-platform-suite-commons - junit-jupiter - junit-jupiter-api - junit-jupiter-engine - junit-jupiter-migrationsupport - junit-jupiter-params + junit-platform-testkit junit-vintage-engine + org.apache.maven.plugins maven-compiler-plugin - - 1.8 - 1.8 - + + + default-compile + + compile + + + 8 + + false + + **/module-info.java + + + + + java9 + + compile + + + 9 + + ${project.basedir}/src/main/java9 + + + + + module-info + + compile + + + 9 + + **/module-info.java + + + + maven-jar-plugin diff --git a/junit-bom-5.8.2.pom b/junit-bom-5.10.2.pom similarity index 88% rename from junit-bom-5.8.2.pom rename to junit-bom-5.10.2.pom index 13cf5fb..4311203 100644 --- a/junit-bom-5.8.2.pom +++ b/junit-bom-5.10.2.pom @@ -9,7 +9,7 @@ 4.0.0 org.junit junit-bom - 5.8.2 + 5.10.2 pom JUnit 5 (Bill of Materials) This Bill of Materials POM can be used to ease dependency management when referencing multiple JUnit artifacts using Gradle or Maven. @@ -67,92 +67,92 @@ org.junit.jupiter junit-jupiter - 5.8.2 + 5.10.2 org.junit.jupiter junit-jupiter-api - 5.8.2 + 5.10.2 org.junit.jupiter junit-jupiter-engine - 5.8.2 + 5.10.2 org.junit.jupiter junit-jupiter-migrationsupport - 5.8.2 + 5.10.2 org.junit.jupiter junit-jupiter-params - 5.8.2 + 5.10.2 org.junit.platform junit-platform-commons - 1.8.2 + 1.10.2 org.junit.platform junit-platform-console - 1.8.2 + 1.10.2 org.junit.platform junit-platform-engine - 1.8.2 + 1.10.2 org.junit.platform junit-platform-jfr - 1.8.2 + 1.10.2 org.junit.platform junit-platform-launcher - 1.8.2 + 1.10.2 org.junit.platform junit-platform-reporting - 1.8.2 + 1.10.2 org.junit.platform junit-platform-runner - 1.8.2 + 1.10.2 org.junit.platform junit-platform-suite - 1.8.2 + 1.10.2 org.junit.platform junit-platform-suite-api - 1.8.2 + 1.10.2 org.junit.platform junit-platform-suite-commons - 1.8.2 + 1.10.2 org.junit.platform junit-platform-suite-engine - 1.8.2 + 1.10.2 org.junit.platform junit-platform-testkit - 1.8.2 + 1.10.2 org.junit.vintage junit-vintage-engine - 5.8.2 + 5.10.2 diff --git a/junit-jupiter-5.8.2.pom b/junit-jupiter-5.10.2.pom similarity index 95% rename from junit-jupiter-5.8.2.pom rename to junit-jupiter-5.10.2.pom index 45aa1b4..89341d1 100644 --- a/junit-jupiter-5.8.2.pom +++ b/junit-jupiter-5.10.2.pom @@ -9,7 +9,7 @@ 4.0.0 org.junit.jupiter junit-jupiter - 5.8.2 + 5.10.2 JUnit Jupiter (Aggregator) Module "junit-jupiter" of JUnit 5. https://junit.org/junit5/ @@ -66,7 +66,7 @@ org.junit junit-bom - 5.8.2 + 5.10.2 pom import @@ -76,19 +76,19 @@ org.junit.jupiter junit-jupiter-api - 5.8.2 + 5.10.2 compile org.junit.jupiter junit-jupiter-params - 5.8.2 + 5.10.2 compile org.junit.jupiter junit-jupiter-engine - 5.8.2 + 5.10.2 runtime diff --git a/junit-jupiter-api-5.8.2.pom b/junit-jupiter-api-5.10.2.pom similarity index 96% rename from junit-jupiter-api-5.8.2.pom rename to junit-jupiter-api-5.10.2.pom index ba3ad92..2fe9870 100644 --- a/junit-jupiter-api-5.8.2.pom +++ b/junit-jupiter-api-5.10.2.pom @@ -8,7 +8,7 @@ 4.0.0 org.junit.jupiter junit-jupiter-api - 5.8.2 + 5.10.2 JUnit Jupiter API Module "junit-jupiter-api" of JUnit 5. https://junit.org/junit5/ @@ -65,7 +65,7 @@ org.junit junit-bom - 5.8.2 + 5.10.2 pom import @@ -75,13 +75,13 @@ org.opentest4j opentest4j - 1.2.0 + 1.3.0 compile org.junit.platform junit-platform-commons - 1.8.2 + 1.10.2 compile diff --git a/junit-jupiter-engine-5.8.2.pom b/junit-jupiter-engine-5.10.2.pom similarity index 96% rename from junit-jupiter-engine-5.8.2.pom rename to junit-jupiter-engine-5.10.2.pom index 8b1fce7..de8b947 100644 --- a/junit-jupiter-engine-5.8.2.pom +++ b/junit-jupiter-engine-5.10.2.pom @@ -8,7 +8,7 @@ 4.0.0 org.junit.jupiter junit-jupiter-engine - 5.8.2 + 5.10.2 JUnit Jupiter Engine Module "junit-jupiter-engine" of JUnit 5. https://junit.org/junit5/ @@ -65,7 +65,7 @@ org.junit junit-bom - 5.8.2 + 5.10.2 pom import @@ -75,13 +75,13 @@ org.junit.platform junit-platform-engine - 1.8.2 + 1.10.2 compile org.junit.jupiter junit-jupiter-api - 5.8.2 + 5.10.2 compile diff --git a/junit-jupiter-migrationsupport-5.8.2.pom b/junit-jupiter-migrationsupport-5.10.2.pom similarity index 97% rename from junit-jupiter-migrationsupport-5.8.2.pom rename to junit-jupiter-migrationsupport-5.10.2.pom index afc21fb..f294717 100644 --- a/junit-jupiter-migrationsupport-5.8.2.pom +++ b/junit-jupiter-migrationsupport-5.10.2.pom @@ -9,7 +9,7 @@ 4.0.0 org.junit.jupiter junit-jupiter-migrationsupport - 5.8.2 + 5.10.2 JUnit Jupiter Migration Support Module "junit-jupiter-migrationsupport" of JUnit 5. https://junit.org/junit5/ @@ -66,7 +66,7 @@ org.junit junit-bom - 5.8.2 + 5.10.2 pom import @@ -82,7 +82,7 @@ org.junit.jupiter junit-jupiter-api - 5.8.2 + 5.10.2 compile diff --git a/junit-jupiter-params-5.8.2.pom b/junit-jupiter-params-5.10.2.pom similarity index 96% rename from junit-jupiter-params-5.8.2.pom rename to junit-jupiter-params-5.10.2.pom index d982997..2ce6bf9 100644 --- a/junit-jupiter-params-5.8.2.pom +++ b/junit-jupiter-params-5.10.2.pom @@ -8,7 +8,7 @@ 4.0.0 org.junit.jupiter junit-jupiter-params - 5.8.2 + 5.10.2 JUnit Jupiter Params Module "junit-jupiter-params" of JUnit 5. https://junit.org/junit5/ @@ -65,7 +65,7 @@ org.junit junit-bom - 5.8.2 + 5.10.2 pom import @@ -75,7 +75,7 @@ org.junit.jupiter junit-jupiter-api - 5.8.2 + 5.10.2 compile diff --git a/junit-platform-commons-1.8.2.pom b/junit-platform-commons-1.10.2.pom similarity index 97% rename from junit-platform-commons-1.8.2.pom rename to junit-platform-commons-1.10.2.pom index c8ca419..49d0aa0 100644 --- a/junit-platform-commons-1.8.2.pom +++ b/junit-platform-commons-1.10.2.pom @@ -9,7 +9,7 @@ 4.0.0 org.junit.platform junit-platform-commons - 1.8.2 + 1.10.2 JUnit Platform Commons Module "junit-platform-commons" of JUnit 5. https://junit.org/junit5/ @@ -66,7 +66,7 @@ org.junit junit-bom - 5.8.2 + 5.10.2 pom import diff --git a/junit-platform-console-1.8.2.pom b/junit-platform-console-1.10.2.pom similarity index 96% rename from junit-platform-console-1.8.2.pom rename to junit-platform-console-1.10.2.pom index cc01627..a94a5f5 100644 --- a/junit-platform-console-1.8.2.pom +++ b/junit-platform-console-1.10.2.pom @@ -9,7 +9,7 @@ 4.0.0 org.junit.platform junit-platform-console - 1.8.2 + 1.10.2 JUnit Platform Console Module "junit-platform-console" of JUnit 5. https://junit.org/junit5/ @@ -66,7 +66,7 @@ org.junit junit-bom - 5.8.2 + 5.10.2 pom import @@ -76,7 +76,7 @@ org.junit.platform junit-platform-reporting - 1.8.2 + 1.10.2 compile diff --git a/junit-platform-console-standalone-1.8.2.pom b/junit-platform-console-standalone-1.10.2.pom similarity index 98% rename from junit-platform-console-standalone-1.8.2.pom rename to junit-platform-console-standalone-1.10.2.pom index b6ccf1b..549ba8a 100644 --- a/junit-platform-console-standalone-1.8.2.pom +++ b/junit-platform-console-standalone-1.10.2.pom @@ -9,7 +9,7 @@ 4.0.0 org.junit.platform junit-platform-console-standalone - 1.8.2 + 1.10.2 JUnit Platform Console Standalone Module "junit-platform-console-standalone" of JUnit 5. https://junit.org/junit5/ diff --git a/junit-platform-engine-1.8.2.pom b/junit-platform-engine-1.10.2.pom similarity index 96% rename from junit-platform-engine-1.8.2.pom rename to junit-platform-engine-1.10.2.pom index a94e0af..37cc6b2 100644 --- a/junit-platform-engine-1.8.2.pom +++ b/junit-platform-engine-1.10.2.pom @@ -9,7 +9,7 @@ 4.0.0 org.junit.platform junit-platform-engine - 1.8.2 + 1.10.2 JUnit Platform Engine API Module "junit-platform-engine" of JUnit 5. https://junit.org/junit5/ @@ -66,7 +66,7 @@ org.junit junit-bom - 5.8.2 + 5.10.2 pom import @@ -76,13 +76,13 @@ org.opentest4j opentest4j - 1.2.0 + 1.3.0 compile org.junit.platform junit-platform-commons - 1.8.2 + 1.10.2 compile diff --git a/junit-platform-launcher-1.8.2.pom b/junit-platform-launcher-1.10.2.pom similarity index 96% rename from junit-platform-launcher-1.8.2.pom rename to junit-platform-launcher-1.10.2.pom index 1a7317f..d9e0c45 100644 --- a/junit-platform-launcher-1.8.2.pom +++ b/junit-platform-launcher-1.10.2.pom @@ -9,7 +9,7 @@ 4.0.0 org.junit.platform junit-platform-launcher - 1.8.2 + 1.10.2 JUnit Platform Launcher Module "junit-platform-launcher" of JUnit 5. https://junit.org/junit5/ @@ -66,7 +66,7 @@ org.junit junit-bom - 5.8.2 + 5.10.2 pom import @@ -76,7 +76,7 @@ org.junit.platform junit-platform-engine - 1.8.2 + 1.10.2 compile diff --git a/junit-platform-reporting-1.8.2.pom b/junit-platform-reporting-1.10.2.pom similarity index 96% rename from junit-platform-reporting-1.8.2.pom rename to junit-platform-reporting-1.10.2.pom index a4bc36a..a96ab98 100644 --- a/junit-platform-reporting-1.8.2.pom +++ b/junit-platform-reporting-1.10.2.pom @@ -9,7 +9,7 @@ 4.0.0 org.junit.platform junit-platform-reporting - 1.8.2 + 1.10.2 JUnit Platform Reporting Module "junit-platform-reporting" of JUnit 5. https://junit.org/junit5/ @@ -66,7 +66,7 @@ org.junit junit-bom - 5.8.2 + 5.10.2 pom import @@ -76,7 +76,7 @@ org.junit.platform junit-platform-launcher - 1.8.2 + 1.10.2 compile diff --git a/junit-platform-runner-1.8.2.pom b/junit-platform-runner-1.10.2.pom similarity index 95% rename from junit-platform-runner-1.8.2.pom rename to junit-platform-runner-1.10.2.pom index 961fae0..63305af 100644 --- a/junit-platform-runner-1.8.2.pom +++ b/junit-platform-runner-1.10.2.pom @@ -9,7 +9,7 @@ 4.0.0 org.junit.platform junit-platform-runner - 1.8.2 + 1.10.2 JUnit Platform Runner Module "junit-platform-runner" of JUnit 5. https://junit.org/junit5/ @@ -66,7 +66,7 @@ org.junit junit-bom - 5.8.2 + 5.10.2 pom import @@ -82,13 +82,13 @@ org.junit.platform junit-platform-launcher - 1.8.2 + 1.10.2 compile org.junit.platform junit-platform-suite-api - 1.8.2 + 1.10.2 compile @@ -100,7 +100,7 @@ org.junit.platform junit-platform-suite-commons - 1.8.2 + 1.10.2 runtime diff --git a/junit-platform-suite-api-1.8.2.pom b/junit-platform-suite-api-1.10.2.pom similarity index 96% rename from junit-platform-suite-api-1.8.2.pom rename to junit-platform-suite-api-1.10.2.pom index d56225d..59aa928 100644 --- a/junit-platform-suite-api-1.8.2.pom +++ b/junit-platform-suite-api-1.10.2.pom @@ -9,7 +9,7 @@ 4.0.0 org.junit.platform junit-platform-suite-api - 1.8.2 + 1.10.2 JUnit Platform Suite API Module "junit-platform-suite-api" of JUnit 5. https://junit.org/junit5/ @@ -66,7 +66,7 @@ org.junit junit-bom - 5.8.2 + 5.10.2 pom import @@ -76,7 +76,7 @@ org.junit.platform junit-platform-commons - 1.8.2 + 1.10.2 compile diff --git a/junit-platform-suite-commons-1.8.2.pom b/junit-platform-suite-commons-1.10.2.pom similarity index 95% rename from junit-platform-suite-commons-1.8.2.pom rename to junit-platform-suite-commons-1.10.2.pom index 967a627..c8bc8f7 100644 --- a/junit-platform-suite-commons-1.8.2.pom +++ b/junit-platform-suite-commons-1.10.2.pom @@ -9,7 +9,7 @@ 4.0.0 org.junit.platform junit-platform-suite-commons - 1.8.2 + 1.10.2 JUnit Platform Suite Commons Module "junit-platform-suite-commons" of JUnit 5. https://junit.org/junit5/ @@ -66,7 +66,7 @@ org.junit junit-bom - 5.8.2 + 5.10.2 pom import @@ -76,7 +76,7 @@ org.junit.platform junit-platform-launcher - 1.8.2 + 1.10.2 compile @@ -88,13 +88,13 @@ org.junit.platform junit-platform-engine - 1.8.2 + 1.10.2 runtime org.junit.platform junit-platform-suite-api - 1.8.2 + 1.10.2 runtime diff --git a/junit-platform-testkit-1.10.2.pom b/junit-platform-testkit-1.10.2.pom new file mode 100644 index 0000000..ebf1011 --- /dev/null +++ b/junit-platform-testkit-1.10.2.pom @@ -0,0 +1,101 @@ + + + + + + + + 4.0.0 + org.junit.platform + junit-platform-testkit + 1.10.2 + JUnit Platform Test Kit + Module "junit-platform-testkit" of JUnit 5. + https://junit.org/junit5/ + + + Eclipse Public License v2.0 + https://www.eclipse.org/legal/epl-v20.html + + + + + bechte + Stefan Bechtold + stefan.bechtold@me.com + + + jlink + Johannes Link + business@johanneslink.net + + + marcphilipp + Marc Philipp + mail@marcphilipp.de + + + mmerdes + Matthias Merdes + matthias.merdes@heidelpay.com + + + sbrannen + Sam Brannen + sam@sambrannen.com + + + sormuras + Christian Stein + sormuras@gmail.com + + + juliette-derancourt + Juliette de Rancourt + derancourt.juliette@gmail.com + + + + scm:git:git://github.com/junit-team/junit5.git + scm:git:git://github.com/junit-team/junit5.git + https://github.com/junit-team/junit5 + + + + + org.junit + junit-bom + 5.10.2 + pom + import + + + + + + org.assertj + assertj-core + 3.24.2 + compile + + + org.opentest4j + opentest4j + 1.3.0 + compile + + + org.junit.platform + junit-platform-launcher + 1.10.2 + compile + + + org.apiguardian + apiguardian-api + 1.1.2 + compile + + + diff --git a/junit-vintage-engine-5.8.2.pom b/junit-vintage-engine-5.10.2.pom similarity index 97% rename from junit-vintage-engine-5.8.2.pom rename to junit-vintage-engine-5.10.2.pom index 82e2737..d5d19eb 100644 --- a/junit-vintage-engine-5.8.2.pom +++ b/junit-vintage-engine-5.10.2.pom @@ -9,7 +9,7 @@ 4.0.0 org.junit.vintage junit-vintage-engine - 5.8.2 + 5.10.2 JUnit Vintage Engine Module "junit-vintage-engine" of JUnit 5. https://junit.org/junit5/ @@ -66,7 +66,7 @@ org.junit junit-bom - 5.8.2 + 5.10.2 pom import @@ -76,7 +76,7 @@ org.junit.platform junit-platform-engine - 1.8.2 + 1.10.2 compile diff --git a/junit5-5.10.2.tar.gz b/junit5-5.10.2.tar.gz new file mode 100644 index 0000000..074dc8e --- /dev/null +++ b/junit5-5.10.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3648f19004831a98b72950aa8954218a337e41b55212eacbc2e5067b4eff58c1 +size 2942035 diff --git a/junit5-5.8.2.tar.gz b/junit5-5.8.2.tar.gz deleted file mode 100644 index 6280c7e..0000000 --- a/junit5-5.8.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cc37632dc36c4eebb9ba8dff07a8a6ced35472be48bf0d9874ecdf7b4bea7fb4 -size 2808680 diff --git a/junit5-build.tar.xz b/junit5-build.tar.xz new file mode 100644 index 0000000..c3c7644 --- /dev/null +++ b/junit5-build.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a1541ecd93898fb939b1c8507033164f8103390db265408194cb5080b454e2ea +size 2152 diff --git a/junit5.changes b/junit5.changes index d04764d..58e3541 100644 --- a/junit5.changes +++ b/junit5.changes @@ -1,3 +1,69 @@ +------------------------------------------------------------------- +Fri May 24 05:33:13 UTC 2024 - Fridrich Strba + +- Let junit5 require junit5-minimal to avoid conflict of providers + +------------------------------------------------------------------- +Tue Apr 30 16:25:27 UTC 2024 - Fridrich Strba + +- Update to upstream version 5.10.2 + * Changes: + + XML reports in new Open Test Reporting format + + Configurable cleanup mode for @TempDir + + Configurable thread mode for @Timeout + + Conditional execution based on OS architectures + + New TestInstancePreConstructCallback extension API + + Reusable parameter resolution for custom extension methods + via ExecutableInvoker + + Parameter injection for @MethodSource methods + + New IterationSelector + + Various improvements to ConsoleLauncher + + Promotion of various experimental APIs to stable + + New LauncherInterceptor SPI + + New testfeed details mode for ConsoleLauncher + + New ConsoleLauncher subcommand for test discovery without + execution + + Dry-run mode for test execution + + New NamespacedHierarchicalStore for use in third-party test + engines + + Stacktrace pruning to hide internal JUnit calls + + New @SelectMethod support in test @Suite classes. + + New TempDirFactory SPI for customizing how temporary + directories are created + + Failure threshold for @RepeatedTest + + New convenience base classes for implementing + ArgumentsProvider and ArgumentConverter + + Custom class loader support for class/method selectors, + @MethodSource, @EnabledIf, and @DisabledIf + + Improved configurability of parallel execution + + Numerous bug fixes and minor improvements +- Added patches: + * 0001-Drop-transitive-requirement-on-apiguardian.patch + * 0002-Add-missing-module-static-requires.patch + + fix dependencies in module-info.java files + * 0003-Bump-open-test-reporting-to-0.1.0-M2.patch + + fix build with the latest open-test-reporting milestone +- Removed patch: + * unreported-exception.patch + + not needed any more with this version + +------------------------------------------------------------------- +Mon Apr 29 12:16:37 UTC 2024 - Fridrich Strba + +- The binaries are compatible with java 1.8 + +------------------------------------------------------------------- +Tue Apr 9 20:21:54 UTC 2024 - Fridrich Strba + +- Split into two _multibuild packages so that we can use the + junit-jupiter-api pretty early in the build without creating + build cycles. + +------------------------------------------------------------------- +Wed Feb 21 10:48:09 UTC 2024 - Gus Kenion + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Thu Oct 26 12:21:48 UTC 2023 - Fridrich Strba diff --git a/junit5.spec b/junit5.spec index f3372bb..58bdd75 100644 --- a/junit5.spec +++ b/junit5.spec @@ -1,7 +1,7 @@ # # spec file for package junit5 # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,18 +16,26 @@ # -%global platform_version 1.8.2 +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "bootstrap" +%bcond_without bootstrap +%else +%bcond_with bootstrap +%endif +%global platform_version 1.10.2 %global jupiter_version %{version} %global vintage_version %{version} -%bcond_without console -Name: junit5 -Version: 5.8.2 +%global base_name junit5 +# The automatic requires would be java-headless >= 9, but the +# binaries are java 8 compatible +%define __requires_exclude java-headless +Version: 5.10.2 Release: 0 -Summary: Java regression testing framework License: EPL-2.0 Group: Development/Libraries/Java URL: https://junit.org/junit5/ -Source0: https://github.com/junit-team/junit5/archive/r%{version}/junit5-%{version}.tar.gz +Source0: https://github.com/junit-team/%{base_name}/archive/r%{version}/%{base_name}-%{version}.tar.gz +Source1: %{base_name}-build.tar.xz # Aggregator POM (used for packaging only) Source100: aggregator.pom # Platform POMs @@ -39,7 +47,8 @@ Source205: https://repo1.maven.org/maven2/org/junit/platform/junit-platform Source206: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-runner/%{platform_version}/junit-platform-runner-%{platform_version}.pom Source207: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-suite-api/%{platform_version}/junit-platform-suite-api-%{platform_version}.pom Source208: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-reporting/%{platform_version}/junit-platform-reporting-%{platform_version}.pom -Source209: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-suite-commons/%{platform_version}/junit-platform-suite-commons-%{platform_version}.pom +Source209: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-testkit/%{platform_version}/junit-platform-testkit-%{platform_version}.pom +Source210: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-suite-commons/%{platform_version}/junit-platform-suite-commons-%{platform_version}.pom # Jupiter POMs Source300: https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter/%{jupiter_version}/junit-jupiter-%{jupiter_version}.pom Source301: https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-api/%{jupiter_version}/junit-jupiter-api-%{jupiter_version}.pom @@ -50,19 +59,37 @@ Source304: https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-p Source400: https://repo1.maven.org/maven2/org/junit/vintage/junit-vintage-engine/%{vintage_version}/junit-vintage-engine-%{vintage_version}.pom # BOM POM Source500: https://repo1.maven.org/maven2/org/junit/junit-bom/%{version}/junit-bom-%{version}.pom -Patch0: unreported-exception.patch -BuildRequires: asciidoc +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 >= 1.1.2 BuildRequires: fdupes +BuildRequires: java-devel >= 9 +BuildRequires: opentest4j +Requires: java-headless >= 1.8 +Requires: javapackages-tools +BuildArch: noarch +%if %{with bootstrap} +Name: %{base_name}-minimal +Summary: Java regression testing framework (minimal) +BuildRequires: ant +BuildRequires: javapackages-local >= 6 +%else +Name: %{base_name} +Summary: Java regression testing framework +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) -BuildArch: noarch -%if %{with console} -BuildRequires: mvn(info.picocli:picocli) -Requires: javapackages-tools +Requires: %{base_name}-minimal >= %{version} %endif %description @@ -92,8 +119,10 @@ Requires: %{name}-javadoc = %{version}-%{release} JUnit 5 User Guide. %prep -%setup -q -n %{name}-r%{version} -%patch0 -p1 +%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 @@ -105,7 +134,8 @@ cp -p %{SOURCE205} junit-platform-launcher/pom.xml cp -p %{SOURCE206} junit-platform-runner/pom.xml cp -p %{SOURCE207} junit-platform-suite-api/pom.xml cp -p %{SOURCE208} junit-platform-reporting/pom.xml -cp -p %{SOURCE209} junit-platform-suite-commons/pom.xml +cp -p %{SOURCE209} junit-platform-testkit/pom.xml +cp -p %{SOURCE210} junit-platform-suite-commons/pom.xml cp -p %{SOURCE300} junit-jupiter/pom.xml cp -p %{SOURCE301} junit-jupiter-api/pom.xml cp -p %{SOURCE302} junit-jupiter-engine/pom.xml @@ -115,32 +145,44 @@ cp -p %{SOURCE400} junit-vintage-engine/pom.xml cp -p %{SOURCE500} junit-bom/pom.xml for pom in $(find -mindepth 2 -name pom.xml | grep -v tests/); do + module=$(dirname $pom) + if [ -d ${module}/src/module ]; then + mkdir -p ${module}/src/main/java + mv ${module}/src/module/*/module-info.java ${module}/src/main/java/ + fi # Set parent to aggregator - %pom_xpath_inject pom:project "org.fedoraproject.xmvn.junit5aggregator1.0.0" $pom + %pom_add_parent org.fedoraproject.xmvn.junit5:aggregator:any $pom # OSGi BSN bsn=$(sed 's|/pom.xml$||;s|.*/|org.|;s|-|.|g' <<<"$pom") %pom_xpath_inject pom:project "${bsn}" $pom # Incorrect scope - API guardian is just annotation, needed only during compilation %pom_xpath_set -f "pom:dependency[pom:artifactId='apiguardian-api']/pom:scope" provided $pom - sed -i s/runtime/compile/ $pom + %pom_xpath_set -f "pom:dependency[pom:scope='runtime']/pom:scope" compile $pom done %pom_remove_parent junit-bom # Add deps which are shaded by upstream and therefore not present in POMs. -%pom_add_dep info.picocli:picocli:4.0.4 junit-platform-console -%pom_add_dep com.univocity:univocity-parsers:2.9.1 junit-jupiter-params +%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 -%if %{without console} -# Disable the console modules -%pom_disable_module junit-platform-console +# Disable the standalone console (just jar with shaded dependencies) %pom_disable_module junit-platform-console-standalone -%endif +# Disable the modules built in -minimal package +%pom_disable_module junit-platform-commons +%pom_disable_module junit-jupiter-api -%{mvn_package} :aggregator __noinstall %{mvn_package} :junit-bom bom +%{mvn_package} :aggregator __noinstall %build +%if %{with bootstrap} +mkdir -p lib +build-jar-repository -s lib opentest4j/opentest4j apiguardian/apiguardian-api +%{ant} package javadoc +%else %{mvn_build} -f -- \ -Dproject.build.outputTimestamp=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ) \ -Dencoding=utf-8 -Dsource=8 @@ -149,22 +191,38 @@ done # still produces readable docs. asciidoc documentation/src/docs/asciidoc/index.adoc || : ln -s ../../javadoc/junit5 documentation/src/docs/api +%endif %install +%if %{with bootstrap} + +install -dm 0755 %{buildroot}%{_javadir}/%{base_name} +install -dm 0755 %{buildroot}%{_mavenpomdir}/%{base_name} +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +for i in junit-platform-commons junit-jupiter-api; do + install -pm 0644 ${i}/target/${i}*.jar %{buildroot}%{_javadir}/%{base_name}/${i}.jar + %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{base_name}/${i}.pom + %add_maven_depmap %{base_name}/${i}.pom %{base_name}/${i}.jar + cp -r ${i}/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/${i} +done + +%else + %mvn_install -%fdupes -s %{buildroot}%{_javadocdir} +%jpackage_script org/junit/platform/console/ConsoleLauncher "" "" junit5:junit:hamcrest:opentest4j:open-test-reporting:picocli:jopt-simple:assertj-core %{name} true %fdupes -s documentation/src/docs/ -%if %{with console} -%jpackage_script org/junit/platform/console/ConsoleLauncher "" "" junit5:junit:opentest4j:picocli %{name} true %endif +%fdupes -s %{buildroot}%{_javadocdir} + %files -f .mfiles -%if %{with console} -%{_bindir}/%{name} -%endif %license LICENSE.md LICENSE-notice.md +%if %{without bootstrap} + +%{_bindir}/%{name} + %files bom -f .mfiles-bom %license LICENSE.md LICENSE-notice.md @@ -174,4 +232,12 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api %files guide %doc documentation/src/docs/* +%else + +%files javadoc +%{_javadocdir}/%{name} +%license LICENSE.md LICENSE-notice.md + +%endif + %changelog diff --git a/unreported-exception.patch b/unreported-exception.patch deleted file mode 100644 index 089c4ef..0000000 --- a/unreported-exception.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- junit5-r5.8.2/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java 2023-10-26 14:17:20.653152124 +0200 -+++ junit5-r5.8.2/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java 2023-10-26 14:18:08.740160341 +0200 -@@ -316,7 +316,7 @@ - } - - @SuppressWarnings("unchecked") -- private SerializedForm(ObjectInputStream.GetField fields) throws IOException { -+ private SerializedForm(ObjectInputStream.GetField fields) throws ClassNotFoundException, IOException { - this.uniqueId = (String) fields.get("uniqueId", null); - this.parentId = (String) fields.get("parentId", null); - this.displayName = (String) fields.get("displayName", null);