Skip to content

Commit ca5f38c

Browse files
committed
marked Apache HttpComponents dependency as optional (SPR-8788); cleanup of conversation dependencies
1 parent 3c649a6 commit ca5f38c

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

org.springframework.web/template.mf

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,12 @@ Import-Template:
2222
org.apache.commons.fileupload.*;version="[1.2.0, 2.0.0)";resolution:=optional,
2323
org.apache.commons.httpclient.*;version="[3.1.0, 4.0.0)";resolution:=optional,
2424
org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
25-
org.apache.http.*;version="[4.1, 5.0.0)",
25+
org.apache.http.*;version="[4.1.0, 5.0.0)";resolution:=optional,
2626
org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional,
2727
org.springframework.aop.*;version=${spring.osgi.range},
2828
org.springframework.beans.*;version=${spring.osgi.range},
2929
org.springframework.context.*;version=${spring.osgi.range},
3030
org.springframework.core.*;version=${spring.osgi.range},
31-
org.springframework.conversation.*;version=${spring.osgi.range},
32-
org.springframework.web.conversation.*;version=${spring.osgi.range},
3331
org.springframework.jndi.*;version=${spring.osgi.range};resolution:=optional,
3432
org.springframework.oxm.*;version=${spring.osgi.range};resolution:=optional,
3533
org.springframework.remoting.*;version=${spring.osgi.range};resolution:=optional,

0 commit comments

Comments
 (0)