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/16 21:47:37 UTC

[12/12] camel git commit: camel-test-karaf feature cannot install

camel-test-karaf feature cannot install


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/49095146
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/49095146
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/49095146

Branch: refs/heads/master
Commit: 4909514603d7fc9892f07b109d442dfc57c68063
Parents: 4ffcc30
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 16 22:45:06 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 16 22:45:06 2016 +0100

----------------------------------------------------------------------
 components/camel-test-karaf/pom.xml                      | 8 --------
 platforms/karaf/features/src/main/resources/features.xml | 3 ++-
 2 files changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/49095146/components/camel-test-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-test-karaf/pom.xml b/components/camel-test-karaf/pom.xml
index 83abab2..ca6f649 100644
--- a/components/camel-test-karaf/pom.xml
+++ b/components/camel-test-karaf/pom.xml
@@ -217,14 +217,6 @@
       </build>
     </profile>
 
-    <!-- test with older karaf 3.x -->
-    <profile>
-      <id>karaf3</id>
-      <properties>
-        <karf-test-version>${karaf3-version}</karf-test-version>
-      </properties>
-    </profile>
-
   </profiles>
 
 </project>

http://git-wip-us.apache.org/repos/asf/camel/blob/49095146/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 ffbb5fa..ab63b73 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1839,12 +1839,13 @@
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-test/${project.version}</bundle>
   </feature>
+  <!-- TODO: this feature does not work
   <feature name='camel-test-karaf' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-test</feature>
     <bundle>mvn:biz.aQute.bnd/biz.aQute.bndlib/${bndlib-version}</bundle>
     <bundle>mvn:org.ops4j.pax.tinybundles/tinybundles/${tinybundles-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-test-karaf/${project.version}</bundle>
-  </feature>
+  </feature> -->
   <feature name='camel-test-spring' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-spring</feature>
     <feature version='${spring-version-range}'>spring-test</feature>