You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/02/13 14:10:05 UTC

[camel] branch master updated (e64c137 -> 3e0aedd)

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from e64c137  Fixed Camel-boon test
     new df05286  Revert "CAMEL-12230:Camel-Ribbon: add a Karaf feature"
     new 3e0aedd  Revert "CAMEL-12230: camel-ribbon need to import this osgi package"

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 components/camel-ribbon/pom.xml                          | 3 ---
 platforms/karaf/features/src/main/resources/features.xml | 6 ------
 2 files changed, 9 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
acosentino@apache.org.

[camel] 01/02: Revert "CAMEL-12230:Camel-Ribbon: add a Karaf feature"

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit df052860eb477185308c44639f75fb8e4c6c34ca
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Feb 13 15:08:55 2018 +0100

    Revert "CAMEL-12230:Camel-Ribbon: add a Karaf feature"
    
    This reverts commit 90fd46eebca67ad6787fc95e1fc220cff7015274.
---
 platforms/karaf/features/src/main/resources/features.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 74cdba4..7912071 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1837,12 +1837,6 @@
     <feature version='${project.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-rmi/${project.version}</bundle>
   </feature>
-  <feature name="camel-ribbon" version='${project.version}' resolver='(obr)' start-level='50'>
-    <feature version='${project.version}'>camel-core</feature>
-    <bundle dependency='true'>wrap:mvn:com.netflix.ribbon/ribbon-core/${ribbon-version}</bundle>
-    <bundle dependency='true'>wrap:mvn:com.netflix.ribbon/ribbon-loadbalancer/${ribbon-version}</bundle>
-    <bundle>mvn:org.apache.camel/camel-ribbon/${project.version}</bundle>
-  </feature>
   <feature name='camel-routebox' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-routebox/${project.version}</bundle>

-- 
To stop receiving notification emails like this one, please contact
acosentino@apache.org.

[camel] 02/02: Revert "CAMEL-12230: camel-ribbon need to import this osgi package"

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 3e0aedd17975c2b1db3c775dd2bc39de888e05dc
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Feb 13 15:09:06 2018 +0100

    Revert "CAMEL-12230: camel-ribbon need to import this osgi package"
    
    This reverts commit f33627d5262f5270048411de3efa2ca74be3f5d5.
---
 components/camel-ribbon/pom.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/components/camel-ribbon/pom.xml b/components/camel-ribbon/pom.xml
index 043ecdb..1e775b6 100644
--- a/components/camel-ribbon/pom.xml
+++ b/components/camel-ribbon/pom.xml
@@ -38,9 +38,6 @@
     <firstVersion>2.18.0</firstVersion>
     <label>microservice</label>
 
-    <camel.osgi.import.before.defaults>
-      com.netflix.client
-    </camel.osgi.import.before.defaults>
     <camel.osgi.export.pkg>org.apache.camel.component.ribbon.*</camel.osgi.export.pkg>
   </properties>
 

-- 
To stop receiving notification emails like this one, please contact
acosentino@apache.org.