From 94ee22dffde622c62527f7da0d34a3380d2c419b Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Fri, 23 Oct 2009 17:26:12 +0000
Subject: [PATCH] updated version ranges for javax.el and javax.inject

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2171 50f2f4bb-b051-0410-bef5-90022cba6387
---
 org.springframework.beans/template.mf       | 4 ++--
 org.springframework.context/template.mf     | 2 +-
 org.springframework.test/template.mf        | 2 +-
 org.springframework.web.servlet/template.mf | 2 +-
 org.springframework.web/template.mf         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/org.springframework.beans/template.mf b/org.springframework.beans/template.mf
index 3078108f9ce..6cd6615a2cf 100644
--- a/org.springframework.beans/template.mf
+++ b/org.springframework.beans/template.mf
@@ -3,8 +3,8 @@ Bundle-Name: Spring Beans
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
- javax.el.*;version="[1.0.0, 2.0.0)";resolution:=optional,
- javax.inject.*;version="[0.9.0, 2.0.0)";resolution:=optional,
+ javax.el.*;version="[1.0.0, 3.0.0)";resolution:=optional,
+ javax.inject.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  javax.xml.*;version="0";resolution:=optional,
  net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
diff --git a/org.springframework.context/template.mf b/org.springframework.context/template.mf
index 42e04d527a3..24eaeaf47d4 100644
--- a/org.springframework.context/template.mf
+++ b/org.springframework.context/template.mf
@@ -14,7 +14,7 @@ Import-Template:
  groovy.*;version="[1.5.0, 2.0.0)";resolution:=optional,
  javax.annotation.*;version="0";resolution:=optional,
  javax.ejb.*;version="[2.1.0, 4.0.0)";resolution:=optional,
- javax.inject.*;version="[0.9.0, 2.0.0)";resolution:=optional,
+ javax.inject.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  javax.interceptor.*;version="[3.0.0, 4.0.0)";resolution:=optional,
  javax.jms.*;version="[1.1.0, 2.0.0)";resolution:=optional,
  javax.management.*;version="0";resolution:=optional,
diff --git a/org.springframework.test/template.mf b/org.springframework.test/template.mf
index ecaa2989c05..e23816d5a10 100644
--- a/org.springframework.test/template.mf
+++ b/org.springframework.test/template.mf
@@ -4,7 +4,7 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  javax.activation.*;version="0";resolution:=optional,
- javax.el.*;version="[1.0.0, 2.0.0)";resolution:=optional,
+ javax.el.*;version="[1.0.0, 3.0.0)";resolution:=optional,
  javax.naming.*;version="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,
diff --git a/org.springframework.web.servlet/template.mf b/org.springframework.web.servlet/template.mf
index 9d597fcd252..cb9780aff34 100644
--- a/org.springframework.web.servlet/template.mf
+++ b/org.springframework.web.servlet/template.mf
@@ -7,8 +7,8 @@ Import-Template:
  com.lowagie.text.*;version="[2.0.0, 3.0.0)";resolution:=optional,
  freemarker.*;version="[2.3.14, 3.0.0)";resolution:=optional,
  javax.activation.*;version="0";resolution:=optional,
+ javax.el.*;version="[1.0.0, 3.0.0)";resolution:=optional,
  javax.sql.*;version="0";resolution:=optional,
- javax.el.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  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,
diff --git a/org.springframework.web/template.mf b/org.springframework.web/template.mf
index 1f7c6c47889..7407f16c019 100644
--- a/org.springframework.web/template.mf
+++ b/org.springframework.web/template.mf
@@ -6,7 +6,7 @@ Import-Template:
  com.caucho.*;version="[3.2.0, 4.0.0)";resolution:=optional,
  org.codehaus.jackson.*;version="[1.0.0, 1.1.0)";resolution:=optional,
  com.sun.net.*;version="0";resolution:=optional,
- javax.el.*;version="[1.0.0, 2.0.0)";resolution:=optional,
+ javax.el.*;version="[1.0.0, 3.0.0)";resolution:=optional,
  javax.faces.*;version="[1.1.0, 3.0.0)";resolution:=optional,
  javax.imageio.*;version="0";resolution:=optional,
  javax.jws.*;version="0";resolution:=optional,