From 225eb6bcd9beaefb35abdd0a48a2780852be3bfb Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 27 Mar 2009 17:29:48 +0000 Subject: [PATCH] refined version ranges in OSGi manifests --- .../template.mf | 2 +- org.springframework.context/template.mf | 10 +-- org.springframework.orm/template.mf | 71 ++++++++----------- org.springframework.test/template.mf | 8 +-- org.springframework.web.portlet/template.mf | 2 +- org.springframework.web.servlet/template.mf | 17 +++-- org.springframework.web/template.mf | 9 ++- 7 files changed, 53 insertions(+), 66 deletions(-) diff --git a/org.springframework.context.support/template.mf b/org.springframework.context.support/template.mf index 22f8c1b4ab9..b3ca4cc6dec 100644 --- a/org.springframework.context.support/template.mf +++ b/org.springframework.context.support/template.mf @@ -4,7 +4,7 @@ Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: commonj.*;version="[1.1.0, 2.0.0)";resolution:=optional, - freemarker.*;version="[2.3.12, 3.0.0)";resolution:=optional, + freemarker.*;version="[2.3.0, 3.0.0)";resolution:=optional, javax.activation.*;version="[1.1.0, 2.0.0)";resolution:=optional, javax.mail.*;version="[1.4.0, 2.0.0)";resolution:=optional, net.sf.ehcache.*;version="[1.3.0, 2.0.0)";resolution:=optional, diff --git a/org.springframework.context/template.mf b/org.springframework.context/template.mf index 6620a14c493..375b2c83e1c 100644 --- a/org.springframework.context/template.mf +++ b/org.springframework.context/template.mf @@ -11,19 +11,19 @@ Import-Template: com.sun.enterprise.loader.*;version="[1.0.0, 2.0.0)";resolution:=optional, com.sun.net.*;resolution:=optional, edu.emory.mathcs.backport.*;version="[3.0.0, 4.0.0)";resolution:=optional, - groovy.*;version="[1.5.1, 2.0.0)";resolution:=optional, + groovy.*;version="[1.5.0, 2.0.0)";resolution:=optional, javax.annotation.*;version="[0.0.0, 2.0.0)";resolution:=optional, - javax.ejb.*;version="[3.0.0, 4.0.0)";resolution:=optional, + javax.ejb.*;version="[2.1.0, 4.0.0)";resolution:=optional, javax.interceptor.*;version="[3.0.0, 4.0.0)";resolution:=optional, - javax.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional, + javax.persistence.*;version="[1.0.0, 3.0.0)";resolution:=optional, javax.jms.*;version="[1.1.0, 2.0.0)";resolution:=optional, - javax.xml.ws.*;version="[2.1.1, 3.0.0)";resolution:=optional, + javax.xml.ws.*;version="[2.0.0, 3.0.0)";resolution:=optional, net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional, oracle.classloader.*;version="[10.1.3.1, 10.2.0.0)";resolution:=optional, org.aopalliance.*;version="[1.0.0, 2.0.0)", org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional, - org.codehaus.groovy.*;version="[1.5.1, 2.0.0)";resolution:=optional, + org.codehaus.groovy.*;version="[1.5.0, 2.0.0)";resolution:=optional, org.jruby.*;version="[1.1.0, 2.0.0)";resolution:=optional, org.springframework.aop.*;version="[3.0.0, 3.0.1)", org.springframework.beans.*;version="[3.0.0, 3.0.1)", diff --git a/org.springframework.orm/template.mf b/org.springframework.orm/template.mf index cc1ecaeab1b..9dcd42ab7f6 100644 --- a/org.springframework.orm/template.mf +++ b/org.springframework.orm/template.mf @@ -3,52 +3,41 @@ Bundle-Name: Spring ORM Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Package: - com.ibatis.sqlmap.engine.transaction.external;version="[2.3.0.677, 3.0.0)";resolution:=optional, - oracle.toplink.essentials.expressions;version="[2.0.0.b41-beta2, 3.0.0)";resolution:=optional, - org.eclipse.persistence.expressions;version="[1.0.0, 2.0.0)";resolution:=optional + com.ibatis.sqlmap.engine.transaction.external;version="[2.3.0, 3.0.0)";resolution:=optional, + oracle.toplink.essentials.expressions;version="[2.0.0, 3.0.0)";resolution:=optional, + org.eclipse.persistence.expressions;version="[1.0.0, 3.0.0)";resolution:=optional Import-Template: - com.ibatis.*;version="[2.3.0.677, 3.0.0)";resolution:=optional, + com.ibatis.*;version="[2.3.0, 3.0.0)";resolution:=optional, javax.jdo.*;version="[2.0.0, 3.0.0)";resolution:=optional, - javax.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional, - javax.servlet.*;version="[2.4.0, 3.0.0)";resolution:=optional, + javax.persistence.*;version="[1.0.0, 3.0.0)";resolution:=optional, + javax.servlet.*;version="[2.4.0, 4.0.0)";resolution:=optional, javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional, - oracle.toplink.essentials.*;version="[2.0.0.b41-beta2, 3.0.0)";resolution:=optional, - oracle.toplink.exceptions;version="[10.1.3, 11.0.0)";resolution:=optional, - oracle.toplink.expressions;version="[10.1.3, 11.0.0)";resolution:=optional, - oracle.toplink.internal.databaseaccess;version="[10.1.3, 11.0.0)";resolution:=optional, - oracle.toplink.jndi;version="[10.1.3, 11.0.0)";resolution:=optional, - oracle.toplink.logging;version="[10.1.3, 11.0.0)";resolution:=optional, - oracle.toplink.publicinterface;version="[10.1.3, 11.0.0)";resolution:=optional, - oracle.toplink.queryframework;version="[10.1.3, 11.0.0)";resolution:=optional, - oracle.toplink.sessionbroker;version="[10.1.3, 11.0.0)";resolution:=optional, - oracle.toplink.sessions;version="[10.1.3, 11.0.0)";resolution:=optional, - oracle.toplink.threetier;version="[10.1.3, 11.0.0)";resolution:=optional, - oracle.toplink.tools.*;version="[10.1.3, 11.0.0)";resolution:=optional, + oracle.toplink.essentials.*;version="[2.0.0, 3.0.0)";resolution:=optional, org.aopalliance.*;version="[1.0.0, 2.0.0)", org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", - org.apache.openjpa.persistence.*;version="[1.0.2, 2.0.0)";resolution:=optional, - org.eclipse.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional, - org.hibernate;version="[3.2.6.ga, 3.3.0)";resolution:=optional, - org.hibernate.cache;version="[3.2.6.ga, 3.3.0)";resolution:=optional, - org.hibernate.cfg;version="[3.2.6.ga, 3.3.0)";resolution:=optional, - org.hibernate.classic;version="[3.2.6.ga, 3.3.0)";resolution:=optional, - org.hibernate.connection;version="[3.2.6.ga, 3.3.0)";resolution:=optional, - org.hibernate.context;version="[3.2.6.ga, 3.3.0)";resolution:=optional, - org.hibernate.criterion;version="[3.2.6.ga, 3.3.0)";resolution:=optional, - org.hibernate.dialect;version="[3.2.6.ga, 3.3.0)";resolution:=optional, - org.hibernate.ejb;version="[3.3.0.ga, 3.4.0)";resolution:=optional, - org.hibernate.engine;version="[3.2.6.ga, 3.3.0)";resolution:=optional, - org.hibernate.event.*;version="[3.2.6.ga, 3.3.0)";resolution:=optional, - org.hibernate.exception;version="[3.2.6.ga, 3.3.0)";resolution:=optional, - org.hibernate.impl;version="[3.2.6.ga, 3.3.0)";resolution:=optional, - org.hibernate.jdbc;version="[3.2.6.ga, 3.3.0)";resolution:=optional, - org.hibernate.persister.entity;version="[3.2.6.ga, 3.3.0)";resolution:=optional, - org.hibernate.tool.hbm2ddl;version="[3.2.6.ga, 3.3.0)";resolution:=optional, - org.hibernate.transaction;version="[3.2.6.ga, 3.3.0)";resolution:=optional, - org.hibernate.transform;version="[3.2.6.ga, 3.3.0)";resolution:=optional, - org.hibernate.type;version="[3.2.6.ga, 3.3.0)";resolution:=optional, - org.hibernate.usertype;version="[3.2.6.ga, 3.3.0)";resolution:=optional, - org.hibernate.util;version="[3.2.6.ga, 3.3.0)";resolution:=optional, + org.apache.openjpa.persistence.*;version="[1.0.0, 3.0.0)";resolution:=optional, + org.eclipse.persistence.*;version="[1.0.0, 3.0.0)";resolution:=optional, + org.hibernate;version="[3.2.6.ga, 4.0.0)";resolution:=optional, + org.hibernate.cache;version="[3.2.6.ga, 4.0.0)";resolution:=optional, + org.hibernate.cfg;version="[3.2.6.ga, 4.0.0)";resolution:=optional, + org.hibernate.classic;version="[3.2.6.ga, 4.0.0)";resolution:=optional, + org.hibernate.connection;version="[3.2.6.ga, 4.0.0)";resolution:=optional, + org.hibernate.context;version="[3.2.6.ga, 4.0.0)";resolution:=optional, + org.hibernate.criterion;version="[3.2.6.ga, 4.0.0)";resolution:=optional, + org.hibernate.dialect;version="[3.2.6.ga, 4.0.0)";resolution:=optional, + org.hibernate.ejb;version="[4.0.0.ga, 3.4.0)";resolution:=optional, + org.hibernate.engine;version="[3.2.6.ga, 4.0.0)";resolution:=optional, + org.hibernate.event.*;version="[3.2.6.ga, 4.0.0)";resolution:=optional, + org.hibernate.exception;version="[3.2.6.ga, 4.0.0)";resolution:=optional, + org.hibernate.impl;version="[3.2.6.ga, 4.0.0)";resolution:=optional, + org.hibernate.jdbc;version="[3.2.6.ga, 4.0.0)";resolution:=optional, + org.hibernate.persister.entity;version="[3.2.6.ga, 4.0.0)";resolution:=optional, + org.hibernate.tool.hbm2ddl;version="[3.2.6.ga, 4.0.0)";resolution:=optional, + org.hibernate.transaction;version="[3.2.6.ga, 4.0.0)";resolution:=optional, + org.hibernate.transform;version="[3.2.6.ga, 4.0.0)";resolution:=optional, + org.hibernate.type;version="[3.2.6.ga, 4.0.0)";resolution:=optional, + org.hibernate.usertype;version="[3.2.6.ga, 4.0.0)";resolution:=optional, + org.hibernate.util;version="[3.2.6.ga, 4.0.0)";resolution:=optional, org.springframework.aop.*;version="[3.0.0, 3.0.1)", org.springframework.beans.*;version="[3.0.0, 3.0.1)", org.springframework.context.*;version="[3.0.0, 3.0.1)", diff --git a/org.springframework.test/template.mf b/org.springframework.test/template.mf index 57ca66bea74..c586fabad27 100644 --- a/org.springframework.test/template.mf +++ b/org.springframework.test/template.mf @@ -4,14 +4,14 @@ Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: javax.activation.*;version="[1.1.0, 2.0.0)";resolution:=optional, - javax.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional, + javax.persistence.*;version="[1.0.0, 3.0.0)";resolution:=optional, javax.portlet.*;version="[2.0.0, 3.0.0)";resolution:=optional, - javax.servlet;version="[2.4.0, 3.0.0)";resolution:=optional, - javax.servlet.http;version="[2.4.0, 3.0.0)";resolution:=optional, + javax.servlet;version="[2.4.0, 4.0.0)";resolution:=optional, + javax.servlet.http;version="[2.4.0, 4.0.0)";resolution:=optional, javax.servlet.jsp.*;version="[2.0.0, 3.0.0)";resolution:=optional, junit.framework.*;version="[3.8.2, 5.0.0)";resolution:=optional, org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", - org.apache.taglibs.standard.*;version="[1.1.2, 2.0.0)";resolution:=optional, + org.apache.taglibs.standard.*;version="[1.1.0, 2.0.0)";resolution:=optional, org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional, org.junit.*;version="[4.5.0, 5.0.0)";resolution:=optional, org.springframework.*;version="[3.0.0, 3.0.1)";resolution:=optional, diff --git a/org.springframework.web.portlet/template.mf b/org.springframework.web.portlet/template.mf index 3bca8f23403..9929f518d28 100644 --- a/org.springframework.web.portlet/template.mf +++ b/org.springframework.web.portlet/template.mf @@ -4,7 +4,7 @@ Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: javax.portlet.*;version="[1.0.0, 3.0.0)", - javax.servlet.*;version="[2.4.0, 3.0.0)", + javax.servlet.*;version="[2.4.0, 4.0.0)", org.apache.commons.fileupload.*;version="[1.2.0, 2.0.0)";resolution:=optional, org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.springframework.beans.*;version="[3.0.0, 3.0.1)", diff --git a/org.springframework.web.servlet/template.mf b/org.springframework.web.servlet/template.mf index 768e053eacf..6b007bc3701 100644 --- a/org.springframework.web.servlet/template.mf +++ b/org.springframework.web.servlet/template.mf @@ -8,17 +8,16 @@ Import-Package: org.apache.tiles.jsp.context;version="[2.0.5, 3.0.0)";resolution:=optional Import-Template: com.sun.syndication.*;version="[0.9.0, 0.9.1)";resolution:=optional, - com.lowagie.text.*;version="[2.0.8, 3.0.0)";resolution:=optional, - freemarker.*;version="[2.3.12, 3.0.0)";resolution:=optional, + com.lowagie.text.*;version="[2.0.0, 3.0.0)";resolution:=optional, + freemarker.*;version="[2.3.0, 3.0.0)";resolution:=optional, javax.el.*;version="[1.0.0, 2.0.0)";resolution:=optional, - javax.servlet;version="[2.4.0, 3.0.0)", - javax.servlet.http;version="[2.4.0, 3.0.0)", + javax.servlet;version="[2.4.0, 4.0.0)", + javax.servlet.http;version="[2.4.0, 4.0.0)", javax.servlet.jsp;version="[2.0.0, 3.0.0)";resolution:=optional, - javax.servlet.jsp.jstl.*;version="[1.1.2, 2.0.0)";resolution:=optional, - javax.servlet.jsp.tagext;version="[2.1.0, 3.0.0)";resolution:=optional, + javax.servlet.jsp.jstl.*;version="[1.1.0, 2.0.0)";resolution:=optional, + javax.servlet.jsp.tagext;version="[2.0.0, 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, - org.apache.commons.attributes.*;version="[2.2.0, 3.0.0)";resolution:=optional, org.apache.commons.fileupload.*;version="[1.2.0, 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, @@ -35,8 +34,8 @@ Import-Template: org.apache.velocity.context;version="[1.5.0, 2.0.0)";resolution:=optional, org.apache.velocity.exception;version="[1.5.0, 2.0.0)";resolution:=optional, org.apache.velocity.runtime.*;version="[1.5.0, 2.0.0)";resolution:=optional, - org.apache.velocity.tools.generic;version="[1.4.0, 2.0.0)";resolution:=optional, - org.apache.velocity.tools.view.*;version="[1.4.0, 2.0.0)";resolution:=optional, + org.apache.velocity.tools.generic;version="[1.4.0, 3.0.0)";resolution:=optional, + org.apache.velocity.tools.view.*;version="[1.4.0, 3.0.0)";resolution:=optional, org.springframework.beans.*;version="[3.0.0, 3.0.1)", org.springframework.context.*;version="[3.0.0, 3.0.1)", org.springframework.core.*;version="[3.0.0, 3.0.1)", diff --git a/org.springframework.web/template.mf b/org.springframework.web/template.mf index 99809a50f4a..feabcf7d6b1 100644 --- a/org.springframework.web/template.mf +++ b/org.springframework.web/template.mf @@ -6,16 +6,15 @@ Import-Template: com.caucho.*;version="[3.1.5, 4.0.0)";resolution:=optional, com.sun.net.*;resolution:=optional, javax.el.*;version="[1.0.0, 2.0.0)";resolution:=optional, - javax.faces.*;version="[1.2.0.08, 2.0.0)";resolution:=optional, + javax.faces.*;version="[1.1.0, 3.0.0)";resolution:=optional, javax.jws.*;resolution:=optional, - javax.servlet;version="[2.4.0, 3.0.0)", - javax.servlet.http;version="[2.4.0, 3.0.0)", + javax.servlet;version="[2.4.0, 4.0.0)", + javax.servlet.http;version="[2.4.0, 4.0.0)", javax.servlet.jsp.*;version="[2.0.0, 3.0.0)";resolution:=optional, javax.xml.rpc.*;version="[1.1.0, 2.0.0)";resolution:=optional, javax.xml.soap.*;version="[1.3.0, 2.0.0)";resolution:=optional, - javax.xml.ws.*;version="[2.1.1, 3.0.0)";resolution:=optional, + javax.xml.ws.*;version="[2.0.0, 3.0.0)";resolution:=optional, org.aopalliance.*;version="[1.0.0, 2.0.0)", - org.apache.axis.*;version="[1.4.0, 2.0.0)";resolution:=optional, org.apache.commons.httpclient.*;version="[3.1.0, 4.0.0)";resolution:=optional, org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional,