From ca5f38c5e4f62335b5d97e5b4bacb5c7f2952e44 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 20 Oct 2011 09:55:09 +0000 Subject: [PATCH] marked Apache HttpComponents dependency as optional (SPR-8788); cleanup of conversation dependencies --- org.springframework.web/template.mf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/org.springframework.web/template.mf b/org.springframework.web/template.mf index 0deb48fc349..095a5cfafc1 100644 --- a/org.springframework.web/template.mf +++ b/org.springframework.web/template.mf @@ -22,14 +22,12 @@ Import-Template: org.apache.commons.fileupload.*;version="[1.2.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.http.*;version="[4.1, 5.0.0)", + org.apache.http.*;version="[4.1.0, 5.0.0)";resolution:=optional, org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional, org.springframework.aop.*;version=${spring.osgi.range}, org.springframework.beans.*;version=${spring.osgi.range}, org.springframework.context.*;version=${spring.osgi.range}, org.springframework.core.*;version=${spring.osgi.range}, - org.springframework.conversation.*;version=${spring.osgi.range}, - org.springframework.web.conversation.*;version=${spring.osgi.range}, org.springframework.jndi.*;version=${spring.osgi.range};resolution:=optional, org.springframework.oxm.*;version=${spring.osgi.range};resolution:=optional, org.springframework.remoting.*;version=${spring.osgi.range};resolution:=optional,