diff --git a/google-guice.spec b/google-guice.spec
index 1ce6ef4..e57adaa 100644
--- a/google-guice.spec
+++ b/google-guice.spec
@@ -17,7 +17,7 @@ BuildRequires:  jurand
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  maven-local-openjdk25
+BuildRequires:  maven-local
 BuildRequires:  mvn(aopalliance:aopalliance)
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
 BuildRequires:  mvn(com.google.guava:guava)
@@ -32,8 +32,6 @@ BuildRequires:  mvn(org.ow2.asm:asm)
 # xmvn-builddep misses this:
 BuildRequires:  mvn(org.apache:apache-jar-resource-bundle)
 %endif
-# TODO Remove in Fedora 46
-Obsoletes:      %{name}-javadoc < 5.1.0-27
 
 %description
 Put simply, Guice alleviates the need for factories and the use of new
@@ -117,6 +115,12 @@ Summary:        Bill of Materials for Guice
 Guice is a lightweight dependency injection framework for Java 5
 and above. This package provides Bill of Materials module for Guice.
 
+%package javadoc
+Summary:        API documentation for %{name}
+
+%description javadoc
+API documentation for %{name}.
+
 %prep
 %autosetup -p1 -C
 
@@ -168,8 +172,6 @@ and above. This package provides Bill of Materials module for Guice.
 
 #%pom_xpath_inject "pom:dependency[pom:artifactId='guice']" "<scope>provided</scope>" extensions
 
-%mvn_alias :guice :::classes:
-
 %build
 #%mvn_alias "com.google.inject.extensions:" "org.sonatype.sisu.inject:"
 
@@ -180,7 +182,7 @@ and above. This package provides Bill of Materials module for Guice.
 %mvn_file  ":guice" guice/%{name} %{name}
 #%mvn_alias ":guice" "org.sonatype.sisu:sisu-guice"
 # Skip tests because of missing dependency guice-testlib
-%mvn_build -j -f -s
+%mvn_build -f -s
 
 %install
 %mvn_install
@@ -206,5 +208,8 @@ and above. This package provides Bill of Materials module for Guice.
 
 %files -n guice-bom -f .mfiles-guice-bom
 
+%files javadoc -f .mfiles-javadoc
+%license COPYING
+
 %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