Migrate from Tomcat 6 to Tomcat 7

- Resolves: rhbz#913879

apache-commons-jxpath.spec

@@ -3,15 +3,13 @@
 
 Name:             apache-%{short_name}
 Version:          1.3
-Release:          14%{?dist}
+Release:          15%{?dist}
 Summary:          Simple XPath interpreter
 
 Group:            Development/Libraries
 License:          ASL 2.0
 URL:              http://commons.apache.org/%{base_name}/
 Source0:          http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
-# Depmap needed to bend servlet-api and jsp-api to tomcat6
-Source1:          %{short_name}.depmap
 Patch0:           %{short_name}-mockrunner.patch
 BuildArch:        noarch
 
@@ -28,7 +26,7 @@ BuildRequires:    maven-javadoc-plugin
 BuildRequires:    maven-plugin-bundle
 BuildRequires:    maven-resources-plugin
 BuildRequires:    maven-surefire-plugin
-BuildRequires:    servlet25
+BuildRequires:    servlet
 BuildRequires:    jsp
 BuildRequires:    el_api
 
@@ -59,7 +57,7 @@ This package contains the API documentation for %{name}.
 # we are skipping tests because we don't have com.mockrunner in repos yet
 %mvn_file  : %{short_name} %{name}
 %mvn_alias : org.apache.commons:%{short_name}
-%mvn_build -f -D "%{SOURCE1}"
+%mvn_build -f
 
 %install
 %mvn_install
@@ -77,6 +75,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Tue Feb 26 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3-15
+- Migrate from Tomcat 6 to Tomcat 7
+- Resolves: rhbz#913879
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 

commons-jxpath.depmap

@@ -1,22 +0,0 @@
-<dependencies>
-  <dependency>
-    <maven>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-    </maven>
-    <jpp>
-      <groupId>JPP</groupId>
-      <artifactId>tomcat6-servlet-2.5-api</artifactId>
-    </jpp>
-  </dependency>
-  <dependency>
-    <maven>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jsp-api</artifactId>
-    </maven>
-    <jpp>
-      <groupId>JPP</groupId>
-      <artifactId>tomcat6-jsp-2.1-api</artifactId>
-    </jpp>
-  </dependency>
-</dependencies>