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/7d715c89 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7d715c89 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7d715c89 Branch: refs/heads/master Commit: 7d715c895d6b4ff82342b55af8f125085c47f3f2 Parents: 577d8d1 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Dec 10 09:10:31 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Dec 10 09:10:31 2015 +0100 ---------------------------------------------------------------------- platforms/karaf/features/src/main/resources/features.xml | 3 ++- .../org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7d715c89/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 625957a..92f2067 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1403,13 +1403,14 @@ <feature version='${project.version}'>camel-spring</feature> <bundle>mvn:org.apache.camel/camel-spring-batch/${project.version}</bundle> </feature> + <!-- TODO: require spring-integration 4.x bundles <feature name='camel-spring-integration' version='${project.version}' resolver='(obr)' start-level='50'> <details>spring-integartion doesn't support importing spring 4.x </details> <feature version='${project.version}'>camel-spring</feature> <bundle dependency='true'>mvn:org.springframework.retry/spring-retry/${spring-retry-version}</bundle> <bundle dependency='true'>mvn:org.springframework.integration/spring-integration-core/${spring-integration-version}</bundle> <bundle>mvn:org.apache.camel/camel-spring-integration/${project.version}</bundle> - </feature> + </feature> --> <feature name='camel-spring-javaconfig' version='${project.version}' resolver='(obr)' start-level='50'> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-bundle-version}</bundle> <feature version='${project.version}'>camel-spring</feature> http://git-wip-us.apache.org/repos/asf/camel/blob/7d715c89/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java index 99aba62..30e8f84 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.apache.camel.itest.karaf; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Configuration; @@ -23,6 +24,7 @@ import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) +@Ignore("Spring Integration 4.x is not OSGi bundle") public class CamelSpringIntegrationTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelSpringIntegrationTest.class);
