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 2016/12/07 15:21:09 UTC
camel git commit: CAMEL-10566: Remove camel-spring-javaconfig from
karaf
Repository: camel
Updated Branches:
refs/heads/master 87b062900 -> 31cce6bc9
CAMEL-10566: Remove camel-spring-javaconfig from karaf
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/31cce6bc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/31cce6bc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/31cce6bc
Branch: refs/heads/master
Commit: 31cce6bc9a4964779f918f64f0719f531ef83b66
Parents: 87b0629
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Dec 7 16:20:45 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Dec 7 16:21:03 2016 +0100
----------------------------------------------------------------------
.../features/src/main/resources/features.xml | 5 ---
.../itest/karaf/CamelSpringJavaconfigTest.java | 33 --------------------
2 files changed, 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/31cce6bc/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 0ded6b1..9d953e8 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1666,11 +1666,6 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-batch-infrastructure/${spring-batch-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-spring-batch/${project.version}</bundle>
</feature>
- <feature name='camel-spring-javaconfig' version='${project.version}' resolver='(obr)' start-level='50'>
- <feature version='${project.version}'>camel-spring</feature>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-bundle-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-spring-javaconfig/${project.version}</bundle>
- </feature>
<feature name='camel-spring-ldap' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<feature>transaction</feature>
http://git-wip-us.apache.org/repos/asf/camel/blob/31cce6bc/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringJavaconfigTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringJavaconfigTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringJavaconfigTest.java
deleted file mode 100644
index 43bcbb4..0000000
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringJavaconfigTest.java
+++ /dev/null
@@ -1,33 +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.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.PaxExam;
-
-@RunWith(PaxExam.class)
-public class CamelSpringJavaconfigTest extends BaseKarafTest {
-
- public static final String COMPONENT = extractName(CamelSpringJavaconfigTest.class);
-
- @Test
- public void test() throws Exception {
- installCamelFeature(COMPONENT);
- }
-
-}
\ No newline at end of file