Update javapackages-validator URL

plans/javapackages.fmf

@@ -2,6 +2,6 @@ summary: Run javapackages-specific tests
 discover:
   how: fmf
   url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
-  ref: f43
+  ref: f42
 execute:
   how: tmt

xml-commons-apis.spec

@@ -16,11 +16,9 @@ Source2:        %{name}-ext-MANIFEST.MF
 Source3:        http://repo1.maven.org/maven2/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom
 Source4:        http://repo1.maven.org/maven2/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.pom
 
-BuildRequires:  javapackages-local-openjdk25
-BuildRequires:  ant-openjdk25 
+BuildRequires:  javapackages-local
+BuildRequires:  ant
 BuildRequires:  apache-parent
-# TODO Remove in Fedora 46
-Obsoletes:      %{name}-javadoc < 1.4.01-59
 Provides:       xml-commons = %{version}-%{release}
 
 %description
@@ -28,6 +26,18 @@ xml-commons-apis is designed to organize and have common packaging for
 the various externally-defined standard interfaces for XML. This
 includes the DOM, SAX, and JAXP.
 
+%package manual
+Summary:        Manual for %{name}
+
+%description manual
+%{summary}.
+
+%package javadoc
+Summary:        API documentation for %{name}
+
+%description javadoc
+API documentation for %{name}.
+
 %prep
 %autosetup -p1 -C
 # Make sure upstream hasn't sneaked in any jars we don't know about
@@ -49,7 +59,7 @@ sed -i '/distributionManagement/,/\/distributionManagement/ {d}' *.pom
 %mvn_alias :xml-apis-ext xerces:dom3-xml-apis
 
 %build
-%ant -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 jar
+%ant -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 jar javadoc
 
 # inject OSGi manifests
 jar ufm build/xml-apis.jar %{SOURCE1}
@@ -59,7 +69,7 @@ jar ufm build/xml-apis-ext.jar %{SOURCE2}
 %mvn_artifact xml-apis-ext*.pom build/xml-apis-ext.jar
 
 %install
-%mvn_install
+%mvn_install -J build/docs/javadoc
 
 # prevent apis javadoc from being included in doc
 rm -rf build/docs/javadoc
@@ -70,5 +80,10 @@ rm -rf build/docs/javadoc
 %doc LICENSE.dom-software.txt LICENSE.sac.html
 %doc LICENSE.sax.txt README-sax  README.sax.txt
 
+%files manual
+%doc build/docs/*
+
+%files javadoc -f .mfiles-javadoc
+
 %changelog
 %autochangelog