From dba34af51142e88f23ef5d1bb11dfc37b8f2d98d Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 27 Mar 2023 16:50:48 +0200
Subject: [PATCH] Enable javadoc package

---
 ...ransitive-requirement-on-apiguardian.patch |  6 ++---
 0002-Add-missing-module-static-requires.patch | 24 +++++++++++++++++++
 junit5.spec                                   |  9 +++----
 3 files changed, 30 insertions(+), 9 deletions(-)
 create mode 100644 0002-Add-missing-module-static-requires.patch

diff --git a/0001-Drop-transitive-requirement-on-apiguardian.patch b/0001-Drop-transitive-requirement-on-apiguardian.patch
index 1beaf98..a69268d 100644
--- a/0001-Drop-transitive-requirement-on-apiguardian.patch
+++ b/0001-Drop-transitive-requirement-on-apiguardian.patch
@@ -1,7 +1,7 @@
-From a07642197d3c26e44e527d568c82fd0edee42aea Mon Sep 17 00:00:00 2001
+From 58cb1677c9e0f1bb77b66f5e304ba695678d510e Mon Sep 17 00:00:00 2001
 From: Marian Koncek <mkoncek@redhat.com>
 Date: Mon, 27 Feb 2023 14:39:29 +0100
-Subject: [PATCH] Drop transitive requirement on apiguardian
+Subject: [PATCH 1/2] Drop transitive requirement on apiguardian
 
 ---
  .../src/module/org.junit.jupiter.api/module-info.java           | 2 +-
@@ -161,5 +161,5 @@ index c0ae318..0d4cf42 100644
  	requires org.junit.platform.commons;
  	requires transitive org.junit.platform.engine;
 -- 
-2.39.1
+2.39.2
 
diff --git a/0002-Add-missing-module-static-requires.patch b/0002-Add-missing-module-static-requires.patch
new file mode 100644
index 0000000..0eef828
--- /dev/null
+++ b/0002-Add-missing-module-static-requires.patch
@@ -0,0 +1,24 @@
+From 2f5ad4483784985a299e9ed28429bb52da21564d Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Mon, 27 Mar 2023 16:55:13 +0200
+Subject: [PATCH 2/2] 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
+--- 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.39.2
+
diff --git a/junit5.spec b/junit5.spec
index f60f50b..9379419 100644
--- a/junit5.spec
+++ b/junit5.spec
@@ -40,6 +40,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
 
 BuildRequires:  asciidoc
 %if %{with bootstrap}
@@ -57,13 +58,11 @@ BuildRequires:  mvn(org.opentest4j:opentest4j)
 %description
 JUnit is a popular regression testing framework for Java platform.
 
-%if 0
 %package javadoc
 Summary:        Javadoc for %{name}
 
 %description javadoc
 Junit5 API documentation.
-%endif
 
 %package guide
 Summary:        Documentation for %{name}
@@ -77,6 +76,7 @@ JUnit 5 User Guide.
 find -name '*.jar' -delete
 
 %patch1 -p1
+%patch2 -p1
 
 cp -p %{SOURCE100} pom.xml
 
@@ -111,8 +111,7 @@ done
 %mvn_package :aggregator __noinstall
 
 %build
-# javadoc fails: https://github.com/fedora-java/xmvn/issues/223
-%mvn_build -f -j
+%mvn_build -f
 
 # Build docs. Ignore exit asciidoc -- it fails for some reason, but
 # still produces readable docs.
@@ -125,10 +124,8 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api
 %files -f .mfiles
 %license LICENSE.md LICENSE-notice.md
 
-%if 0
 %files javadoc -f .mfiles-javadoc
 %license LICENSE.md LICENSE-notice.md
-%endif
 
 %files guide
 %doc documentation/src/docs/*