From b5b60cafb757e51294a96e94843ba94d46f24f38 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Tue, 6 Apr 2010 11:39:50 +0000 Subject: [PATCH] SPR-7063 - MappingJacksonHttpMessageConverter breaks with Jackson 1.0.x --- org.springframework.web.servlet/template.mf | 2 +- org.springframework.web/template.mf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.springframework.web.servlet/template.mf b/org.springframework.web.servlet/template.mf index 2687d2c2431..d552b090238 100644 --- a/org.springframework.web.servlet/template.mf +++ b/org.springframework.web.servlet/template.mf @@ -21,7 +21,7 @@ Import-Template: org.apache.tiles.*;version="[2.1.2, 3.0.0)";resolution:=optional, org.apache.velocity.*;version="[1.5.0, 2.0.0)";resolution:=optional, org.apache.velocity.tools.*;version="[1.4.0, 3.0.0)";resolution:=optional, - org.codehaus.jackson.*;version="[1.0.0, 2.0.0)";resolution:=optional, + org.codehaus.jackson.*;version="[1.3.0, 2.0.0)";resolution:=optional, org.springframework.beans.*;version=${spring.osgi.range}, org.springframework.context.*;version=${spring.osgi.range}, org.springframework.core.*;version=${spring.osgi.range}, diff --git a/org.springframework.web/template.mf b/org.springframework.web/template.mf index 77dde13dd4f..c804a98d369 100644 --- a/org.springframework.web/template.mf +++ b/org.springframework.web/template.mf @@ -5,7 +5,7 @@ Bundle-ManifestVersion: 2 Import-Template: com.caucho.*;version="[3.2.0, 5.0.0)";resolution:=optional, com.sun.syndication.*;version="[1.0.0, 2.0.0)";resolution:=optional, - org.codehaus.jackson.*;version="[1.0.0, 2.0.0)";resolution:=optional, + org.codehaus.jackson.*;version="[1.3.0, 2.0.0)";resolution:=optional, com.sun.net.*;version="0";resolution:=optional, javax.activation.*;version="0";resolution:=optional, javax.el.*;version="[1.0.0, 3.0.0)";resolution:=optional,