[camel] branch master updated: [CAMEL-13109] Generate the Provide-Capability for the services for components/ languages / dataformats

[gnodet]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new ed3223b  [CAMEL-13109] Generate the Provide-Capability for the 
services for components/ languages / dataformats
ed3223b is described below

commit ed3223b3fa8d09509af46ebbe044d1a9fadab87f
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Wed Jan 23 13:05:44 2019 +0100

    [CAMEL-13109] Generate the Provide-Capability for the services for 
components/ languages / dataformats
---
 camel-core/pom.xml                                 | 51 ++++++++----------
 components/camel-ahc-ws/pom.xml                    |  1 -
 components/camel-ahc/pom.xml                       |  1 -
 components/camel-amqp/pom.xml                      |  1 -
 components/camel-apns/pom.xml                      |  1 -
 components/camel-asn1/pom.xml                      |  1 -
 components/camel-asterisk/pom.xml                  |  1 -
 components/camel-atmos/pom.xml                     |  1 -
 components/camel-atmosphere-websocket/pom.xml      |  1 -
 components/camel-atom/pom.xml                      |  1 -
 components/camel-atomix/pom.xml                    |  8 ---
 components/camel-avro/pom.xml                      |  4 --
 components/camel-aws/pom.xml                       | 16 ------
 components/camel-azure/pom.xml                     |  4 --
 components/camel-barcode/pom.xml                   |  1 -
 components/camel-base64/pom.xml                    |  3 --
 components/camel-bean-validator/pom.xml            |  2 -
 components/camel-beanio/pom.xml                    |  1 -
 components/camel-beanstalk/pom.xml                 |  1 -
 components/camel-bindy/pom.xml                     |  5 --
 components/camel-boon/pom.xml                      |  1 -
 components/camel-box/camel-box-component/pom.xml   |  1 -
 components/camel-caffeine/pom.xml                  |  3 --
 components/camel-cassandraql/pom.xml               |  1 -
 components/camel-chronicle/pom.xml                 |  3 --
 components/camel-chunk/pom.xml                     |  1 -
 components/camel-cm-sms/pom.xml                    |  1 -
 components/camel-cmis/pom.xml                      |  1 -
 components/camel-coap/pom.xml                      |  1 -
 components/camel-cometd/pom.xml                    |  4 --
 components/camel-consul/pom.xml                    |  3 --
 components/camel-corda/pom.xml                     |  1 -
 components/camel-couchbase/pom.xml                 |  2 -
 components/camel-couchdb/pom.xml                   |  1 -
 components/camel-crypto-cms/pom.xml                |  3 --
 components/camel-crypto/pom.xml                    |  5 --
 components/camel-csv/pom.xml                       |  1 -
 components/camel-cxf/pom.xml                       |  4 --
 components/camel-digitalocean/pom.xml              |  1 -
 components/camel-direct/pom.xml                    |  1 -
 components/camel-disruptor/pom.xml                 |  4 --
 components/camel-dns/pom.xml                       |  1 -
 components/camel-docker/pom.xml                    |  1 -
 components/camel-drill/pom.xml                     |  1 -
 components/camel-dropbox/pom.xml                   |  1 -
 components/camel-ehcache/pom.xml                   |  3 --
 components/camel-ejb/pom.xml                       |  1 -
 components/camel-elasticsearch-rest/pom.xml        |  1 -
 components/camel-elsql/pom.xml                     |  1 -
 components/camel-etcd/pom.xml                      |  3 --
 components/camel-eventadmin/pom.xml                |  1 -
 components/camel-exec/pom.xml                      |  1 -
 components/camel-facebook/pom.xml                  |  1 -
 components/camel-fastjson/pom.xml                  |  1 -
 components/camel-fhir/camel-fhir-component/pom.xml |  5 --
 components/camel-flatpack/pom.xml                  |  4 --
 components/camel-flink/pom.xml                     |  1 -
 components/camel-fop/pom.xml                       |  1 -
 components/camel-freemarker/pom.xml                |  1 -
 components/camel-ftp/pom.xml                       |  5 --
 components/camel-ganglia/pom.xml                   |  1 -
 components/camel-geocoder/pom.xml                  |  1 -
 components/camel-git/pom.xml                       |  1 -
 components/camel-github/pom.xml                    |  1 -
 components/camel-google-bigquery/pom.xml           |  1 -
 components/camel-google-calendar/pom.xml           |  3 --
 components/camel-google-drive/pom.xml              |  3 --
 components/camel-google-mail/pom.xml               |  3 --
 components/camel-google-pubsub/pom.xml             |  3 --
 components/camel-google-sheets/pom.xml             |  1 -
 components/camel-gora/pom.xml                      |  1 -
 components/camel-groovy/pom.xml                    |  1 -
 components/camel-grpc/pom.xml                      |  1 -
 components/camel-gson/pom.xml                      |  1 -
 components/camel-guava-eventbus/pom.xml            |  1 -
 components/camel-hazelcast/pom.xml                 |  1 -
 components/camel-hbase/pom.xml                     |  1 -
 components/camel-hdfs2/pom.xml                     |  1 -
 components/camel-hipchat/pom.xml                   |  1 -
 components/camel-hl7/pom.xml                       |  4 --
 components/camel-http4/pom.xml                     |  4 --
 components/camel-hystrix/pom.xml                   |  1 -
 components/camel-iec60870/pom.xml                  |  4 --
 components/camel-ignite/pom.xml                    |  1 -
 components/camel-infinispan/pom.xml                |  1 -
 components/camel-influxdb/pom.xml                  |  1 -
 components/camel-iota/pom.xml                      |  1 -
 components/camel-ipfs/pom.xml                      |  1 -
 components/camel-irc/pom.xml                       |  4 --
 components/camel-ironmq/pom.xml                    |  1 -
 components/camel-jackson/pom.xml                   |  1 -
 components/camel-jacksonxml/pom.xml                |  1 -
 components/camel-jaxb/pom.xml                      |  1 -
 components/camel-jbpm/pom.xml                      |  1 -
 components/camel-jcache/pom.xml                    |  3 --
 components/camel-jclouds/pom.xml                   |  1 -
 components/camel-jcr/pom.xml                       |  1 -
 components/camel-jdbc/pom.xml                      |  1 -
 components/camel-jetty-common/pom.xml              |  1 -
 components/camel-jetty/pom.xml                     |  1 -
 components/camel-jetty9/pom.xml                    |  1 -
 components/camel-jgroups-raft/pom.xml              |  1 -
 components/camel-jgroups/pom.xml                   |  1 -
 components/camel-jibx/pom.xml                      |  1 -
 components/camel-jing/pom.xml                      |  4 --
 components/camel-jms/pom.xml                       |  1 -
 components/camel-jmx/pom.xml                       |  1 -
 components/camel-johnzon/pom.xml                   |  1 -
 components/camel-jolt/pom.xml                      |  4 --
 components/camel-jpa/pom.xml                       |  1 -
 components/camel-jsch/pom.xml                      |  1 -
 components/camel-json-validator/pom.xml            |  3 --
 components/camel-jsonpath/pom.xml                  |  1 -
 components/camel-jt400/pom.xml                     |  1 -
 components/camel-kafka/pom.xml                     |  3 --
 components/camel-kubernetes/pom.xml                |  1 -
 components/camel-ldap/pom.xml                      |  1 -
 components/camel-ldif/pom.xml                      |  1 -
 components/camel-lucene/pom.xml                    |  1 -
 components/camel-lumberjack/pom.xml                |  3 --
 components/camel-lzf/pom.xml                       |  1 -
 components/camel-mail/pom.xml                      | 10 ----
 components/camel-master/pom.xml                    |  1 -
 components/camel-metrics/pom.xml                   |  1 -
 components/camel-micrometer/pom.xml                |  2 -
 components/camel-milo/pom.xml                      |  4 --
 components/camel-mina2/pom.xml                     |  1 -
 components/camel-mllp/pom.xml                      |  1 -
 components/camel-mongodb-gridfs/pom.xml            |  1 -
 components/camel-mongodb3/pom.xml                  |  1 -
 components/camel-mqtt/pom.xml                      |  1 -
 components/camel-msv/pom.xml                       |  1 -
 components/camel-mustache/pom.xml                  |  1 -
 components/camel-mvel/pom.xml                      |  4 --
 components/camel-mybatis/pom.xml                   |  1 -
 components/camel-nagios/pom.xml                    |  1 -
 components/camel-nats/pom.xml                      |  1 -
 components/camel-netty4-http/pom.xml               |  1 -
 components/camel-netty4/pom.xml                    |  1 -
 components/camel-nsq/pom.xml                       |  1 -
 components/camel-ognl/pom.xml                      |  1 -
 components/camel-optaplanner/pom.xml               |  1 -
 components/camel-paho/pom.xml                      |  1 -
 components/camel-paxlogging/pom.xml                |  1 -
 components/camel-pdf/pom.xml                       |  1 -
 components/camel-pgevent/pom.xml                   |  1 -
 components/camel-printer/pom.xml                   |  1 -
 components/camel-protobuf/pom.xml                  |  1 -
 components/camel-pubnub/pom.xml                    |  1 -
 components/camel-quartz2/pom.xml                   |  1 -
 components/camel-quickfix/pom.xml                  |  1 -
 components/camel-rabbitmq/pom.xml                  |  1 -
 components/camel-reactive-streams/pom.xml          |  1 -
 components/camel-rest-swagger/pom.xml              |  1 -
 components/camel-restlet/pom.xml                   |  1 -
 components/camel-rmi/pom.xml                       |  1 -
 components/camel-rss/pom.xml                       |  4 --
 .../camel-salesforce-component/pom.xml             |  1 -
 components/camel-sap-netweaver/pom.xml             |  1 -
 components/camel-saxon/pom.xml                     |  4 --
 components/camel-schematron/pom.xml                |  1 -
 components/camel-service/pom.xml                   |  1 -
 .../camel-servicenow-component/pom.xml             |  3 --
 components/camel-servlet/pom.xml                   |  1 -
 components/camel-sip/pom.xml                       |  1 -
 components/camel-sjms/pom.xml                      |  4 --
 components/camel-sjms2/pom.xml                     |  3 --
 components/camel-slack/pom.xml                     |  1 -
 components/camel-smpp/pom.xml                      |  4 --
 components/camel-snakeyaml/pom.xml                 |  1 -
 components/camel-snmp/pom.xml                      |  1 -
 components/camel-soap/pom.xml                      |  1 -
 components/camel-solr/pom.xml                      |  1 -
 components/camel-spark/pom.xml                     |  1 -
 components/camel-splunk/pom.xml                    |  1 -
 components/camel-spring-batch/pom.xml              |  1 -
 components/camel-spring-integration/pom.xml        |  1 -
 components/camel-spring-ldap/pom.xml               |  3 --
 components/camel-spring-redis/pom.xml              |  1 -
 components/camel-spring-ws/pom.xml                 |  1 -
 components/camel-spring/pom.xml                    |  4 --
 components/camel-sql/pom.xml                       |  4 --
 components/camel-ssh/pom.xml                       |  1 -
 components/camel-stax/pom.xml                      |  1 -
 components/camel-stomp/pom.xml                     |  1 -
 components/camel-stream/pom.xml                    |  1 -
 components/camel-stringtemplate/pom.xml            |  1 -
 components/camel-syslog/pom.xml                    |  1 -
 components/camel-tagsoup/pom.xml                   |  1 -
 components/camel-tarfile/pom.xml                   |  1 -
 components/camel-telegram/pom.xml                  |  2 -
 components/camel-test-karaf/pom.xml                |  7 +++
 components/camel-thrift/pom.xml                    |  4 --
 components/camel-tika/pom.xml                      |  1 -
 components/camel-twilio/pom.xml                    |  1 -
 components/camel-twitter/pom.xml                   |  1 -
 components/camel-undertow/pom.xml                  |  1 -
 components/camel-univocity-parsers/pom.xml         |  5 --
 components/camel-velocity/pom.xml                  |  1 -
 components/camel-vertx/pom.xml                     |  1 -
 components/camel-weather/pom.xml                   |  1 -
 components/camel-web3j/pom.xml                     |  1 -
 components/camel-websocket-jsr356/pom.xml          |  1 -
 components/camel-websocket/pom.xml                 |  1 -
 components/camel-wordpress/pom.xml                 |  1 -
 components/camel-xchange/pom.xml                   |  1 -
 components/camel-xmlsecurity/pom.xml               |  4 --
 components/camel-xmpp/pom.xml                      |  1 -
 components/camel-xstream/pom.xml                   |  4 --
 components/camel-yammer/pom.xml                    |  1 -
 components/camel-zipfile/pom.xml                   |  1 -
 components/camel-zookeeper-master/pom.xml          |  1 -
 components/camel-zookeeper/pom.xml                 |  1 -
 components/pom.xml                                 | 21 ++++++++
 parent/pom.xml                                     |  2 -
 .../maven/camel-bundle-plugin}/pom.xml             | 47 +++++++---------
 .../org/apache/camel/maven/bundle/CamelPlugin.java | 63 ++++++++++++++++++++++
 tooling/maven/pom.xml                              |  1 +
 218 files changed, 133 insertions(+), 430 deletions(-)

diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index 8674fe6..cb7793d 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -56,36 +56,6 @@
       =org.apache.camel.util.concurrent,
       *
     </camel.osgi.import.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=bean,
-      org.apache.camel.spi.ComponentResolver;component=binding,
-      org.apache.camel.spi.ComponentResolver;component=class,
-      org.apache.camel.spi.ComponentResolver;component=controlbus,
-      org.apache.camel.spi.ComponentResolver;component=dataset,
-      org.apache.camel.spi.ComponentResolver;component=file,
-      org.apache.camel.spi.ComponentResolver;component=mock,
-      org.apache.camel.spi.ComponentResolver;component=properties,
-      org.apache.camel.spi.ComponentResolver;component=rest,
-      org.apache.camel.spi.ComponentResolver;component=rest-api,
-      org.apache.camel.spi.ComponentResolver;component=seda,
-      org.apache.camel.spi.ComponentResolver;component=test,
-      org.apache.camel.spi.ComponentResolver;component=validator,
-      org.apache.camel.spi.ComponentResolver;component=xslt,
-      org.apache.camel.spi.DataFormatResolver;dataformat=gzip,
-      org.apache.camel.spi.DataFormatResolver;dataformat=serialization,
-      org.apache.camel.spi.DataFormatResolver;dataformat=string,
-      org.apache.camel.spi.DataFormatResolver;dataformat=zip,
-      org.apache.camel.spi.LanguageResolver;language=bean,
-      org.apache.camel.spi.LanguageResolver;language=constant,
-      org.apache.camel.spi.LanguageResolver;language=exchangeProperty,
-      org.apache.camel.spi.LanguageResolver;language=file,
-      org.apache.camel.spi.LanguageResolver;language=header,
-      org.apache.camel.spi.LanguageResolver;language=ref,
-      org.apache.camel.spi.LanguageResolver;language=simple,
-      org.apache.camel.spi.LanguageResolver;language=tokenize,
-      org.apache.camel.spi.LanguageResolver;language=xpath,
-      org.apache.camel.spi.LanguageResolver;language=xtokenize
-    </camel.osgi.export.service>
     <camel.osgi.dynamic>
       org.apache.camel.spring.util;${camel.osgi.import.strict.version},
       
