You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/12/10 09:14:11 UTC
camel git commit: CAMEL-9338: Remove spring-integration feature in
karaf as its not osgi bundle and nobody really use it anyway.
Repository: camel
Updated Branches:
refs/heads/master 7d715c895 -> 64008dec5
CAMEL-9338: Remove spring-integration feature in karaf as its not osgi bundle and nobody really use it anyway.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/64008dec
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/64008dec
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/64008dec
Branch: refs/heads/master
Commit: 64008dec503f4466f03318406ae39f5d08d5323d
Parents: 7d715c8
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Dec 10 09:14:04 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Dec 10 09:14:04 2015 +0100
----------------------------------------------------------------------
.../features/src/main/resources/features.xml | 8 ----
.../itest/karaf/CamelSpringIntegrationTest.java | 42 --------------------
2 files changed, 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/64008dec/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 92f2067..cc266fd 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1403,14 +1403,6 @@
<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 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/64008dec/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
deleted file mode 100644
index 30e8f84..0000000
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringIntegrationTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-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;
-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);
-
- @Test
- public void test() throws Exception {
- testComponent(COMPONENT);
- }
-
- @Configuration
- public static Option[] configure() {
- return configure(COMPONENT);
- }
-
-}
\ No newline at end of file