From cbf8d38402fac5ede0bba60ff0419d0fa28fff53 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Sep 12 2019 15:39:30 +0000 Subject: Revert "Remove dependency on glassfish" This reverts commit f57e065afa8298d4716d0ac39e2c577b942dc4a9. --- diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index be4b486..9bc32ed 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -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: