SPECS/apache-commons-jxpath.spec

@@ -1,6 +1,6 @@
 Name:           apache-commons-jxpath
 Version:        1.3
-Release:        31%{?dist}
+Release:        29%{?dist}
 Summary:        Simple XPath interpreter
 License:        ASL 2.0
 URL:            http://commons.apache.org/jxpath/
@@ -12,6 +12,8 @@ Patch0:         commons-jxpath-mockrunner.patch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(commons-beanutils:commons-beanutils)
+BuildRequires:  mvn(javax.servlet:jsp-api)
+BuildRequires:  mvn(javax.servlet:servlet-api)
 BuildRequires:  mvn(jdom:jdom)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
@@ -34,13 +36,6 @@ This package contains the API documentation for %{name}.
 %setup -q -n commons-jxpath-%{version}-src
 %patch0 -p1
 
-# Remove dependency on glassfish
-%pom_remove_dep :servlet-api
-%pom_remove_dep :jsp-api
-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:
 
@@ -49,7 +44,7 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java
 
 %build
 # we are skipping tests because we don't have com.mockrunner in repos yet
-%mvn_build -f -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6
+%mvn_build -f
 
 %install
 %mvn_install
@@ -61,12 +56,6 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java
 %license LICENSE.txt NOTICE.txt
 
 %changelog
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3-31
-- Mass rebuild for javapackages-tools 201902
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3-30
-- Mass rebuild for javapackages-tools 201901
-
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-29
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
@@ -195,7 +184,7 @@ rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java
 - Use jdom-1.0-0.rc1.1jpp
 - Relax some versioned dependencies
 
-* Mon Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:1.1-3jpp
+* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:1.1-3jpp
 - Rebuild with ant-1.6.2
 
 * Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:1.1-2jpp