[springframework] Switch to jstl 1.2

[Michal Srb]

commit 93f19647dcebd886aef20cc35b7cd9b0eaa5b48c
Author: Michal Srb <msrb at redhat.com>
Date:   Fri Mar 6 10:38:38 2015 +0100

    Switch to jstl 1.2

 springframework.spec | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/springframework.spec b/springframework.spec
index 08f5284..a343892 100644
--- a/springframework.spec
+++ b/springframework.spec
@@ -3,7 +3,7 @@
 
 Name:          springframework
 Version:       3.2.13
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Spring Java Application Framework
 Epoch:         0
 License:       ASL 2.0
@@ -122,11 +122,14 @@ BuildRequires:  mvn(org.quartz-scheduler:quartz)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
 BuildRequires:  mvn(org.testng:testng)
 BuildRequires:  mvn(rome:rome)
-BuildRequires:  mvn(taglibs:standard)
 BuildRequires:  mvn(toplink.essentials:toplink-essentials)
 BuildRequires:  mvn(velocity-tools:velocity-tools-view)
 BuildRequires:  mvn(velocity:velocity)
 BuildRequires:  mvn(xmlunit:xmlunit)
+BuildRequires:  mvn(javax.el:el-api)
+BuildRequires:  mvn(org.apache.taglibs:taglibs-standard-jstlel)
+Buildrequires:  mvn(javax.servlet:jstl)
+BuildRequires:  mvn(org.apache.taglibs:taglibs-standard-spec)
 
 BuildArch:     noarch
 
@@ -307,10 +310,6 @@ cp %{SOURCE119} spring-webmvc-portlet/pom.xml
 # missing dep
 %pom_remove_dep com.jayway.jsonpath:json-path spring-test
 
-# looks like older jstl 1.1 works just fine (upstream uses 1.2)
-%pom_remove_dep javax.servlet:jstl spring-test
-%pom_add_dep taglibs:standard spring-test
-
 %pom_remove_dep struts:struts spring-struts
 %pom_add_dep org.apache.struts:struts-core spring-struts
 %pom_add_dep org.apache.struts:struts-extras spring-struts
@@ -388,6 +387,13 @@ rm -Rf spring-context-support/src/main/java/org/springframework/scheduling/
 
 %pom_remove_dep -r javax.activation:activation
 
+%pom_add_dep org.apache.taglibs:taglibs-standard-jstlel spring-test '<optional>true</optional>'
+
+%pom_add_dep javax.servlet:jstl spring-web '<optional>true</optional>'
+%pom_remove_dep taglibs:standard spring-web
+
+%pom_add_dep org.apache.taglibs:taglibs-standard-spec spring-webmvc '<optional>true</optional>'
+
 # Disable part of Derby support, require derby 10.5
 # unavailable method purgeDatabase in org.apache.derby.impl.io.VFMemoryStorageFactory
 rm -r spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java
@@ -459,6 +465,9 @@ cp -p src/dist/* .
 
 
 %changelog
+* Fri Mar 06 2015 Michal Srb <msrb at redhat.com> - 0:3.2.13-3
+- Switch to jstl 1.2
+
 * Sun Feb 22 2015 Michal Srb <msrb at redhat.com> - 0:3.2.13-2
 - Port to javax.servlet API 3.1
 - Reduce dependency bloat (Resolves: rhbz#1141469)