[ehcache-core] use servlet api 3.1

[gil]

commit b6c1ce61c9f09a6b65fc8a381bbca03cb5f78cd9
Author: gil <puntogil at libero.it>
Date:   Wed Mar 4 11:05:24 2015 +0100

    use servlet api 3.1

 ehcache-core.spec | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/ehcache-core.spec b/ehcache-core.spec
index 80e8624..c7953c7 100644
--- a/ehcache-core.spec
+++ b/ehcache-core.spec
@@ -1,6 +1,6 @@
 Name:          ehcache-core
 Version:       2.6.7
-Release:       6%{?dist}
+Release:       7%{?dist}
 Summary:       Easy Hibernate Cache
 License:       ASL 2.0
 URL:           http://ehcache.org/
@@ -13,12 +13,12 @@ URL:           http://ehcache.org/
 Source0:       %{name}-%{version}-clean-src-svn.tar.gz
 Patch0:        %{name}-2.6.7-java8.patch
 
-BuildRequires: ehcache-parent
-BuildRequires: geronimo-jta
-BuildRequires: hibernate3 >= 3.6.10-7
-BuildRequires: ehcache-sizeof-agent
-BuildRequires: slf4j
-BuildRequires: tomcat-servlet-3.0-api
+BuildRequires: mvn(javax.servlet:javax.servlet-api)
+BuildRequires: mvn(javax.transaction:jta)
+BuildRequires: mvn(net.sf.ehcache:ehcache-parent:pom:)
+BuildRequires: mvn(net.sf.ehcache:sizeof-agent)
+BuildRequires: mvn(org.hibernate:hibernate-core:3)
+BuildRequires: mvn(org.slf4j:slf4j-api)
 BuildRequires: mvn(org.slf4j:slf4j-jdk14)
 
 # test
@@ -38,16 +38,11 @@ BuildRequires: xsom
 %endif
 
 BuildRequires: maven-local
-BuildRequires: maven-source-plugin
 BuildRequires: rmic-maven-plugin
 BuildRequires: xml-maven-plugin
 BuildRequires: plexus-resources
 
-Requires:      ehcache-sizeof-agent
-Requires:      geronimo-jta
 Requires:      hibernate3 >= 3.6.10-7
-Requires:      slf4j
-Requires:      tomcat-servlet-3.0-api
 
 BuildArch:     noarch
 
@@ -67,6 +62,7 @@ This package contains javadoc for %{name}.
 %pom_remove_plugin org.codehaus.gmaven:gmaven-plugin
 %pom_remove_plugin org.eclipse.m2e:lifecycle-mapping
 %pom_remove_plugin org.apache.maven.plugins:maven-checkstyle-plugin
+%pom_remove_plugin org.apache.maven.plugins:maven-source-plugin
 
 # don't generate source archive
 %pom_remove_plugin org.apache.maven.plugins:maven-assembly-plugin
@@ -75,6 +71,9 @@ This package contains javadoc for %{name}.
 %pom_xpath_remove "pom:dependencies/pom:dependency[pom:groupId = 'org.hibernate']/pom:version"
 %pom_xpath_inject "pom:dependencies/pom:dependency[pom:groupId = 'org.hibernate']" "<version>3</version>"
 
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'javax.servlet']/pom:version" 3.1.0
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'javax.servlet']/pom:artifactId" javax.servlet-api
+
 # Don't use buildnumber-plugin, because jna is required (and currently broken)
 %pom_xpath_remove "pom:profiles/pom:profile[pom:id = 'buildnumber-git']"
 
@@ -84,6 +83,8 @@ This package contains javadoc for %{name}.
 %pom_remove_dep net.sf.hibernate:hibernate
 %pom_xpath_remove "pom:dependencies/pom:dependency[pom:scope = 'test']"
 
+%pom_xpath_remove "pom:dependencies/pom:dependency/pom:scope"
+
 # disable embedded ehcache-sizeof-agent.jar copy
 %pom_remove_plugin :maven-dependency-plugin
 
@@ -93,7 +94,7 @@ This package contains javadoc for %{name}.
 %build
 
 # tests skipped. cause: missing dependencies
-%mvn_build -f -- -Dmaven.local.depmap.file="%{_mavendepmapfragdir}/tomcat-tomcat-servlet-api"
+%mvn_build -f
 
 %install
 %mvn_install
@@ -105,6 +106,9 @@ This package contains javadoc for %{name}.
 %license src/assemble/EHCACHE-CORE-LICENSE.txt
 
 %changelog
+* Wed Mar 04 2015 gil cattaneo <puntogil at libero.it> 2.6.7-7
+- use servlet api 3.1
+
 * Sun Feb 01 2015 gil cattaneo <puntogil at libero.it> 2.6.7-6
 - introduce license macro