Skip to content

Commit 6b0b83c

Browse files
committed
SWS-771 - Upgrade template.mf
1 parent 1f15b8c commit 6b0b83c

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

core/template.mf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ Import-Template:
1414
javax.xml.xpath.*;version="0",
1515
javax.xml.soap.*;version="0";resolution:=optional,
1616
javax.xml.stream.*;version="0";resolution:=optional,
17-
nu.xom.*;version="[1.1.0, 2.0.0)";resolution:=optional,
18-
org.apache.axiom.*;version="[1.2.5, 2.0.0)";resolution:=optional,
17+
nu.xom.*;version="[1.2.5, 2.0.0)";resolution:=optional,
18+
org.apache.axiom.*;version="[1.2.13, 2.0.0)";resolution:=optional,
1919
org.apache.commons.httpclient.*;version="[3.1.0, 4.0.0)";resolution:=optional,
20+
org.apache.http.*;version="[4.1.3, 5.0.0)";resolution:=optional,
2021
org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
2122
org.dom4j.*;version="[1.6.1, 2.0.0)";resolution:=optional,
2223
org.jdom2.*;version="[2.0.0, 3.0.0)";resolution:=optional,

parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<url>https://fisheye.springframework.org/browse/spring-ws/trunk</url>
4848
</scm>
4949
<properties>
50-
<osgi.version>2.0.5.RELEASE</osgi.version>
50+
<osgi.version>2.1.0.RC1</osgi.version>
5151
<osgi.range>"${osgi.version:[=.=.=, =.=.+1)}"</osgi.range>
5252
<spring.framework.version>3.1.1.RELEASE</spring.framework.version>
5353
<spring.framework.osgi.range>"[3.1.0, 4.0.0)"</spring.framework.osgi.range>

security/template.mf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ Import-Template:
1212
net.sf.ehcache.*;version="2.0.0";resolution:=optional,
1313
org.apache.axiom.*;version="[1.2.5, 2.0.0)";resolution:=optional,
1414
org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
15-
org.apache.ws.security.*;version="[1.5.8, 2.0.0)";resolution:=optional,
15+
org.apache.ws.security.*;version="[1.6.5, 2.0.0)";resolution:=optional,
1616
org.apache.xml.security.*;version="[1.0.5.D2, 2.0.0)";resolution:=optional,
1717
org.springframework.beans.*;version=${spring.framework.osgi.range},
1818
org.springframework.context.*;version=${spring.framework.osgi.range},
1919
org.springframework.core.*;version=${spring.framework.osgi.range},
2020
org.springframework.dao.*;version=${spring.framework.osgi.range},
21-
org.springframework.security.*;version="[3.0.0, 4.0.0)",
21+
org.springframework.security.*;version="[3.1.0, 4.0.0)",
2222
org.springframework.util.*;version=${spring.framework.osgi.range},
2323
org.springframework.ws.*;version=${osgi.range},
2424
org.w3c.dom.*;version="0"

test/template.mf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Import-Template:
88
javax.xml.parsers.*;version="0",
99
javax.xml.transform.*;version="0",
1010
org.apache.commons.logging;version="[1.1.1, 2.0.0)",
11-
org.custommonkey.xmlunit.*;version="[1.3.0, 2.0.0)",
11+
org.custommonkey.xmlunit.*;version="[1.1.0, 2.0.0)",
1212
org.springframework.beans.*;version=${spring.framework.osgi.range},
1313
org.springframework.core.*;version=${spring.framework.osgi.range},
1414
org.springframework.context.*;version=${spring.framework.osgi.range},

xml/template.mf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Import-Template:
1313
javax.xml.validation.*;version="0",
1414
javax.xml.xpath.*;version="0",
1515
org.apache.commons.logging;version="[1.1.1, 2.0.0)",
16-
org.apache.ws.commons.schema.*;version="[1.3.2, 2.0.0)";resolution:=optional,
17-
org.jaxen.*;version="[1.1.1, 2.0.0)";resolution:=optional,
16+
org.apache.ws.commons.schema.*;version="[2.0.0, 3.0.0)";resolution:=optional,
17+
org.jaxen.*;version="[1.1.3, 2.0.0)";resolution:=optional,
1818
org.springframework.beans.*;version=${spring.framework.osgi.range},
1919
org.springframework.core.*;version=${spring.framework.osgi.range},
2020
org.springframework.context.*;version=${spring.framework.osgi.range},

0 commit comments

Comments
 (0)