[cas-client] disable tomcat7 module and opensalm support

[gil]

commit 82e1902f846a2d66f39ad095517a1ab00d522582
Author: gil <puntogil at libero.it>
Date:   Wed Mar 4 10:42:06 2015 +0100

    disable tomcat7 module and opensalm support

 cas-client.spec | 83 +++++++++++++++++++++++----------------------------------
 1 file changed, 34 insertions(+), 49 deletions(-)
---
diff --git a/cas-client.spec b/cas-client.spec
index dced42f..864e74a 100644
--- a/cas-client.spec
+++ b/cas-client.spec
@@ -10,42 +10,28 @@ Source0:       https://github.com/Jasig/java-%{name}/archive/%{name}-%{version}.
 Source1:       %{name}-LICENSE.txt
 Source2:       http://www.apache.org/licenses/LICENSE-2.0.txt
 
-Patch0:        %{name}-3.3.3-integration-tomcat-v7-unreported-exception.patch
-
-BuildRequires: apache-commons-codec
-BuildRequires: ehcache-core
-BuildRequires: joda-time
-BuildRequires: opensaml-java
-BuildRequires: opensaml-java-openws
-BuildRequires: opensaml-java-parent
-BuildRequires: opensaml-java-xmltooling
-BuildRequires: springframework-beans
-BuildRequires: spymemcached
-BuildRequires: tomcat-lib
-BuildRequires: tomcat-servlet-3.0-api
-BuildRequires: xml-security
+BuildRequires: mvn(commons-codec:commons-codec)
+BuildRequires: mvn(commons-lang:commons-lang)
+BuildRequires: mvn(javax.servlet:javax.servlet-api)
+BuildRequires: mvn(joda-time:joda-time)
+BuildRequires: mvn(net.sf.ehcache:ehcache-core)
+BuildRequires: mvn(net.spy:spymemcached)
+BuildRequires: mvn(org.apache.santuario:xmlsec)
+BuildRequires: mvn(org.springframework:spring-beans)
 
 # test deps
-BuildRequires: apache-commons-logging
-BuildRequires: junit
-%if %{fedora} > 20
-BuildRequires: log4j12
+BuildRequires: mvn(commons-logging:commons-logging)
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(log4j:log4j:1.2.17)
 BuildRequires: mvn(org.slf4j:jcl-over-slf4j)
+BuildRequires: mvn(org.slf4j:slf4j-api)
 BuildRequires: mvn(org.slf4j:slf4j-nop)
 BuildRequires: mvn(org.slf4j:slf4j-simple)
-%else
-BuildRequires: log4j
-%endif
-BuildRequires: slf4j
-# org.springframework:spring-test
-BuildRequires: springframework
-BuildRequires: springframework-context
+BuildRequires: mvn(org.springframework:spring-core)
+BuildRequires: mvn(org.springframework:spring-context)
+BuildRequires: mvn(org.springframework:spring-test)
 
 BuildRequires: maven-local
-BuildRequires: maven-source-plugin
-
-Requires:      springframework-beans
-Requires:      tomcat-servlet-3.0-api
 
 BuildArch:     noarch
 
@@ -62,8 +48,6 @@ This package contains javadoc for %{name}.
 %prep
 %setup -q -n java-%{name}-%{name}-%{version}
 
-%patch0 -p0
-
 find . -name "*.class" -delete
 find . -name "*.jar" -delete
 %pom_remove_parent
@@ -80,29 +64,26 @@ find . -name "*.jar" -delete
 # require org.jboss.jbossas jboss-as-tomcat 5.1.0.GA
 %pom_disable_module cas-client-integration-jboss
 %pom_disable_module cas-client-integration-tomcat-v6
-
-%pom_remove_dep javax.servlet:javax.servlet-api
-%pom_add_dep org.apache.tomcat:tomcat-servlet-api::provided
+%pom_disable_module cas-client-integration-tomcat-v7
 
 %pom_remove_dep xml-security:xmlsec cas-client-core
 %pom_add_dep org.apache.santuario:xmlsec::runtime cas-client-core
 
 %pom_add_dep org.slf4j:slf4j-nop::test cas-client-support-distributed-ehcache
 
-sed -i.log4j12 "s|<version>1.2.15|<version>1.2.17|" cas-client-core/pom.xml
-
-%pom_remove_dep org.springframework:spring-test cas-client-core
-rm -r cas-client-core/src/test/java/org/jasig/cas/client/session/SingleSignOutHandlerTests.java \
-  cas-client-core/src/test/java/org/jasig/cas/client/session/SingleSignOutFilterTests.java \
-  cas-client-core/src/test/java/org/jasig/cas/client/authentication/DefaultAuthenticationRedirectStrategyTests.java \
-  cas-client-core/src/test/java/org/jasig/cas/client/authentication/FacesCompatibleAuthenticationRedirectStrategyTests.java \
-  cas-client-core/src/test/java/org/jasig/cas/client/validation/Saml11TicketValidationFilterTests.java \
-  cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas10TicketValidationFilterTests.java \
-  cas-client-core/src/test/java/org/jasig/cas/client/util/CasFilterTests.java \
-  cas-client-core/src/test/java/org/jasig/cas/client/util/CommonUtilsTests.java \
-  cas-client-core/src/test/java/org/jasig/cas/client/authentication/AuthenticationFilterTests.java \
-  cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ProxyReceivingTicketValidationFilterTests.java \
-  cas-client-core/src/test/java/org/jasig/cas/client/util/HttpServletRequestWrapperFilterTests.java
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'log4j']/pom:version" 1.2.17 cas-client-core
+
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'javax.servlet-api']/pom:version" 3.1.0
+
+# use, also, org.opensaml:xmltooling currently is broken. see rhbz#1106661
+%pom_remove_dep org.opensaml: cas-client-core
+rm -r cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidator.java \
+ cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidationFilter.java \
+ cas-client-core/src/test/java/org/jasig/cas/client/validation/Saml11TicketValidatorTests.java \
+ cas-client-core/src/test/java/org/jasig/cas/client/validation/Saml11TicketValidationFilterTests.java
+%pom_add_dep commons-lang:commons-lang cas-client-core
+%pom_add_dep joda-time:joda-time cas-client-core
+
 # this test fails
 rm -r cas-client-support-distributed-ehcache/src/test/java/EhCacheBackedProxyGrantingTicketStorageImplTests.java
 rm -r cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas10TicketValidatorTests.java \
@@ -129,6 +110,10 @@ sed -i 's/\r//' LICENSE.txt LICENSE-2.0.txt
 %license LICENSE.txt LICENSE-2.0.txt
 
 %changelog
+* Wed Mar 04 2015 gil cattaneo <puntogil at libero.it> 3.3.3-3
+- disable tomcat7 module and opensalm support
+- use servlet api 3.1
+
 * Fri Jan 30 2015 gil cattaneo <puntogil at libero.it> 3.3.3-2
 - introduce license macro
 
@@ -150,4 +135,4 @@ sed -i 's/\r//' LICENSE.txt LICENSE-2.0.txt
 - adapt to current guideline
 
 * Fri Nov 16 2012 gil cattaneo <puntogil at libero.it> 3.2.1-1
-- initial rpm
\ No newline at end of file
+- initial rpm