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

This commit is contained in:
Juergen Hoeller 2010-04-01 10:57:15 +00:00
parent 4a98fcb3f7
commit ee686188b7
2 changed files with 3 additions and 3 deletions

View File

@ -10,12 +10,12 @@ Import-Template:
javax.naming.*;version="0";resolution:=optional, javax.naming.*;version="0";resolution:=optional,
javax.sql.*;version="0";resolution:=optional, javax.sql.*;version="0";resolution:=optional,
net.sf.ehcache.*;version="[1.3.0, 2.0.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.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.commons.logging.*;version="[1.1.1, 2.0.0)";resolution:=optional,
org.apache.velocity.*;version="[1.5.0, 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.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.context.*;version=${spring.osgi.range},
org.springframework.core.*;version=${spring.osgi.range}, org.springframework.core.*;version=${spring.osgi.range},
org.springframework.jdbc.*;version=${spring.osgi.range};resolution:=optional, org.springframework.jdbc.*;version=${spring.osgi.range};resolution:=optional,

View File

@ -15,7 +15,7 @@ Import-Template:
javax.servlet.jsp.jstl.*;version="[1.1.0, 2.0.0)";resolution:=optional, javax.servlet.jsp.jstl.*;version="[1.1.0, 2.0.0)";resolution:=optional,
javax.xml.*;version="0";resolution:=optional, javax.xml.*;version="0";resolution:=optional,
jxl.*;version="[2.6.6, 3.0.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.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.poi.*;version="[3.0.2.FINAL, 4.0.0)";resolution:=optional,
org.apache.tiles.*;version="[2.1.2, 3.0.0)";resolution:=optional, org.apache.tiles.*;version="[2.1.2, 3.0.0)";resolution:=optional,