From ee686188b70611ae43dec303da176c8e44f921a9 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 1 Apr 2010 10:57:15 +0000 Subject: [PATCH] OSGi version range accepts JasperReports 3.x as well; fixed missing Spring version placeholder in context-support bundle --- org.springframework.context.support/template.mf | 4 ++-- org.springframework.web.servlet/template.mf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.springframework.context.support/template.mf b/org.springframework.context.support/template.mf index 6a1ba004d7b..9d5cf4da87b 100644 --- a/org.springframework.context.support/template.mf +++ b/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, diff --git a/org.springframework.web.servlet/template.mf b/org.springframework.web.servlet/template.mf index e68cb7c7da4..2687d2c2431 100644 --- a/org.springframework.web.servlet/template.mf +++ b/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,