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
diff --git a/plexus-languages.spec b/plexus-languages.spec
index aaa6bd0..0c5e0ac 100644
--- a/plexus-languages.spec
+++ b/plexus-languages.spec
@@ -18,7 +18,7 @@ Source2:        generate-tarball.sh
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  maven-local-openjdk25
+BuildRequires:  maven-local
 BuildRequires:  mvn(com.thoughtworks.qdox:qdox)
 BuildRequires:  mvn(javax.inject:javax.inject)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-failsafe-plugin)
@@ -26,13 +26,17 @@ BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:)
 BuildRequires:  mvn(org.eclipse.sisu:sisu-maven-plugin)
 BuildRequires:  mvn(org.ow2.asm:asm)
 %endif
-# TODO Remove in Fedora 46
-Obsoletes:      %{name}-javadoc < 1.2.0-15
 
 %description
 Plexus Languages is a set of Plexus components that maintain shared
 language features.
 
+%package javadoc
+Summary:        API documentation for %{name}
+
+%description javadoc
+API documentation for %{name}.
+
 %prep
 %autosetup -p1 -C
 
@@ -42,7 +46,7 @@ cp %{SOURCE1} .
 
 %build
 # many tests rely on bundled test jars/classes
-%mvn_build -j -f
+%mvn_build -f
 
 %install
 %mvn_install
@@ -50,5 +54,7 @@ cp %{SOURCE1} .
 %files -f .mfiles
 %license LICENSE-2.0.txt
 
+%files javadoc -f .mfiles-javadoc
+
 %changelog
 %autochangelog