diff --git a/org.springframework.integration.adapter/.classpath b/org.springframework.integration.adapter/.classpath index 45dec9c710..fd3a1efe3a 100644 --- a/org.springframework.integration.adapter/.classpath +++ b/org.springframework.integration.adapter/.classpath @@ -11,12 +11,12 @@ - - - - - - + + + + + + diff --git a/org.springframework.integration.adapter/ivy.xml b/org.springframework.integration.adapter/ivy.xml index 307d1a8f3c..725d3e37c3 100644 --- a/org.springframework.integration.adapter/ivy.xml +++ b/org.springframework.integration.adapter/ivy.xml @@ -21,7 +21,7 @@ - + diff --git a/org.springframework.integration.adapter/template.mf b/org.springframework.integration.adapter/template.mf index ea8ebbeefd..faeb0ab394 100644 --- a/org.springframework.integration.adapter/template.mf +++ b/org.springframework.integration.adapter/template.mf @@ -3,16 +3,10 @@ Bundle-Name: Spring Integration Adapters Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: - com.sun.mail.imap.*;version="[1.4.0, 2.0.0)";resolution:=optional, - javax.mail.*;version="[1.4.0, 2.0.0)";resolution:=optional, org.apache.commons.logging;version="[1.1.1, 2.0.0)", - org.apache.commons.net.ftp;version="[1.4.1, 2.0.0)";resolution:=optional, - org.springframework.beans.*;version="[2.5.5.A, 3.0.0)", - org.springframework.context;version="[2.5.5.A, 3.0.0)", - org.springframework.core.*;version="[2.5.5.A, 3.0.0)", - org.springframework.mail.*;version="[2.5.5.A, 3.0.0)";resolution:=optional, - org.springframework.remoting;version="[2.5.5.A, 3.0.0)", - org.springframework.util;version="[2.5.5.A, 3.0.0)", + org.springframework.beans.*;version="[2.5.6, 3.0.0)", + org.springframework.remoting;version="[2.5.6, 3.0.0)", + org.springframework.util;version="[2.5.6, 3.0.0)", org.springframework.integration.*;version="[1.0.0, 1.0.1)" Unversioned-Imports: org.w3c.dom diff --git a/org.springframework.integration.event/.classpath b/org.springframework.integration.event/.classpath index 1edf4aed5a..82c684e3be 100644 --- a/org.springframework.integration.event/.classpath +++ b/org.springframework.integration.event/.classpath @@ -6,9 +6,9 @@ - - - + + + diff --git a/org.springframework.integration.event/ivy.xml b/org.springframework.integration.event/ivy.xml index 3732f1b9c8..226730e8c3 100644 --- a/org.springframework.integration.event/ivy.xml +++ b/org.springframework.integration.event/ivy.xml @@ -21,8 +21,8 @@ + - diff --git a/org.springframework.integration.event/template.mf b/org.springframework.integration.event/template.mf index 724ae87feb..fc6ae760de 100644 --- a/org.springframework.integration.event/template.mf +++ b/org.springframework.integration.event/template.mf @@ -4,7 +4,7 @@ Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: org.springframework.integration.*;version="[1.0.0, 1.0.1)", - org.springframework.context;version="[2.5.5.A, 3.0.0)", - org.springframework.util;version="[2.5.5.A, 3.0.0)", + org.springframework.context;version="[2.5.6, 3.0.0)", + org.springframework.util;version="[2.5.6, 3.0.0)", org.apache.commons.logging;version="[1.1.1, 2.0.0)" diff --git a/org.springframework.integration.file/.classpath b/org.springframework.integration.file/.classpath index 757ca5c99e..c5adc51806 100644 --- a/org.springframework.integration.file/.classpath +++ b/org.springframework.integration.file/.classpath @@ -6,10 +6,10 @@ - - - - + + + + diff --git a/org.springframework.integration.file/ivy.xml b/org.springframework.integration.file/ivy.xml index b3d351e0eb..3fa07bf3b8 100644 --- a/org.springframework.integration.file/ivy.xml +++ b/org.springframework.integration.file/ivy.xml @@ -24,9 +24,9 @@ + + - - diff --git a/org.springframework.integration.file/template.mf b/org.springframework.integration.file/template.mf index 0090c06f02..79fa97b931 100644 --- a/org.springframework.integration.file/template.mf +++ b/org.springframework.integration.file/template.mf @@ -3,12 +3,12 @@ Bundle-Name: Spring Integration File Adapters Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: - org.springframework.integration.*;version="[1.0.0, 1.0.1)", - org.springframework.beans.*;version="[2.5.5.A, 3.0.0)", - org.springframework.context;version="[2.5.5.A, 3.0.0)", - org.springframework.core.*;version="[2.5.5.A, 3.0.0)", - org.springframework.util;version="[2.5.5.A, 3.0.0)", org.apache.commons.logging;version="[1.1.1, 2.0.0)", + org.springframework.integration.*;version="[1.0.0, 1.0.1)", + org.springframework.beans.*;version="[2.5.6, 3.0.0)", + org.springframework.context;version="[2.5.6, 3.0.0)", + org.springframework.core.*;version="[2.5.6, 3.0.0)", + org.springframework.util;version="[2.5.6, 3.0.0)" Unversioned-Imports: org.w3c.dom diff --git a/org.springframework.integration.ftp/.classpath b/org.springframework.integration.ftp/.classpath index c3e2b2a672..bf1cd742fc 100644 --- a/org.springframework.integration.ftp/.classpath +++ b/org.springframework.integration.ftp/.classpath @@ -8,11 +8,11 @@ - - - - - + + + + + diff --git a/org.springframework.integration.ftp/ivy.xml b/org.springframework.integration.ftp/ivy.xml index 0d6feaf06f..62181010c4 100644 --- a/org.springframework.integration.ftp/ivy.xml +++ b/org.springframework.integration.ftp/ivy.xml @@ -26,7 +26,7 @@ - + diff --git a/org.springframework.integration.ftp/template.mf b/org.springframework.integration.ftp/template.mf index c1ed5c3c4b..6ce11594f8 100644 --- a/org.springframework.integration.ftp/template.mf +++ b/org.springframework.integration.ftp/template.mf @@ -4,8 +4,8 @@ Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: org.springframework.integration.*;version="[1.0.0, 1.0.1)", - org.springframework.beans.*;version="[2.5.5.A, 3.0.0)", - org.springframework.util;version="[2.5.5.A, 3.0.0)", + org.springframework.beans.*;version="[2.5.6, 3.0.0)", + org.springframework.util;version="[2.5.6, 3.0.0)", org.apache.commons.logging;version="[1.1.1, 2.0.0)", org.apache.commons.net.ftp;version="[1.4.1, 2.0.0)";resolution:=optional Unversioned-Imports: diff --git a/org.springframework.integration.httpinvoker/.classpath b/org.springframework.integration.httpinvoker/.classpath index 3b239fc384..51c75f9eb5 100644 --- a/org.springframework.integration.httpinvoker/.classpath +++ b/org.springframework.integration.httpinvoker/.classpath @@ -8,12 +8,12 @@ - - - - - - + + + + + + diff --git a/org.springframework.integration.httpinvoker/ivy.xml b/org.springframework.integration.httpinvoker/ivy.xml index 916f992537..4fb36f68f0 100644 --- a/org.springframework.integration.httpinvoker/ivy.xml +++ b/org.springframework.integration.httpinvoker/ivy.xml @@ -22,9 +22,9 @@ - - - + + + diff --git a/org.springframework.integration.httpinvoker/template.mf b/org.springframework.integration.httpinvoker/template.mf index 7eaddf61e8..8cea5fce64 100644 --- a/org.springframework.integration.httpinvoker/template.mf +++ b/org.springframework.integration.httpinvoker/template.mf @@ -4,12 +4,12 @@ Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: org.springframework.integration.*;version="[1.0.0, 1.0.1)", - org.springframework.beans.*;version="[2.5.5.A, 3.0.0)", - org.springframework.context;version="[2.5.5.A, 3.0.0)", - org.springframework.core.*;version="[2.5.5.A, 3.0.0)", - org.springframework.remoting.*;version="[2.5.5.A, 3.0.0)", - org.springframework.util;version="[2.5.5.A, 3.0.0)", - org.springframework.web;version="[2.5.5.A, 3.0.0)";resolution:=optional, + org.springframework.beans.*;version="[2.5.6, 3.0.0)", + org.springframework.context;version="[2.5.6, 3.0.0)", + org.springframework.core.*;version="[2.5.6, 3.0.0)", + org.springframework.remoting.*;version="[2.5.6, 3.0.0)", + org.springframework.util;version="[2.5.6, 3.0.0)", + org.springframework.web;version="[2.5.6, 3.0.0)";resolution:=optional, org.apache.commons.logging;version="[1.1.1, 2.0.0)", javax.servlet.*;version="[2.4.0, 3.0.0)";resolution:=optional Unversioned-Imports: diff --git a/org.springframework.integration.jms/.classpath b/org.springframework.integration.jms/.classpath index c61c61bfdb..c900a41bc5 100644 --- a/org.springframework.integration.jms/.classpath +++ b/org.springframework.integration.jms/.classpath @@ -7,11 +7,11 @@ - - - - - + + + + + diff --git a/org.springframework.integration.jms/ivy.xml b/org.springframework.integration.jms/ivy.xml index 84cfd48329..b08fb00064 100644 --- a/org.springframework.integration.jms/ivy.xml +++ b/org.springframework.integration.jms/ivy.xml @@ -22,8 +22,8 @@ - - + + diff --git a/org.springframework.integration.jms/template.mf b/org.springframework.integration.jms/template.mf index 67f42166d8..9f8aa3f8e7 100644 --- a/org.springframework.integration.jms/template.mf +++ b/org.springframework.integration.jms/template.mf @@ -4,12 +4,12 @@ Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: org.springframework.integration.*;version="[1.0.0, 1.0.1)", - org.springframework.beans.*;version="[2.5.5.A, 3.0.0)", - org.springframework.context;version="[2.5.5.A, 3.0.0)", - org.springframework.core.*;version="[2.5.5.A, 3.0.0)", - org.springframework.jms.*;version="[2.5.5.A, 3.0.0)", - org.springframework.transaction.*;version="[2.5.5.A, 3.0.0)", - org.springframework.util;version="[2.5.5.A, 3.0.0)", + org.springframework.beans.*;version="[2.5.6, 3.0.0)", + org.springframework.context;version="[2.5.6, 3.0.0)", + org.springframework.core.*;version="[2.5.6, 3.0.0)", + org.springframework.jms.*;version="[2.5.6, 3.0.0)", + org.springframework.transaction.*;version="[2.5.6, 3.0.0)", + org.springframework.util;version="[2.5.6, 3.0.0)", org.apache.commons.logging;version="[1.1.1, 2.0.0)", javax.jms;version="[1.1.0, 2.0.0)";resolution:=optional Unversioned-Imports: diff --git a/org.springframework.integration.mail/.classpath b/org.springframework.integration.mail/.classpath index f07fa18112..1bf7d94cea 100644 --- a/org.springframework.integration.mail/.classpath +++ b/org.springframework.integration.mail/.classpath @@ -8,11 +8,11 @@ - - - - - + + + + + diff --git a/org.springframework.integration.mail/ivy.xml b/org.springframework.integration.mail/ivy.xml index 50aec26d22..3127ee1b07 100644 --- a/org.springframework.integration.mail/ivy.xml +++ b/org.springframework.integration.mail/ivy.xml @@ -26,8 +26,8 @@ - - + + diff --git a/org.springframework.integration.mail/template.mf b/org.springframework.integration.mail/template.mf index 3aa6677392..ece62ad2d7 100644 --- a/org.springframework.integration.mail/template.mf +++ b/org.springframework.integration.mail/template.mf @@ -4,11 +4,11 @@ Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: org.springframework.integration.*;version="[1.0.0, 1.0.1)", - org.springframework.beans.*;version="[2.5.5.A, 3.0.0)", - org.springframework.context;version="[2.5.5.A, 3.0.0)", - org.springframework.core.*;version="[2.5.5.A, 3.0.0)", - org.springframework.mail.*;version="[2.5.5.A, 3.0.0)", - org.springframework.util.*;version="[2.5.5.A, 3.0.0)", + org.springframework.beans.*;version="[2.5.6, 3.0.0)", + org.springframework.context;version="[2.5.6, 3.0.0)", + org.springframework.core.*;version="[2.5.6, 3.0.0)", + org.springframework.mail.*;version="[2.5.6, 3.0.0)", + org.springframework.util.*;version="[2.5.6, 3.0.0)", org.apache.commons.logging;version="[1.1.1, 2.0.0)", javax.mail.*;version="[1.4.0, 2.0.0)", com.sun.mail.imap.*;version="[1.4.0, 2.0.0)";resolution:=optional diff --git a/org.springframework.integration.rmi/.classpath b/org.springframework.integration.rmi/.classpath index ab39647c68..64c1cefd7b 100644 --- a/org.springframework.integration.rmi/.classpath +++ b/org.springframework.integration.rmi/.classpath @@ -7,11 +7,11 @@ - - - - - + + + + + diff --git a/org.springframework.integration.rmi/ivy.xml b/org.springframework.integration.rmi/ivy.xml index f03781c6c6..3b70b93a64 100644 --- a/org.springframework.integration.rmi/ivy.xml +++ b/org.springframework.integration.rmi/ivy.xml @@ -21,9 +21,9 @@ - - - + + + diff --git a/org.springframework.integration.rmi/template.mf b/org.springframework.integration.rmi/template.mf index 5ee01f5196..41c06e53b6 100644 --- a/org.springframework.integration.rmi/template.mf +++ b/org.springframework.integration.rmi/template.mf @@ -4,11 +4,11 @@ Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: org.springframework.integration.*;version="[1.0.0, 1.0.1)", - org.springframework.beans.*;version="[2.5.5.A, 3.0.0)", - org.springframework.context;version="[2.5.5.A, 3.0.0)", - org.springframework.core.*;version="[2.5.5.A, 3.0.0)", - org.springframework.remoting.*;version="[2.5.5.A, 3.0.0)", - org.springframework.util;version="[2.5.5.A, 3.0.0)", + org.springframework.beans.*;version="[2.5.6, 3.0.0)", + org.springframework.context;version="[2.5.6, 3.0.0)", + org.springframework.core.*;version="[2.5.6, 3.0.0)", + org.springframework.remoting.*;version="[2.5.6, 3.0.0)", + org.springframework.util;version="[2.5.6, 3.0.0)", org.apache.commons.logging;version="[1.1.1, 2.0.0)" Unversioned-Imports: org.w3c.dom diff --git a/org.springframework.integration.samples/.classpath b/org.springframework.integration.samples/.classpath index 5d0cd99579..fa43ffa38c 100644 --- a/org.springframework.integration.samples/.classpath +++ b/org.springframework.integration.samples/.classpath @@ -9,13 +9,13 @@ - - - - - - - + + + + + + + diff --git a/org.springframework.integration.samples/ivy.xml b/org.springframework.integration.samples/ivy.xml index 105383a931..428f47f41b 100644 --- a/org.springframework.integration.samples/ivy.xml +++ b/org.springframework.integration.samples/ivy.xml @@ -26,10 +26,10 @@ - - - - + + + + \ No newline at end of file diff --git a/org.springframework.integration.samples/template.mf b/org.springframework.integration.samples/template.mf index faa1f99c98..dcc60b9f11 100644 --- a/org.springframework.integration.samples/template.mf +++ b/org.springframework.integration.samples/template.mf @@ -4,7 +4,7 @@ Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: org.springframework.integration.*;version="[1.0.0, 1.0.1)", - org.springframework.beans.*;version="[2.5.5.A, 3.0.0)", - org.springframework.context.support;version="[2.5.5.A, 3.0.0)", - org.springframework.stereotype;version="[2.5.5.A, 3.0.0)" + org.springframework.beans.*;version="[2.5.6, 3.0.0)", + org.springframework.context.support;version="[2.5.6, 3.0.0)", + org.springframework.stereotype;version="[2.5.6, 3.0.0)" diff --git a/org.springframework.integration.security/.classpath b/org.springframework.integration.security/.classpath index 309ade5c29..cc46068c98 100644 --- a/org.springframework.integration.security/.classpath +++ b/org.springframework.integration.security/.classpath @@ -6,14 +6,14 @@ - - - + + + - - - + + + diff --git a/org.springframework.integration.security/ivy.xml b/org.springframework.integration.security/ivy.xml index 272cb38394..64bcf3c7ee 100644 --- a/org.springframework.integration.security/ivy.xml +++ b/org.springframework.integration.security/ivy.xml @@ -20,11 +20,11 @@ - - - - + + + + diff --git a/org.springframework.integration.security/template.mf b/org.springframework.integration.security/template.mf index 839f76f206..5451f03e6b 100644 --- a/org.springframework.integration.security/template.mf +++ b/org.springframework.integration.security/template.mf @@ -3,14 +3,13 @@ Bundle-Name: Spring Integration Security Support Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: - org.springframework.beans.*;version="[2.5.5.A, 3.0.0)", - org.springframework.core;version="[2.5.5.A, 3.0.0)", - org.springframework.util.*;version="[2.5.5.A, 3.0.0)", - org.springframework.aop.*;version="[2.5.5.A, 3.0.0)", - org.springframework.integration.*;version="[1.0.0, 1.0.1)", - org.springframework.security.*;version="[2.0.2.A, 3.0.0)", org.aopalliance.*;version="[1.0.0,2.0.0)", - org.apache.commons.logging;version="[1.1.1, 2.0.0)" + org.apache.commons.logging;version="[1.1.1, 2.0.0)", + org.springframework.aop.*;version="[2.5.6, 3.0.0)", + org.springframework.beans.*;version="[2.5.6, 3.0.0)", + org.springframework.core;version="[2.5.6, 3.0.0)", + org.springframework.util.*;version="[2.5.6, 3.0.0)", + org.springframework.integration.*;version="[1.0.0, 1.0.1)", + org.springframework.security.*;version="[2.0.2.A, 3.0.0)" Unversioned-Imports: org.w3c.dom - diff --git a/org.springframework.integration.stream/.classpath b/org.springframework.integration.stream/.classpath index 1edf4aed5a..82c684e3be 100644 --- a/org.springframework.integration.stream/.classpath +++ b/org.springframework.integration.stream/.classpath @@ -6,9 +6,9 @@ - - - + + + diff --git a/org.springframework.integration.stream/ivy.xml b/org.springframework.integration.stream/ivy.xml index 3ff8bb5634..08a494d3b9 100644 --- a/org.springframework.integration.stream/ivy.xml +++ b/org.springframework.integration.stream/ivy.xml @@ -21,9 +21,9 @@ + + - - diff --git a/org.springframework.integration.stream/template.mf b/org.springframework.integration.stream/template.mf index 3cbb1228dc..1d465ac9f3 100644 --- a/org.springframework.integration.stream/template.mf +++ b/org.springframework.integration.stream/template.mf @@ -3,10 +3,9 @@ Bundle-Name: Spring Integration Stream Support Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: - org.springframework.integration.*;version="[1.0.0, 1.0.1)", - org.springframework.beans.*;version="[2.5.5.A, 3.0.0)", - org.springframework.util;version="[2.5.5.A, 3.0.0)", - org.apache.commons.logging;version="[1.1.1, 2.0.0)" + org.apache.commons.logging;version="[1.1.1, 2.0.0)", + org.springframework.beans.*;version="[2.5.6, 3.0.0)", + org.springframework.util;version="[2.5.6, 3.0.0)", + org.springframework.integration.*;version="[1.0.0, 1.0.1)" Unversioned-Imports: org.w3c.dom - diff --git a/org.springframework.integration.ws/.classpath b/org.springframework.integration.ws/.classpath index 9569a72cb7..a724fd521f 100644 --- a/org.springframework.integration.ws/.classpath +++ b/org.springframework.integration.ws/.classpath @@ -9,9 +9,9 @@ - - - + + + diff --git a/org.springframework.integration.ws/template.mf b/org.springframework.integration.ws/template.mf index 2aac218aab..70276bb69f 100644 --- a/org.springframework.integration.ws/template.mf +++ b/org.springframework.integration.ws/template.mf @@ -4,9 +4,9 @@ Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: org.springframework.integration.*;version="[1.0.0, 1.0.1)", - org.springframework.beans.factory.*;version="[2.5.5.A, 3.0.0)", + org.springframework.beans.factory.*;version="[2.5.6, 3.0.0)", + org.springframework.util;version="[2.5.6, 3.0.0)", org.springframework.oxm;version="[1.5.4.A, 2.0.0)", - org.springframework.util;version="[2.5.5.A, 3.0.0)", org.springframework.ws.*;version="[1.5.4.A, 2.0.0)", org.springframework.xml.transform;version="[1.5.4.A, 2.0.0)" Unversioned-Imports: diff --git a/org.springframework.integration.xml/.classpath b/org.springframework.integration.xml/.classpath index cfc199778f..59d23e47d1 100644 --- a/org.springframework.integration.xml/.classpath +++ b/org.springframework.integration.xml/.classpath @@ -10,12 +10,12 @@ - - - + + + - + diff --git a/org.springframework.integration.xml/ivy.xml b/org.springframework.integration.xml/ivy.xml index 2f85d9bb18..1cb7ff83b5 100644 --- a/org.springframework.integration.xml/ivy.xml +++ b/org.springframework.integration.xml/ivy.xml @@ -20,17 +20,17 @@ - + + + + - - - + + + - - + - - diff --git a/org.springframework.integration.xml/template.mf b/org.springframework.integration.xml/template.mf index dbf0db0f6e..074c6a19dc 100644 --- a/org.springframework.integration.xml/template.mf +++ b/org.springframework.integration.xml/template.mf @@ -4,12 +4,12 @@ Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: org.springframework.integration.*;version="[1.0.0, 1.0.1)", - org.springframework.beans.*;version="[2.5.5.A, 3.0.0)", - org.springframework.core.*;version="[2.5.5.A, 3.0.0)", + org.springframework.beans.*;version="[2.5.6, 3.0.0)", + org.springframework.core.*;version="[2.5.6, 3.0.0)", + org.springframework.util;version="[2.5.6, 3.0.0)", org.springframework.oxm;version="[1.5.4.A, 2.0.0)";resolution:=optional, - org.springframework.util;version="[2.5.5.A, 3.0.0)", org.springframework.xml.*;version="[1.5.4.A, 2.0.0)" Unversioned-Imports: org.w3c.dom, javax.xml.*, - org.xml.sax.* \ No newline at end of file + org.xml.sax.* diff --git a/org.springframework.integration/.classpath b/org.springframework.integration/.classpath index 0b17768ab2..384a4957ff 100644 --- a/org.springframework.integration/.classpath +++ b/org.springframework.integration/.classpath @@ -9,13 +9,12 @@ - - - - - - - - + + + + + + + diff --git a/org.springframework.integration/ivy.xml b/org.springframework.integration/ivy.xml index 17ed703c40..ef4af532af 100644 --- a/org.springframework.integration/ivy.xml +++ b/org.springframework.integration/ivy.xml @@ -23,10 +23,10 @@ - - - - + + + + \ No newline at end of file diff --git a/org.springframework.integration/template.mf b/org.springframework.integration/template.mf index b8ed01ab5c..589c0ffa77 100644 --- a/org.springframework.integration/template.mf +++ b/org.springframework.integration/template.mf @@ -3,7 +3,7 @@ Bundle-Name: Spring Integration Core Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: - org.springframework.*;version="[2.5.5.A, 3.0.0)", + org.springframework.*;version="[2.5.6, 3.0.0)", org.apache.commons.logging;version="[1.1.1, 2.0.0)", org.aopalliance.*;version="[1.0.0,2.0.0)" Unversioned-Imports: