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

xml-commons-resolver.spec

@@ -16,15 +16,19 @@ Source8:        %{name}-xread.1
 Patch:          %{name}-1.2-crosslink.patch
 Patch:          %{name}-1.2-osgi.patch
 
-BuildRequires:  javapackages-local-openjdk25
-BuildRequires:  ant-openjdk25 
+BuildRequires:  javapackages-local
+BuildRequires:  ant
 BuildRequires:  apache-parent
-# TODO Remove in Fedora 46
-Obsoletes:      %{name}-javadoc < 1.2-53
 
 %description
 Resolver subproject of xml-commons.
 
+%package javadoc
+Summary:        API documentation for %{name}
+
+%description javadoc
+API documentation for %{name}.
+
 %prep
 %autosetup -p1 -C
 
@@ -36,11 +40,11 @@ sed -i 's/\r//' KEYS LICENSE.resolver.txt NOTICE-resolver.txt
 %mvn_file : xml-commons-resolver xml-resolver
 
 %build
-%ant -f resolver.xml jar -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8
+%ant -f resolver.xml jar javadocs -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8
 %mvn_artifact %{SOURCE5} build/resolver.jar
 
 %install
-%mvn_install
+%mvn_install -J build/apidocs/resolver
 
 # Scripts
 mkdir -p %{buildroot}%{_bindir}
@@ -60,5 +64,8 @@ install -p -m 644 %{SOURCE8} %{buildroot}%{_mandir}/man1/xml-xread.1
 %{_mandir}/man1/*
 %{_bindir}/xml-*
 
+%files javadoc -f .mfiles-javadoc
+%license LICENSE.resolver.txt NOTICE-resolver.txt
+
 %changelog
 %autochangelog