SWS-771 - Upgrade template.mf

Author: poutsma

core/template.mf

@@ -14,9 +14,10 @@ Import-Template:
  javax.xml.xpath.*;version="0",
  javax.xml.soap.*;version="0";resolution:=optional,
  javax.xml.stream.*;version="0";resolution:=optional,
- nu.xom.*;version="[1.1.0, 2.0.0)";resolution:=optional,
- org.apache.axiom.*;version="[1.2.5, 2.0.0)";resolution:=optional,
+ nu.xom.*;version="[1.2.5, 2.0.0)";resolution:=optional,
+ org.apache.axiom.*;version="[1.2.13, 2.0.0)";resolution:=optional,
  org.apache.commons.httpclient.*;version="[3.1.0, 4.0.0)";resolution:=optional,
+ org.apache.http.*;version="[4.1.3, 5.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.dom4j.*;version="[1.6.1, 2.0.0)";resolution:=optional,
  org.jdom2.*;version="[2.0.0, 3.0.0)";resolution:=optional,

parent/pom.xml

@@ -47,7 +47,7 @@
         <url>https://fisheye.springframework.org/browse/spring-ws/trunk</url>
     </scm>
     <properties>
-        <osgi.version>2.0.5.RELEASE</osgi.version>
+        <osgi.version>2.1.0.RC1</osgi.version>
         <osgi.range>"${osgi.version:[=.=.=, =.=.+1)}"</osgi.range>
         <spring.framework.version>3.1.1.RELEASE</spring.framework.version>
         <spring.framework.osgi.range>"[3.1.0, 4.0.0)"</spring.framework.osgi.range>

security/template.mf

@@ -12,13 +12,13 @@ Import-Template:
  net.sf.ehcache.*;version="2.0.0";resolution:=optional,
  org.apache.axiom.*;version="[1.2.5, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.apache.ws.security.*;version="[1.5.8, 2.0.0)";resolution:=optional,
+ org.apache.ws.security.*;version="[1.6.5, 2.0.0)";resolution:=optional,
  org.apache.xml.security.*;version="[1.0.5.D2, 2.0.0)";resolution:=optional,
  org.springframework.beans.*;version=${spring.framework.osgi.range},
  org.springframework.context.*;version=${spring.framework.osgi.range},
  org.springframework.core.*;version=${spring.framework.osgi.range},
  org.springframework.dao.*;version=${spring.framework.osgi.range},
- org.springframework.security.*;version="[3.0.0, 4.0.0)",
+ org.springframework.security.*;version="[3.1.0, 4.0.0)",
  org.springframework.util.*;version=${spring.framework.osgi.range},
  org.springframework.ws.*;version=${osgi.range},
  org.w3c.dom.*;version="0"

test/template.mf

@@ -8,7 +8,7 @@ Import-Template:
  javax.xml.parsers.*;version="0",
  javax.xml.transform.*;version="0",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- org.custommonkey.xmlunit.*;version="[1.3.0, 2.0.0)",
+ org.custommonkey.xmlunit.*;version="[1.1.0, 2.0.0)",
  org.springframework.beans.*;version=${spring.framework.osgi.range},
  org.springframework.core.*;version=${spring.framework.osgi.range},
  org.springframework.context.*;version=${spring.framework.osgi.range},

xml/template.mf

@@ -13,8 +13,8 @@ Import-Template:
  javax.xml.validation.*;version="0",
  javax.xml.xpath.*;version="0",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- org.apache.ws.commons.schema.*;version="[1.3.2, 2.0.0)";resolution:=optional,
- org.jaxen.*;version="[1.1.1, 2.0.0)";resolution:=optional,
+ org.apache.ws.commons.schema.*;version="[2.0.0, 3.0.0)";resolution:=optional,
+ org.jaxen.*;version="[1.1.3, 2.0.0)";resolution:=optional,
  org.springframework.beans.*;version=${spring.framework.osgi.range},
  org.springframework.core.*;version=${spring.framework.osgi.range},
  org.springframework.context.*;version=${spring.framework.osgi.range},