diff --git a/beust-jcommander.spec b/beust-jcommander.spec
index 94cbb67..068fbc6 100644
--- a/beust-jcommander.spec
+++ b/beust-jcommander.spec
@@ -20,17 +20,21 @@ Patch:          0001-ParseValues-NullPointerException-patch.patch
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  maven-local-openjdk25
+BuildRequires:  maven-local
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.testng:testng)
 %endif
-# TODO Remove in Fedora 46
-Obsoletes:      %{name}-javadoc < 1.82-23
 
 %description
 JCommander is a very small Java framework that makes it trivial to
 parse command line parameters (with annotations).
 
+%package javadoc
+Summary:        API documentation for %{name}
+
+%description javadoc
+API documentation for %{name}.
+
 %prep
 %autosetup -p1 -C
 chmod -x license.txt
@@ -44,7 +48,7 @@ cp -p %SOURCE1 pom.xml
 %mvn_file : %{name}
 
 %build
-%mvn_build -j
+%mvn_build
 
 %install
 %mvn_install
@@ -53,5 +57,8 @@ cp -p %SOURCE1 pom.xml
 %license license.txt notice.md
 %doc README.markdown
 
+%files javadoc -f .mfiles-javadoc
+%license license.txt notice.md
+
 %changelog
 %autochangelog
diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
index ae17c0c..86bfcea 100644
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@@ -1,7 +1,7 @@
 summary: Run javapackages-specific tests
 discover:
   how: fmf
-  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
-  ref: f43
+  url: https://src.fedoraproject.org/tests/javapackages
+  ref: f42
 execute:
   how: tmt