org.apache.camel.spring.pollingconsumer;${camel.osgi.import.strict.version},
@@ -560,6 +530,27 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <_plugin>
+              org.apache.felix.bundleplugin.BlueprintPlugin,
+              aQute.lib.spring.SpringXMLType,
+              org.apache.felix.bundleplugin.JpaPlugin,
+              org.apache.camel.maven.bundle.CamelPlugin
+            </_plugin>
+          </instructions>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-bundle-plugin</artifactId>
+            <version>${project.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/components/camel-ahc-ws/pom.xml b/components/camel-ahc-ws/pom.xml
index 241d31e..445b99a 100644
--- a/components/camel-ahc-ws/pom.xml
+++ b/components/camel-ahc-ws/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.ahc.ws.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=ahc-ws</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-ahc/pom.xml b/components/camel-ahc/pom.xml
index c4a667c..89b4768 100644
--- a/components/camel-ahc/pom.xml
+++ b/components/camel-ahc/pom.xml
@@ -34,7 +34,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.ahc.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=ahc</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml
index 1397100..29b4e9e 100644
--- a/components/camel-amqp/pom.xml
+++ b/components/camel-amqp/pom.xml
@@ -41,7 +41,6 @@
       *
     </camel.osgi.import>
     
<camel.osgi.export.pkg>org.apache.camel.component.amqp.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=amqp</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-apns/pom.xml b/components/camel-apns/pom.xml
index efa06d2..b3515db 100644
--- a/components/camel-apns/pom.xml
+++ b/components/camel-apns/pom.xml
@@ -34,7 +34,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.apns.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=apns</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-asn1/pom.xml b/components/camel-asn1/pom.xml
index 1842ac4..e10df17 100644
--- a/components/camel-asn1/pom.xml
+++ b/components/camel-asn1/pom.xml
@@ -39,7 +39,6 @@
     <camel.osgi.export>
        org.apache.camel.dataformat.asn1;${camel.osgi.version}
     </camel.osgi.export>
-    
<camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=asn1</camel.osgi.export.service>
     
   </properties>
 
diff --git a/components/camel-asterisk/pom.xml 
b/components/camel-asterisk/pom.xml
index 28312d5..3a9412a 100644
--- a/components/camel-asterisk/pom.xml
+++ b/components/camel-asterisk/pom.xml
@@ -38,7 +38,6 @@
     <camel.osgi.export.pkg>
       org.apache.camel.component.asterisk.*;${camel.osgi.version},
     </camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=asterisk</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-atmos/pom.xml b/components/camel-atmos/pom.xml
index 8ab14f3..6e56bd7 100644
--- a/components/camel-atmos/pom.xml
+++ b/components/camel-atmos/pom.xml
@@ -34,7 +34,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.atmos.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=atmos</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-atmosphere-websocket/pom.xml 
b/components/camel-atmosphere-websocket/pom.xml
index 5fef172..211eac0 100644
--- a/components/camel-atmosphere-websocket/pom.xml
+++ b/components/camel-atmosphere-websocket/pom.xml
@@ -48,7 +48,6 @@
             ${camel.osgi.import.defaults},
             *
         </camel.osgi.import.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=atmosphere-websocket</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-atom/pom.xml b/components/camel-atom/pom.xml
index 67f38a9..6c06868 100644
--- a/components/camel-atom/pom.xml
+++ b/components/camel-atom/pom.xml
@@ -41,7 +41,6 @@
         ${camel.osgi.import.defaults},
         *
     </camel.osgi.import.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=atom</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-atomix/pom.xml b/components/camel-atomix/pom.xml
index c654ed1..2827682 100644
--- a/components/camel-atomix/pom.xml
+++ b/components/camel-atomix/pom.xml
@@ -45,14 +45,6 @@
       org.apache.camel.component.atomix.client.messaging.*,
       org.apache.camel.component.atomix.cluster.*
     </camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=atomix-map,
-      org.apache.camel.spi.ComponentResolver;component=atomix-multimap,
-      org.apache.camel.spi.ComponentResolver;component=atomix-set,
-      org.apache.camel.spi.ComponentResolver;component=atomix-queue,
-      org.apache.camel.spi.ComponentResolver;component=atomix-value,
-      org.apache.camel.spi.ComponentResolver;component=atomix-messaging
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-avro/pom.xml b/components/camel-avro/pom.xml
index 204ca18..16bf0fc 100644
--- a/components/camel-avro/pom.xml
+++ b/components/camel-avro/pom.xml
@@ -33,10 +33,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.dataformat.avro*,org.apache.camel.component.avro*</camel.osgi.export.pkg>
-        <camel.osgi.export.service>
-          org.apache.camel.spi.ComponentResolver;component=avro,
-          org.apache.camel.spi.DataFormatResolver;dataformat=avro
-      </camel.osgi.export.service>
     </properties>
 
     <build>
diff --git a/components/camel-aws/pom.xml b/components/camel-aws/pom.xml
index 5a857ad..67601b2 100644
--- a/components/camel-aws/pom.xml
+++ b/components/camel-aws/pom.xml
@@ -34,22 +34,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.aws.*</camel.osgi.export.pkg>
-        <camel.osgi.export.service>
-          org.apache.camel.spi.ComponentResolver;component=aws-cw,
-          org.apache.camel.spi.ComponentResolver;component=aws-ddb,
-          org.apache.camel.spi.ComponentResolver;component=aws-ec2,
-          org.apache.camel.spi.ComponentResolver;component=aws-kinesis,
-          
org.apache.camel.spi.ComponentResolver;component=aws-kinesis-firehose,
-          org.apache.camel.spi.ComponentResolver;component=aws-kms,
-          org.apache.camel.spi.ComponentResolver;component=aws-lambda,
-          org.apache.camel.spi.ComponentResolver;component=aws-mq,
-          org.apache.camel.spi.ComponentResolver;component=aws-s3,
-          org.apache.camel.spi.ComponentResolver;component=aws-sdb,
-          org.apache.camel.spi.ComponentResolver;component=aws-ses,
-          org.apache.camel.spi.ComponentResolver;component=aws-sns,
-          org.apache.camel.spi.ComponentResolver;component=aws-sqs,
-          org.apache.camel.spi.ComponentResolver;component=aws-swf
-        </camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-azure/pom.xml b/components/camel-azure/pom.xml
index 1058ee8..e7986e4 100644
--- a/components/camel-azure/pom.xml
+++ b/components/camel-azure/pom.xml
@@ -35,10 +35,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.azure.*</camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=azure-blob,
-      org.apache.camel.spi.ComponentResolver;component=azure-queue
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-barcode/pom.xml b/components/camel-barcode/pom.xml
index 3725afb..1beb95d 100644
--- a/components/camel-barcode/pom.xml
+++ b/components/camel-barcode/pom.xml
@@ -34,7 +34,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.dataformat.barcode.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=barcode</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-base64/pom.xml b/components/camel-base64/pom.xml
index 1fd51a3..fbfc884 100644
--- a/components/camel-base64/pom.xml
+++ b/components/camel-base64/pom.xml
@@ -35,9 +35,6 @@
     <camel.osgi.export.pkg>
       org.apache.camel.dataformat.base64.*
     </camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.DataFormatResolver;dataformat=base64
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-bean-validator/pom.xml 
b/components/camel-bean-validator/pom.xml
index 93d138a..34de749 100644
--- a/components/camel-bean-validator/pom.xml
+++ b/components/camel-bean-validator/pom.xml
@@ -34,8 +34,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.bean.validator.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=bean-validator
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-beanio/pom.xml b/components/camel-beanio/pom.xml
index a2c4a92..68df9f9 100644
--- a/components/camel-beanio/pom.xml
+++ b/components/camel-beanio/pom.xml
@@ -37,7 +37,6 @@
     <camel.osgi.export.pkg>
       org.apache.camel.dataformat.beanio.*;
     </camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=beanio</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-beanstalk/pom.xml 
b/components/camel-beanstalk/pom.xml
index f5cae77..28dbbdc 100644
--- a/components/camel-beanstalk/pom.xml
+++ b/components/camel-beanstalk/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.beanstalk.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=beanstalk</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-bindy/pom.xml b/components/camel-bindy/pom.xml
index b5477af..292e9e9 100644
--- a/components/camel-bindy/pom.xml
+++ b/components/camel-bindy/pom.xml
@@ -35,11 +35,6 @@
         <camel.osgi.export.pkg>
             org.apache.camel.dataformat.bindy.*;
         </camel.osgi.export.pkg>
-        <camel.osgi.export.service>
-          org.apache.camel.spi.DataFormatResolver;dataformat=bindy-csv,
-          org.apache.camel.spi.DataFormatResolver;dataformat=bindy-fixed,
-          org.apache.camel.spi.DataFormatResolver;dataformat=bindy-kvp
-        </camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-boon/pom.xml b/components/camel-boon/pom.xml
index 7616759..820787f 100644
--- a/components/camel-boon/pom.xml
+++ b/components/camel-boon/pom.xml
@@ -36,7 +36,6 @@
           org.boon.json.*;version="[${boon-version},1)"
         </camel.osgi.import.before.defaults>
         
<camel.osgi.export.pkg>org.apache.camel.component.boon.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=json-boon</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-box/camel-box-component/pom.xml 
b/components/camel-box/camel-box-component/pom.xml
index cab06b3..297dd4b 100644
--- a/components/camel-box/camel-box-component/pom.xml
+++ b/components/camel-box/camel-box-component/pom.xml
@@ -40,7 +40,6 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     
<camel.osgi.export.pkg>org.apache.camel.component.box</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=box</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-caffeine/pom.xml 
b/components/camel-caffeine/pom.xml
index a7f1f0b..7d2c849 100644
--- a/components/camel-caffeine/pom.xml
+++ b/components/camel-caffeine/pom.xml
@@ -36,9 +36,6 @@
     <camel.osgi.export.pkg>
       org.apache.camel.component.caffeine.*,
     </camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=caffeine
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-cassandraql/pom.xml 
b/components/camel-cassandraql/pom.xml
index 39c505e..53cb2fd 100644
--- a/components/camel-cassandraql/pom.xml
+++ b/components/camel-cassandraql/pom.xml
@@ -41,7 +41,6 @@
       org.apache.camel.processor.idempotent.cassandra,
       org.apache.camel.utils.cassandra
     </camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=cql</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-chronicle/pom.xml 
b/components/camel-chronicle/pom.xml
index 75cd8c6..a541d61 100644
--- a/components/camel-chronicle/pom.xml
+++ b/components/camel-chronicle/pom.xml
@@ -36,9 +36,6 @@
     <camel.osgi.export.pkg>
       org.apache.camel.component.chronicle.*
     </camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=chronicle-engine
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-chunk/pom.xml b/components/camel-chunk/pom.xml
index 8363088..829ca55 100644
--- a/components/camel-chunk/pom.xml
+++ b/components/camel-chunk/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.chunk.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=chunk</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-cm-sms/pom.xml b/components/camel-cm-sms/pom.xml
index 1c5af8c..eede225 100644
--- a/components/camel-cm-sms/pom.xml
+++ b/components/camel-cm-sms/pom.xml
@@ -35,7 +35,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.cm.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=cm-sms</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-cmis/pom.xml b/components/camel-cmis/pom.xml
index c3a4076..4cb0727 100644
--- a/components/camel-cmis/pom.xml
+++ b/components/camel-cmis/pom.xml
@@ -36,7 +36,6 @@
         <camel.osgi.activator>
            org.apache.camel.component.cmis.osgi.Activator
         </camel.osgi.activator>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=cmis</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-coap/pom.xml b/components/camel-coap/pom.xml
index 1ccb1d8..b39d9c5 100644
--- a/components/camel-coap/pom.xml
+++ b/components/camel-coap/pom.xml
@@ -34,7 +34,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.coap.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=coap</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml
index 7a58bb5..583134d 100644
--- a/components/camel-cometd/pom.xml
+++ b/components/camel-cometd/pom.xml
@@ -39,10 +39,6 @@
             ${camel.osgi.import.defaults},
             *
         </camel.osgi.import.pkg>
-       <camel.osgi.export.service>
-         org.apache.camel.spi.ComponentResolver;component=cometd,
-         org.apache.camel.spi.ComponentResolver;component=cometds
-       </camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-consul/pom.xml b/components/camel-consul/pom.xml
index b2084e8..1911c10 100644
--- a/components/camel-consul/pom.xml
+++ b/components/camel-consul/pom.xml
@@ -37,9 +37,6 @@
     <camel.osgi.export.pkg>
       org.apache.camel.component.consul.*,
     </camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=consul
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-corda/pom.xml b/components/camel-corda/pom.xml
index a35576f..d382a68 100644
--- a/components/camel-corda/pom.xml
+++ b/components/camel-corda/pom.xml
@@ -34,7 +34,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.corda.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=corda</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-couchbase/pom.xml 
b/components/camel-couchbase/pom.xml
index dcfca60..ab84ddf 100644
--- a/components/camel-couchbase/pom.xml
+++ b/components/camel-couchbase/pom.xml
@@ -33,8 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.couchbase</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=couchbase
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-couchdb/pom.xml b/components/camel-couchdb/pom.xml
index 29e89b8..4d0bf83 100644
--- a/components/camel-couchdb/pom.xml
+++ b/components/camel-couchdb/pom.xml
@@ -34,7 +34,6 @@
 
        <properties>
                
<camel.osgi.export.pkg>org.apache.camel.component.couchdb.*</camel.osgi.export.pkg>
-               
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=couchdb</camel.osgi.export.service>
        </properties>
 
        <dependencies>
diff --git a/components/camel-crypto-cms/pom.xml 
b/components/camel-crypto-cms/pom.xml
index 19cf239..928b4fd 100644
--- a/components/camel-crypto-cms/pom.xml
+++ b/components/camel-crypto-cms/pom.xml
@@ -41,9 +41,6 @@
       ${camel.osgi.import.defaults},
       *
     </camel.osgi.import.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=crypto-cms,
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-crypto/pom.xml b/components/camel-crypto/pom.xml
index 141cf32..6b73d02 100644
--- a/components/camel-crypto/pom.xml
+++ b/components/camel-crypto/pom.xml
@@ -42,11 +42,6 @@
                        ${camel.osgi.import.defaults},
                        *
                </camel.osgi.import.pkg>
-               <camel.osgi.export.service>
-                       org.apache.camel.spi.ComponentResolver;component=crypto,
-                       
org.apache.camel.spi.DataFormatResolver;dataformat=crypto,
-                       org.apache.camel.spi.DataFormatResolver;dataformat=gpg
-               </camel.osgi.export.service>
        </properties>
 
        <dependencies>
diff --git a/components/camel-csv/pom.xml b/components/camel-csv/pom.xml
index f856ebe..2e58cf8 100644
--- a/components/camel-csv/pom.xml
+++ b/components/camel-csv/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
        
<camel.osgi.export.pkg>org.apache.camel.dataformat.csv.*</camel.osgi.export.pkg>
-       
<camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=csv</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index 91859c2..f7d9d3e 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -75,10 +75,6 @@
       org.apache.camel.component.cxf.spring;${camel.osgi.version},
       org.apache.camel.component.cxf.util;${camel.osgi.version}
     </camel.osgi.export>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=cxf,
-      org.apache.camel.spi.ComponentResolver;component=cxfrs
-    </camel.osgi.export.service>
     <camel.osgi.failok>true</camel.osgi.failok>
 
   </properties>
diff --git a/components/camel-digitalocean/pom.xml 
b/components/camel-digitalocean/pom.xml
index ba7b340..0f6e85b 100644
--- a/components/camel-digitalocean/pom.xml
+++ b/components/camel-digitalocean/pom.xml
@@ -35,7 +35,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.digitalocean.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=digitalocean</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-direct/pom.xml b/components/camel-direct/pom.xml
index a29a104..7dd561e 100644
--- a/components/camel-direct/pom.xml
+++ b/components/camel-direct/pom.xml
@@ -39,7 +39,6 @@
       *
     </camel.osgi.import>
     
<camel.osgi.export.pkg>org.apache.camel.component.direct.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=direct</camel.osgi.export.service>
     <!-- do not skip any tests by default -->
     <platform.skip.tests/>
   </properties>
diff --git a/components/camel-disruptor/pom.xml 
b/components/camel-disruptor/pom.xml
index 971223d..ba69023 100644
--- a/components/camel-disruptor/pom.xml
+++ b/components/camel-disruptor/pom.xml
@@ -33,10 +33,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.disruptor.*</camel.osgi.export.pkg>
-        <camel.osgi.export.service>
-          org.apache.camel.spi.ComponentResolver;component=disruptor,
-          org.apache.camel.spi.ComponentResolver;component=disruptor-vm
-        </camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-dns/pom.xml b/components/camel-dns/pom.xml
index 5251141..138159a 100644
--- a/components/camel-dns/pom.xml
+++ b/components/camel-dns/pom.xml
@@ -40,7 +40,6 @@
       !org.apache.camel.component.dns*,
       *
     </camel.osgi.import.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=dns</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-docker/pom.xml b/components/camel-docker/pom.xml
index ef36ae8..b09169f 100644
--- a/components/camel-docker/pom.xml
+++ b/components/camel-docker/pom.xml
@@ -35,7 +35,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.docker.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=docker</camel.osgi.export.service>
        <jffi.version>1.2.7</jffi.version>
        <jnr-x86asm.version>1.0.2</jnr-x86asm.version>
   </properties>
diff --git a/components/camel-drill/pom.xml b/components/camel-drill/pom.xml
index 8952397..360ff5b 100644
--- a/components/camel-drill/pom.xml
+++ b/components/camel-drill/pom.xml
@@ -40,7 +40,6 @@
                        ${camel.osgi.import.defaults},
                        *
                </camel.osgi.import.pkg>
-               
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=drill</camel.osgi.export.service>
        </properties>
 
     <dependencies>
diff --git a/components/camel-dropbox/pom.xml b/components/camel-dropbox/pom.xml
index 0344d28..4aafdc1 100644
--- a/components/camel-dropbox/pom.xml
+++ b/components/camel-dropbox/pom.xml
@@ -35,7 +35,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.dropbox.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=dropbox</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-ehcache/pom.xml b/components/camel-ehcache/pom.xml
index a7794d1..370bff7 100644
--- a/components/camel-ehcache/pom.xml
+++ b/components/camel-ehcache/pom.xml
@@ -36,9 +36,6 @@
     <camel.osgi.export.pkg>
       org.apache.camel.component.ehcache.*,
     </camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=ehcache
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-ejb/pom.xml b/components/camel-ejb/pom.xml
index 83dc933..5f5064e 100644
--- a/components/camel-ejb/pom.xml
+++ b/components/camel-ejb/pom.xml
@@ -33,7 +33,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.ejb.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=ejb</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-elasticsearch-rest/pom.xml 
b/components/camel-elasticsearch-rest/pom.xml
index 994d254..edbd0e4 100644
--- a/components/camel-elasticsearch-rest/pom.xml
+++ b/components/camel-elasticsearch-rest/pom.xml
@@ -34,7 +34,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.elasticsearch.*;${camel.osgi.version}</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=elasticsearch-rest</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-elsql/pom.xml b/components/camel-elsql/pom.xml
index 52284b1..ba157e0 100644
--- a/components/camel-elsql/pom.xml
+++ b/components/camel-elsql/pom.xml
@@ -41,7 +41,6 @@
       ${camel.osgi.import.defaults},
       *
     </camel.osgi.import.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=elsql</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-etcd/pom.xml b/components/camel-etcd/pom.xml
index 11a335e..9409486 100644
--- a/components/camel-etcd/pom.xml
+++ b/components/camel-etcd/pom.xml
@@ -35,9 +35,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.etcd.*</camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=etc
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-eventadmin/pom.xml 
b/components/camel-eventadmin/pom.xml
index 8658729..d8b40cd 100644
--- a/components/camel-eventadmin/pom.xml
+++ b/components/camel-eventadmin/pom.xml
@@ -33,7 +33,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.eventadmin</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=eventadmin</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-exec/pom.xml b/components/camel-exec/pom.xml
index bd6e571..6980f39 100644
--- a/components/camel-exec/pom.xml
+++ b/components/camel-exec/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.exec.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=exec</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-facebook/pom.xml 
b/components/camel-facebook/pom.xml
index 14d09fc..50ab46f 100644
--- a/components/camel-facebook/pom.xml
+++ b/components/camel-facebook/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.facebook.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=facebook</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-fastjson/pom.xml 
b/components/camel-fastjson/pom.xml
index 219a9b9..3cb0c55 100644
--- a/components/camel-fastjson/pom.xml
+++ b/components/camel-fastjson/pom.xml
@@ -33,7 +33,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.fastjson.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=json-fastjson</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-fhir/camel-fhir-component/pom.xml 
b/components/camel-fhir/camel-fhir-component/pom.xml
index d6ffee2..1107bf3 100644
--- a/components/camel-fhir/camel-fhir-component/pom.xml
+++ b/components/camel-fhir/camel-fhir-component/pom.xml
@@ -41,11 +41,6 @@
     <camel.osgi.dynamic>
       org.hl7.fhir.*
     </camel.osgi.dynamic>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.DataFormatResolver;dataformat=fhirJson,
-      org.apache.camel.spi.DataFormatResolver;dataformat=fhirXml,
-      org.apache.camel.spi.ComponentResolver;component=${schemeName}
-    </camel.osgi.export.service>
     <camel.osgi.private.pkg>${outPackage}</camel.osgi.private.pkg>
   </properties>
 
diff --git a/components/camel-flatpack/pom.xml 
b/components/camel-flatpack/pom.xml
index 2c6d0c2..3afd3b2 100644
--- a/components/camel-flatpack/pom.xml
+++ b/components/camel-flatpack/pom.xml
@@ -36,10 +36,6 @@
       org.apache.camel.component.flatpack.*,
       org.apache.camel.dataformat.flatpack.*
     </camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=flatpack,
-      org.apache.camel.spi.DataFormatResolver;dataformat=flatpack
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-flink/pom.xml b/components/camel-flink/pom.xml
index 5cb81fe..ac3d626 100644
--- a/components/camel-flink/pom.xml
+++ b/components/camel-flink/pom.xml
@@ -35,7 +35,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.flink.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=flink</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-fop/pom.xml b/components/camel-fop/pom.xml
index 3212842..a9eb132 100644
--- a/components/camel-fop/pom.xml
+++ b/components/camel-fop/pom.xml
@@ -33,7 +33,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.fop.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=fop</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-freemarker/pom.xml 
b/components/camel-freemarker/pom.xml
index 6bf07d8..fad69ad 100644
--- a/components/camel-freemarker/pom.xml
+++ b/components/camel-freemarker/pom.xml
@@ -33,7 +33,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.freemarker.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=freemarker</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index 663b6fc..33a8cad 100644
--- a/components/camel-ftp/pom.xml
+++ b/components/camel-ftp/pom.xml
@@ -36,11 +36,6 @@
         com.jcraft.jsch.*;version="[0.1.40,0.2)"
     </camel.osgi.import.before.defaults>
     
<camel.osgi.export.pkg>org.apache.camel.component.file.remote.*</camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=ftp,
-      org.apache.camel.spi.ComponentResolver;component=ftps,
-      org.apache.camel.spi.ComponentResolver;component=sftp
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-ganglia/pom.xml b/components/camel-ganglia/pom.xml
index 0e67e0b..bfb8053 100644
--- a/components/camel-ganglia/pom.xml
+++ b/components/camel-ganglia/pom.xml
@@ -38,7 +38,6 @@
     <camel.osgi.export.pkg>
       org.apache.camel.component.ganglia.*
     </camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=ganglia</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-geocoder/pom.xml 
b/components/camel-geocoder/pom.xml
index 2c90790..bd4f896 100644
--- a/components/camel-geocoder/pom.xml
+++ b/components/camel-geocoder/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.geocoder.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=geocoder</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-git/pom.xml b/components/camel-git/pom.xml
index 3d39335..6941737 100644
--- a/components/camel-git/pom.xml
+++ b/components/camel-git/pom.xml
@@ -33,7 +33,6 @@
 
    <properties>
       
<camel.osgi.export.pkg>org.apache.camel.component.git.*</camel.osgi.export.pkg>
-      
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=git</camel.osgi.export.service>
    </properties>
 
   <dependencies>
diff --git a/components/camel-github/pom.xml b/components/camel-github/pom.xml
index 4872646..29703ae 100644
--- a/components/camel-github/pom.xml
+++ b/components/camel-github/pom.xml
@@ -33,7 +33,6 @@
 
    <properties>
       
<camel.osgi.export.pkg>org.apache.camel.component.github.*</camel.osgi.export.pkg>
-      
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=github</camel.osgi.export.service>
    </properties>
 
   <dependencies>
diff --git a/components/camel-google-bigquery/pom.xml 
b/components/camel-google-bigquery/pom.xml
index 73a42d9..92ca460 100644
--- a/components/camel-google-bigquery/pom.xml
+++ b/components/camel-google-bigquery/pom.xml
@@ -35,7 +35,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.google.bigquery</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=google-bigquery</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-google-calendar/pom.xml 
b/components/camel-google-calendar/pom.xml
index 2499d5a..c47efea 100644
--- a/components/camel-google-calendar/pom.xml
+++ b/components/camel-google-calendar/pom.xml
@@ -39,9 +39,6 @@
     
<outPackage>org.apache.camel.component.google.calendar.internal</outPackage>
     
<camel.osgi.private.pkg>org.apache.camel.component.google.calendar.internal</camel.osgi.private.pkg>
     
<camel.osgi.export.pkg>org.apache.camel.component.google.calendar,org.apache.camel.component.google.calendar.stream</camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-          org.apache.camel.spi.ComponentResolver;component=google-calendar
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-google-drive/pom.xml 
b/components/camel-google-drive/pom.xml
index f1883f3..b23fdf5 100644
--- a/components/camel-google-drive/pom.xml
+++ b/components/camel-google-drive/pom.xml
@@ -39,9 +39,6 @@
     <outPackage>org.apache.camel.component.google.drive.internal</outPackage>
     
<camel.osgi.private.pkg>org.apache.camel.component.google.drive.internal</camel.osgi.private.pkg>
     
<camel.osgi.export.pkg>org.apache.camel.component.google.drive</camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-          org.apache.camel.spi.ComponentResolver;component=google-drive
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-google-mail/pom.xml 
b/components/camel-google-mail/pom.xml
index d90fe62..2bf07f8 100644
--- a/components/camel-google-mail/pom.xml
+++ b/components/camel-google-mail/pom.xml
@@ -39,9 +39,6 @@
     <outPackage>org.apache.camel.component.google.mail.internal</outPackage>
     
<camel.osgi.private.pkg>org.apache.camel.component.google.mail.internal</camel.osgi.private.pkg>
     
<camel.osgi.export.pkg>org.apache.camel.component.google.mail,org.apache.camel.component.google.mail.stream</camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-          org.apache.camel.spi.ComponentResolver;component=google-mail
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-google-pubsub/pom.xml 
b/components/camel-google-pubsub/pom.xml
index 1f16146..dbe0bb5 100644
--- a/components/camel-google-pubsub/pom.xml
+++ b/components/camel-google-pubsub/pom.xml
@@ -38,9 +38,6 @@
         <componentName>GooglePubSub</componentName>
         
<componentPackage>org.apache.camel.component.google.pubsub</componentPackage>
         
<camel.osgi.export.pkg>org.apache.camel.component.google.pubsub</camel.osgi.export.pkg>
-        <camel.osgi.export.service>
-            org.apache.camel.spi.ComponentResolver;component=google-pubsub
-        </camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-google-sheets/pom.xml 
b/components/camel-google-sheets/pom.xml
index eb57fcf..0a4931c 100644
--- a/components/camel-google-sheets/pom.xml
+++ b/components/camel-google-sheets/pom.xml
@@ -39,7 +39,6 @@
     <outPackage>org.apache.camel.component.google.sheets.internal</outPackage>
     
<camel.osgi.private.pkg>org.apache.camel.component.google.sheets.internal</camel.osgi.private.pkg>
     
<camel.osgi.export.pkg>org.apache.camel.component.google.sheets</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=google-sheets</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-gora/pom.xml b/components/camel-gora/pom.xml
index 5801cfe..42b453e 100644
--- a/components/camel-gora/pom.xml
+++ b/components/camel-gora/pom.xml
@@ -43,7 +43,6 @@
       org.apache.hadoop.conf;version="[1,2)"
     </camel.osgi.import.before.defaults>
     
<camel.osgi.export.pkg>org.apache.camel.component.gora.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=gora</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-groovy/pom.xml b/components/camel-groovy/pom.xml
index b54b752..22681f7 100644
--- a/components/camel-groovy/pom.xml
+++ b/components/camel-groovy/pom.xml
@@ -40,7 +40,6 @@
       *
     </camel.osgi.import.pkg>
     
<camel.osgi.export.pkg>org.apache.camel.language.groovy.*,org.apache.camel.groovy.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.LanguageResolver;language=groovy</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index 2cdb05d..1b409ec 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -35,7 +35,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.grpc.*;${camel.osgi.version}</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=grpc</camel.osgi.export.service>
     <!-- gRPC requires strong own of the Google Guava version -->
     <google-guava-version>${grpc-guava-version}</google-guava-version>
   </properties>
diff --git a/components/camel-gson/pom.xml b/components/camel-gson/pom.xml
index 22c9eb9..30c4f28 100644
--- a/components/camel-gson/pom.xml
+++ b/components/camel-gson/pom.xml
@@ -33,7 +33,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.gson.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=json-gson</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-guava-eventbus/pom.xml 
b/components/camel-guava-eventbus/pom.xml
index dfbe676..4695fb4 100644
--- a/components/camel-guava-eventbus/pom.xml
+++ b/components/camel-guava-eventbus/pom.xml
@@ -33,7 +33,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.guava.eventbus.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=guava-eventbus</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-hazelcast/pom.xml 
b/components/camel-hazelcast/pom.xml
index 1bce896..733f434 100644
--- a/components/camel-hazelcast/pom.xml
+++ b/components/camel-hazelcast/pom.xml
@@ -40,7 +40,6 @@
       org.apache.camel.processor.idempotent.hazelcast.*,
       org.apache.camel.processor.aggregate.hazelcast.*
     </camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=hazelcast</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-hbase/pom.xml b/components/camel-hbase/pom.xml
index af21b09..8367399 100644
--- a/components/camel-hbase/pom.xml
+++ b/components/camel-hbase/pom.xml
@@ -36,7 +36,6 @@
             org.apache.hadoop.hbase.*;version="[1,2)"
         </camel.osgi.import.before.defaults>
         
<camel.osgi.export.pkg>org.apache.camel.component.hbase.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=hbase</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-hdfs2/pom.xml b/components/camel-hdfs2/pom.xml
index 9127716..ffe6f5a 100644
--- a/components/camel-hdfs2/pom.xml
+++ b/components/camel-hdfs2/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.hdfs2.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=hdfs2</camel.osgi.export.service>
     <camel.osgi.import.additional>
       org.apache.hadoop.hdfs,
       org.apache.hadoop.hdfs.client,
diff --git a/components/camel-hipchat/pom.xml b/components/camel-hipchat/pom.xml
index d752dcc..1585a92 100644
--- a/components/camel-hipchat/pom.xml
+++ b/components/camel-hipchat/pom.xml
@@ -35,7 +35,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.hipchat.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=hipchat</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-hl7/pom.xml b/components/camel-hl7/pom.xml
index 4eea89e..777819b 100644
--- a/components/camel-hl7/pom.xml
+++ b/components/camel-hl7/pom.xml
@@ -36,10 +36,6 @@
         <camel.osgi.import.before.defaults>
             org.apache.mina.*;version="[2,3)"
         </camel.osgi.import.before.defaults>
-        <camel.osgi.export.service>
-          org.apache.camel.spi.LanguageResolver;language=terser,
-          org.apache.camel.spi.DataFormatResolver;dataformat=hl7
-        </camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-http4/pom.xml b/components/camel-http4/pom.xml
index cd9719f..619bf4a 100644
--- a/components/camel-http4/pom.xml
+++ b/components/camel-http4/pom.xml
@@ -38,10 +38,6 @@
       org.apache.http.*;version="[4.3,5)"
     </camel.osgi.import.before.defaults>
     
<camel.osgi.export.pkg>org.apache.camel.component.http4.*</camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=http4,
-      org.apache.camel.spi.ComponentResolver;component=https4
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-hystrix/pom.xml b/components/camel-hystrix/pom.xml
index ae1aec0..d43f487 100644
--- a/components/camel-hystrix/pom.xml
+++ b/components/camel-hystrix/pom.xml
@@ -38,7 +38,6 @@
     <label>eip,microservice</label>
 
     
<camel.osgi.export.pkg>org.apache.camel.component.hystrix.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=hystrix</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-iec60870/pom.xml 
b/components/camel-iec60870/pom.xml
index ba75a78..be6b494 100644
--- a/components/camel-iec60870/pom.xml
+++ b/components/camel-iec60870/pom.xml
@@ -36,10 +36,6 @@
     <camel.osgi.export.pkg>
       org.apache.camel.component.iec60870.*
     </camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=iec60870-client,
-      org.apache.camel.spi.ComponentResolver;component=iec60870-server
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-ignite/pom.xml b/components/camel-ignite/pom.xml
index 730eafd..efab5a9 100644
--- a/components/camel-ignite/pom.xml
+++ b/components/camel-ignite/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.ignite.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=ignite</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-infinispan/pom.xml 
b/components/camel-infinispan/pom.xml
index a9a4734..da1f216 100644
--- a/components/camel-infinispan/pom.xml
+++ b/components/camel-infinispan/pom.xml
@@ -34,7 +34,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.infinispan.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=infinispan</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-influxdb/pom.xml 
b/components/camel-influxdb/pom.xml
index 6db4a7c..1fcabd8 100644
--- a/components/camel-influxdb/pom.xml
+++ b/components/camel-influxdb/pom.xml
@@ -26,7 +26,6 @@
 
        <properties>
                
<camel.osgi.export.pkg>org.apache.camel.component.influxdb.*</camel.osgi.export.pkg>
-               
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=influxdb</camel.osgi.export.service>
        </properties>
 
        <dependencies>
diff --git a/components/camel-iota/pom.xml b/components/camel-iota/pom.xml
index 12ce39b..f9d96a6 100644
--- a/components/camel-iota/pom.xml
+++ b/components/camel-iota/pom.xml
@@ -26,7 +26,6 @@
 
        <properties>
                
<camel.osgi.export.pkg>org.apache.camel.component.iota.*</camel.osgi.export.pkg>
-               
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=iota</camel.osgi.export.service>
        </properties>
 
        <dependencies>
diff --git a/components/camel-ipfs/pom.xml b/components/camel-ipfs/pom.xml
index 76cd2b5..a7944f0 100644
--- a/components/camel-ipfs/pom.xml
+++ b/components/camel-ipfs/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.ipfs.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=ipfs</camel.osgi.export.service>
   </properties>
 
   <repositories>
diff --git a/components/camel-irc/pom.xml b/components/camel-irc/pom.xml
index 6dee839..2c51d41 100644
--- a/components/camel-irc/pom.xml
+++ b/components/camel-irc/pom.xml
@@ -33,10 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.irc.*</camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=irc,
-      org.apache.camel.spi.ComponentResolver;component=ircs,
-    </camel.osgi.export.service>
   </properties>
 
 
diff --git a/components/camel-ironmq/pom.xml b/components/camel-ironmq/pom.xml
index 62a722c..8896b35 100644
--- a/components/camel-ironmq/pom.xml
+++ b/components/camel-ironmq/pom.xml
@@ -34,7 +34,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.ironmq.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=ironmq</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-jackson/pom.xml b/components/camel-jackson/pom.xml
index 651f5f3..5ff2885 100644
--- a/components/camel-jackson/pom.xml
+++ b/components/camel-jackson/pom.xml
@@ -36,7 +36,6 @@
           com.fasterxml.jackson.*;version="[2.6,3)"
         </camel.osgi.import.before.defaults>
         
<camel.osgi.export.pkg>org.apache.camel.component.jackson.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=json-jackson</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jacksonxml/pom.xml 
b/components/camel-jacksonxml/pom.xml
index d54ad73..54100f6 100644
--- a/components/camel-jacksonxml/pom.xml
+++ b/components/camel-jacksonxml/pom.xml
@@ -36,7 +36,6 @@
       com.fasterxml.jackson.*;version="[2.3,3)"
     </camel.osgi.import.before.defaults>
     
<camel.osgi.export.pkg>org.apache.camel.component.jacksonxml.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=jacksonxml</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-jaxb/pom.xml b/components/camel-jaxb/pom.xml
index 3d7c404..f6b1ab5 100644
--- a/components/camel-jaxb/pom.xml
+++ b/components/camel-jaxb/pom.xml
@@ -36,7 +36,6 @@
                        
com.sun.xml.bind.marshaller;resolution:=optional;version="[2.2,3)"
                </camel.osgi.import.before.defaults>
                
<camel.osgi.export.pkg>org.apache.camel.converter.jaxb.*</camel.osgi.export.pkg>
-               
<camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=jaxb</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jbpm/pom.xml b/components/camel-jbpm/pom.xml
index bf0091d..d313439 100644
--- a/components/camel-jbpm/pom.xml
+++ b/components/camel-jbpm/pom.xml
@@ -34,7 +34,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.jbpm.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jbpm</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jcache/pom.xml b/components/camel-jcache/pom.xml
index b2ad1c4..8443e0f 100644
--- a/components/camel-jcache/pom.xml
+++ b/components/camel-jcache/pom.xml
@@ -37,9 +37,6 @@
       org.apache.camel.component.jcache.*,
       org.apache.camel.component.jcache.processor.idempotent.*,
     </camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=jcache
-    </camel.osgi.export.service>
   </properties>
 
 
diff --git a/components/camel-jclouds/pom.xml b/components/camel-jclouds/pom.xml
index 91e893f..3942880 100644
--- a/components/camel-jclouds/pom.xml
+++ b/components/camel-jclouds/pom.xml
@@ -37,7 +37,6 @@
     </camel.osgi.import.before.defaults>
 
     
<camel.osgi.export.pkg>org.apache.camel.component.jclouds.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jclouds</camel.osgi.export.service>
 
     <!-- jclouds requires guice 3 -->
     
<google-guava-version>${jclouds-google-guava-version}</google-guava-version>
diff --git a/components/camel-jcr/pom.xml b/components/camel-jcr/pom.xml
index dd89483..85e1a6b 100644
--- a/components/camel-jcr/pom.xml
+++ b/components/camel-jcr/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.jcr.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jcr</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-jdbc/pom.xml b/components/camel-jdbc/pom.xml
index 750971f..a912063 100644
--- a/components/camel-jdbc/pom.xml
+++ b/components/camel-jdbc/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.jdbc.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jdbc</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-jetty-common/pom.xml 
b/components/camel-jetty-common/pom.xml
index 2385780..7c786b7 100644
--- a/components/camel-jetty-common/pom.xml
+++ b/components/camel-jetty-common/pom.xml
@@ -36,7 +36,6 @@
             javax.servlet.*;version="${servlet-version-range}"
         </camel.osgi.import.before.defaults>
         
<camel.osgi.export.pkg>org.apache.camel.component.jetty</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jetty</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jetty/pom.xml b/components/camel-jetty/pom.xml
index 8e2eb97..6cd66be 100644
--- a/components/camel-jetty/pom.xml
+++ b/components/camel-jetty/pom.xml
@@ -36,7 +36,6 @@
             javax.servlet.*;version="${servlet-version-range}"
         </camel.osgi.import.before.defaults>
         
<camel.osgi.export.pkg>org.apache.camel.component.jetty9</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jetty</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jetty9/pom.xml b/components/camel-jetty9/pom.xml
index b516667..1263b0a 100644
--- a/components/camel-jetty9/pom.xml
+++ b/components/camel-jetty9/pom.xml
@@ -36,7 +36,6 @@
       javax.servlet.*;version="${servlet-version-range}"
     </camel.osgi.import.before.defaults>
     
<camel.osgi.export.pkg>org.apache.camel.component.jetty9</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jetty</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-jgroups-raft/pom.xml 
b/components/camel-jgroups-raft/pom.xml
index 5308566..a82389b 100644
--- a/components/camel-jgroups-raft/pom.xml
+++ b/components/camel-jgroups-raft/pom.xml
@@ -33,7 +33,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.jgroups-raft</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jgroups-raft</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jgroups/pom.xml b/components/camel-jgroups/pom.xml
index 3bf7a7f..749e5e7 100644
--- a/components/camel-jgroups/pom.xml
+++ b/components/camel-jgroups/pom.xml
@@ -33,7 +33,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.jgroups</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jgroups</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jibx/pom.xml b/components/camel-jibx/pom.xml
index 0b5f388..7e8a9ea 100644
--- a/components/camel-jibx/pom.xml
+++ b/components/camel-jibx/pom.xml
@@ -33,7 +33,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.dataformat.jibx.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=jibx</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jing/pom.xml b/components/camel-jing/pom.xml
index 6692ca9..55b8ad0 100644
--- a/components/camel-jing/pom.xml
+++ b/components/camel-jing/pom.xml
@@ -33,10 +33,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.validator.jing.*</camel.osgi.export.pkg>
-        <camel.osgi.export.service>
-          org.apache.camel.spi.ComponentResolver;component=rnc,
-          org.apache.camel.spi.ComponentResolver;component=rng
-        </camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml
index 7173b20..4092434 100644
--- a/components/camel-jms/pom.xml
+++ b/components/camel-jms/pom.xml
@@ -34,7 +34,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.jms.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jms</camel.osgi.export.service>
     
<camel.osgi.import.additional>javax.jms;version="[1.1,3)"</camel.osgi.import.additional>
   </properties>
 
diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml
index b341402..fdb91f4 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -33,7 +33,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.jmx.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jmx</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-johnzon/pom.xml b/components/camel-johnzon/pom.xml
index 9409be7..b0dd903 100644
--- a/components/camel-johnzon/pom.xml
+++ b/components/camel-johnzon/pom.xml
@@ -33,7 +33,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.johnzon.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=json-johnzon</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jolt/pom.xml b/components/camel-jolt/pom.xml
index 1141174..43884d3 100644
--- a/components/camel-jolt/pom.xml
+++ b/components/camel-jolt/pom.xml
@@ -34,10 +34,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.jolt.*</camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=jolt,
-      org.apache.camel.spi.LanguageResolver;language=jolt
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index c03261f..aac7c35 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -47,7 +47,6 @@
       javassist.util.proxy;resolution:=optional,
       *
     </camel.osgi.import.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jpa</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml
index e367c4c..8ec5357 100644
--- a/components/camel-jsch/pom.xml
+++ b/components/camel-jsch/pom.xml
@@ -36,7 +36,6 @@
         com.jcraft.jsch.*;version="[0.1.40,0.2)"
     </camel.osgi.import.before.defaults>
     
<camel.osgi.export.pkg>org.apache.camel.component.scp.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=scp</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-json-validator/pom.xml 
b/components/camel-json-validator/pom.xml
index a9ec4a1..3c3b96b 100644
--- a/components/camel-json-validator/pom.xml
+++ b/components/camel-json-validator/pom.xml
@@ -31,9 +31,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.jsonvalidator.*</camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=json-validator
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-jsonpath/pom.xml 
b/components/camel-jsonpath/pom.xml
index ee4c56c..6c5a331 100644
--- a/components/camel-jsonpath/pom.xml
+++ b/components/camel-jsonpath/pom.xml
@@ -37,7 +37,6 @@
       org.apache.camel.jsonpath,
       org.apache.camel.jsonpath.*
     </camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.LanguageResolver;language=jsonpath</camel.osgi.export.service>
     <camel.osgi.import>
       com.fasterxml.jackson.databind;resolution:=optional,
       com.fasterxml.jackson.module.jaxb;resolution:=optional,
diff --git a/components/camel-jt400/pom.xml b/components/camel-jt400/pom.xml
index 398f0a2..e6b7424 100644
--- a/components/camel-jt400/pom.xml
+++ b/components/camel-jt400/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.jt400.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jt400</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml
index 3740d41..070e38f 100644
--- a/components/camel-kafka/pom.xml
+++ b/components/camel-kafka/pom.xml
@@ -37,9 +37,6 @@
       org.apache.camel.component.kafka.*,
       org.apache.camel.processor.idempotent.kafka
     </camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=kafka,
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-kubernetes/pom.xml 
b/components/camel-kubernetes/pom.xml
index b821e63..207112f 100644
--- a/components/camel-kubernetes/pom.xml
+++ b/components/camel-kubernetes/pom.xml
@@ -33,7 +33,6 @@
 
    <properties>
       
<camel.osgi.export.pkg>org.apache.camel.component.kubernetes.*</camel.osgi.export.pkg>
-      
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=kubernetes</camel.osgi.export.service>
    </properties>
 
   <dependencies>
diff --git a/components/camel-ldap/pom.xml b/components/camel-ldap/pom.xml
index 0bfe215..f0195cd 100644
--- a/components/camel-ldap/pom.xml
+++ b/components/camel-ldap/pom.xml
@@ -33,7 +33,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.ldap.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=ldap</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-ldif/pom.xml b/components/camel-ldif/pom.xml
index 665fd1b..0de9984 100644
--- a/components/camel-ldif/pom.xml
+++ b/components/camel-ldif/pom.xml
@@ -34,7 +34,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.ldif.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=ldif</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-lucene/pom.xml b/components/camel-lucene/pom.xml
index 6e21d23..5ac0fc1 100644
--- a/components/camel-lucene/pom.xml
+++ b/components/camel-lucene/pom.xml
@@ -43,7 +43,6 @@
       ${camel.osgi.import.defaults},
       *
     </camel.osgi.import.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=lucene</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-lumberjack/pom.xml 
b/components/camel-lumberjack/pom.xml
index a5b57bf..56586a0 100644
--- a/components/camel-lumberjack/pom.xml
+++ b/components/camel-lumberjack/pom.xml
@@ -35,9 +35,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.lumberjack.*</camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=lumberjack
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-lzf/pom.xml b/components/camel-lzf/pom.xml
index 7ad9ec2..d4d0afe 100644
--- a/components/camel-lzf/pom.xml
+++ b/components/camel-lzf/pom.xml
@@ -39,7 +39,6 @@
     <camel.osgi.export>
        org.apache.camel.dataformat.lzf;${camel.osgi.version},
     </camel.osgi.export>
-    
<camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=lzf</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml
index d9697d9..eb64d15 100644
--- a/components/camel-mail/pom.xml
+++ b/components/camel-mail/pom.xml
@@ -36,16 +36,6 @@
           org.apache.camel.component.mail.*,
           org.apache.camel.dataformat.mime.multipart.*
         </camel.osgi.export.pkg>
-        <camel.osgi.export.service>
-          org.apache.camel.spi.ComponentResolver;component=imap,
-          org.apache.camel.spi.ComponentResolver;component=imaps,
-          org.apache.camel.spi.ComponentResolver;component=nntp,
-          org.apache.camel.spi.ComponentResolver;component=pop3,
-          org.apache.camel.spi.ComponentResolver;component=pop3s,
-          org.apache.camel.spi.ComponentResolver;component=smtp,
-          org.apache.camel.spi.ComponentResolver;component=smtps,
-          org.apache.camel.spi.DataFormatResolver;dataformat=mime-multipart
-        </camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-master/pom.xml b/components/camel-master/pom.xml
index 4349316..31dc2ef 100644
--- a/components/camel-master/pom.xml
+++ b/components/camel-master/pom.xml
@@ -35,7 +35,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.master</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=master</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-metrics/pom.xml b/components/camel-metrics/pom.xml
index 3c47399..e49c4ec 100644
--- a/components/camel-metrics/pom.xml
+++ b/components/camel-metrics/pom.xml
@@ -35,7 +35,6 @@
     <camel.osgi.export.pkg>
       org.apache.camel.component.metrics.*
     </camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=metrics</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-micrometer/pom.xml 
b/components/camel-micrometer/pom.xml
index 39bfc7c..fc47720 100644
--- a/components/camel-micrometer/pom.xml
+++ b/components/camel-micrometer/pom.xml
@@ -36,8 +36,6 @@
         <camel.osgi.export.pkg>
             org.apache.camel.component.micrometer.*
         </camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=micrometer
-        </camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-milo/pom.xml b/components/camel-milo/pom.xml
index b16dcca..bd60cd9 100644
--- a/components/camel-milo/pom.xml
+++ b/components/camel-milo/pom.xml
@@ -40,10 +40,6 @@
     <camel.osgi.import.before.defaults>
       com.google.common.*;version="19.0.0"
     </camel.osgi.import.before.defaults>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=milo-client,
-      org.apache.camel.spi.ComponentResolver;component=milo-server
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-mina2/pom.xml b/components/camel-mina2/pom.xml
index ae11e46..6249b39 100644
--- a/components/camel-mina2/pom.xml
+++ b/components/camel-mina2/pom.xml
@@ -34,7 +34,6 @@
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.mina2.*</camel.osgi.export.pkg>
         
<camel.osgi.import.before.defaults>org.apache.mina.*;version="[2.0,3.0)"</camel.osgi.import.before.defaults>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=mina2</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-mllp/pom.xml b/components/camel-mllp/pom.xml
index 9eab605..679477b 100644
--- a/components/camel-mllp/pom.xml
+++ b/components/camel-mllp/pom.xml
@@ -39,7 +39,6 @@
       org.apache.camel.component.mllp.*,
       org.apache.camel.processor.mllp.*
     </camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=mllp</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-mongodb-gridfs/pom.xml 
b/components/camel-mongodb-gridfs/pom.xml
index 4b96a92..7f0d163 100644
--- a/components/camel-mongodb-gridfs/pom.xml
+++ b/components/camel-mongodb-gridfs/pom.xml
@@ -34,7 +34,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.gridfs.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=gridfs</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-mongodb3/pom.xml 
b/components/camel-mongodb3/pom.xml
index 8409b3c..ed91c91 100644
--- a/components/camel-mongodb3/pom.xml
+++ b/components/camel-mongodb3/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.mongodb3.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=mongodb3</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-mqtt/pom.xml b/components/camel-mqtt/pom.xml
index fe0b372..12433cf 100644
--- a/components/camel-mqtt/pom.xml
+++ b/components/camel-mqtt/pom.xml
@@ -33,7 +33,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.mqtt.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=mqtt</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-msv/pom.xml b/components/camel-msv/pom.xml
index d4598be..6bc96fc 100644
--- a/components/camel-msv/pom.xml
+++ b/components/camel-msv/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.validator.msv.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=msv</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-mustache/pom.xml 
b/components/camel-mustache/pom.xml
index d43a59f..0a9bde9 100644
--- a/components/camel-mustache/pom.xml
+++ b/components/camel-mustache/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.mustache.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=mustache</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-mvel/pom.xml b/components/camel-mvel/pom.xml
index 04e67b4..5a7269c 100644
--- a/components/camel-mvel/pom.xml
+++ b/components/camel-mvel/pom.xml
@@ -36,10 +36,6 @@
       org.apache.camel.component.mvel.*,
       org.apache.camel.language.mvel.*
     </camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=mvel,
-      org.apache.camel.spi.LanguageResolver;language=mvel
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-mybatis/pom.xml b/components/camel-mybatis/pom.xml
index 72d8ed1..038827f 100644
--- a/components/camel-mybatis/pom.xml
+++ b/components/camel-mybatis/pom.xml
@@ -36,7 +36,6 @@
          org.apache.ibatis.*;version="[3,4)"
        </camel.osgi.import.before.defaults>
        
<camel.osgi.export.pkg>org.apache.camel.component.mybatis.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=mybatis</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-nagios/pom.xml b/components/camel-nagios/pom.xml
index 65714b0..fac44eb 100644
--- a/components/camel-nagios/pom.xml
+++ b/components/camel-nagios/pom.xml
@@ -35,7 +35,6 @@
     <camel.osgi.export.pkg>
       org.apache.camel.component.nagios.*
     </camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=nagios</camel.osgi.export.service>
   </properties>
 
   <repositories>
diff --git a/components/camel-nats/pom.xml b/components/camel-nats/pom.xml
index 4cf3efd..3f32f1c 100644
--- a/components/camel-nats/pom.xml
+++ b/components/camel-nats/pom.xml
@@ -33,7 +33,6 @@
 
    <properties>
       
<camel.osgi.export.pkg>org.apache.camel.component.nats.*</camel.osgi.export.pkg>
-      
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=nats</camel.osgi.export.service>
    </properties>
 
   <dependencies>
diff --git a/components/camel-netty4-http/pom.xml 
b/components/camel-netty4-http/pom.xml
index 24ab150..89c9844 100644
--- a/components/camel-netty4-http/pom.xml
+++ b/components/camel-netty4-http/pom.xml
@@ -35,7 +35,6 @@
     <camel.osgi.export.pkg>
       org.apache.camel.component.netty4.http.*
     </camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=netty4-http</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-netty4/pom.xml b/components/camel-netty4/pom.xml
index c147e4e..8564c44 100644
--- a/components/camel-netty4/pom.xml
+++ b/components/camel-netty4/pom.xml
@@ -35,7 +35,6 @@
                <camel.osgi.export.pkg>
                        org.apache.camel.component.netty4.*
                </camel.osgi.export.pkg>
-               
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=netty</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-nsq/pom.xml b/components/camel-nsq/pom.xml
index 0e3cbe8..c922b30 100644
--- a/components/camel-nsq/pom.xml
+++ b/components/camel-nsq/pom.xml
@@ -33,7 +33,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.nsq.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=nsq</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-ognl/pom.xml b/components/camel-ognl/pom.xml
index 895a734..cd278e9 100644
--- a/components/camel-ognl/pom.xml
+++ b/components/camel-ognl/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.language.ognl.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.LanguageResolver;language=ognl</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-optaplanner/pom.xml 
b/components/camel-optaplanner/pom.xml
index f6aaa21..a15eed3 100644
--- a/components/camel-optaplanner/pom.xml
+++ b/components/camel-optaplanner/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.optaplanner.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=optaplanner</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-paho/pom.xml b/components/camel-paho/pom.xml
index da01777..cd98026 100644
--- a/components/camel-paho/pom.xml
+++ b/components/camel-paho/pom.xml
@@ -34,7 +34,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.paho.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=paho</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-paxlogging/pom.xml 
b/components/camel-paxlogging/pom.xml
index 3ce1604..26b3f38 100644
--- a/components/camel-paxlogging/pom.xml
+++ b/components/camel-paxlogging/pom.xml
@@ -33,7 +33,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.paxlogging</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=paxlogging</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-pdf/pom.xml b/components/camel-pdf/pom.xml
index 8df8f8f..8eeab75 100644
--- a/components/camel-pdf/pom.xml
+++ b/components/camel-pdf/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.pdf.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=pdf</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-pgevent/pom.xml b/components/camel-pgevent/pom.xml
index 9313212..4aa27c8 100644
--- a/components/camel-pgevent/pom.xml
+++ b/components/camel-pgevent/pom.xml
@@ -34,7 +34,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.pgevent.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=pgevent</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-printer/pom.xml b/components/camel-printer/pom.xml
index abe4c83..84b0a7f 100644
--- a/components/camel-printer/pom.xml
+++ b/components/camel-printer/pom.xml
@@ -33,7 +33,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.printer.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=lpr</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-protobuf/pom.xml 
b/components/camel-protobuf/pom.xml
index b2c57dc..3fcc3bd 100644
--- a/components/camel-protobuf/pom.xml
+++ b/components/camel-protobuf/pom.xml
@@ -35,7 +35,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.dataformat.protobuf.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=protobuf</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-pubnub/pom.xml b/components/camel-pubnub/pom.xml
index 9b833c5..130f924 100644
--- a/components/camel-pubnub/pom.xml
+++ b/components/camel-pubnub/pom.xml
@@ -35,7 +35,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.pubnub.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=pubnub</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-quartz2/pom.xml b/components/camel-quartz2/pom.xml
index eacda9f..a2afcbd 100644
--- a/components/camel-quartz2/pom.xml
+++ b/components/camel-quartz2/pom.xml
@@ -44,7 +44,6 @@
       ${camel.osgi.import.defaults},
       *
     </camel.osgi.import.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=quartz2</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-quickfix/pom.xml 
b/components/camel-quickfix/pom.xml
index 83032c7..22f1a0b 100644
--- a/components/camel-quickfix/pom.xml
+++ b/components/camel-quickfix/pom.xml
@@ -34,7 +34,6 @@
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.quickfixj.*</camel.osgi.export.pkg>
     
<camel.osgi.import.additional>org.slf4j*;resolution:=optional</camel.osgi.import.additional>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=quickfix</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-rabbitmq/pom.xml 
b/components/camel-rabbitmq/pom.xml
index 5f0865d..953ccdf 100644
--- a/components/camel-rabbitmq/pom.xml
+++ b/components/camel-rabbitmq/pom.xml
@@ -35,7 +35,6 @@
     <camel.osgi.export.pkg>
       org.apache.camel.component.rabbitmq.*
     </camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=rabbitmq</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-reactive-streams/pom.xml 
b/components/camel-reactive-streams/pom.xml
index 5746812..4d7f158 100644
--- a/components/camel-reactive-streams/pom.xml
+++ b/components/camel-reactive-streams/pom.xml
@@ -34,7 +34,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.reactive.streams.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=reactive-streams</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-rest-swagger/pom.xml 
b/components/camel-rest-swagger/pom.xml
index 139bdab..dcc5a3e 100644
--- a/components/camel-rest-swagger/pom.xml
+++ b/components/camel-rest-swagger/pom.xml
@@ -37,7 +37,6 @@
     <firstVersion>2.19.0</firstVersion>
     <label>rest,api,http</label>
     
<camel.osgi.export.pkg>org.apache.camel.component.rest.swagger.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=rest-swagger</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-restlet/pom.xml b/components/camel-restlet/pom.xml
index 57512e8..2e97d92 100644
--- a/components/camel-restlet/pom.xml
+++ b/components/camel-restlet/pom.xml
@@ -36,7 +36,6 @@
     <camel.osgi.export.pkg>
       org.apache.camel.component.restlet.*
     </camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=restlet</camel.osgi.export.service>
   </properties>
 
   <repositories>
diff --git a/components/camel-rmi/pom.xml b/components/camel-rmi/pom.xml
index 7cc4722..0357b03 100644
--- a/components/camel-rmi/pom.xml
+++ b/components/camel-rmi/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
        
<camel.osgi.export.pkg>org.apache.camel.component.rmi.*</camel.osgi.export.pkg>
-       
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=rmi</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-rss/pom.xml b/components/camel-rss/pom.xml
index c6cb38f..baa6a69 100644
--- a/components/camel-rss/pom.xml
+++ b/components/camel-rss/pom.xml
@@ -33,10 +33,6 @@
   
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.rss.*;${camel.osgi.version},org.apache.camel.dataformat.rss.*</camel.osgi.export.pkg>
-        <camel.osgi.export.service>
-            org.apache.camel.spi.ComponentResolver;component=rss,
-            org.apache.camel.spi.DataFormatResolver;dataformat=rss
-        </camel.osgi.export.service>
     </properties>
  
     <dependencies>
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml 
b/components/camel-salesforce/camel-salesforce-component/pom.xml
index 9c70329..67870ec 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -38,7 +38,6 @@
       org.apache.camel.component.salesforce,
       org.apache.camel.component.salesforce.api.*
     </camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=salesforce</camel.osgi.export.service>
     
<camel.osgi.private.pkg>org.apache.camel.component.salesforce.internal.*</camel.osgi.private.pkg>
     <salesforce.component.root>..</salesforce.component.root>
   </properties>
diff --git a/components/camel-sap-netweaver/pom.xml 
b/components/camel-sap-netweaver/pom.xml
index f67c0fd..3866552 100644
--- a/components/camel-sap-netweaver/pom.xml
+++ b/components/camel-sap-netweaver/pom.xml
@@ -33,7 +33,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.sap.netweaver.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=sap-netweaver</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-saxon/pom.xml b/components/camel-saxon/pom.xml
index a1f12d2..678c8101 100644
--- a/components/camel-saxon/pom.xml
+++ b/components/camel-saxon/pom.xml
@@ -37,10 +37,6 @@
       org.apache.camel.language.xquery.*,
       org.apache.camel.converter.saxon.*
     </camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=xquery,
-      org.apache.camel.spi.LanguageResolver;language=xquery
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-schematron/pom.xml 
b/components/camel-schematron/pom.xml
index c8e6671..adb6ed0 100644
--- a/components/camel-schematron/pom.xml
+++ b/components/camel-schematron/pom.xml
@@ -34,7 +34,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.schematron.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=schematron</camel.osgi.export.service>
     </properties>
     
     <dependencies>
diff --git a/components/camel-service/pom.xml b/components/camel-service/pom.xml
index 65eea08..d80c756 100644
--- a/components/camel-service/pom.xml
+++ b/components/camel-service/pom.xml
@@ -35,7 +35,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.service</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=service</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-servicenow/camel-servicenow-component/pom.xml 
b/components/camel-servicenow/camel-servicenow-component/pom.xml
index 541a80f6..f37df53 100644
--- a/components/camel-servicenow/camel-servicenow-component/pom.xml
+++ b/components/camel-servicenow/camel-servicenow-component/pom.xml
@@ -36,9 +36,6 @@
     <camel.osgi.export.pkg>
       org.apache.camel.component.servicenow.*
     </camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=servicenow
-    </camel.osgi.export.service>
   </properties>
 
 
diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml
index d0e2ff4..f3972b7 100644
--- a/components/camel-servlet/pom.xml
+++ b/components/camel-servlet/pom.xml
@@ -36,7 +36,6 @@
       javax.servlet.*;version="${servlet-version-range}"
     </camel.osgi.import.before.defaults>
     
<camel.osgi.export.pkg>org.apache.camel.component.servlet.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=servlet</camel.osgi.export.service>
 
     <!-- used for testing -->
     <tomcat.version>8.5.0</tomcat.version>
diff --git a/components/camel-sip/pom.xml b/components/camel-sip/pom.xml
index 27b9a4a..d072bef 100644
--- a/components/camel-sip/pom.xml
+++ b/components/camel-sip/pom.xml
@@ -36,7 +36,6 @@
                <camel.osgi.export.pkg>
                        org.apache.camel.component.sip.*
                </camel.osgi.export.pkg>
-               
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=sip</camel.osgi.export.service>
        </properties>
        
        <dependencies>
diff --git a/components/camel-sjms/pom.xml b/components/camel-sjms/pom.xml
index a5c3c3c..b407bb2 100644
--- a/components/camel-sjms/pom.xml
+++ b/components/camel-sjms/pom.xml
@@ -43,10 +43,6 @@
       org.apache.camel.component.sjms.taskmanager,
       org.apache.camel.component.sjms.tx
     </camel.osgi.private.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=sjms,
-      org.apache.camel.spi.ComponentResolver;component=sjms-batch
-    </camel.osgi.export.service>
     
<camel.osgi.import.additional>javax.jms;version="[1.1,3)"</camel.osgi.import.additional>
   </properties>
 
diff --git a/components/camel-sjms2/pom.xml b/components/camel-sjms2/pom.xml
index b8cf2f7..a558c17 100644
--- a/components/camel-sjms2/pom.xml
+++ b/components/camel-sjms2/pom.xml
@@ -37,9 +37,6 @@
       org.apache.camel.component.sjms2,
       org.apache.camel.component.sjms2.jms
     </camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=sjms2
-    </camel.osgi.export.service>
     
<camel.osgi.import.additional>javax.jms;version="[2,3)"</camel.osgi.import.additional>
   </properties>
 
diff --git a/components/camel-slack/pom.xml b/components/camel-slack/pom.xml
index 658621d..66ac1dd 100644
--- a/components/camel-slack/pom.xml
+++ b/components/camel-slack/pom.xml
@@ -34,7 +34,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.slack.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=slack</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-smpp/pom.xml b/components/camel-smpp/pom.xml
index 8bcaf2c..58ca5b5 100644
--- a/components/camel-smpp/pom.xml
+++ b/components/camel-smpp/pom.xml
@@ -33,10 +33,6 @@
 
     <properties>
       
<camel.osgi.export.pkg>org.apache.camel.component.smpp.*</camel.osgi.export.pkg>
-        <camel.osgi.export.service>
-          org.apache.camel.spi.ComponentResolver;component=smpp,
-          org.apache.camel.spi.ComponentResolver;component=smpps
-        </camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-snakeyaml/pom.xml 
b/components/camel-snakeyaml/pom.xml
index dc3fd3a..b8665ee 100644
--- a/components/camel-snakeyaml/pom.xml
+++ b/components/camel-snakeyaml/pom.xml
@@ -33,7 +33,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.snakeyaml.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=yaml-snakeyaml</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-snmp/pom.xml b/components/camel-snmp/pom.xml
index e6938c3..d2fd83f 100644
--- a/components/camel-snmp/pom.xml
+++ b/components/camel-snmp/pom.xml
@@ -33,7 +33,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.snmp.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=snmp</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index 9912488..f90e396 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -38,7 +38,6 @@
           org.xmlsoap.schemas.soap.envelope.*,
           org.w3._2003._05.soap_envelope.*
         </camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=soapjaxb</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-solr/pom.xml b/components/camel-solr/pom.xml
index 7cc1490..2632e09 100644
--- a/components/camel-solr/pom.xml
+++ b/components/camel-solr/pom.xml
@@ -34,7 +34,6 @@
     <camel.osgi.export.pkg>
       org.apache.camel.component.solr.*;${camel.osgi.version}
     </camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=solr</camel.osgi.export.service>
     <java.awt.headless>true</java.awt.headless>
     
<solr-test-framework-jetty-version>9.4.11.v20180605</solr-test-framework-jetty-version>
   </properties>
diff --git a/components/camel-spark/pom.xml b/components/camel-spark/pom.xml
index dfb5c1b..b438f1d 100644
--- a/components/camel-spark/pom.xml
+++ b/components/camel-spark/pom.xml
@@ -35,7 +35,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.spark.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=spark</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-splunk/pom.xml b/components/camel-splunk/pom.xml
index 3c48559..675c6b6 100644
--- a/components/camel-splunk/pom.xml
+++ b/components/camel-splunk/pom.xml
@@ -36,7 +36,6 @@
       org.joda.time.*;version="[1.6,3)"
     </camel.osgi.import.before.defaults>
     
<camel.osgi.export.pkg>org.apache.camel.component.splunk.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=splunk</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-spring-batch/pom.xml 
b/components/camel-spring-batch/pom.xml
index d5360ee..7b8134f 100644
--- a/components/camel-spring-batch/pom.xml
+++ b/components/camel-spring-batch/pom.xml
@@ -34,7 +34,6 @@
         
<camel.osgi.export.pkg>org.apache.camel.component.spring.batch.*</camel.osgi.export.pkg>
         
<camel.osgi.import.before.defaults>org.springframework.batch.*;version="[4,6)"
         </camel.osgi.import.before.defaults>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=spring-batch</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-spring-integration/pom.xml 
b/components/camel-spring-integration/pom.xml
index 9ad10ab..50d70ae 100644
--- a/components/camel-spring-integration/pom.xml
+++ b/components/camel-spring-integration/pom.xml
@@ -37,7 +37,6 @@
             org.springframework.integration.*;version="[4.2,5)",
             org.springframework.messaging.*;version="[4.2,5)"
         </camel.osgi.import.before.defaults>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=spring-integration</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-spring-ldap/pom.xml 
b/components/camel-spring-ldap/pom.xml
index f710e4d..5636f57 100644
--- a/components/camel-spring-ldap/pom.xml
+++ b/components/camel-spring-ldap/pom.xml
@@ -36,9 +36,6 @@
             org.springframework.transaction.compensating.*;version="[2,3)"
         </camel.osgi.import.before.defaults>
         
<camel.osgi.export.pkg>org.apache.camel.component.springldap.*</camel.osgi.export.pkg>
-        <camel.osgi.export.service>
-            org.apache.camel.spi.ComponentResolver;component=spring-ldap
-        </camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-spring-redis/pom.xml 
b/components/camel-spring-redis/pom.xml
index 2960a33..4dee6a2 100644
--- a/components/camel-spring-redis/pom.xml
+++ b/components/camel-spring-redis/pom.xml
@@ -34,7 +34,6 @@
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.redis.*</camel.osgi.export.pkg>
     
<camel.osgi.import.before.defaults>org.springframework.data.*;version="[1.0,2)"</camel.osgi.import.before.defaults>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=redis</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-spring-ws/pom.xml 
b/components/camel-spring-ws/pom.xml
index e306fbe..8e60556 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -39,7 +39,6 @@
       org.springframework.util.*;version="${spring-version-range}"
     </camel.osgi.import.before.defaults>
     
<camel.osgi.export.pkg>org.apache.camel.component.spring.ws.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=spring-ws</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 03954ea..8780171 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -61,10 +61,6 @@
       
org.apache.camel.component.event;${camel.osgi.split.pkg};${camel.osgi.version},
       
org.apache.camel.language.spel;${camel.osgi.split.pkg};${camel.osgi.version}
     </camel.osgi.export>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=spring-event,
-      org.apache.camel.spi.LanguageResolver;language=spel
-    </camel.osgi.export.service>
     <!-- do not skip any tests by default -->
     <platform.skip.tests/>
   </properties>
diff --git a/components/camel-sql/pom.xml b/components/camel-sql/pom.xml
index dd02c1c..ca98578 100644
--- a/components/camel-sql/pom.xml
+++ b/components/camel-sql/pom.xml
@@ -44,10 +44,6 @@
       ${camel.osgi.import.defaults},
       *
     </camel.osgi.import.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.ComponentResolver;component=sql,
-      org.apache.camel.spi.ComponentResolver;component=sql-stored
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-ssh/pom.xml b/components/camel-ssh/pom.xml
index fa5cb4c..32f33de 100644
--- a/components/camel-ssh/pom.xml
+++ b/components/camel-ssh/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.ssh.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=ssh</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-stax/pom.xml b/components/camel-stax/pom.xml
index 7ee098e..59b6fa5 100644
--- a/components/camel-stax/pom.xml
+++ b/components/camel-stax/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
       
<camel.osgi.export.pkg>org.apache.camel.component.stax.*</camel.osgi.export.pkg>
-      
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=stax</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-stomp/pom.xml b/components/camel-stomp/pom.xml
index 8ac4562..b0dcb49 100644
--- a/components/camel-stomp/pom.xml
+++ b/components/camel-stomp/pom.xml
@@ -34,7 +34,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.stomp.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=stomp</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-stream/pom.xml b/components/camel-stream/pom.xml
index 1e1c9e1..26da5c1 100644
--- a/components/camel-stream/pom.xml
+++ b/components/camel-stream/pom.xml
@@ -34,7 +34,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.stream.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=stream</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-stringtemplate/pom.xml 
b/components/camel-stringtemplate/pom.xml
index 4b73808..9388f14 100644
--- a/components/camel-stringtemplate/pom.xml
+++ b/components/camel-stringtemplate/pom.xml
@@ -34,7 +34,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.stringtemplate.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=string-template</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-syslog/pom.xml b/components/camel-syslog/pom.xml
index af7a7a6..5205cc9 100644
--- a/components/camel-syslog/pom.xml
+++ b/components/camel-syslog/pom.xml
@@ -32,7 +32,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.syslog.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=syslog</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-tagsoup/pom.xml b/components/camel-tagsoup/pom.xml
index 0207a42..2253e35 100644
--- a/components/camel-tagsoup/pom.xml
+++ b/components/camel-tagsoup/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.dataformat.tagsoup.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=tidyMarkup</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-tarfile/pom.xml b/components/camel-tarfile/pom.xml
index 6491b56..ed2849d 100644
--- a/components/camel-tarfile/pom.xml
+++ b/components/camel-tarfile/pom.xml
@@ -41,7 +41,6 @@
        org.apache.camel.dataformat.tarfile;${camel.osgi.version},
        org.apache.camel.processor.aggregate.tarfile;${camel.osgi.version}
     </camel.osgi.export>
-    
<camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=tarfile</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-telegram/pom.xml 
b/components/camel-telegram/pom.xml
index 1ee2ae2..a62ebf8 100644
--- a/components/camel-telegram/pom.xml
+++ b/components/camel-telegram/pom.xml
@@ -36,8 +36,6 @@
     <camel.osgi.export.pkg>
       
org.apache.camel.component.telegram.*,org.apache.camel.component.telegram.model.*
     </camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=telegram
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-test-karaf/pom.xml 
b/components/camel-test-karaf/pom.xml
index 54d449e..10f30f5 100644
--- a/components/camel-test-karaf/pom.xml
+++ b/components/camel-test-karaf/pom.xml
@@ -180,6 +180,13 @@
                   <_removeheaders>Import-Package, Private-Package, 
Include-Resource, Karaf-Info, Require-Capability</_removeheaders>
               </instructions>
           </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-bundle-plugin</artifactId>
+            <version>${project.version}</version>
+          </dependency>
+        </dependencies>
       </plugin>
 
     </plugins>
diff --git a/components/camel-thrift/pom.xml b/components/camel-thrift/pom.xml
index 56cce7d..9cd3ce3 100644
--- a/components/camel-thrift/pom.xml
+++ b/components/camel-thrift/pom.xml
@@ -38,10 +38,6 @@
       org.apache.camel.dataformat.thrift.*;${camel.osgi.version},
       org.apache.camel.component.thrift.*;${camel.osgi.version}
     </camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.DataFormatResolver;dataformat=thrift,
-      org.apache.camel.spi.ComponentResolver;component=thrift
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-tika/pom.xml b/components/camel-tika/pom.xml
index a359b58..022f2de 100644
--- a/components/camel-tika/pom.xml
+++ b/components/camel-tika/pom.xml
@@ -34,7 +34,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.tika.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=tika</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-twilio/pom.xml b/components/camel-twilio/pom.xml
index 4ded467..e674e18 100644
--- a/components/camel-twilio/pom.xml
+++ b/components/camel-twilio/pom.xml
@@ -40,7 +40,6 @@
 
     <camel.osgi.export.pkg>${componentPackage}</camel.osgi.export.pkg>
     <camel.osgi.private.pkg>${outPackage}</camel.osgi.private.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=twilio</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-twitter/pom.xml b/components/camel-twitter/pom.xml
index 57dc397..516e48d 100644
--- a/components/camel-twitter/pom.xml
+++ b/components/camel-twitter/pom.xml
@@ -34,7 +34,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.twitter.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=twitter</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-undertow/pom.xml 
b/components/camel-undertow/pom.xml
index 4464913..a126bf9 100644
--- a/components/camel-undertow/pom.xml
+++ b/components/camel-undertow/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.undertow.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=undertow</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-univocity-parsers/pom.xml 
b/components/camel-univocity-parsers/pom.xml
index b1371da..fb475fc 100644
--- a/components/camel-univocity-parsers/pom.xml
+++ b/components/camel-univocity-parsers/pom.xml
@@ -33,11 +33,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.dataformat.univocity.*</camel.osgi.export.pkg>
-        <camel.osgi.export.service>
-            org.apache.camel.spi.DataFormatResolver;dataformat=univocity-csv,
-            org.apache.camel.spi.DataFormatResolver;dataformat=univocity-fixed,
-            org.apache.camel.spi.DataFormatResolver;dataformat=univocity-tsv
-        </camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-velocity/pom.xml 
b/components/camel-velocity/pom.xml
index 7df4419..12d5f0f 100644
--- a/components/camel-velocity/pom.xml
+++ b/components/camel-velocity/pom.xml
@@ -34,7 +34,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.velocity.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=velocity</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-vertx/pom.xml b/components/camel-vertx/pom.xml
index 2dc73c6..fd56ee4 100644
--- a/components/camel-vertx/pom.xml
+++ b/components/camel-vertx/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.vertx.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=vertx</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-weather/pom.xml b/components/camel-weather/pom.xml
index 5df23ed..8b51b83 100644
--- a/components/camel-weather/pom.xml
+++ b/components/camel-weather/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.weather.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=weather</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-web3j/pom.xml b/components/camel-web3j/pom.xml
index 918f5ca..9d82024 100644
--- a/components/camel-web3j/pom.xml
+++ b/components/camel-web3j/pom.xml
@@ -33,7 +33,6 @@
 
     <properties>
         
<camel.osgi.export.pkg>org.apache.camel.component.web3j.*</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=web3j</camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-websocket-jsr356/pom.xml 
b/components/camel-websocket-jsr356/pom.xml
index f805504..d9ce398 100644
--- a/components/camel-websocket-jsr356/pom.xml
+++ b/components/camel-websocket-jsr356/pom.xml
@@ -45,7 +45,6 @@
       ${camel.osgi.import.defaults},
       *
     </camel.osgi.import.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=websocket-jsr356</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-websocket/pom.xml 
b/components/camel-websocket/pom.xml
index e9e893d..7c0e5aa 100644
--- a/components/camel-websocket/pom.xml
+++ b/components/camel-websocket/pom.xml
@@ -43,7 +43,6 @@
       ${camel.osgi.import.defaults},
       *
     </camel.osgi.import.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=websocket</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-wordpress/pom.xml 
b/components/camel-wordpress/pom.xml
index 0a146fb..b86d93c 100644
--- a/components/camel-wordpress/pom.xml
+++ b/components/camel-wordpress/pom.xml
@@ -39,7 +39,6 @@
                <camel.osgi.export.pkg>
                        org.apache.camel.component.wordpress.*,
                </camel.osgi.export.pkg>
-               
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=wordpress</camel.osgi.export.service>
        </properties>
 
        <dependencies>
diff --git a/components/camel-xchange/pom.xml b/components/camel-xchange/pom.xml
index 158972e..c5863a1 100644
--- a/components/camel-xchange/pom.xml
+++ b/components/camel-xchange/pom.xml
@@ -33,7 +33,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.xchange.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=xchange</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-xmlsecurity/pom.xml 
b/components/camel-xmlsecurity/pom.xml
index 6913b26..a5ad8f0 100644
--- a/components/camel-xmlsecurity/pom.xml
+++ b/components/camel-xmlsecurity/pom.xml
@@ -37,10 +37,6 @@
              org.apache.camel.component.xmlsecurity.*;${camel.osgi.version},
              org.apache.camel.dataformat.xmlsecurity.*
         </camel.osgi.export.pkg>
-        <camel.osgi.export.service>
-            org.apache.camel.spi.ComponentResolver;component=xmlsecurity,
-            org.apache.camel.spi.DataFormatResolver;dataformat=secureXML
-        </camel.osgi.export.service>
     </properties>
 
     <dependencies>
diff --git a/components/camel-xmpp/pom.xml b/components/camel-xmpp/pom.xml
index 4cad94c..26de598 100644
--- a/components/camel-xmpp/pom.xml
+++ b/components/camel-xmpp/pom.xml
@@ -34,7 +34,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.xmpp.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=xmpp</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-xstream/pom.xml b/components/camel-xstream/pom.xml
index 3e0b8b7..2c6d4d9 100644
--- a/components/camel-xstream/pom.xml
+++ b/components/camel-xstream/pom.xml
@@ -34,10 +34,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.dataformat.xstream.*</camel.osgi.export.pkg>
-    <camel.osgi.export.service>
-      org.apache.camel.spi.DataFormatResolver;dataformat=xstream,
-      org.apache.camel.spi.DataFormatResolver;dataformat=json-xstream,
-    </camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-yammer/pom.xml b/components/camel-yammer/pom.xml
index ce09ea6..5ea7040 100644
--- a/components/camel-yammer/pom.xml
+++ b/components/camel-yammer/pom.xml
@@ -33,7 +33,6 @@
 
  <properties>
   
<camel.osgi.export.pkg>org.apache.camel.component.yammer.*</camel.osgi.export.pkg>
-  
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=yammer</camel.osgi.export.service>
  </properties>
 
  <dependencies>
diff --git a/components/camel-zipfile/pom.xml b/components/camel-zipfile/pom.xml
index 75b16c0..ea22783 100644
--- a/components/camel-zipfile/pom.xml
+++ b/components/camel-zipfile/pom.xml
@@ -41,7 +41,6 @@
        org.apache.camel.dataformat.zipfile;${camel.osgi.version},
        org.apache.camel.processor.aggregate.zipfile;${camel.osgi.version}
     </camel.osgi.export>
-    
<camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=zipfile</camel.osgi.export.service>
     
   </properties>
 
diff --git a/components/camel-zookeeper-master/pom.xml 
b/components/camel-zookeeper-master/pom.xml
index fc6a7ed..0bdc717 100644
--- a/components/camel-zookeeper-master/pom.xml
+++ b/components/camel-zookeeper-master/pom.xml
@@ -42,7 +42,6 @@
       org.apache.camel.component.zookeepermaster,
       org.apache.camel.component.zookeepermaster.group
     </camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=zookeeper-master</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/camel-zookeeper/pom.xml 
b/components/camel-zookeeper/pom.xml
index b6c4680..aad1c4f 100644
--- a/components/camel-zookeeper/pom.xml
+++ b/components/camel-zookeeper/pom.xml
@@ -34,7 +34,6 @@
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.component.zookeeper.*</camel.osgi.export.pkg>
-    
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=zookeeper</camel.osgi.export.service>
   </properties>
 
   <dependencies>
diff --git a/components/pom.xml b/components/pom.xml
index a22d4fc..681b0a0 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -381,6 +381,27 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <_plugin>
+              org.apache.felix.bundleplugin.BlueprintPlugin,
+              aQute.lib.spring.SpringXMLType,
+              org.apache.felix.bundleplugin.JpaPlugin,
+              org.apache.camel.maven.bundle.CamelPlugin
+            </_plugin>
+          </instructions>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-bundle-plugin</artifactId>
+            <version>${project.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 0f3a2bd..35b48b6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -5319,8 +5319,6 @@
             <Export-Package>${camel.osgi.export}</Export-Package>
             
<DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
             <Private-Package>${camel.osgi.private.pkg}</Private-Package>
-            <Import-Service>${camel.osgi.import.service}</Import-Service>
-            <Export-Service>${camel.osgi.export.service}</Export-Service>
             
<Require-Capability>${camel.osgi.require.capability}</Require-Capability>
             
<Provide-Capability>${camel.osgi.provide.capability}</Provide-Capability>
             <Implementation-Title>Apache Camel</Implementation-Title>
diff --git a/components/camel-jetty/pom.xml 
b/tooling/maven/camel-bundle-plugin/pom.xml
similarity index 53%
copy from components/camel-jetty/pom.xml
copy to tooling/maven/camel-bundle-plugin/pom.xml
index 8e2eb97..c82dd69 100644
--- a/components/camel-jetty/pom.xml
+++ b/tooling/maven/camel-bundle-plugin/pom.xml
@@ -18,32 +18,25 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>components</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>camel-jetty</artifactId>
-    <packaging>jar</packaging>
-    <name>Camel :: Jetty</name>
-    <description>Camel Jetty Component</description>
-
-    <properties>
-        <camel.osgi.import.before.defaults>
-            javax.servlet.*;version="${servlet-version-range}"
-        </camel.osgi.import.before.defaults>
-        
<camel.osgi.export.pkg>org.apache.camel.component.jetty9</camel.osgi.export.pkg>
-        
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jetty</camel.osgi.export.service>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-jetty9</artifactId>
-        </dependency>
-    </dependencies>
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.camel</groupId>
+    <artifactId>maven-plugins</artifactId>
+    <version>3.0.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>camel-bundle-plugin</artifactId>
+  <name>Camel :: Maven Plugins :: Camel Bundle Plugin</name>
+  <description>Plugin for the maven-bundle-plugin</description>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>maven-bundle-plugin</artifactId>
+      <version>${maven-bundle-plugin-version}</version>
+    </dependency>
+  </dependencies>
 
 </project>
diff --git 
a/tooling/maven/camel-bundle-plugin/src/main/java/org/apache/camel/maven/bundle/CamelPlugin.java
 
b/tooling/maven/camel-bundle-plugin/src/main/java/org/apache/camel/maven/bundle/CamelPlugin.java
new file mode 100644
index 0000000..2788bad
--- /dev/null
+++ 
b/tooling/maven/camel-bundle-plugin/src/main/java/org/apache/camel/maven/bundle/CamelPlugin.java
@@ -0,0 +1,63 @@
+/**
+ * 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.maven.bundle;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import aQute.bnd.annotation.plugin.BndPlugin;
+import aQute.bnd.osgi.Analyzer;
+import aQute.bnd.osgi.Jar;
+import aQute.bnd.osgi.Resource;
+import aQute.bnd.service.AnalyzerPlugin;
+
+@BndPlugin(name = "camel")
+public class CamelPlugin implements AnalyzerPlugin {
+
+    @Override
+    public boolean analyzeJar(Analyzer analyzer) {
+        Jar jar = analyzer.getJar();
+        Map<String, Map<String, Resource>> dir = jar.getDirectories();
+
+        Stream<String> components = 
dir.getOrDefault("META-INF/services/org/apache/camel/component", 
Collections.emptyMap())
+                .keySet()
+                .stream()
+                .map(s -> s.substring(s.lastIndexOf('/') + 1))
+                .map(s -> 
"osgi.service;effective:=active;objectClass=\"org.apache.camel.spi.ComponentResolver\";component="
 + s);
+        Stream<String> languages = 
dir.getOrDefault("META-INF/services/org/apache/camel/language", 
Collections.emptyMap())
+                .keySet()
+                .stream()
+                .map(s -> s.substring(s.lastIndexOf('/') + 1))
+                .map(s -> 
"osgi.service;effective:=active;objectClass=\"org.apache.camel.spi.LanguageResolver\";language="
 + s);
+        Stream<String>  dataformats = 
dir.getOrDefault("META-INF/services/org/apache/camel/dataformat", 
Collections.emptyMap())
+                .keySet()
+                .stream()
+                .map(s -> s.substring(s.lastIndexOf('/') + 1))
+                .map(s -> 
"osgi.service;effective:=active;objectClass=\"org.apache.camel.spi.DataformatResolver\";dataformat="
 + s);
+        String header = analyzer.getProperty("Provide-Capability");
+
+        header = Stream.concat(header != null && !header.isEmpty() ? 
Stream.of(header) : Stream.empty(), Stream.concat(components, 
Stream.concat(languages, dataformats)))
+                .collect(Collectors.joining(","));
+
+        analyzer.setProperty("Provide-Capability", header);
+
+        return false;
+    }
+
+}
diff --git a/tooling/maven/pom.xml b/tooling/maven/pom.xml
index 6feeb8e..801e61a 100644
--- a/tooling/maven/pom.xml
+++ b/tooling/maven/pom.xml
@@ -38,6 +38,7 @@
     <module>camel-api-component-maven-plugin</module>
     <module>bom-generator-maven-plugin</module>
     <module>camel-restdsl-swagger-plugin</module>
+    <module>camel-bundle-plugin</module>
   </modules>
 
   <!-- Apply to children. -->