camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject camel git commit: CAMEL-8051 Removing karaf spring feature repo and adding status provisional to import
Date Fri, 14 Nov 2014 16:15:10 GMT
Repository: camel
Updated Branches:
  refs/heads/master 7acbd5dcf -> afb08310a


CAMEL-8051 Removing karaf spring feature repo and adding status provisional to import


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

Branch: refs/heads/master
Commit: afb08310a61370a4d27e446142e424387317b5bb
Parents: 7acbd5d
Author: Christian Schneider <chris@die-schneider.net>
Authored: Fri Nov 14 17:13:29 2014 +0100
Committer: Christian Schneider <chris@die-schneider.net>
Committed: Fri Nov 14 17:14:48 2014 +0100

----------------------------------------------------------------------
 platforms/karaf/commands/pom.xml                         | 2 +-
 platforms/karaf/features/src/main/resources/features.xml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/afb08310/platforms/karaf/commands/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands/pom.xml b/platforms/karaf/commands/pom.xml
index 775b9a3..f2106b0 100644
--- a/platforms/karaf/commands/pom.xml
+++ b/platforms/karaf/commands/pom.xml
@@ -76,7 +76,7 @@
         <configuration>
           <instructions>
             <Import-Package>
-              org.apache.felix.service.command;version="[0.6,1)",
+              org.apache.felix.service.command;mandatory:=status;status=provisional;version="[0.6,1)",
               org.apache.felix.gogo.commands;version="[0.6,1)",
               org.apache.karaf.shell.console;version="[2.2,4)",
               org.slf4j.*;version="[1.6,2)",

http://git-wip-us.apache.org/repos/asf/camel/blob/afb08310/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 d8a63f6..1e56bb0 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -16,7 +16,6 @@
     limitations under the License.
 -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name='camel-${project.version}'>
-  <repository>mvn:org.apache.karaf.assemblies.features/spring/${karaf-version}/xml/features</repository>
   <repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf-version}/xml/features</repository>
   <repository>mvn:org.apache.jclouds.karaf/jclouds-karaf/${jclouds-version}/xml/features</repository>
 


Mime
View raw message