INT-2814 Fix OSGI Versions for OXM/WS - Backport

OSGI version ranges were incorrect for oxm because it moved
to core. This precluded use with Spring 3.1 with OSGI.

Update oxm version range to match other Spring core modules.

Also update maximum for Spring-WS to < 3.0.0.
This commit is contained in:
Gary Russell
2012-11-09 10:39:30 -05:00
committed by Mark Fisher
parent 87f7f8ead4
commit bb75c06b0d

View File

@@ -811,9 +811,9 @@ project('spring-integration-ws') {
'org.springframework.scheduling.*;version="[3.0.5, 4.0.0)"',
'org.springframework.util.*;version="[3.0.5, 4.0.0)"',
'org.springframework.web.*;version="[3.0.5, 4.0.0)"',
'org.springframework.oxm;version="[1.5.9, 3.1.0)"',
'org.springframework.ws.*;version="[2.0.0, 2.1.0)"',
'org.springframework.xml.*;version="[1.5.9, 2.1.0)"',
'org.springframework.oxm;version="[1.5.9, 4.0.0)"',
'org.springframework.ws.*;version="[2.0.0, 3.0.0)"',
'org.springframework.xml.*;version="[1.5.9, 3.0.0)"',
'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
'org.w3c.dom.*;version="0"',
'javax.xml.*;version="0"'
@@ -847,8 +847,8 @@ project('spring-integration-xml') {
'org.springframework.context.expression.*;version="[3.0.5, 4.0.0)"',
'org.springframework.expression.*;version="[3.0.5, 4.0.0)"',
'org.springframework.util.*;version="[3.0.5, 4.0.0)"',
'org.springframework.oxm;version="[1.5.9, 3.1.0)";resolution:=optional',
'org.springframework.xml.*;version="[1.5.9, 2.1.0)"',
'org.springframework.oxm;version="[1.5.9, 4.0.0)";resolution:=optional',
'org.springframework.xml.*;version="[1.5.9, 3.0.0)"',
'org.apache.commons.logging.*;version="[1.0, 2.0)"',
'org.w3c.dom.*;version="0"',
'org.xml.sax.*;version="0"',