From 18e05eea511de95aba269ff88596f227f9f6cd1f Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mar 27 2023 13:19:55 +0000 Subject: Drop transitive requirement on apiguardian --- diff --git a/0001-Drop-transitive-requirement-on-apiguardian.patch b/0001-Drop-transitive-requirement-on-apiguardian.patch new file mode 100644 index 0000000..1beaf98 --- /dev/null +++ b/0001-Drop-transitive-requirement-on-apiguardian.patch @@ -0,0 +1,165 @@ +From a07642197d3c26e44e527d568c82fd0edee42aea Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Mon, 27 Feb 2023 14:39:29 +0100 +Subject: [PATCH] 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 b6856c7..25a1523 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 3ace009..25a86fa 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 7f3ea05..572e8ed 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 f33ffd3..c25315a 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 0b6336c..6931626 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 9501caf..c2fef28 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 @@ + */ + 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 66c7494..2a6acd7 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 47edeb1..4313c64 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 9af8dae..cf50c08 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 b810efc..ccb6756 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 c0ae318..0d4cf42 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.39.1 + diff --git a/junit5.spec b/junit5.spec index 2b904b5..f60f50b 100644 --- a/junit5.spec +++ b/junit5.spec @@ -39,6 +39,8 @@ Source400: https://repo1.maven.org/maven2/org/junit/vintage/junit-vintage-e # BOM POM Source500: https://repo1.maven.org/maven2/org/junit/junit-bom/%{version}/junit-bom-%{version}.pom +Patch1: 0001-Drop-transitive-requirement-on-apiguardian.patch + BuildRequires: asciidoc %if %{with bootstrap} BuildRequires: javapackages-bootstrap @@ -74,6 +76,8 @@ JUnit 5 User Guide. %setup -q -n %{name}-r%{version} find -name '*.jar' -delete +%patch1 -p1 + cp -p %{SOURCE100} pom.xml for source in $(echo %{sources} | cut -d ' ' -f3-); do