diff --git a/google-guice.spec b/google-guice.spec
index e57adaa..1ce6ef4 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
+BuildRequires:  maven-local-openjdk25
 BuildRequires:  mvn(aopalliance:aopalliance)
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
 BuildRequires:  mvn(com.google.guava:guava)
@@ -32,6 +32,8 @@ 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
@@ -115,12 +117,6 @@ 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
 
@@ -172,6 +168,8 @@ API documentation for %{name}.
 
 #%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:"
 
@@ -182,7 +180,7 @@ API documentation for %{name}.
 %mvn_file  ":guice" guice/%{name} %{name}
 #%mvn_alias ":guice" "org.sonatype.sisu:sisu-guice"
 # Skip tests because of missing dependency guice-testlib
-%mvn_build -f -s
+%mvn_build -j -f -s
 
 %install
 %mvn_install
@@ -208,8 +206,5 @@ API documentation for %{name}.
 
 %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 86bfcea..ae17c0c 100644
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@@ -1,7 +1,7 @@
 summary: Run javapackages-specific tests
 discover:
   how: fmf
-  url: https://src.fedoraproject.org/tests/javapackages
-  ref: f42
+  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
+  ref: f43
 execute:
   how: tmt