OSGi version range accepts JasperReports 3.x as well; fixed missing Spring version placeholder in context-support bundle

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3215 50f2f4bb-b051-0410-bef5-90022cba6387

org.springframework.context.support/template.mf

@@ -10,12 +10,12 @@ Import-Template:
  javax.naming.*;version="0";resolution:=optional,
  javax.sql.*;version="0";resolution:=optional,
  net.sf.ehcache.*;version="[1.3.0, 2.0.0)";resolution:=optional,
- net.sf.jasperreports.*;version="[2.0.5, 3.0.0)";resolution:=optional,
+ net.sf.jasperreports.*;version="[2.0.5, 4.0.0)";resolution:=optional,
  org.apache.commons.collections.*;version="[3.2.0, 4.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)";resolution:=optional,
  org.apache.velocity.*;version="[1.5.0, 2.0.0)";resolution:=optional,
  org.quartz.*;version="[1.6.0, 2.0.0)";resolution:=optional,
- org.springframework.beans.*;version="[3.0.0, 3.0.1)";resolution:=optional,
+ org.springframework.beans.*;version=${spring.osgi.range};resolution:=optional,
  org.springframework.context.*;version=${spring.osgi.range},
  org.springframework.core.*;version=${spring.osgi.range},
  org.springframework.jdbc.*;version=${spring.osgi.range};resolution:=optional,

org.springframework.web.servlet/template.mf

@@ -15,7 +15,7 @@ Import-Template:
  javax.servlet.jsp.jstl.*;version="[1.1.0, 2.0.0)";resolution:=optional,
  javax.xml.*;version="0";resolution:=optional,
  jxl.*;version="[2.6.6, 3.0.0)";resolution:=optional,
- net.sf.jasperreports.*;version="[2.0.5, 3.0.0)";resolution:=optional,
+ net.sf.jasperreports.*;version="[2.0.5, 4.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)";resolution:=optional,
  org.apache.poi.*;version="[3.0.2.FINAL, 4.0.0)";resolution:=optional,
  org.apache.tiles.*;version="[2.1.2, 3.0.0)";resolution:=optional,