CAMEL-9338: Upgrade Spring Integration to version 4.2.2
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/74b9e987 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/74b9e987 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/74b9e987 Branch: refs/heads/master Commit: 74b9e987d4116ee27315a2fbe4fac05fe675a0be Parents: 07f1594 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Dec 10 08:24:15 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Dec 10 08:25:32 2015 +0100 ---------------------------------------------------------------------- components/camel-spring-integration/pom.xml | 9 ++++----- parent/pom.xml | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/74b9e987/components/camel-spring-integration/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring-integration/pom.xml b/components/camel-spring-integration/pom.xml index 1d3e50f..b68ab4b 100644 --- a/components/camel-spring-integration/pom.xml +++ b/components/camel-spring-integration/pom.xml @@ -31,12 +31,11 @@ <properties> <camel.osgi.export.pkg>org.apache.camel.component.spring.integration.*</camel.osgi.export.pkg> - <camel.osgi.import.before.defaults>org.springframework.integration.*;version="[4" - org.springframework.messaging.*;version="[4"</camel.osgi.import.before.defaults> + <camel.osgi.import.before.defaults> + org.springframework.integration.*;version="[4.2,5)", + org.springframework.messaging.*;version="[4.2,5)" + </camel.osgi.import.before.defaults> <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=spring-integration</camel.osgi.export.service> - - <!-- must use older spring version --> - <spring-version>${spring41-version}</spring-version> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/74b9e987/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 028dc02..68f6a62 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -467,7 +467,7 @@ <spring-castor-bundle-version>1.2.0</spring-castor-bundle-version> <spring-data-commons-version>1.6.5.RELEASE</spring-data-commons-version> <spring-data-redis-version>1.6.0.RELEASE</spring-data-redis-version> - <spring-integration-version>4.2.2.RELEASE</spring-integration-version> + <spring-integration-version>4.2.3.RELEASE</spring-integration-version> <spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version> <spring-ldap-version>2.0.4.RELEASE</spring-ldap-version> <spring-ldap-bundle-version>2.0.3.RELEASE_1</spring-ldap-bundle-version>
