From c09ac0b5a83b370b1884603f7de24ec2582472e7 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Fri, 9 Nov 2012 10:27:59 -0500 Subject: [PATCH] INT-2814 Fix OSGI Versions for OXM/WS 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 and minumum to 2.0.0. Also fix bundlor version ranges for new JPA module. --- build.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index a640180086..5ef8ff3254 100644 --- a/build.gradle +++ b/build.gradle @@ -546,8 +546,8 @@ project('spring-integration-jpa') { bundlor { bundleSymbolicName = 'org.springframework.integration.jpa' importTemplate += [ - 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"', - 'org.springframework.*;version="[3.0.5, 4.0.0)"', + 'org.springframework.integration.*;version="[2.2.0, 2.2.1)"', + 'org.springframework.*;version="[3.0.7, 4.0.0)"', 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', 'org.aopalliance.*;version="[1.0.0, 2.0.0)"', 'javax.persistence.*;version="[1.0.0, 2.0.0)"', @@ -888,9 +888,9 @@ project('spring-integration-ws') { 'org.springframework.scheduling.*;version="[3.0.7, 4.0.0)"', 'org.springframework.util.*;version="[3.0.7, 4.0.0)"', 'org.springframework.web.*;version="[3.0.7, 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="[3.0.7, 4.0.0)"', + 'org.springframework.ws.*;version="[2.0.0, 3.0.0)"', + 'org.springframework.xml.*;version="[2.0.0, 3.0.0)"', 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"', 'org.w3c.dom.*;version="0"', 'javax.xml.*;version="0"' @@ -924,8 +924,8 @@ project('spring-integration-xml') { 'org.springframework.context.expression.*;version="[3.0.7, 4.0.0)"', 'org.springframework.expression.*;version="[3.0.7, 4.0.0)"', 'org.springframework.util.*;version="[3.0.7, 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="[3.0.7, 4.0.0)";resolution:=optional', + 'org.springframework.xml.*;version="[2.0.0, 3.0.0)"', 'org.apache.commons.logging.*;version="[1.0, 2.0)"', 'org.w3c.dom.*;version="0"', 'org.xml.sax.*;version="0"',