diff --git a/log4j.spec b/log4j.spec
index 542ad0b..ecafc8e 100644
--- a/log4j.spec
+++ b/log4j.spec
@@ -20,7 +20,7 @@ Patch:          0002-Remove-usage-of-toolchains.patch
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  maven-local-openjdk25
+BuildRequires:  maven-local
 BuildRequires:  mvn(com.lmax:disruptor)
 BuildRequires:  mvn(commons-logging:commons-logging)
 BuildRequires:  mvn(jakarta.activation:jakarta.activation-api)
@@ -71,9 +71,6 @@ BuildRequires:  mvn(sun.jdk:jconsole)
 # - io.fabric8.kubernetes-client
 %endif
 
-# TODO Remove in Fedora 46
-Obsoletes:      %{name}-javadoc < 2.2.0-18
-
 %description
 Log4j is a tool to help the programmer output log statements to a
 variety of output targets.
@@ -117,7 +114,7 @@ Apache Log4j Tag Library for Web Applications.
 
 %package jmx-gui
 Summary:        Apache Log4j JMX GUI
-Requires:       java-25-devel
+Requires:       java-devel
 
 %description jmx-gui
 Swing-based client for remotely editing the log4j configuration and remotely
@@ -130,6 +127,12 @@ Summary:        Apache Log4j NoSql
 Use NoSQL databases such as MongoDB and CouchDB to append log messages.
 %endif
 
+%package        javadoc
+Summary:        API documentation for %{name}
+
+%description    javadoc
+%{summary}.
+
 %prep
 %autosetup -p1 -C
 
@@ -274,7 +277,7 @@ rm log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadCo
 
 %build
 # missing test deps (mockejb)
-%mvn_build -j -f
+%mvn_build -f
 
 %install
 %mvn_install
@@ -297,5 +300,8 @@ rm log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadCo
 %{_bindir}/%{name}-jmx
 %endif
 
+%files javadoc -f .mfiles-javadoc
+%license LICENSE.txt NOTICE.txt
+
 %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