.gitignore

@@ -2,4 +2,3 @@
 /.build-*.log
 /noarch
 /*.src.rpm
-/commons-jxpath-1.4.0-src.tar.gz

apache-commons-jxpath.spec

@@ -1,7 +1,7 @@
 %bcond_with bootstrap
 
 Name:           apache-commons-jxpath
-Version:        1.4.0
+Version:        1.3
 Release:        %autorelease
 Summary:        Simple XPath interpreter
 License:        Apache-2.0
@@ -11,34 +11,41 @@ ExclusiveArch:  %{java_arches} noarch
 
 Source0:        http://www.apache.org/dist/commons/jxpath/source/commons-jxpath-%{version}-src.tar.gz
 
+Patch:          commons-jxpath-mockrunner.patch
+
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  maven-local-openjdk25
+BuildRequires:  maven-local
 BuildRequires:  mvn(commons-beanutils:commons-beanutils)
 BuildRequires:  mvn(jdom:jdom)
 BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-assembly-plugin)
 %endif
-# TODO Remove in Fedora 46
-Obsoletes:      %{name}-javadoc < 1.3-77
 
 %description
 Defines a simple interpreter of an expression language called XPath.
 JXPath applies XPath expressions to graphs of objects of all kinds:
 JavaBeans, Maps, Servlet contexts, DOM etc, including mixtures thereof.
 
+%package javadoc
+Summary:        API documentation for %{name}
+
+%description javadoc
+API documentation for %{name}.
+
 %prep
 %autosetup -p1 -C
 
-%pom_remove_dep com.mockrunner:
+%pom_remove_dep xerces:
+%pom_remove_dep xml-apis:
 
 # Remove dependency on glassfish
 %pom_remove_dep :servlet-api
 %pom_remove_dep :jsp-api
-rm src/main/java/org/apache/commons/jxpath/servlet/*Context*.java
-rm src/main/java/org/apache/commons/jxpath/servlet/*Handler.java
-rm src/test/java/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java
+rm src/java/org/apache/commons/jxpath/servlet/*Context*.java
+rm src/java/org/apache/commons/jxpath/servlet/*Handler.java
+rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java
 
 %mvn_file ":{*}" %{name} @1
 %mvn_alias : org.apache.commons:
@@ -48,7 +55,7 @@ rm src/test/java/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java
 
 %build
 # we are skipping tests because we don't have com.mockrunner in repos yet
-%mvn_build -j -f -- -Dcommons.packageId=jxpath
+%mvn_build -f -- -Dcommons.packageId=jxpath
 
 %install
 %mvn_install
@@ -56,5 +63,8 @@ rm src/test/java/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java
 %files -f .mfiles
 %license LICENSE.txt NOTICE.txt
 
+%files javadoc -f .mfiles-javadoc
+%license LICENSE.txt NOTICE.txt
+
 %changelog
 %autochangelog

commons-jxpath-mockrunner.patch

@@ -0,0 +1,47 @@
+diff --git a/pom.xml b/pom.xml
+index 1a4f2c4..f5fa596 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -160,42 +160,6 @@ under the License.
+       <version>1.7.0</version>
+       <optional>true</optional>
+     </dependency>
+-    <dependency>
+-      <groupId>com.mockrunner</groupId>
+-      <artifactId>mockrunner-jdk1.3-j2ee1.3</artifactId>
+-      <version>0.4</version>
+-      <scope>test</scope>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>cglib-nodep</groupId>
+-          <artifactId>cglib-nodep</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>jboss</groupId>
+-          <artifactId>jboss-jee</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>nekohtml</groupId>
+-          <artifactId>nekohtml</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>struts</groupId>
+-          <artifactId>struts</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>oro</groupId>
+-          <artifactId>oro</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>commons-validator</groupId>
+-          <artifactId>commons-validator</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>commons-digester</groupId>
+-          <artifactId>commons-digester</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+   </dependencies>
+   <reporting>
+     <plugins>

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

sources

@@ -1 +1 @@
-SHA512 (commons-jxpath-1.4.0-src.tar.gz) = fd18abb89fa37f6d78e906a4e65af54a4d8424949f01df1166e6ce1ef7a1938f07290bba15e14185fcdd108a4836243f94dcff77f8bbd98ae4b2c7c546607416
+SHA512 (commons-jxpath-1.3-src.tar.gz) = a0ad0b90c9aa4c732c47c8f38f036990438f526295b782fbdc00fd67e4c0e92643c7850429eb5263f9d322aff7cb7000b8ff2bffcdcfa88fa3ba5354dce7e152