diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec
index ad7ad61..e0937f5 100644
--- a/apache-commons-jxpath.spec
+++ b/apache-commons-jxpath.spec
@@ -1,3 +1,5 @@
+%bcond_without bootstrap
+
 Name:           apache-commons-jxpath
 Version:        1.3
 Release:        38%{?dist}
@@ -11,13 +13,14 @@ Source0:        http://www.apache.org/dist/commons/jxpath/source/commons-jxpath-
 Patch0:         commons-jxpath-mockrunner.patch
 
 BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(commons-beanutils:commons-beanutils)
-BuildRequires:  mvn(javax.servlet:jsp-api)
-BuildRequires:  mvn(javax.servlet:servlet-api)
 BuildRequires:  mvn(jdom:jdom)
 BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
-BuildRequires:  mvn(xerces:xercesImpl)
-BuildRequires:  mvn(xml-apis:xml-apis)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-assembly-plugin)
+%endif
 
 %description
 Defines a simple interpreter of an expression language called XPath.
@@ -34,6 +37,16 @@ This package contains the API documentation for %{name}.
 %setup -q -n commons-jxpath-%{version}-src
 %patch0 -p1
 
+%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/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:
 
@@ -42,7 +55,7 @@ This package contains the API documentation for %{name}.
 
 %build
 # we are skipping tests because we don't have com.mockrunner in repos yet
-%mvn_build -f -- -Dcommons.osgi.symbolicName=org.apache.commons.jxpath -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
+%mvn_build -f -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 -Dcommons.osgi.symbolicName=org.apache.commons.jxpath
 
 %install
 %mvn_install
@@ -69,9 +82,15 @@ This package contains the API documentation for %{name}.
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-34
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3-31
+- Mass rebuild for javapackages-tools 201902
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-33
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3-30
+- Mass rebuild for javapackages-tools 201901
+
 * Thu Feb 07 2019 Mat Booth <mat.booth@redhat.com> - 1.3-32
 - Rebuild to fix OSGi metadata
 
@@ -209,7 +228,7 @@ This package contains the API documentation for %{name}.
 - Use jdom-1.0-0.rc1.1jpp
 - Relax some versioned dependencies
 
-* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:1.1-3jpp
+* Mon 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
diff --git a/sources b/sources
index acfb54e..a92c68f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9af6ed5d009061986d709a370829860e  commons-jxpath-1.3-src.tar.gz
+SHA512 (commons-jxpath-1.3-src.tar.gz) = a0ad0b90c9aa4c732c47c8f38f036990438f526295b782fbdc00fd67e4c0e92643c7850429eb5263f9d322aff7cb7000b8ff2bffcdcfa88fa3ba5354dce7e152