You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2019/01/23 15:03:06 UTC

[camel] branch master updated: [13002] Remove unneeded osgi directives

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 c4f445e  [13002] Remove unneeded osgi directives
c4f445e is described below

commit c4f445e7b95b46a6fc85236d899de226da892572
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Jan 23 14:57:42 2019 +0100

    [13002] Remove unneeded osgi directives
---
 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-as2/camel-as2-component/pom.xml   | 27 ----------------------
 components/camel-asn1/pom.xml                      |  8 -------
 components/camel-asterisk/pom.xml                  |  3 ---
 components/camel-atmos/pom.xml                     |  1 -
 components/camel-atmosphere-websocket/pom.xml      |  3 ---
 components/camel-atom/pom.xml                      |  3 ---
 components/camel-atomix/pom.xml                    | 11 ---------
 components/camel-avro/pom.xml                      |  1 -
 components/camel-aws-xray/pom.xml                  |  1 -
 components/camel-aws/pom.xml                       |  1 -
 components/camel-azure/pom.xml                     |  1 -
 components/camel-barcode/pom.xml                   |  1 -
 components/camel-base64/pom.xml                    |  3 ---
 components/camel-bean-validator/pom.xml            |  1 -
 components/camel-beanio/pom.xml                    |  3 ---
 components/camel-beanstalk/pom.xml                 |  1 -
 components/camel-bindy/pom.xml                     |  3 ---
 components/camel-boon/pom.xml                      |  1 -
 components/camel-box/camel-box-api/pom.xml         |  1 -
 components/camel-box/camel-box-component/pom.xml   |  1 -
 components/camel-braintree/pom.xml                 |  1 -
 components/camel-browse/pom.xml                    |  5 ----
 components/camel-caffeine/pom.xml                  |  3 ---
 components/camel-cassandraql/pom.xml               |  6 -----
 components/camel-cdi/pom.xml                       |  3 ---
 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                    |  1 -
 components/camel-consul/pom.xml                    |  3 ---
 components/camel-controlbus/pom.xml                |  5 ----
 components/camel-corda/pom.xml                     |  1 -
 components/camel-core-osgi/pom.xml                 |  3 ---
 components/camel-core-xml/pom.xml                  |  3 ---
 components/camel-couchbase/pom.xml                 |  1 -
 components/camel-couchdb/pom.xml                   |  1 -
 components/camel-crypto-cms/pom.xml                |  3 ---
 components/camel-crypto/pom.xml                    |  4 ----
 components/camel-csv/pom.xml                       |  1 -
 components/camel-cxf/pom.xml                       | 12 +---------
 components/camel-dataformat/pom.xml                |  5 ----
 components/camel-digitalocean/pom.xml              |  1 -
 components/camel-direct/pom.xml                    |  7 ------
 components/camel-directvm/pom.xml                  |  5 ----
 components/camel-disruptor/pom.xml                 |  1 -
 components/camel-dns/pom.xml                       |  3 ---
 components/camel-docker/pom.xml                    |  1 -
 components/camel-dozer/pom.xml                     |  4 ----
 components/camel-drill/pom.xml                     |  3 ---
 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                     |  3 ---
 components/camel-etcd/pom.xml                      |  1 -
 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-api/pom.xml       |  1 -
 components/camel-fhir/camel-fhir-component/pom.xml |  1 -
 components/camel-file/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                       |  1 -
 components/camel-ganglia/pom.xml                   |  3 ---
 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           |  1 -
 components/camel-google-drive/pom.xml              |  1 -
 components/camel-google-mail/pom.xml               |  1 -
 components/camel-google-pubsub/pom.xml             |  1 -
 components/camel-google-sheets/pom.xml             |  1 -
 components/camel-gora/pom.xml                      |  4 ----
 components/camel-grape/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                 |  5 ----
 components/camel-hbase/pom.xml                     |  1 -
 components/camel-hdfs2/pom.xml                     |  1 -
 components/camel-headersmap/pom.xml                |  1 -
 components/camel-hipchat/pom.xml                   |  1 -
 components/camel-hl7/pom.xml                       |  1 -
 components/camel-http-common/pom.xml               |  1 -
 components/camel-http4/pom.xml                     |  1 -
 components/camel-hystrix/pom.xml                   |  1 -
 components/camel-ical/pom.xml                      |  3 ---
 components/camel-iec60870/pom.xml                  |  3 ---
 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                       |  1 -
 components/camel-ironmq/pom.xml                    |  1 -
 components/camel-jackson/pom.xml                   |  1 -
 components/camel-jacksonxml/pom.xml                |  1 -
 components/camel-jasypt/pom.xml                    |  1 -
 components/camel-jaxb/pom.xml                      |  1 -
 components/camel-jbpm/pom.xml                      |  1 -
 components/camel-jcache/pom.xml                    |  4 ----
 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                      |  1 -
 components/camel-jms/pom.xml                       |  1 -
 components/camel-jmx/pom.xml                       |  1 -
 components/camel-johnzon/pom.xml                   |  1 -
 components/camel-jolt/pom.xml                      |  1 -
 components/camel-jpa/pom.xml                       |  5 ----
 components/camel-jsch/pom.xml                      |  1 -
 components/camel-json-validator/pom.xml            |  1 -
 components/camel-jsonpath/pom.xml                  |  4 ----
 components/camel-jt400/pom.xml                     |  1 -
 components/camel-kafka/pom.xml                     |  4 ----
 components/camel-kubernetes/pom.xml                |  1 -
 components/camel-kura/pom.xml                      |  1 -
 components/camel-language/pom.xml                  |  5 ----
 components/camel-ldap/pom.xml                      |  1 -
 components/camel-ldif/pom.xml                      |  1 -
 components/camel-leveldb/pom.xml                   |  1 -
 .../camel-linkedin/camel-linkedin-api/pom.xml      |  1 -
 .../camel-linkedin-component/pom.xml               |  1 -
 components/camel-log/pom.xml                       |  5 ----
 components/camel-lra/pom.xml                       |  1 -
 components/camel-lucene/pom.xml                    |  4 ----
 components/camel-lumberjack/pom.xml                |  1 -
 components/camel-lzf/pom.xml                       |  7 ------
 components/camel-mail/pom.xml                      |  4 ----
 components/camel-master/pom.xml                    |  1 -
 components/camel-metrics/pom.xml                   |  3 ---
 components/camel-micrometer/pom.xml                |  3 ---
 components/camel-milo/pom.xml                      |  4 ----
 components/camel-mina2/pom.xml                     |  1 -
 components/camel-mllp/pom.xml                      |  4 ----
 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                    |  3 ---
 components/camel-nats/pom.xml                      |  1 -
 components/camel-netty4-http/pom.xml               |  3 ---
 components/camel-netty4/pom.xml                    |  3 ---
 components/camel-nsq/pom.xml                       |  1 -
 components/camel-ognl/pom.xml                      |  1 -
 components/camel-olingo2/camel-olingo2-api/pom.xml |  1 -
 .../camel-olingo2/camel-olingo2-component/pom.xml  |  1 -
 components/camel-olingo4/camel-olingo4-api/pom.xml |  1 -
 .../camel-olingo4/camel-olingo4-component/pom.xml  |  1 -
 components/camel-opentracing/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                   |  5 ----
 components/camel-quickfix/pom.xml                  |  1 -
 components/camel-rabbitmq/pom.xml                  |  3 ---
 components/camel-reactive-streams/pom.xml          |  1 -
 components/camel-reactor/pom.xml                   |  1 -
 components/camel-ref/pom.xml                       |  5 ----
 components/camel-rest-swagger/pom.xml              |  1 -
 components/camel-restlet/pom.xml                   |  3 ---
 components/camel-ribbon/pom.xml                    |  1 -
 components/camel-rmi/pom.xml                       |  1 -
 components/camel-rss/pom.xml                       |  1 -
 components/camel-rxjava2/pom.xml                   |  1 -
 components/camel-saga/pom.xml                      |  5 ----
 .../camel-salesforce-component/pom.xml             |  4 ----
 components/camel-sap-netweaver/pom.xml             |  1 -
 components/camel-saxon/pom.xml                     |  5 ----
 components/camel-scheduler/pom.xml                 |  5 ----
 components/camel-schematron/pom.xml                |  1 -
 components/camel-script/pom.xml                    |  4 ----
 components/camel-seda/pom.xml                      |  5 ----
 components/camel-service/pom.xml                   |  1 -
 .../camel-servicenow-component/pom.xml             |  3 ---
 components/camel-servlet/pom.xml                   |  1 -
 components/camel-shiro/pom.xml                     |  1 -
 components/camel-sip/pom.xml                       |  3 ---
 components/camel-sjms/pom.xml                      |  5 ----
 components/camel-sjms2/pom.xml                     |  4 ----
 components/camel-slack/pom.xml                     |  1 -
 components/camel-smpp/pom.xml                      |  1 -
 components/camel-snakeyaml/pom.xml                 |  1 -
 components/camel-snmp/pom.xml                      |  1 -
 components/camel-soap/pom.xml                      |  5 ----
 components/camel-solr/pom.xml                      |  3 ---
 components/camel-spark-rest/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-javaconfig/pom.xml         |  1 -
 components/camel-spring-ldap/pom.xml               |  1 -
 components/camel-spring-redis/pom.xml              |  1 -
 components/camel-spring-security/pom.xml           |  1 -
 components/camel-spring-ws/pom.xml                 |  1 -
 components/camel-sql/pom.xml                       |  5 ----
 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-stub/pom.xml                      |  5 ----
 components/camel-swagger-java/pom.xml              |  1 -
 components/camel-syslog/pom.xml                    |  1 -
 components/camel-tagsoup/pom.xml                   |  1 -
 components/camel-tarfile/pom.xml                   |  9 --------
 components/camel-telegram/pom.xml                  |  3 ---
 components/camel-test-blueprint/pom.xml            |  1 -
 components/camel-test-cdi/pom.xml                  |  1 -
 components/camel-test-karaf/pom.xml                | 11 +--------
 components/camel-test-spring/pom.xml               |  1 -
 components/camel-test/pom.xml                      |  1 -
 components/camel-testcontainers-spring/pom.xml     |  1 -
 components/camel-testcontainers/pom.xml            |  1 -
 components/camel-thrift/pom.xml                    |  4 ----
 components/camel-tika/pom.xml                      |  1 -
 components/camel-timer/pom.xml                     |  5 ----
 components/camel-twilio/pom.xml                    |  1 -
 components/camel-twitter/pom.xml                   |  1 -
 components/camel-undertow/pom.xml                  |  1 -
 components/camel-univocity-parsers/pom.xml         |  1 -
 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          |  3 ---
 components/camel-websocket/pom.xml                 |  3 ---
 components/camel-wordpress/pom.xml                 |  3 ---
 components/camel-xchange/pom.xml                   |  1 -
 components/camel-xmlsecurity/pom.xml               |  4 ----
 components/camel-xmpp/pom.xml                      |  1 -
 components/camel-xstream/pom.xml                   |  1 -
 components/camel-yammer/pom.xml                    |  1 -
 components/camel-zipfile/pom.xml                   | 10 --------
 components/camel-zipkin/pom.xml                    | 14 -----------
 components/camel-zookeeper-master/pom.xml          |  4 ----
 components/camel-zookeeper/pom.xml                 |  1 -
 parent/pom.xml                                     |  2 +-
 .../karaf/features/src/main/resources/features.xml | 13 +----------
 266 files changed, 4 insertions(+), 588 deletions(-)

diff --git a/components/camel-ahc-ws/pom.xml b/components/camel-ahc-ws/pom.xml
index 445b99a..0fcff99 100644
--- a/components/camel-ahc-ws/pom.xml
+++ b/components/camel-ahc-ws/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel Websocket Client support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.ahc.ws.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-ahc/pom.xml b/components/camel-ahc/pom.xml
index 89b4768..3f03bde 100644
--- a/components/camel-ahc/pom.xml
+++ b/components/camel-ahc/pom.xml
@@ -33,7 +33,6 @@
   <description>Camel Async Http Client support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.ahc.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml
index 29b4e9e..bf8bc5c 100644
--- a/components/camel-amqp/pom.xml
+++ b/components/camel-amqp/pom.xml
@@ -40,7 +40,6 @@
       ${camel.osgi.import.defaults},
       *
     </camel.osgi.import>
-    <camel.osgi.export.pkg>org.apache.camel.component.amqp.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-apns/pom.xml b/components/camel-apns/pom.xml
index b3515db..fc13c70 100644
--- a/components/camel-apns/pom.xml
+++ b/components/camel-apns/pom.xml
@@ -33,7 +33,6 @@
   <description>A Camel Apple Push Notification Server Component</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.apns.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-as2/camel-as2-component/pom.xml b/components/camel-as2/camel-as2-component/pom.xml
index 37af503..f0a25f4 100644
--- a/components/camel-as2/camel-as2-component/pom.xml
+++ b/components/camel-as2/camel-as2-component/pom.xml
@@ -112,33 +112,6 @@
         <artifactId>maven-resources-plugin</artifactId>
       </plugin>
 
-      <!-- to generate the MANIFEST-FILE of the bundle -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>3.2.0</version>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Name>Camel Component for ${componentName}</Bundle-Name>
-            <Bundle-SymbolicName>org.apache.camel.camel-as2</Bundle-SymbolicName>
-            <Export-Service>org.apache.camel.spi.ComponentResolver;component=${schemeName}</Export-Service>
-            <Export-Package>${componentPackage};version=${project.version}</Export-Package>
-            <Import-Package>
-              ${componentPackage}.api;version=${project.version},
-              ${componentPackage};version=${project.version},
-              org.apache.camel.*;version=2.18.3
-            </Import-Package>
-            <Private-Package>${outPackage}</Private-Package>
-            <Implementation-Title>Apache Camel</Implementation-Title>
-            <Implementation-Version>${project.version}</Implementation-Version>
-            <Karaf-Info>Camel;${project.artifactId}=${project.version}</Karaf-Info>
-            <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
-            <_failok>false</_failok>
-          </instructions>
-        </configuration>
-      </plugin>
-
       <!-- generate Component source and test source -->
       <plugin>
         <groupId>org.apache.camel</groupId>
diff --git a/components/camel-asn1/pom.xml b/components/camel-asn1/pom.xml
index e10df17..79b448e 100644
--- a/components/camel-asn1/pom.xml
+++ b/components/camel-asn1/pom.xml
@@ -32,14 +32,6 @@
   <description>Camel ASN.1 support</description>
 
   <properties>
-    <camel.osgi.import>
-    	!org.apache.camel.dataformat.asn1,
-    	*
-    </camel.osgi.import>
-    <camel.osgi.export>
-    	org.apache.camel.dataformat.asn1;${camel.osgi.version}
-    </camel.osgi.export>
-    
   </properties>
 
   <dependencies>
diff --git a/components/camel-asterisk/pom.xml b/components/camel-asterisk/pom.xml
index 3a9412a..a37c60e 100644
--- a/components/camel-asterisk/pom.xml
+++ b/components/camel-asterisk/pom.xml
@@ -35,9 +35,6 @@
     <camel.osgi.import.before.defaults>
       org.asteriskjava.*;version="[1.0,4)"
     </camel.osgi.import.before.defaults>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.asterisk.*;${camel.osgi.version},
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-atmos/pom.xml b/components/camel-atmos/pom.xml
index 6e56bd7..0f5b942 100644
--- a/components/camel-atmos/pom.xml
+++ b/components/camel-atmos/pom.xml
@@ -33,7 +33,6 @@
   <description>Camel Atmos support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.atmos.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml
index 211eac0..aabd5d2 100644
--- a/components/camel-atmosphere-websocket/pom.xml
+++ b/components/camel-atmosphere-websocket/pom.xml
@@ -33,9 +33,6 @@
     <description>Camel Atmosphere WebSocket Servlet</description>
 
     <properties>
-        <camel.osgi.export.pkg>
-            org.apache.camel.component.atmosphere.websocket.*;${camel.osgi.version}
-        </camel.osgi.export.pkg>
         <camel.osgi.import.pkg>
             !org.apache.camel.component.atmosphere.websocket.*,
             javax.servlet.*;version="${servlet-version-range}",
diff --git a/components/camel-atom/pom.xml b/components/camel-atom/pom.xml
index 6c06868..c2f047e 100644
--- a/components/camel-atom/pom.xml
+++ b/components/camel-atom/pom.xml
@@ -32,9 +32,6 @@
   <description>Camel Atom support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-        org.apache.camel.component.atom.*;${camel.osgi.version},
-        org.apache.camel.component.feed.*</camel.osgi.export.pkg>
     <camel.osgi.import.pkg>
         !org.apache.camel.component.atom.*,
         !org.apache.camel.component.feed.*,
diff --git a/components/camel-atomix/pom.xml b/components/camel-atomix/pom.xml
index 2827682..c77389d 100644
--- a/components/camel-atomix/pom.xml
+++ b/components/camel-atomix/pom.xml
@@ -34,17 +34,6 @@
   <description>Camel Atomix support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.atomix.*,
-      org.apache.camel.component.atomix.client.*,
-      org.apache.camel.component.atomix.client.map.*,
-      org.apache.camel.component.atomix.client.multimap.*,
-      org.apache.camel.component.atomix.client.set.*,
-      org.apache.camel.component.atomix.client.queue.*,
-      org.apache.camel.component.atomix.client.value.*,
-      org.apache.camel.component.atomix.client.messaging.*,
-      org.apache.camel.component.atomix.cluster.*
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-avro/pom.xml b/components/camel-avro/pom.xml
index 16bf0fc..4fe46c2 100644
--- a/components/camel-avro/pom.xml
+++ b/components/camel-avro/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel Avro data format</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.dataformat.avro*,org.apache.camel.component.avro*</camel.osgi.export.pkg>
     </properties>
 
     <build>
diff --git a/components/camel-aws-xray/pom.xml b/components/camel-aws-xray/pom.xml
index 87a8828..8cc84e5 100644
--- a/components/camel-aws-xray/pom.xml
+++ b/components/camel-aws-xray/pom.xml
@@ -37,7 +37,6 @@
     <label>monitoring,microservice</label>
     <title>XRay</title>
 
-    <camel.osgi.export.pkg>org.apache.camel.component.aws.xray.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencyManagement>
diff --git a/components/camel-aws/pom.xml b/components/camel-aws/pom.xml
index 67601b2..79957ba 100644
--- a/components/camel-aws/pom.xml
+++ b/components/camel-aws/pom.xml
@@ -33,7 +33,6 @@
     <description>A Camel Amazon Web Services Components</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.aws.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-azure/pom.xml b/components/camel-azure/pom.xml
index e7986e4..0f9253d 100644
--- a/components/camel-azure/pom.xml
+++ b/components/camel-azure/pom.xml
@@ -34,7 +34,6 @@
   <description>Camel Microsoft Azure Components</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.azure.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-barcode/pom.xml b/components/camel-barcode/pom.xml
index 1beb95d..86d0ccb 100644
--- a/components/camel-barcode/pom.xml
+++ b/components/camel-barcode/pom.xml
@@ -33,7 +33,6 @@
     <description>Camel Barcode (e.g. QRcode, PDF417, DataMatrix) support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.dataformat.barcode.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-base64/pom.xml b/components/camel-base64/pom.xml
index fbfc884..9c1afec 100644
--- a/components/camel-base64/pom.xml
+++ b/components/camel-base64/pom.xml
@@ -32,9 +32,6 @@
   <description>Camel Base64 data format support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.dataformat.base64.*
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-bean-validator/pom.xml b/components/camel-bean-validator/pom.xml
index 34de749..add2f13 100644
--- a/components/camel-bean-validator/pom.xml
+++ b/components/camel-bean-validator/pom.xml
@@ -33,7 +33,6 @@
   <packaging>jar</packaging>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.bean.validator.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-beanio/pom.xml b/components/camel-beanio/pom.xml
index 68df9f9..0992c4a 100644
--- a/components/camel-beanio/pom.xml
+++ b/components/camel-beanio/pom.xml
@@ -34,9 +34,6 @@
   <url>http://www.beanio.org</url>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.dataformat.beanio.*;
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-beanstalk/pom.xml b/components/camel-beanstalk/pom.xml
index 28dbbdc..f2e4d7c 100644
--- a/components/camel-beanstalk/pom.xml
+++ b/components/camel-beanstalk/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel Beanstalk component</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.beanstalk.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-bindy/pom.xml b/components/camel-bindy/pom.xml
index 292e9e9..1871038 100644
--- a/components/camel-bindy/pom.xml
+++ b/components/camel-bindy/pom.xml
@@ -32,9 +32,6 @@
     <description>Camel Bindy data format support</description>
 
     <properties>
-        <camel.osgi.export.pkg>
-            org.apache.camel.dataformat.bindy.*;
-        </camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-boon/pom.xml b/components/camel-boon/pom.xml
index 820787f..5ac7f80 100644
--- a/components/camel-boon/pom.xml
+++ b/components/camel-boon/pom.xml
@@ -35,7 +35,6 @@
         <camel.osgi.import.before.defaults>
           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>
     </properties>
 
     <dependencies>
diff --git a/components/camel-box/camel-box-api/pom.xml b/components/camel-box/camel-box-api/pom.xml
index 9df7f07..c8848f3 100644
--- a/components/camel-box/camel-box-api/pom.xml
+++ b/components/camel-box/camel-box-api/pom.xml
@@ -35,7 +35,6 @@
   <properties>
     <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.api*</camel.osgi.export.pkg>
   </properties>
 
   <build>
diff --git a/components/camel-box/camel-box-component/pom.xml b/components/camel-box/camel-box-component/pom.xml
index 297dd4b..83fc0ed 100644
--- a/components/camel-box/camel-box-component/pom.xml
+++ b/components/camel-box/camel-box-component/pom.xml
@@ -39,7 +39,6 @@
     <outPackage>org.apache.camel.component.box.internal</outPackage>
     <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>
   </properties>
 
   <dependencies>
diff --git a/components/camel-braintree/pom.xml b/components/camel-braintree/pom.xml
index 1a28166..586c1bb 100644
--- a/components/camel-braintree/pom.xml
+++ b/components/camel-braintree/pom.xml
@@ -41,7 +41,6 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-    <camel.osgi.export.pkg>${componentPackage}</camel.osgi.export.pkg>
     <camel.osgi.private.pkg>${outPackage}</camel.osgi.private.pkg>
   </properties>
 
diff --git a/components/camel-browse/pom.xml b/components/camel-browse/pom.xml
index 8049388..9cac84e 100644
--- a/components/camel-browse/pom.xml
+++ b/components/camel-browse/pom.xml
@@ -34,11 +34,6 @@
   <description>Camel Browse component</description>
 
   <properties>
-    <camel.osgi.import>
-      ${camel.osgi.import.defaults},
-      *
-    </camel.osgi.import>
-    <camel.osgi.export.pkg>org.apache.camel.component.browse.*</camel.osgi.export.pkg>
     <!-- do not skip any tests by default -->
     <platform.skip.tests/>
   </properties>
diff --git a/components/camel-caffeine/pom.xml b/components/camel-caffeine/pom.xml
index 7d2c849..0a0a53b 100644
--- a/components/camel-caffeine/pom.xml
+++ b/components/camel-caffeine/pom.xml
@@ -33,9 +33,6 @@
   <description>Camel Caffeine support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.caffeine.*,
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-cassandraql/pom.xml b/components/camel-cassandraql/pom.xml
index 53cb2fd..cecb705 100644
--- a/components/camel-cassandraql/pom.xml
+++ b/components/camel-cassandraql/pom.xml
@@ -35,12 +35,6 @@
   <description>Cassandra CQL3 support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.cassandra.*,
-      org.apache.camel.processor.aggregate.cassandra,
-      org.apache.camel.processor.idempotent.cassandra,
-      org.apache.camel.utils.cassandra
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index d561086..87f9261 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -43,9 +43,6 @@
       ${camel.osgi.import.defaults},
       *
     </camel.osgi.import>
-    <camel.osgi.export.pkg>
-      org.apache.camel.cdi;${camel.osgi.version}
-    </camel.osgi.export.pkg>
     <camel.osgi.provide.capability>
       org.ops4j.pax.cdi.extension; extension=camel-cdi-extension
     </camel.osgi.provide.capability>
diff --git a/components/camel-chronicle/pom.xml b/components/camel-chronicle/pom.xml
index a541d61..264ccbc 100644
--- a/components/camel-chronicle/pom.xml
+++ b/components/camel-chronicle/pom.xml
@@ -33,9 +33,6 @@
   <description>Camel Chronicle support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.chronicle.*
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-chunk/pom.xml b/components/camel-chunk/pom.xml
index 829ca55..409967c 100644
--- a/components/camel-chunk/pom.xml
+++ b/components/camel-chunk/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel Chunk support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.chunk.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-cm-sms/pom.xml b/components/camel-cm-sms/pom.xml
index eede225..232e1f4 100644
--- a/components/camel-cm-sms/pom.xml
+++ b/components/camel-cm-sms/pom.xml
@@ -34,7 +34,6 @@
   <description>Camel CM SMS Gateway Component</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.cm.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-cmis/pom.xml b/components/camel-cmis/pom.xml
index 4cb0727..5ff7463 100644
--- a/components/camel-cmis/pom.xml
+++ b/components/camel-cmis/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel CMIS which is based on Apache Chemistry support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.cmis.*</camel.osgi.export.pkg>
         <camel.osgi.activator>
            org.apache.camel.component.cmis.osgi.Activator
         </camel.osgi.activator>
diff --git a/components/camel-coap/pom.xml b/components/camel-coap/pom.xml
index b39d9c5..a387b36 100644
--- a/components/camel-coap/pom.xml
+++ b/components/camel-coap/pom.xml
@@ -33,7 +33,6 @@
   <description>Camel CoAP support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.coap.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml
index 583134d..9d1c610 100644
--- a/components/camel-cometd/pom.xml
+++ b/components/camel-cometd/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel Cometd support based on Jetty </description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.cometd.*</camel.osgi.export.pkg>
         <camel.osgi.import.pkg>
             !org.apache.camel.component.cometd.*,
             org.eclipse.jetty.util.ssl;version="[9.2,10)";resolution:=optional,
diff --git a/components/camel-consul/pom.xml b/components/camel-consul/pom.xml
index 1911c10..0f84a56 100644
--- a/components/camel-consul/pom.xml
+++ b/components/camel-consul/pom.xml
@@ -34,9 +34,6 @@
   <description>Camel Consul support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.consul.*,
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-controlbus/pom.xml b/components/camel-controlbus/pom.xml
index 30bee32..c4695de 100644
--- a/components/camel-controlbus/pom.xml
+++ b/components/camel-controlbus/pom.xml
@@ -34,11 +34,6 @@
   <description>Camel Controlbus component</description>
 
   <properties>
-    <camel.osgi.import>
-      ${camel.osgi.import.defaults},
-      *
-    </camel.osgi.import>
-    <camel.osgi.export.pkg>org.apache.camel.component.controlbus.*</camel.osgi.export.pkg>
     <!-- do not skip any tests by default -->
     <platform.skip.tests/>
   </properties>
diff --git a/components/camel-corda/pom.xml b/components/camel-corda/pom.xml
index d382a68..ab049c8 100644
--- a/components/camel-corda/pom.xml
+++ b/components/camel-corda/pom.xml
@@ -33,7 +33,6 @@
       <description>Camel Corda which is based on corda-rpc support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.corda.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-core-osgi/pom.xml b/components/camel-core-osgi/pom.xml
index ab34392..ad56d2e 100644
--- a/components/camel-core-osgi/pom.xml
+++ b/components/camel-core-osgi/pom.xml
@@ -32,9 +32,6 @@
   <description>Using Camel with OSGi</description>
   
   <properties>
-      <camel.osgi.export.pkg>
-            org.apache.camel.core.osgi.*
-      </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-core-xml/pom.xml b/components/camel-core-xml/pom.xml
index 15a6914..33c29dc 100644
--- a/components/camel-core-xml/pom.xml
+++ b/components/camel-core-xml/pom.xml
@@ -31,9 +31,6 @@
   <description>Camel Core XML support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.core.xml.*
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-couchbase/pom.xml b/components/camel-couchbase/pom.xml
index ab84ddf..deb69b8 100644
--- a/components/camel-couchbase/pom.xml
+++ b/components/camel-couchbase/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel Couchbase component</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.couchbase</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-couchdb/pom.xml b/components/camel-couchdb/pom.xml
index 4d0bf83..b22e8a6 100644
--- a/components/camel-couchdb/pom.xml
+++ b/components/camel-couchdb/pom.xml
@@ -33,7 +33,6 @@
 	<description>Camel CouchDB component</description>
 
 	<properties>
-		<camel.osgi.export.pkg>org.apache.camel.component.couchdb.*</camel.osgi.export.pkg>
 	</properties>
 
 	<dependencies>
diff --git a/components/camel-crypto-cms/pom.xml b/components/camel-crypto-cms/pom.xml
index 928b4fd..b3cd598 100644
--- a/components/camel-crypto-cms/pom.xml
+++ b/components/camel-crypto-cms/pom.xml
@@ -33,9 +33,6 @@
   <description>Camel Cryptographic Message Syntax Support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.crypto.cms.*;${camel.osgi.version},
-    </camel.osgi.export.pkg>
     <camel.osgi.import.pkg>
       !org.apache.camel.component.crypto.cms.*,
       ${camel.osgi.import.defaults},
diff --git a/components/camel-crypto/pom.xml b/components/camel-crypto/pom.xml
index 6b73d02..c9bcefc 100644
--- a/components/camel-crypto/pom.xml
+++ b/components/camel-crypto/pom.xml
@@ -32,10 +32,6 @@
 	<description>Camel Cryptographic Support</description>
 
 	<properties>
-		<camel.osgi.export.pkg>
-			org.apache.camel.component.crypto.*;${camel.osgi.version},
-			org.apache.camel.converter.crypto.*
-		</camel.osgi.export.pkg>
 		<camel.osgi.import.pkg>
 			!org.apache.camel.component.crypto.*,
 			!org.apache.camel.converter.crypto.*,
diff --git a/components/camel-csv/pom.xml b/components/camel-csv/pom.xml
index 2e58cf8..f00beb1 100644
--- a/components/camel-csv/pom.xml
+++ b/components/camel-csv/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel CSV data format support</description>
 
   <properties>
-	<camel.osgi.export.pkg>org.apache.camel.dataformat.csv.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index f7d9d3e..ab3fa12 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -65,18 +65,7 @@
       org.apache.camel.blueprint;resolution:=optional,
       *
     </camel.osgi.import>
-    <camel.osgi.export>
-      org.apache.camel.component.cxf;${camel.osgi.version},
-      org.apache.camel.component.cxf.blueprint;${camel.osgi.version},
-      org.apache.camel.component.cxf.converter;${camel.osgi.version},
-      org.apache.camel.component.cxf.feature;${camel.osgi.version},
-      org.apache.camel.component.cxf.interceptors;${camel.osgi.version},
-      org.apache.camel.component.cxf.jaxrs;${camel.osgi.version},
-      org.apache.camel.component.cxf.spring;${camel.osgi.version},
-      org.apache.camel.component.cxf.util;${camel.osgi.version}
-    </camel.osgi.export>
     <camel.osgi.failok>true</camel.osgi.failok>
-
   </properties>
 
   <dependencies>
@@ -137,6 +126,7 @@
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-blueprint</artifactId>
+      <optional>true</optional>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/components/camel-dataformat/pom.xml b/components/camel-dataformat/pom.xml
index 3d8822f..4400a99 100644
--- a/components/camel-dataformat/pom.xml
+++ b/components/camel-dataformat/pom.xml
@@ -34,11 +34,6 @@
   <description>Camel DataFormat component</description>
 
   <properties>
-    <camel.osgi.import>
-      ${camel.osgi.import.defaults},
-      *
-    </camel.osgi.import>
-    <camel.osgi.export.pkg>org.apache.camel.component.dataformat.*</camel.osgi.export.pkg>
     <!-- do not skip any tests by default -->
     <platform.skip.tests/>
   </properties>
diff --git a/components/camel-digitalocean/pom.xml b/components/camel-digitalocean/pom.xml
index 0f6e85b..71b01e6 100644
--- a/components/camel-digitalocean/pom.xml
+++ b/components/camel-digitalocean/pom.xml
@@ -34,7 +34,6 @@
   <description>Camel DigitalOcean support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.digitalocean.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-direct/pom.xml b/components/camel-direct/pom.xml
index 7dd561e..625d8ce 100644
--- a/components/camel-direct/pom.xml
+++ b/components/camel-direct/pom.xml
@@ -34,13 +34,6 @@
   <description>Camel Direct component</description>
 
   <properties>
-    <camel.osgi.import>
-      ${camel.osgi.import.defaults},
-      *
-    </camel.osgi.import>
-    <camel.osgi.export.pkg>org.apache.camel.component.direct.*</camel.osgi.export.pkg>
-    <!-- do not skip any tests by default -->
-    <platform.skip.tests/>
   </properties>
 
   <dependencies>
diff --git a/components/camel-directvm/pom.xml b/components/camel-directvm/pom.xml
index 8ba5f71..ad76302 100644
--- a/components/camel-directvm/pom.xml
+++ b/components/camel-directvm/pom.xml
@@ -34,11 +34,6 @@
   <description>Camel Direct VM component</description>
 
   <properties>
-    <camel.osgi.import>
-      ${camel.osgi.import.defaults},
-      *
-    </camel.osgi.import>
-    <camel.osgi.export.pkg>org.apache.camel.component.directvm.*</camel.osgi.export.pkg>
     <!-- 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 ba69023..d1fdcd6 100644
--- a/components/camel-disruptor/pom.xml
+++ b/components/camel-disruptor/pom.xml
@@ -32,7 +32,6 @@
     <packaging>jar</packaging>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.disruptor.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-dns/pom.xml b/components/camel-dns/pom.xml
index 138159a..f3ea664 100644
--- a/components/camel-dns/pom.xml
+++ b/components/camel-dns/pom.xml
@@ -32,9 +32,6 @@
   <packaging>jar</packaging>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.dns*
-    </camel.osgi.export.pkg>
 
     <camel.osgi.import.pkg>
       !org.apache.camel.component.dns*,
diff --git a/components/camel-docker/pom.xml b/components/camel-docker/pom.xml
index b09169f..2cbf161 100644
--- a/components/camel-docker/pom.xml
+++ b/components/camel-docker/pom.xml
@@ -34,7 +34,6 @@
 
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.docker.*</camel.osgi.export.pkg>
   	<jffi.version>1.2.7</jffi.version>
   	<jnr-x86asm.version>1.0.2</jnr-x86asm.version>
   </properties>
diff --git a/components/camel-dozer/pom.xml b/components/camel-dozer/pom.xml
index 2f68412..e53ab91 100644
--- a/components/camel-dozer/pom.xml
+++ b/components/camel-dozer/pom.xml
@@ -33,10 +33,6 @@
   <description>Camel Support for the Dozer type conversion framework</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.converter.dozer.*,
-      org.apache.camel.component.dozer.*
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-drill/pom.xml b/components/camel-drill/pom.xml
index 360ff5b..4dbe590 100644
--- a/components/camel-drill/pom.xml
+++ b/components/camel-drill/pom.xml
@@ -32,9 +32,6 @@
     <description>Camel Apache Drill support</description>
 
     <properties>
-		<camel.osgi.export.pkg>
-			org.apache.camel.component.drill.*;${camel.osgi.version}
-		</camel.osgi.export.pkg>
 		<camel.osgi.import.pkg>
 			!org.apache.camel.component.drill.*,
 			${camel.osgi.import.defaults},
diff --git a/components/camel-dropbox/pom.xml b/components/camel-dropbox/pom.xml
index 4aafdc1..0077a29 100644
--- a/components/camel-dropbox/pom.xml
+++ b/components/camel-dropbox/pom.xml
@@ -34,7 +34,6 @@
   <description>Camel Dropbox support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.dropbox.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-ehcache/pom.xml b/components/camel-ehcache/pom.xml
index 370bff7..06e1b50 100644
--- a/components/camel-ehcache/pom.xml
+++ b/components/camel-ehcache/pom.xml
@@ -33,9 +33,6 @@
   <description>Camel Ehcache support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.ehcache.*,
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-ejb/pom.xml b/components/camel-ejb/pom.xml
index 5f5064e..e2437fa 100644
--- a/components/camel-ejb/pom.xml
+++ b/components/camel-ejb/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel EJB support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.ejb.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-elasticsearch-rest/pom.xml b/components/camel-elasticsearch-rest/pom.xml
index edbd0e4..114632e 100644
--- a/components/camel-elasticsearch-rest/pom.xml
+++ b/components/camel-elasticsearch-rest/pom.xml
@@ -33,7 +33,6 @@
   <description>Camel ElasticSearch REST support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.elasticsearch.*;${camel.osgi.version}</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-elsql/pom.xml b/components/camel-elsql/pom.xml
index ba157e0..83b83cf 100644
--- a/components/camel-elsql/pom.xml
+++ b/components/camel-elsql/pom.xml
@@ -32,9 +32,6 @@
   <description>Camel ElSql support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.elsql.*;${camel.osgi.version}
-    </camel.osgi.export.pkg>
     <camel.osgi.import.pkg>
       org.apache.camel.component.sql.*,
       !org.apache.camel.component.elsql.*,
diff --git a/components/camel-etcd/pom.xml b/components/camel-etcd/pom.xml
index 9409486..ecab750 100644
--- a/components/camel-etcd/pom.xml
+++ b/components/camel-etcd/pom.xml
@@ -34,7 +34,6 @@
   <description>Camel Etcd support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.etcd.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-eventadmin/pom.xml b/components/camel-eventadmin/pom.xml
index d8b40cd..4025592 100644
--- a/components/camel-eventadmin/pom.xml
+++ b/components/camel-eventadmin/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel OSGi Event Admin support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.eventadmin</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-exec/pom.xml b/components/camel-exec/pom.xml
index 6980f39..edab93f 100644
--- a/components/camel-exec/pom.xml
+++ b/components/camel-exec/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel support for system command execution</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.exec.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-facebook/pom.xml b/components/camel-facebook/pom.xml
index 50ab46f..5830ce4 100644
--- a/components/camel-facebook/pom.xml
+++ b/components/camel-facebook/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel Facebook Support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.facebook.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-fastjson/pom.xml b/components/camel-fastjson/pom.xml
index 3cb0c55..463af00 100644
--- a/components/camel-fastjson/pom.xml
+++ b/components/camel-fastjson/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel Fastjson support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.fastjson.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-fhir/camel-fhir-api/pom.xml b/components/camel-fhir/camel-fhir-api/pom.xml
index d2670ad..da5e579 100644
--- a/components/camel-fhir/camel-fhir-api/pom.xml
+++ b/components/camel-fhir/camel-fhir-api/pom.xml
@@ -32,7 +32,6 @@
   <packaging>jar</packaging>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.fhir.api*</camel.osgi.export.pkg>
 
   </properties>
 
diff --git a/components/camel-fhir/camel-fhir-component/pom.xml b/components/camel-fhir/camel-fhir-component/pom.xml
index 1107bf3..ed61f0c 100644
--- a/components/camel-fhir/camel-fhir-component/pom.xml
+++ b/components/camel-fhir/camel-fhir-component/pom.xml
@@ -37,7 +37,6 @@
     <schemeName>fhir</schemeName>
     <componentPackage>org.apache.camel.component.fhir</componentPackage>
     <outPackage>org.apache.camel.component.fhir.internal</outPackage>
-    <camel.osgi.export.pkg>${componentPackage}</camel.osgi.export.pkg>
     <camel.osgi.dynamic>
       org.hl7.fhir.*
     </camel.osgi.dynamic>
diff --git a/components/camel-file/pom.xml b/components/camel-file/pom.xml
index aac7f3c..458781d 100644
--- a/components/camel-file/pom.xml
+++ b/components/camel-file/pom.xml
@@ -34,11 +34,6 @@
   <description>Camel File component</description>
 
   <properties>
-    <camel.osgi.import>
-      ${camel.osgi.import.defaults},
-      *
-    </camel.osgi.import>
-    <camel.osgi.export.pkg>org.apache.camel.component.file.*</camel.osgi.export.pkg>
     <!-- do not skip any tests by default -->
     <platform.skip.tests/>
   </properties>
diff --git a/components/camel-flatpack/pom.xml b/components/camel-flatpack/pom.xml
index 3afd3b2..8228256 100644
--- a/components/camel-flatpack/pom.xml
+++ b/components/camel-flatpack/pom.xml
@@ -32,10 +32,6 @@
   <description>Camel FlatPack support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.flatpack.*,
-      org.apache.camel.dataformat.flatpack.*
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-flink/pom.xml b/components/camel-flink/pom.xml
index ac3d626..80c7af1 100644
--- a/components/camel-flink/pom.xml
+++ b/components/camel-flink/pom.xml
@@ -34,7 +34,6 @@
   <description>Camel Apache Flink support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.flink.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-fop/pom.xml b/components/camel-fop/pom.xml
index a9eb132..8499b67 100644
--- a/components/camel-fop/pom.xml
+++ b/components/camel-fop/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel FOP support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.fop.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-freemarker/pom.xml b/components/camel-freemarker/pom.xml
index fad69ad..c3ef132 100644
--- a/components/camel-freemarker/pom.xml
+++ b/components/camel-freemarker/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel Freemarker support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.freemarker.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index 225ef8a..12c60b5 100644
--- a/components/camel-ftp/pom.xml
+++ b/components/camel-ftp/pom.xml
@@ -35,7 +35,6 @@
     <camel.osgi.import.before.defaults>
         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>
   </properties>
 
   <dependencies>
diff --git a/components/camel-ganglia/pom.xml b/components/camel-ganglia/pom.xml
index bfb8053..b340c83 100644
--- a/components/camel-ganglia/pom.xml
+++ b/components/camel-ganglia/pom.xml
@@ -35,9 +35,6 @@
     <camel.osgi.import.before.defaults>
       info.ganglia.gmetric4j.*;version="[0,2)"
     </camel.osgi.import.before.defaults>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.ganglia.*
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-geocoder/pom.xml b/components/camel-geocoder/pom.xml
index bd4f896..59d8e8f 100644
--- a/components/camel-geocoder/pom.xml
+++ b/components/camel-geocoder/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel GeoCoder support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.geocoder.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-git/pom.xml b/components/camel-git/pom.xml
index 6941737..a5406b9 100644
--- a/components/camel-git/pom.xml
+++ b/components/camel-git/pom.xml
@@ -32,7 +32,6 @@
   <name>Camel :: Git</name>
 
    <properties>
-      <camel.osgi.export.pkg>org.apache.camel.component.git.*</camel.osgi.export.pkg>
    </properties>
 
   <dependencies>
diff --git a/components/camel-github/pom.xml b/components/camel-github/pom.xml
index 29703ae..6b600ac 100644
--- a/components/camel-github/pom.xml
+++ b/components/camel-github/pom.xml
@@ -32,7 +32,6 @@
   <name>Camel :: GitHub</name>
 
    <properties>
-      <camel.osgi.export.pkg>org.apache.camel.component.github.*</camel.osgi.export.pkg>
    </properties>
 
   <dependencies>
diff --git a/components/camel-google-bigquery/pom.xml b/components/camel-google-bigquery/pom.xml
index 92ca460..dd99eb3 100644
--- a/components/camel-google-bigquery/pom.xml
+++ b/components/camel-google-bigquery/pom.xml
@@ -34,7 +34,6 @@
   <description>Camel Component for Google Cloud Platform BigQuery</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.google.bigquery</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-google-calendar/pom.xml b/components/camel-google-calendar/pom.xml
index c47efea..fe1ccef 100644
--- a/components/camel-google-calendar/pom.xml
+++ b/components/camel-google-calendar/pom.xml
@@ -38,7 +38,6 @@
     <componentPackage>org.apache.camel.component.google.calendar</componentPackage>
     <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>
   </properties>
 
   <dependencies>
diff --git a/components/camel-google-drive/pom.xml b/components/camel-google-drive/pom.xml
index b23fdf5..99da601 100644
--- a/components/camel-google-drive/pom.xml
+++ b/components/camel-google-drive/pom.xml
@@ -38,7 +38,6 @@
     <componentPackage>org.apache.camel.component.google.drive</componentPackage>
     <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>
   </properties>
 
   <dependencies>
diff --git a/components/camel-google-mail/pom.xml b/components/camel-google-mail/pom.xml
index 2bf07f8..21d4f7f 100644
--- a/components/camel-google-mail/pom.xml
+++ b/components/camel-google-mail/pom.xml
@@ -38,7 +38,6 @@
     <componentPackage>org.apache.camel.component.google.mail</componentPackage>
     <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>
   </properties>
 
   <dependencies>
diff --git a/components/camel-google-pubsub/pom.xml b/components/camel-google-pubsub/pom.xml
index dbe0bb5..9c55923 100644
--- a/components/camel-google-pubsub/pom.xml
+++ b/components/camel-google-pubsub/pom.xml
@@ -37,7 +37,6 @@
         <schemeName>google-pubsub</schemeName>
         <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>
     </properties>
 
     <dependencies>
diff --git a/components/camel-google-sheets/pom.xml b/components/camel-google-sheets/pom.xml
index 0a4931c..02f46f3 100644
--- a/components/camel-google-sheets/pom.xml
+++ b/components/camel-google-sheets/pom.xml
@@ -38,7 +38,6 @@
     <componentPackage>org.apache.camel.component.google.sheets</componentPackage>
     <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>
   </properties>
 
   <dependencies>
diff --git a/components/camel-gora/pom.xml b/components/camel-gora/pom.xml
index 42b453e..3995a32 100644
--- a/components/camel-gora/pom.xml
+++ b/components/camel-gora/pom.xml
@@ -34,15 +34,11 @@
   <description>Gora Component for Apache Camel.</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.gora.*
-    </camel.osgi.export.pkg>
     <camel.osgi.import.before.defaults>
       org.apache.camel.*
       com.google.common.base;version="[11,14)",
       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>
   </properties>
 
   <dependencies>
diff --git a/components/camel-grape/pom.xml b/components/camel-grape/pom.xml
index 8b6b2db..a04bcce 100644
--- a/components/camel-grape/pom.xml
+++ b/components/camel-grape/pom.xml
@@ -32,7 +32,6 @@
   <description>The grape component allows you to fetch, load and manage additional jars when CamelContext is running</description>
 
   <properties>
-    <camel.osgi.export.pkg />
   </properties>
 
   <dependencies>
diff --git a/components/camel-groovy/pom.xml b/components/camel-groovy/pom.xml
index 22681f7..903be6c 100644
--- a/components/camel-groovy/pom.xml
+++ b/components/camel-groovy/pom.xml
@@ -39,7 +39,6 @@
       ${camel.osgi.import.defaults},
       *
     </camel.osgi.import.pkg>
-    <camel.osgi.export.pkg>org.apache.camel.language.groovy.*,org.apache.camel.groovy.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index 1b409ec..d58aeb6 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -34,7 +34,6 @@
   <description>Camel component for gRPC (Remote Procedure Call) support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.grpc.*;${camel.osgi.version}</camel.osgi.export.pkg>
     <!-- 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 30c4f28..e94e620 100644
--- a/components/camel-gson/pom.xml
+++ b/components/camel-gson/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel Gson support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.gson.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-guava-eventbus/pom.xml b/components/camel-guava-eventbus/pom.xml
index 4695fb4..d702dc4 100644
--- a/components/camel-guava-eventbus/pom.xml
+++ b/components/camel-guava-eventbus/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel Guava EventBus support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.guava.eventbus.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-hazelcast/pom.xml b/components/camel-hazelcast/pom.xml
index 733f434..a6fc19c 100644
--- a/components/camel-hazelcast/pom.xml
+++ b/components/camel-hazelcast/pom.xml
@@ -35,11 +35,6 @@
     <camel.osgi.import.before.defaults>
       com.hazelcast.*;version="[3.2,4)"
     </camel.osgi.import.before.defaults>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.hazelcast.*;${camel.osgi.version},
-      org.apache.camel.processor.idempotent.hazelcast.*,
-      org.apache.camel.processor.aggregate.hazelcast.*
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-hbase/pom.xml b/components/camel-hbase/pom.xml
index 8367399..7fed08e 100644
--- a/components/camel-hbase/pom.xml
+++ b/components/camel-hbase/pom.xml
@@ -35,7 +35,6 @@
             org.apache.hadoop.conf;version="[2,3)",
             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>
     </properties>
 
     <dependencies>
diff --git a/components/camel-hdfs2/pom.xml b/components/camel-hdfs2/pom.xml
index ffe6f5a..ce8a690 100644
--- a/components/camel-hdfs2/pom.xml
+++ b/components/camel-hdfs2/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel HDFS support with Hadoop 2.x libraries</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.hdfs2.*</camel.osgi.export.pkg>
     <camel.osgi.import.additional>
       org.apache.hadoop.hdfs,
       org.apache.hadoop.hdfs.client,
diff --git a/components/camel-headersmap/pom.xml b/components/camel-headersmap/pom.xml
index 4dc2747..afd1b96 100644
--- a/components/camel-headersmap/pom.xml
+++ b/components/camel-headersmap/pom.xml
@@ -36,7 +36,6 @@
     <firstVersion>2.20.0</firstVersion>
     <label>tooling</label>
 
-    <camel.osgi.export.pkg>org.apache.camel.component.headersmap.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-hipchat/pom.xml b/components/camel-hipchat/pom.xml
index 1585a92..e3e7099 100644
--- a/components/camel-hipchat/pom.xml
+++ b/components/camel-hipchat/pom.xml
@@ -34,7 +34,6 @@
   <description>Camel Hipchat Component</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.hipchat.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-hl7/pom.xml b/components/camel-hl7/pom.xml
index 777819b..46dc538 100644
--- a/components/camel-hl7/pom.xml
+++ b/components/camel-hl7/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel HL7 support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.hl7.*</camel.osgi.export.pkg>
         <camel.osgi.import.before.defaults>
             org.apache.mina.*;version="[2,3)"
         </camel.osgi.import.before.defaults>
diff --git a/components/camel-http-common/pom.xml b/components/camel-http-common/pom.xml
index 53aefd7..d3d937e 100644
--- a/components/camel-http-common/pom.xml
+++ b/components/camel-http-common/pom.xml
@@ -35,7 +35,6 @@
     <camel.osgi.import.before.defaults>
       javax.servlet.*;version="${servlet-version-range}"
     </camel.osgi.import.before.defaults>
-    <camel.osgi.export.pkg>org.apache.camel.http.common.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-http4/pom.xml b/components/camel-http4/pom.xml
index 619bf4a..eabf9c1 100644
--- a/components/camel-http4/pom.xml
+++ b/components/camel-http4/pom.xml
@@ -37,7 +37,6 @@
       javax.servlet.*;version="${servlet-version-range}",
       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>
   </properties>
 
   <dependencies>
diff --git a/components/camel-hystrix/pom.xml b/components/camel-hystrix/pom.xml
index d43f487..959dc37 100644
--- a/components/camel-hystrix/pom.xml
+++ b/components/camel-hystrix/pom.xml
@@ -37,7 +37,6 @@
     <firstVersion>2.18.0</firstVersion>
     <label>eip,microservice</label>
 
-    <camel.osgi.export.pkg>org.apache.camel.component.hystrix.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-ical/pom.xml b/components/camel-ical/pom.xml
index 64914e1..e100cff 100644
--- a/components/camel-ical/pom.xml
+++ b/components/camel-ical/pom.xml
@@ -39,9 +39,6 @@
       ${camel.osgi.import.defaults},
       *
     </camel.osgi.import>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.ical.*;${camel.osgi.version}
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-iec60870/pom.xml b/components/camel-iec60870/pom.xml
index be6b494..bcee712 100644
--- a/components/camel-iec60870/pom.xml
+++ b/components/camel-iec60870/pom.xml
@@ -33,9 +33,6 @@
   <description>Camel IEC 60870-5-104 support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.iec60870.*
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-ignite/pom.xml b/components/camel-ignite/pom.xml
index efab5a9..9f61b9f 100644
--- a/components/camel-ignite/pom.xml
+++ b/components/camel-ignite/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel Ignite component</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.ignite.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-infinispan/pom.xml b/components/camel-infinispan/pom.xml
index da1f216..563cc28 100644
--- a/components/camel-infinispan/pom.xml
+++ b/components/camel-infinispan/pom.xml
@@ -33,7 +33,6 @@
     <description>Camel Infinispan support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.infinispan.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-influxdb/pom.xml b/components/camel-influxdb/pom.xml
index 1fcabd8..5d164fc 100644
--- a/components/camel-influxdb/pom.xml
+++ b/components/camel-influxdb/pom.xml
@@ -25,7 +25,6 @@
 	<description>Camel InfluxDB component</description>
 
 	<properties>
-		<camel.osgi.export.pkg>org.apache.camel.component.influxdb.*</camel.osgi.export.pkg>
 	</properties>
 
 	<dependencies>
diff --git a/components/camel-iota/pom.xml b/components/camel-iota/pom.xml
index f9d96a6..500515b 100644
--- a/components/camel-iota/pom.xml
+++ b/components/camel-iota/pom.xml
@@ -25,7 +25,6 @@
 	<description>Camel IOTA component</description>
 
 	<properties>
-		<camel.osgi.export.pkg>org.apache.camel.component.iota.*</camel.osgi.export.pkg>
 	</properties>
 
 	<dependencies>
diff --git a/components/camel-ipfs/pom.xml b/components/camel-ipfs/pom.xml
index a7944f0..06a36b0 100644
--- a/components/camel-ipfs/pom.xml
+++ b/components/camel-ipfs/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel IPFS support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.ipfs.*</camel.osgi.export.pkg>
   </properties>
 
   <repositories>
diff --git a/components/camel-irc/pom.xml b/components/camel-irc/pom.xml
index 2c51d41..385483d 100644
--- a/components/camel-irc/pom.xml
+++ b/components/camel-irc/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel IRC support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.irc.*</camel.osgi.export.pkg>
   </properties>
 
 
diff --git a/components/camel-ironmq/pom.xml b/components/camel-ironmq/pom.xml
index 8896b35..914ea91 100644
--- a/components/camel-ironmq/pom.xml
+++ b/components/camel-ironmq/pom.xml
@@ -33,7 +33,6 @@
   <description>Camel IronMQ component</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.ironmq.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-jackson/pom.xml b/components/camel-jackson/pom.xml
index 5ff2885..fdc19d3 100644
--- a/components/camel-jackson/pom.xml
+++ b/components/camel-jackson/pom.xml
@@ -35,7 +35,6 @@
         <camel.osgi.import.before.defaults>
           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>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jacksonxml/pom.xml b/components/camel-jacksonxml/pom.xml
index 54100f6..5245907 100644
--- a/components/camel-jacksonxml/pom.xml
+++ b/components/camel-jacksonxml/pom.xml
@@ -35,7 +35,6 @@
     <camel.osgi.import.before.defaults>
       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>
   </properties>
 
   <dependencies>
diff --git a/components/camel-jasypt/pom.xml b/components/camel-jasypt/pom.xml
index 5b2ea4a..64f24b8 100644
--- a/components/camel-jasypt/pom.xml
+++ b/components/camel-jasypt/pom.xml
@@ -37,7 +37,6 @@
         <firstVersion>2.5.0</firstVersion>
         <label>security</label>
 
-        <camel.osgi.export.pkg>org.apache.camel.component.jasypt.*</camel.osgi.export.pkg>
         <camel.osgi.import.before.defaults>org.jasypt.encryption.*;version="[1.9,2)"</camel.osgi.import.before.defaults>
     </properties>
 
diff --git a/components/camel-jaxb/pom.xml b/components/camel-jaxb/pom.xml
index f6b1ab5..7e6df21 100644
--- a/components/camel-jaxb/pom.xml
+++ b/components/camel-jaxb/pom.xml
@@ -35,7 +35,6 @@
 		<camel.osgi.import.before.defaults>
 			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>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jbpm/pom.xml b/components/camel-jbpm/pom.xml
index d313439..0b56893 100644
--- a/components/camel-jbpm/pom.xml
+++ b/components/camel-jbpm/pom.xml
@@ -33,7 +33,6 @@
     <description>Camel JBPM support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.jbpm.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jcache/pom.xml b/components/camel-jcache/pom.xml
index 8443e0f..21d013f 100644
--- a/components/camel-jcache/pom.xml
+++ b/components/camel-jcache/pom.xml
@@ -33,10 +33,6 @@
   <description>Camel JCache support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.jcache.*,
-      org.apache.camel.component.jcache.processor.idempotent.*,
-    </camel.osgi.export.pkg>
   </properties>
 
 
diff --git a/components/camel-jclouds/pom.xml b/components/camel-jclouds/pom.xml
index 3942880..3fdc8f8 100644
--- a/components/camel-jclouds/pom.xml
+++ b/components/camel-jclouds/pom.xml
@@ -36,7 +36,6 @@
       com.google.common.*;version="${jclouds-google-guava-version-range}",
     </camel.osgi.import.before.defaults>
 
-    <camel.osgi.export.pkg>org.apache.camel.component.jclouds.*</camel.osgi.export.pkg>
 
     <!-- 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 85e1a6b..4a69764 100644
--- a/components/camel-jcr/pom.xml
+++ b/components/camel-jcr/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel JCR support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.jcr.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-jdbc/pom.xml b/components/camel-jdbc/pom.xml
index a912063..f495ad2 100644
--- a/components/camel-jdbc/pom.xml
+++ b/components/camel-jdbc/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel JDBC support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.jdbc.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-jetty-common/pom.xml b/components/camel-jetty-common/pom.xml
index 7c786b7..8780586 100644
--- a/components/camel-jetty-common/pom.xml
+++ b/components/camel-jetty-common/pom.xml
@@ -35,7 +35,6 @@
         <camel.osgi.import.before.defaults>
             javax.servlet.*;version="${servlet-version-range}"
         </camel.osgi.import.before.defaults>
-        <camel.osgi.export.pkg>org.apache.camel.component.jetty</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jetty/pom.xml b/components/camel-jetty/pom.xml
index 6cd66be..bc67aa6 100644
--- a/components/camel-jetty/pom.xml
+++ b/components/camel-jetty/pom.xml
@@ -35,7 +35,6 @@
         <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>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jetty9/pom.xml b/components/camel-jetty9/pom.xml
index 1263b0a..62cee6c 100644
--- a/components/camel-jetty9/pom.xml
+++ b/components/camel-jetty9/pom.xml
@@ -35,7 +35,6 @@
     <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>
   </properties>
 
   <dependencies>
diff --git a/components/camel-jgroups-raft/pom.xml b/components/camel-jgroups-raft/pom.xml
index a82389b..bc2312b 100644
--- a/components/camel-jgroups-raft/pom.xml
+++ b/components/camel-jgroups-raft/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel jgroups-raft support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.jgroups-raft</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jgroups/pom.xml b/components/camel-jgroups/pom.xml
index 749e5e7..e4d0137 100644
--- a/components/camel-jgroups/pom.xml
+++ b/components/camel-jgroups/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel JGroups support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.jgroups</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jibx/pom.xml b/components/camel-jibx/pom.xml
index 7e8a9ea..26ea8fe 100644
--- a/components/camel-jibx/pom.xml
+++ b/components/camel-jibx/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel Jibx support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.dataformat.jibx.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jing/pom.xml b/components/camel-jing/pom.xml
index 55b8ad0..dee4cd9 100644
--- a/components/camel-jing/pom.xml
+++ b/components/camel-jing/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel Jing support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.validator.jing.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml
index 4092434..27f98a4 100644
--- a/components/camel-jms/pom.xml
+++ b/components/camel-jms/pom.xml
@@ -33,7 +33,6 @@
   <description>Camel JMS support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.jms.*</camel.osgi.export.pkg>
     <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 fdb91f4..2505019 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel JMX support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.jmx.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-johnzon/pom.xml b/components/camel-johnzon/pom.xml
index b0dd903..4205db8 100644
--- a/components/camel-johnzon/pom.xml
+++ b/components/camel-johnzon/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel Johnzon support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.johnzon.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jolt/pom.xml b/components/camel-jolt/pom.xml
index 43884d3..7c6629a 100644
--- a/components/camel-jolt/pom.xml
+++ b/components/camel-jolt/pom.xml
@@ -33,7 +33,6 @@
   <description>Camel Jolt Support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.jolt.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index aac7c35..23b33cc 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -32,11 +32,6 @@
   <description>Camel JPA support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.jpa.*;${camel.osgi.version},
-      org.apache.camel.processor.idempotent.jpa.*;${camel.osgi.version},
-      org.apache.camel.processor.interceptor.jpa.*
-    </camel.osgi.export.pkg>
     <camel.osgi.import.pkg>
       !org.apache.camel.component.jpa.*,
       !org.apache.camel.processor.idempotent.jpa.*,
diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml
index c24a6ff..485ff3d 100644
--- a/components/camel-jsch/pom.xml
+++ b/components/camel-jsch/pom.xml
@@ -35,7 +35,6 @@
     <camel.osgi.import.before.defaults>
         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>
   </properties>
 
   <dependencies>
diff --git a/components/camel-json-validator/pom.xml b/components/camel-json-validator/pom.xml
index 3c3b96b..44415ef 100644
--- a/components/camel-json-validator/pom.xml
+++ b/components/camel-json-validator/pom.xml
@@ -30,7 +30,6 @@
   <packaging>jar</packaging>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.jsonvalidator.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-jsonpath/pom.xml b/components/camel-jsonpath/pom.xml
index 6c5a331..0ea7b8f 100644
--- a/components/camel-jsonpath/pom.xml
+++ b/components/camel-jsonpath/pom.xml
@@ -33,10 +33,6 @@
   <description>Camel JSON Path Language</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.jsonpath,
-      org.apache.camel.jsonpath.*
-    </camel.osgi.export.pkg>
     <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 e6b7424..df8a306 100644
--- a/components/camel-jt400/pom.xml
+++ b/components/camel-jt400/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel AS/400 support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.jt400.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml
index 070e38f..571a520 100644
--- a/components/camel-kafka/pom.xml
+++ b/components/camel-kafka/pom.xml
@@ -33,10 +33,6 @@
   <description>Camel Kafka support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.kafka.*,
-      org.apache.camel.processor.idempotent.kafka
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-kubernetes/pom.xml b/components/camel-kubernetes/pom.xml
index 207112f..55af1c2 100644
--- a/components/camel-kubernetes/pom.xml
+++ b/components/camel-kubernetes/pom.xml
@@ -32,7 +32,6 @@
   <name>Camel :: Kubernetes</name>
 
    <properties>
-      <camel.osgi.export.pkg>org.apache.camel.component.kubernetes.*</camel.osgi.export.pkg>
    </properties>
 
   <dependencies>
diff --git a/components/camel-kura/pom.xml b/components/camel-kura/pom.xml
index 38353cf..6b8f521 100644
--- a/components/camel-kura/pom.xml
+++ b/components/camel-kura/pom.xml
@@ -38,7 +38,6 @@
     <firstVersion>2.15.0</firstVersion>
     <label>iot,osgi</label>
 
-    <camel.osgi.export.pkg>org.apache.camel.component.kura</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-language/pom.xml b/components/camel-language/pom.xml
index 65d0283..c09786b 100644
--- a/components/camel-language/pom.xml
+++ b/components/camel-language/pom.xml
@@ -34,11 +34,6 @@
   <description>Camel Language component</description>
 
   <properties>
-    <camel.osgi.import>
-      ${camel.osgi.import.defaults},
-      *
-    </camel.osgi.import>
-    <camel.osgi.export.pkg>org.apache.camel.component.language.*</camel.osgi.export.pkg>
     <!-- do not skip any tests by default -->
     <platform.skip.tests/>
   </properties>
diff --git a/components/camel-ldap/pom.xml b/components/camel-ldap/pom.xml
index f0195cd..756830a 100644
--- a/components/camel-ldap/pom.xml
+++ b/components/camel-ldap/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel LDAP support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.ldap.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-ldif/pom.xml b/components/camel-ldif/pom.xml
index 0de9984..7ecdce2 100644
--- a/components/camel-ldif/pom.xml
+++ b/components/camel-ldif/pom.xml
@@ -33,7 +33,6 @@
   <description>Camel LDIF support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.ldif.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml
index 582bb38..b5a21b8 100644
--- a/components/camel-leveldb/pom.xml
+++ b/components/camel-leveldb/pom.xml
@@ -37,7 +37,6 @@
         <label>database</label>
         <title>LevelDB</title>
 
-        <camel.osgi.export.pkg>org.apache.camel.component.leveldb.*</camel.osgi.export.pkg>
         <camel.osgi.import.pkg>
             org.apache.camel*,
             org.fusesource.hawtbuf*,
diff --git a/components/camel-linkedin/camel-linkedin-api/pom.xml b/components/camel-linkedin/camel-linkedin-api/pom.xml
index 5eca882..0892c6f 100644
--- a/components/camel-linkedin/camel-linkedin-api/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-api/pom.xml
@@ -33,7 +33,6 @@
   <packaging>jar</packaging>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.linkedin.api*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-linkedin/camel-linkedin-component/pom.xml b/components/camel-linkedin/camel-linkedin-component/pom.xml
index 4b73c81..485d9f4 100644
--- a/components/camel-linkedin/camel-linkedin-component/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-component/pom.xml
@@ -38,7 +38,6 @@
     <componentPackage>org.apache.camel.component.linkedin</componentPackage>
     <outPackage>org.apache.camel.component.linkedin.internal</outPackage>
 
-    <camel.osgi.export.pkg>${componentPackage}</camel.osgi.export.pkg>
     <camel.osgi.private.pkg>${outPackage}</camel.osgi.private.pkg>
   </properties>
 
diff --git a/components/camel-log/pom.xml b/components/camel-log/pom.xml
index 4b2db7e..90c47fa 100644
--- a/components/camel-log/pom.xml
+++ b/components/camel-log/pom.xml
@@ -34,11 +34,6 @@
   <description>Camel Log component</description>
 
   <properties>
-    <camel.osgi.import>
-      ${camel.osgi.import.defaults},
-      *
-    </camel.osgi.import>
-    <camel.osgi.export.pkg>org.apache.camel.component.log.*</camel.osgi.export.pkg>
     <!-- do not skip any tests by default -->
     <platform.skip.tests/>
   </properties>
diff --git a/components/camel-lra/pom.xml b/components/camel-lra/pom.xml
index cf05129..6a892f0 100644
--- a/components/camel-lra/pom.xml
+++ b/components/camel-lra/pom.xml
@@ -36,7 +36,6 @@
     <!-- used by camel-catalog -->
     <firstVersion>2.21.0</firstVersion>
 
-    <camel.osgi.export.pkg>org.apache.camel.service.lra.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-lucene/pom.xml b/components/camel-lucene/pom.xml
index 5ac0fc1..ea9528a 100644
--- a/components/camel-lucene/pom.xml
+++ b/components/camel-lucene/pom.xml
@@ -33,10 +33,6 @@
   <description>Camel Lucene based search component</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.lucene.*;${camel.osgi.version},
-      org.apache.camel.processor.lucene.*
-    </camel.osgi.export.pkg>
     <camel.osgi.import.pkg>
       !org.apache.camel.component.lucene.*,
       !org.apache.camel.processor.lucene.*,
diff --git a/components/camel-lumberjack/pom.xml b/components/camel-lumberjack/pom.xml
index 56586a0..b00d288 100644
--- a/components/camel-lumberjack/pom.xml
+++ b/components/camel-lumberjack/pom.xml
@@ -34,7 +34,6 @@
   <description>Camel Lumberjack log streaming component</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.lumberjack.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-lzf/pom.xml b/components/camel-lzf/pom.xml
index d4d0afe..5c6488e 100644
--- a/components/camel-lzf/pom.xml
+++ b/components/camel-lzf/pom.xml
@@ -32,13 +32,6 @@
   <description>Camel LZF support</description>
 
   <properties>
-    <camel.osgi.import>
-    	!org.apache.camel.dataformat.lzf,
-    	*
-    </camel.osgi.import>
-    <camel.osgi.export>
-    	org.apache.camel.dataformat.lzf;${camel.osgi.version},
-    </camel.osgi.export>
   </properties>
 
   <dependencies>
diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml
index eb64d15..13f1648 100644
--- a/components/camel-mail/pom.xml
+++ b/components/camel-mail/pom.xml
@@ -32,10 +32,6 @@
     <description>Camel Mail support</description>
 
     <properties>
-        <camel.osgi.export.pkg>
-          org.apache.camel.component.mail.*,
-          org.apache.camel.dataformat.mime.multipart.*
-        </camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-master/pom.xml b/components/camel-master/pom.xml
index 31dc2ef..96a3ae6 100644
--- a/components/camel-master/pom.xml
+++ b/components/camel-master/pom.xml
@@ -34,7 +34,6 @@
   <description>Camel Master Support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.master</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-metrics/pom.xml b/components/camel-metrics/pom.xml
index e49c4ec..54e9878 100644
--- a/components/camel-metrics/pom.xml
+++ b/components/camel-metrics/pom.xml
@@ -32,9 +32,6 @@
   <description>Camel Metrics based monitoring component</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.metrics.*
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-micrometer/pom.xml b/components/camel-micrometer/pom.xml
index fc47720..8a1733b 100644
--- a/components/camel-micrometer/pom.xml
+++ b/components/camel-micrometer/pom.xml
@@ -33,9 +33,6 @@
     <description>Camel Micrometer based monitoring component</description>
 
     <properties>
-        <camel.osgi.export.pkg>
-            org.apache.camel.component.micrometer.*
-        </camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-milo/pom.xml b/components/camel-milo/pom.xml
index bd60cd9..040e710 100644
--- a/components/camel-milo/pom.xml
+++ b/components/camel-milo/pom.xml
@@ -33,10 +33,6 @@
   <description>Camel OPC UA support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      !*.internal.*,
-      org.apache.camel.component.milo.*
-    </camel.osgi.export.pkg>
     <camel.osgi.import.before.defaults>
       com.google.common.*;version="19.0.0"
     </camel.osgi.import.before.defaults>
diff --git a/components/camel-mina2/pom.xml b/components/camel-mina2/pom.xml
index 6249b39..4c6c20a 100644
--- a/components/camel-mina2/pom.xml
+++ b/components/camel-mina2/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel MINA 2.x support</description>
 
     <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>
     </properties>
 
diff --git a/components/camel-mllp/pom.xml b/components/camel-mllp/pom.xml
index 679477b..9dd1b5d 100644
--- a/components/camel-mllp/pom.xml
+++ b/components/camel-mllp/pom.xml
@@ -35,10 +35,6 @@
   <description>Camel MLLP Component</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.mllp.*,
-      org.apache.camel.processor.mllp.*
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-mongodb-gridfs/pom.xml b/components/camel-mongodb-gridfs/pom.xml
index 7f0d163..9f0ab75 100644
--- a/components/camel-mongodb-gridfs/pom.xml
+++ b/components/camel-mongodb-gridfs/pom.xml
@@ -33,7 +33,6 @@
     <description>Camel MongoDB GridFS component</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.gridfs.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-mongodb3/pom.xml b/components/camel-mongodb3/pom.xml
index ed91c91..1dd336b 100644
--- a/components/camel-mongodb3/pom.xml
+++ b/components/camel-mongodb3/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel MongoDB (Java Driver 3) component</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.mongodb3.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-mqtt/pom.xml b/components/camel-mqtt/pom.xml
index 12433cf..c179baa 100644
--- a/components/camel-mqtt/pom.xml
+++ b/components/camel-mqtt/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel MQTT client</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.mqtt.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-msv/pom.xml b/components/camel-msv/pom.xml
index 6bc96fc..5382e2a 100644
--- a/components/camel-msv/pom.xml
+++ b/components/camel-msv/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel MSV support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.validator.msv.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-mustache/pom.xml b/components/camel-mustache/pom.xml
index 0a9bde9..16412e2 100644
--- a/components/camel-mustache/pom.xml
+++ b/components/camel-mustache/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel Mustache support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.mustache.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-mvel/pom.xml b/components/camel-mvel/pom.xml
index 5a7269c..09d3fd4 100644
--- a/components/camel-mvel/pom.xml
+++ b/components/camel-mvel/pom.xml
@@ -32,10 +32,6 @@
   <description>Camel MVEL support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.mvel.*,
-      org.apache.camel.language.mvel.*
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-mybatis/pom.xml b/components/camel-mybatis/pom.xml
index 038827f..b83b882 100644
--- a/components/camel-mybatis/pom.xml
+++ b/components/camel-mybatis/pom.xml
@@ -35,7 +35,6 @@
 	<camel.osgi.import.before.defaults>
 	  org.apache.ibatis.*;version="[3,4)"
 	</camel.osgi.import.before.defaults>
-	<camel.osgi.export.pkg>org.apache.camel.component.mybatis.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-nagios/pom.xml b/components/camel-nagios/pom.xml
index fac44eb..188025c 100644
--- a/components/camel-nagios/pom.xml
+++ b/components/camel-nagios/pom.xml
@@ -32,9 +32,6 @@
   <description>Camel Nagios support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.nagios.*
-    </camel.osgi.export.pkg>
   </properties>
 
   <repositories>
diff --git a/components/camel-nats/pom.xml b/components/camel-nats/pom.xml
index 3f32f1c..cf6a7d8 100644
--- a/components/camel-nats/pom.xml
+++ b/components/camel-nats/pom.xml
@@ -32,7 +32,6 @@
   <name>Camel :: Nats</name>
 
    <properties>
-      <camel.osgi.export.pkg>org.apache.camel.component.nats.*</camel.osgi.export.pkg>
    </properties>
 
   <dependencies>
diff --git a/components/camel-netty4-http/pom.xml b/components/camel-netty4-http/pom.xml
index 89c9844..751bec9 100644
--- a/components/camel-netty4-http/pom.xml
+++ b/components/camel-netty4-http/pom.xml
@@ -32,9 +32,6 @@
   <description>Camel Netty4 HTTP support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.netty4.http.*
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-netty4/pom.xml b/components/camel-netty4/pom.xml
index 8564c44..a4af1fd8 100644
--- a/components/camel-netty4/pom.xml
+++ b/components/camel-netty4/pom.xml
@@ -32,9 +32,6 @@
 	<description>Camel Netty NIO based socket communication component</description>
 
 	<properties>
-		<camel.osgi.export.pkg>
-			org.apache.camel.component.netty4.*
-		</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-nsq/pom.xml b/components/camel-nsq/pom.xml
index c922b30..672f23f 100644
--- a/components/camel-nsq/pom.xml
+++ b/components/camel-nsq/pom.xml
@@ -32,7 +32,6 @@
     <name>Camel :: NSQ</name>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.nsq.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-ognl/pom.xml b/components/camel-ognl/pom.xml
index cd278e9..8524299 100644
--- a/components/camel-ognl/pom.xml
+++ b/components/camel-ognl/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel OGNL support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.language.ognl.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-olingo2/camel-olingo2-api/pom.xml b/components/camel-olingo2/camel-olingo2-api/pom.xml
index 11dd5d2..4747bcb 100644
--- a/components/camel-olingo2/camel-olingo2-api/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-api/pom.xml
@@ -33,7 +33,6 @@
   <packaging>jar</packaging>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.olingo2.api*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml
index 35c7e95..54fd0ff 100644
--- a/components/camel-olingo2/camel-olingo2-component/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-component/pom.xml
@@ -38,7 +38,6 @@
     <componentPackage>org.apache.camel.component.olingo2</componentPackage>
     <outPackage>org.apache.camel.component.olingo2.internal</outPackage>
 
-    <camel.osgi.export.pkg>${componentPackage}</camel.osgi.export.pkg>
     <camel.osgi.private.pkg>${outPackage}</camel.osgi.private.pkg>
     <maven.exe.file.extension />
   </properties>
diff --git a/components/camel-olingo4/camel-olingo4-api/pom.xml b/components/camel-olingo4/camel-olingo4-api/pom.xml
index aa08fdc..75ce89c 100644
--- a/components/camel-olingo4/camel-olingo4-api/pom.xml
+++ b/components/camel-olingo4/camel-olingo4-api/pom.xml
@@ -34,7 +34,6 @@
   <packaging>jar</packaging>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.olingo4.api*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-olingo4/camel-olingo4-component/pom.xml b/components/camel-olingo4/camel-olingo4-component/pom.xml
index 705eddb..847885e 100644
--- a/components/camel-olingo4/camel-olingo4-component/pom.xml
+++ b/components/camel-olingo4/camel-olingo4-component/pom.xml
@@ -36,7 +36,6 @@
     <componentName>Olingo4</componentName>
     <schemeName>olingo4</schemeName>
     <maven.exe.file.extension/>
-    <camel.osgi.export.pkg>${componentPackage}</camel.osgi.export.pkg>
     <componentPackage>org.apache.camel.component.olingo4</componentPackage>
     <outPackage>org.apache.camel.component.olingo4.internal</outPackage>
     <camel.osgi.private.pkg>${outPackage}</camel.osgi.private.pkg>
diff --git a/components/camel-opentracing/pom.xml b/components/camel-opentracing/pom.xml
index 2f86c4d..51270ad 100644
--- a/components/camel-opentracing/pom.xml
+++ b/components/camel-opentracing/pom.xml
@@ -39,7 +39,6 @@
     <label>monitoring,microservice</label>
     <title>OpenTracing</title>
 
-    <camel.osgi.export.pkg>org.apache.camel.opentracing.*</camel.osgi.export.pkg>
 
     <opentracing-agent.lib>${project.build.directory}/lib</opentracing-agent.lib>
   </properties>
diff --git a/components/camel-optaplanner/pom.xml b/components/camel-optaplanner/pom.xml
index a15eed3..b426af2 100644
--- a/components/camel-optaplanner/pom.xml
+++ b/components/camel-optaplanner/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel OptaPlanner support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.optaplanner.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-paho/pom.xml b/components/camel-paho/pom.xml
index cd98026..70fff0b 100644
--- a/components/camel-paho/pom.xml
+++ b/components/camel-paho/pom.xml
@@ -33,7 +33,6 @@
   <description>Camel Eclipse Paho support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.paho.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-paxlogging/pom.xml b/components/camel-paxlogging/pom.xml
index 26b3f38..ea4c834 100644
--- a/components/camel-paxlogging/pom.xml
+++ b/components/camel-paxlogging/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel OSGi PaxLogging support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.paxlogging</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-pdf/pom.xml b/components/camel-pdf/pom.xml
index 8eeab75..a6f4481 100644
--- a/components/camel-pdf/pom.xml
+++ b/components/camel-pdf/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel PDF support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.pdf.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-pgevent/pom.xml b/components/camel-pgevent/pom.xml
index 4aa27c8..21a78ea 100644
--- a/components/camel-pgevent/pom.xml
+++ b/components/camel-pgevent/pom.xml
@@ -33,7 +33,6 @@
   <description>Component for sending/receiving notifications in PostgreSQL</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.pgevent.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-printer/pom.xml b/components/camel-printer/pom.xml
index 84b0a7f..9209b76 100644
--- a/components/camel-printer/pom.xml
+++ b/components/camel-printer/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel Printer support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.printer.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-protobuf/pom.xml b/components/camel-protobuf/pom.xml
index 3fcc3bd..8760d07 100644
--- a/components/camel-protobuf/pom.xml
+++ b/components/camel-protobuf/pom.xml
@@ -34,7 +34,6 @@
   <description>Camel Google Protobuf data format support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.dataformat.protobuf.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-pubnub/pom.xml b/components/camel-pubnub/pom.xml
index 130f924..5fa4548 100644
--- a/components/camel-pubnub/pom.xml
+++ b/components/camel-pubnub/pom.xml
@@ -34,7 +34,6 @@
   <description>Camel PubNub Support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.pubnub.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-quartz2/pom.xml b/components/camel-quartz2/pom.xml
index a2afcbd..c287eb6 100644
--- a/components/camel-quartz2/pom.xml
+++ b/components/camel-quartz2/pom.xml
@@ -32,11 +32,6 @@
   <description>Camel Quartz2 support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.quartz2.*;${camel.osgi.version},
-      org.apache.camel.pollconsumer.quartz2.*,
-      org.apache.camel.routepolicy.quartz2.*
-    </camel.osgi.export.pkg>
     <camel.osgi.import.pkg>
       !org.apache.camel.component.quartz2.*,
       !org.apache.camel.pollconsumer.quartz2.*,
diff --git a/components/camel-quickfix/pom.xml b/components/camel-quickfix/pom.xml
index 22f1a0b..e75bd5b 100644
--- a/components/camel-quickfix/pom.xml
+++ b/components/camel-quickfix/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel QuickFIX/J support</description>
 
   <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>
   </properties>
 
diff --git a/components/camel-rabbitmq/pom.xml b/components/camel-rabbitmq/pom.xml
index 953ccdf..04bfef3 100644
--- a/components/camel-rabbitmq/pom.xml
+++ b/components/camel-rabbitmq/pom.xml
@@ -32,9 +32,6 @@
   <description>Camel RabbitMQ Component</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.rabbitmq.*
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-reactive-streams/pom.xml b/components/camel-reactive-streams/pom.xml
index 4d7f158..508c8d8 100644
--- a/components/camel-reactive-streams/pom.xml
+++ b/components/camel-reactive-streams/pom.xml
@@ -33,7 +33,6 @@
     <description>Camel Reactive Streams Component</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.reactive.streams.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-reactor/pom.xml b/components/camel-reactor/pom.xml
index d62aecd..3fa3aae 100644
--- a/components/camel-reactor/pom.xml
+++ b/components/camel-reactor/pom.xml
@@ -35,7 +35,6 @@
       <firstVersion>2.20.0</firstVersion>
       <label>reactive,streams</label>
 
-      <camel.osgi.export.pkg>org.apache.camel.component.reactor.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-ref/pom.xml b/components/camel-ref/pom.xml
index 2162479..b6b7516 100644
--- a/components/camel-ref/pom.xml
+++ b/components/camel-ref/pom.xml
@@ -34,11 +34,6 @@
   <description>Camel Ref component</description>
 
   <properties>
-    <camel.osgi.import>
-      ${camel.osgi.import.defaults},
-      *
-    </camel.osgi.import>
-    <camel.osgi.export.pkg>org.apache.camel.component.ref.*</camel.osgi.export.pkg>
     <!-- do not skip any tests by default -->
     <platform.skip.tests/>
   </properties>
diff --git a/components/camel-rest-swagger/pom.xml b/components/camel-rest-swagger/pom.xml
index dcc5a3e..5f10d15 100644
--- a/components/camel-rest-swagger/pom.xml
+++ b/components/camel-rest-swagger/pom.xml
@@ -36,7 +36,6 @@
   <properties>
     <firstVersion>2.19.0</firstVersion>
     <label>rest,api,http</label>
-    <camel.osgi.export.pkg>org.apache.camel.component.rest.swagger.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-restlet/pom.xml b/components/camel-restlet/pom.xml
index 2e97d92..0ee06ce 100644
--- a/components/camel-restlet/pom.xml
+++ b/components/camel-restlet/pom.xml
@@ -33,9 +33,6 @@
   <description>Camel REST (Restlet based) Component</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.restlet.*
-    </camel.osgi.export.pkg>
   </properties>
 
   <repositories>
diff --git a/components/camel-ribbon/pom.xml b/components/camel-ribbon/pom.xml
index 3e22add..7cd3c32 100644
--- a/components/camel-ribbon/pom.xml
+++ b/components/camel-ribbon/pom.xml
@@ -38,7 +38,6 @@
     <firstVersion>2.18.0</firstVersion>
     <label>microservice</label>
 
-    <camel.osgi.export.pkg>org.apache.camel.component.ribbon.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-rmi/pom.xml b/components/camel-rmi/pom.xml
index 0357b03..72abad2 100644
--- a/components/camel-rmi/pom.xml
+++ b/components/camel-rmi/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel RMI support</description>
 
   <properties>
-	<camel.osgi.export.pkg>org.apache.camel.component.rmi.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-rss/pom.xml b/components/camel-rss/pom.xml
index baa6a69..46fe5ee 100644
--- a/components/camel-rss/pom.xml
+++ b/components/camel-rss/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel RSS support</description>
   
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.rss.*;${camel.osgi.version},org.apache.camel.dataformat.rss.*</camel.osgi.export.pkg>
     </properties>
  
     <dependencies>
diff --git a/components/camel-rxjava2/pom.xml b/components/camel-rxjava2/pom.xml
index a6099c2..f759269 100644
--- a/components/camel-rxjava2/pom.xml
+++ b/components/camel-rxjava2/pom.xml
@@ -35,7 +35,6 @@
       <firstVersion>2.22.0</firstVersion>
       <label>reactive,streams</label>
 
-      <camel.osgi.export.pkg>org.apache.camel.component.rxjava2.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-saga/pom.xml b/components/camel-saga/pom.xml
index 6bb38a4..f6f1cb1 100644
--- a/components/camel-saga/pom.xml
+++ b/components/camel-saga/pom.xml
@@ -34,11 +34,6 @@
   <description>Camel Saga component</description>
 
   <properties>
-    <camel.osgi.import>
-      ${camel.osgi.import.defaults},
-      *
-    </camel.osgi.import>
-    <camel.osgi.export.pkg>org.apache.camel.component.saga.*</camel.osgi.export.pkg>
     <!-- do not skip any tests by default -->
     <platform.skip.tests/>
   </properties>
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml
index 67870ec..7570ec4 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -34,10 +34,6 @@
   <description>Camel Salesforce support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.salesforce,
-      org.apache.camel.component.salesforce.api.*
-    </camel.osgi.export.pkg>
     <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 3866552..63b15ad 100644
--- a/components/camel-sap-netweaver/pom.xml
+++ b/components/camel-sap-netweaver/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel SAP NetWeaver support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.sap.netweaver.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-saxon/pom.xml b/components/camel-saxon/pom.xml
index 678c8101..1b26d17 100644
--- a/components/camel-saxon/pom.xml
+++ b/components/camel-saxon/pom.xml
@@ -32,11 +32,6 @@
   <description>Camel Saxon (XQuery/XPath) support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.xquery.*,
-      org.apache.camel.language.xquery.*,
-      org.apache.camel.converter.saxon.*
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-scheduler/pom.xml b/components/camel-scheduler/pom.xml
index 29a88b8..f9d7004 100644
--- a/components/camel-scheduler/pom.xml
+++ b/components/camel-scheduler/pom.xml
@@ -34,11 +34,6 @@
   <description>Camel Scheduler component</description>
 
   <properties>
-    <camel.osgi.import>
-      ${camel.osgi.import.defaults},
-      *
-    </camel.osgi.import>
-    <camel.osgi.export.pkg>org.apache.camel.component.scheduler.*</camel.osgi.export.pkg>
     <!-- do not skip any tests by default -->
     <platform.skip.tests/>
   </properties>
diff --git a/components/camel-schematron/pom.xml b/components/camel-schematron/pom.xml
index adb6ed0..e572e9d 100644
--- a/components/camel-schematron/pom.xml
+++ b/components/camel-schematron/pom.xml
@@ -33,7 +33,6 @@
     <description>Camel Schematron support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.schematron.*</camel.osgi.export.pkg>
     </properties>
     
     <dependencies>
diff --git a/components/camel-script/pom.xml b/components/camel-script/pom.xml
index c5de32d..a5f015d 100644
--- a/components/camel-script/pom.xml
+++ b/components/camel-script/pom.xml
@@ -32,10 +32,6 @@
     <description>Camel Script support</description>
 
     <properties>
-        <camel.osgi.export.pkg>
-        	org.apache.camel.builder.script.*;${camel.osgi.version},
-        	org.apache.camel.script.osgi.*
-        </camel.osgi.export.pkg>
         <camel.osgi.import.pkg>
             !org.apache.camel.builder.script.*,
             !org.apache.camel.script.osgi.*,
diff --git a/components/camel-seda/pom.xml b/components/camel-seda/pom.xml
index 0a80509..d2cbe7a 100644
--- a/components/camel-seda/pom.xml
+++ b/components/camel-seda/pom.xml
@@ -34,11 +34,6 @@
   <description>Camel Seda component</description>
 
   <properties>
-    <camel.osgi.import>
-      ${camel.osgi.import.defaults},
-      *
-    </camel.osgi.import>
-    <camel.osgi.export.pkg>org.apache.camel.component.seda.*</camel.osgi.export.pkg>
     <!-- do not skip any tests by default -->
     <platform.skip.tests/>
   </properties>
diff --git a/components/camel-service/pom.xml b/components/camel-service/pom.xml
index d80c756..b0a7a2c 100644
--- a/components/camel-service/pom.xml
+++ b/components/camel-service/pom.xml
@@ -34,7 +34,6 @@
   <description>Camel service Support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.service</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-servicenow/camel-servicenow-component/pom.xml b/components/camel-servicenow/camel-servicenow-component/pom.xml
index f37df53..5423751 100644
--- a/components/camel-servicenow/camel-servicenow-component/pom.xml
+++ b/components/camel-servicenow/camel-servicenow-component/pom.xml
@@ -33,9 +33,6 @@
   <description>Camel ServiceNow support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.servicenow.*
-    </camel.osgi.export.pkg>
   </properties>
 
 
diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml
index f3972b7..45930f3 100644
--- a/components/camel-servlet/pom.xml
+++ b/components/camel-servlet/pom.xml
@@ -35,7 +35,6 @@
     <camel.osgi.import.before.defaults>
       javax.servlet.*;version="${servlet-version-range}"
     </camel.osgi.import.before.defaults>
-    <camel.osgi.export.pkg>org.apache.camel.component.servlet.*</camel.osgi.export.pkg>
 
     <!-- used for testing -->
     <tomcat.version>8.5.0</tomcat.version>
diff --git a/components/camel-shiro/pom.xml b/components/camel-shiro/pom.xml
index 9af2e50..195f483 100644
--- a/components/camel-shiro/pom.xml
+++ b/components/camel-shiro/pom.xml
@@ -36,7 +36,6 @@
     <firstVersion>2.5.0</firstVersion>
     <label>security</label>
 
-		<camel.osgi.export.pkg>org.apache.camel.component.shiro.*</camel.osgi.export.pkg>
 	</properties>
 
 	<dependencies>
diff --git a/components/camel-sip/pom.xml b/components/camel-sip/pom.xml
index d072bef..ea9cafa 100644
--- a/components/camel-sip/pom.xml
+++ b/components/camel-sip/pom.xml
@@ -33,9 +33,6 @@
 	<description>Camel SIP protocol based communication component</description>
 
 	<properties>
-		<camel.osgi.export.pkg>
-			org.apache.camel.component.sip.*
-		</camel.osgi.export.pkg>
 	</properties>
 	
   	<dependencies>
diff --git a/components/camel-sjms/pom.xml b/components/camel-sjms/pom.xml
index b407bb2..c3df609 100644
--- a/components/camel-sjms/pom.xml
+++ b/components/camel-sjms/pom.xml
@@ -32,11 +32,6 @@
   <description>A pure Java JMS Camel Component</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.sjms,
-      org.apache.camel.component.sjms.jms,
-      org.apache.camel.component.sjms.batch
-    </camel.osgi.export.pkg>
     <camel.osgi.private.pkg>
       org.apache.camel.component.sjms.consumer,
       org.apache.camel.component.sjms.producer,
diff --git a/components/camel-sjms2/pom.xml b/components/camel-sjms2/pom.xml
index a558c17..7216e29 100644
--- a/components/camel-sjms2/pom.xml
+++ b/components/camel-sjms2/pom.xml
@@ -33,10 +33,6 @@
   <description>A pure Java JMS 2.0 Camel Component</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.sjms2,
-      org.apache.camel.component.sjms2.jms
-    </camel.osgi.export.pkg>
     <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 66ac1dd..42d7afc 100644
--- a/components/camel-slack/pom.xml
+++ b/components/camel-slack/pom.xml
@@ -33,7 +33,6 @@
   <description>Camel Slack Support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.slack.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-smpp/pom.xml b/components/camel-smpp/pom.xml
index 58ca5b5..ad38dcc 100644
--- a/components/camel-smpp/pom.xml
+++ b/components/camel-smpp/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel SMPP support</description>
 
     <properties>
-      <camel.osgi.export.pkg>org.apache.camel.component.smpp.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-snakeyaml/pom.xml b/components/camel-snakeyaml/pom.xml
index b8665ee..997b62b 100644
--- a/components/camel-snakeyaml/pom.xml
+++ b/components/camel-snakeyaml/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel SnakeYAML support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.snakeyaml.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-snmp/pom.xml b/components/camel-snmp/pom.xml
index d2fd83f..e298b6b 100644
--- a/components/camel-snmp/pom.xml
+++ b/components/camel-snmp/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel SNMP support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.snmp.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index f90e396..9c4e09e 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -33,11 +33,6 @@
 
     <properties>
         <camel.osgi.import.before.defaults>javax.xml.ws;version="[0.0,3)"</camel.osgi.import.before.defaults>
-        <camel.osgi.export.pkg>
-          org.apache.camel.dataformat.soap.*;${camel.osgi.version},
-          org.xmlsoap.schemas.soap.envelope.*,
-          org.w3._2003._05.soap_envelope.*
-        </camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-solr/pom.xml b/components/camel-solr/pom.xml
index 2632e09..108613b 100644
--- a/components/camel-solr/pom.xml
+++ b/components/camel-solr/pom.xml
@@ -31,9 +31,6 @@
   <description>Camel Solr Support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.solr.*;${camel.osgi.version}
-    </camel.osgi.export.pkg>
     <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-rest/pom.xml b/components/camel-spark-rest/pom.xml
index b5cf894..fcd1e81 100644
--- a/components/camel-spark-rest/pom.xml
+++ b/components/camel-spark-rest/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel Spark (REST DSL) support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.sparkrest.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-spark/pom.xml b/components/camel-spark/pom.xml
index b438f1d..927bc87 100644
--- a/components/camel-spark/pom.xml
+++ b/components/camel-spark/pom.xml
@@ -34,7 +34,6 @@
   <description>Camel Apache Spark Support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.spark.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-splunk/pom.xml b/components/camel-splunk/pom.xml
index 675c6b6..27e6102 100644
--- a/components/camel-splunk/pom.xml
+++ b/components/camel-splunk/pom.xml
@@ -35,7 +35,6 @@
     <camel.osgi.import.before.defaults>
       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>
   </properties>
 
   <dependencies>
diff --git a/components/camel-spring-batch/pom.xml b/components/camel-spring-batch/pom.xml
index 7b8134f..a75d592 100644
--- a/components/camel-spring-batch/pom.xml
+++ b/components/camel-spring-batch/pom.xml
@@ -31,7 +31,6 @@
     <description>Camel Spring Batch support</description>
 
     <properties>
-        <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>
     </properties>
diff --git a/components/camel-spring-integration/pom.xml b/components/camel-spring-integration/pom.xml
index 50d70ae..c7e93c0 100644
--- a/components/camel-spring-integration/pom.xml
+++ b/components/camel-spring-integration/pom.xml
@@ -32,7 +32,6 @@
     <packaging>jar</packaging>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.spring.integration.*</camel.osgi.export.pkg>
         <camel.osgi.import.before.defaults>
             org.springframework.integration.*;version="[4.2,5)",
             org.springframework.messaging.*;version="[4.2,5)"
diff --git a/components/camel-spring-javaconfig/pom.xml b/components/camel-spring-javaconfig/pom.xml
index 5043b7e..28652fe 100644
--- a/components/camel-spring-javaconfig/pom.xml
+++ b/components/camel-spring-javaconfig/pom.xml
@@ -37,7 +37,6 @@
     <label>spring</label>
     <title>Spring Java Configuration</title>
 
-    <camel.osgi.export.pkg>org.apache.camel.spring.javaconfig.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-spring-ldap/pom.xml b/components/camel-spring-ldap/pom.xml
index 5636f57..e7be7e2 100644
--- a/components/camel-spring-ldap/pom.xml
+++ b/components/camel-spring-ldap/pom.xml
@@ -35,7 +35,6 @@
             org.springframework.ldap.*;version="[2,3)",
             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>
     </properties>
 
     <dependencies>
diff --git a/components/camel-spring-redis/pom.xml b/components/camel-spring-redis/pom.xml
index 4dee6a2..8536730 100644
--- a/components/camel-spring-redis/pom.xml
+++ b/components/camel-spring-redis/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel Spring Redis Component</description>
 
   <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>
   </properties>
 
diff --git a/components/camel-spring-security/pom.xml b/components/camel-spring-security/pom.xml
index 61d84ec..9a8f44c 100644
--- a/components/camel-spring-security/pom.xml
+++ b/components/camel-spring-security/pom.xml
@@ -36,7 +36,6 @@
     <firstVersion>2.3.0</firstVersion>
     <label>security,spring</label>
 
-    <camel.osgi.export.pkg>org.apache.camel.component.spring.security.*</camel.osgi.export.pkg>
     <camel.osgi.import.before.defaults>org.springframework.security.*;version="[4,5)"</camel.osgi.import.before.defaults>
   </properties>
 
diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml
index 8e60556..a5b090c 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -38,7 +38,6 @@
       org.springframework.beans.*;version="${spring-version-range}",
       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>
   </properties>
 
   <dependencies>
diff --git a/components/camel-sql/pom.xml b/components/camel-sql/pom.xml
index ca98578..b3bca41 100644
--- a/components/camel-sql/pom.xml
+++ b/components/camel-sql/pom.xml
@@ -32,11 +32,6 @@
   <description>Camel SQL support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.sql.*;${camel.osgi.version},
-      org.apache.camel.processor.aggregate.jdbc.*;${camel.osgi.version},
-      org.apache.camel.processor.idempotent.jdbc.*;${camel.osgi.version}
-    </camel.osgi.export.pkg>
     <camel.osgi.import.pkg>
       !org.apache.camel.component.sql.*,
       !org.apache.camel.processor.aggregate.jdbc.*,
diff --git a/components/camel-ssh/pom.xml b/components/camel-ssh/pom.xml
index 32f33de..b938ca8 100644
--- a/components/camel-ssh/pom.xml
+++ b/components/camel-ssh/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel SSH support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.ssh.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-stax/pom.xml b/components/camel-stax/pom.xml
index 59b6fa5..dc7eef3 100644
--- a/components/camel-stax/pom.xml
+++ b/components/camel-stax/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel StAX support</description>
 
   <properties>
-      <camel.osgi.export.pkg>org.apache.camel.component.stax.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-stomp/pom.xml b/components/camel-stomp/pom.xml
index b0dcb49..8693cc9 100644
--- a/components/camel-stomp/pom.xml
+++ b/components/camel-stomp/pom.xml
@@ -33,7 +33,6 @@
   <description>Camel Stomp client</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.stomp.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-stream/pom.xml b/components/camel-stream/pom.xml
index 26da5c1..f1cff9d 100644
--- a/components/camel-stream/pom.xml
+++ b/components/camel-stream/pom.xml
@@ -33,7 +33,6 @@
     <description>Camel Stream (System.in, System.out, System.err) support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.stream.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-stringtemplate/pom.xml b/components/camel-stringtemplate/pom.xml
index 9388f14..635ecfc 100644
--- a/components/camel-stringtemplate/pom.xml
+++ b/components/camel-stringtemplate/pom.xml
@@ -33,7 +33,6 @@
   <description>Camel StringTemplate support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.stringtemplate.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-stub/pom.xml b/components/camel-stub/pom.xml
index a82a2f8..2155dc3 100644
--- a/components/camel-stub/pom.xml
+++ b/components/camel-stub/pom.xml
@@ -34,11 +34,6 @@
   <description>Camel Stub component</description>
 
   <properties>
-    <camel.osgi.import>
-      ${camel.osgi.import.defaults},
-      *
-    </camel.osgi.import>
-    <camel.osgi.export.pkg>org.apache.camel.component.stub.*</camel.osgi.export.pkg>
     <!-- do not skip any tests by default -->
     <platform.skip.tests/>
   </properties>
diff --git a/components/camel-swagger-java/pom.xml b/components/camel-swagger-java/pom.xml
index 2c1b1cb..54ef3f1 100644
--- a/components/camel-swagger-java/pom.xml
+++ b/components/camel-swagger-java/pom.xml
@@ -40,7 +40,6 @@
     <camel.osgi.import.before.defaults>
       com.fasterxml.jackson.*;version="[2.8,3)"
     </camel.osgi.import.before.defaults>
-    <camel.osgi.export.pkg>org.apache.camel.swagger.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-syslog/pom.xml b/components/camel-syslog/pom.xml
index 5205cc9..2d019be 100644
--- a/components/camel-syslog/pom.xml
+++ b/components/camel-syslog/pom.xml
@@ -31,7 +31,6 @@
   <description>Camel Syslog support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.syslog.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-tagsoup/pom.xml b/components/camel-tagsoup/pom.xml
index 2253e35..550bff8 100644
--- a/components/camel-tagsoup/pom.xml
+++ b/components/camel-tagsoup/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel TagSoup support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.dataformat.tagsoup.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-tarfile/pom.xml b/components/camel-tarfile/pom.xml
index ed2849d..57d9bd2 100644
--- a/components/camel-tarfile/pom.xml
+++ b/components/camel-tarfile/pom.xml
@@ -32,15 +32,6 @@
   <description>Camel Tar file support</description>
 
   <properties>
-    <camel.osgi.import>
-    	!org.apache.camel.dataformat.tarfile,
-    	!org.apache.camel.processor.aggregate.tarfile,
-    	*
-    </camel.osgi.import>
-    <camel.osgi.export>
-    	org.apache.camel.dataformat.tarfile;${camel.osgi.version},
-    	org.apache.camel.processor.aggregate.tarfile;${camel.osgi.version}
-    </camel.osgi.export>
   </properties>
 
   <dependencies>
diff --git a/components/camel-telegram/pom.xml b/components/camel-telegram/pom.xml
index a62ebf8..f82bd2b 100644
--- a/components/camel-telegram/pom.xml
+++ b/components/camel-telegram/pom.xml
@@ -33,9 +33,6 @@
   <description>Camel Telegram support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.telegram.*,org.apache.camel.component.telegram.model.*
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-test-blueprint/pom.xml b/components/camel-test-blueprint/pom.xml
index 5b71010..45b6279 100644
--- a/components/camel-test-blueprint/pom.xml
+++ b/components/camel-test-blueprint/pom.xml
@@ -36,7 +36,6 @@
         <firstVersion>2.10.0</firstVersion>
         <label>testing,java,osgi</label>
 
-        <camel.osgi.export.pkg>org.apache.camel.test.blueprint*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-test-cdi/pom.xml b/components/camel-test-cdi/pom.xml
index e7be026..6665f7f 100644
--- a/components/camel-test-cdi/pom.xml
+++ b/components/camel-test-cdi/pom.xml
@@ -38,7 +38,6 @@
     <label>testing,java</label>
     <title>Test CDI</title>
 
-    <camel.osgi.export.pkg>org.apache.camel.test.cdi.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-test-karaf/pom.xml b/components/camel-test-karaf/pom.xml
index 10f30f5..92e0e54 100644
--- a/components/camel-test-karaf/pom.xml
+++ b/components/camel-test-karaf/pom.xml
@@ -39,7 +39,6 @@
     <label>testing,java,osgi</label>
 
     <karf-test-version>${karaf4-version}</karf-test-version>
-    <camel.osgi.export.pkg>org.apache.camel.test.karaf</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
@@ -170,23 +169,15 @@
       <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
-          <extensions>true</extensions>
           <configuration>
               <instructions>
                   <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                  <!-- Export-Package>org.apache.camel.test.karaf</Export-Package -->>
+                  <!-- Export-Package>org.apache.camel.test.karaf</Export-Package -->
                   <DynamicImport-Package>*</DynamicImport-Package>
                   <Import-Package/>
                   <_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-test-spring/pom.xml b/components/camel-test-spring/pom.xml
index 165d1d6..c1c4495 100644
--- a/components/camel-test-spring/pom.xml
+++ b/components/camel-test-spring/pom.xml
@@ -37,7 +37,6 @@
     <firstVersion>2.10.0</firstVersion>
     <label>testing,java,spring</label>
 
-    <camel.osgi.export.pkg>org.apache.camel.test.spring.*</camel.osgi.export.pkg>
     <spring-version>${spring5-version}</spring-version>
   </properties>
 
diff --git a/components/camel-test/pom.xml b/components/camel-test/pom.xml
index 75c0939..e27a26f 100644
--- a/components/camel-test/pom.xml
+++ b/components/camel-test/pom.xml
@@ -36,7 +36,6 @@
         <firstVersion>2.9.0</firstVersion>
         <label>testing,java</label>
 
-        <camel.osgi.export.pkg>org.apache.camel.test.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-testcontainers-spring/pom.xml b/components/camel-testcontainers-spring/pom.xml
index 8f4fdec..1e9ed99 100644
--- a/components/camel-testcontainers-spring/pom.xml
+++ b/components/camel-testcontainers-spring/pom.xml
@@ -36,7 +36,6 @@
         <firstVersion>2.22.0</firstVersion>
         <label>testing,java,docker</label>
 
-        <camel.osgi.export.pkg>org.apache.camel.test.testcontainers.spring.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-testcontainers/pom.xml b/components/camel-testcontainers/pom.xml
index adca22b..d5088e5 100644
--- a/components/camel-testcontainers/pom.xml
+++ b/components/camel-testcontainers/pom.xml
@@ -36,7 +36,6 @@
         <firstVersion>2.22.0</firstVersion>
         <label>testing,java,docker</label>
 
-        <camel.osgi.export.pkg>org.apache.camel.testcontainers.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-thrift/pom.xml b/components/camel-thrift/pom.xml
index 9cd3ce3..9d17631 100644
--- a/components/camel-thrift/pom.xml
+++ b/components/camel-thrift/pom.xml
@@ -34,10 +34,6 @@
   <description>Camel Apache Thrift data format and RPC support</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.dataformat.thrift.*;${camel.osgi.version},
-      org.apache.camel.component.thrift.*;${camel.osgi.version}
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-tika/pom.xml b/components/camel-tika/pom.xml
index 022f2de..f715df9 100644
--- a/components/camel-tika/pom.xml
+++ b/components/camel-tika/pom.xml
@@ -33,7 +33,6 @@
   <description>This component integrates with Apache Tika to extract content and metadata from thousands of file types.</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.tika.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-timer/pom.xml b/components/camel-timer/pom.xml
index d34034a..787c806 100644
--- a/components/camel-timer/pom.xml
+++ b/components/camel-timer/pom.xml
@@ -34,11 +34,6 @@
   <description>Camel Timer component</description>
 
   <properties>
-    <camel.osgi.import>
-      ${camel.osgi.import.defaults},
-      *
-    </camel.osgi.import>
-    <camel.osgi.export.pkg>org.apache.camel.component.timer.*</camel.osgi.export.pkg>
     <!-- do not skip any tests by default -->
     <platform.skip.tests/>
   </properties>
diff --git a/components/camel-twilio/pom.xml b/components/camel-twilio/pom.xml
index e674e18..7a3a24e 100644
--- a/components/camel-twilio/pom.xml
+++ b/components/camel-twilio/pom.xml
@@ -38,7 +38,6 @@
     <componentPackage>org.apache.camel.component.twilio</componentPackage>
     <outPackage>org.apache.camel.component.twilio.internal</outPackage>
 
-    <camel.osgi.export.pkg>${componentPackage}</camel.osgi.export.pkg>
     <camel.osgi.private.pkg>${outPackage}</camel.osgi.private.pkg>
   </properties>
 
diff --git a/components/camel-twitter/pom.xml b/components/camel-twitter/pom.xml
index 516e48d..13ffa5a 100644
--- a/components/camel-twitter/pom.xml
+++ b/components/camel-twitter/pom.xml
@@ -33,7 +33,6 @@
   <description>Camel Twitter support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.twitter.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-undertow/pom.xml b/components/camel-undertow/pom.xml
index a126bf9..a153903 100644
--- a/components/camel-undertow/pom.xml
+++ b/components/camel-undertow/pom.xml
@@ -32,7 +32,6 @@
   <name>Camel :: Undertow</name>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.undertow.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-univocity-parsers/pom.xml b/components/camel-univocity-parsers/pom.xml
index fb475fc..37656cd 100644
--- a/components/camel-univocity-parsers/pom.xml
+++ b/components/camel-univocity-parsers/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel UniVocity parsers data format support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.dataformat.univocity.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-velocity/pom.xml b/components/camel-velocity/pom.xml
index 12d5f0f..2e84eba 100644
--- a/components/camel-velocity/pom.xml
+++ b/components/camel-velocity/pom.xml
@@ -33,7 +33,6 @@
     <description>Camel Velocity support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.velocity.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-vertx/pom.xml b/components/camel-vertx/pom.xml
index fd56ee4..39c8fd1 100644
--- a/components/camel-vertx/pom.xml
+++ b/components/camel-vertx/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel Vertx support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.vertx.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-weather/pom.xml b/components/camel-weather/pom.xml
index 8b51b83..4137f42 100644
--- a/components/camel-weather/pom.xml
+++ b/components/camel-weather/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel Weather support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.weather.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-web3j/pom.xml b/components/camel-web3j/pom.xml
index 9d82024..31e1066 100644
--- a/components/camel-web3j/pom.xml
+++ b/components/camel-web3j/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel Ethereum support through Web3j</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.web3j.*</camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-websocket-jsr356/pom.xml b/components/camel-websocket-jsr356/pom.xml
index d9ce398..41acc1b 100644
--- a/components/camel-websocket-jsr356/pom.xml
+++ b/components/camel-websocket-jsr356/pom.xml
@@ -36,9 +36,6 @@
   <properties>
     <tomcat.version>9.0.13</tomcat.version>
 
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.websocket.jsr356.*;${camel.osgi.version}
-    </camel.osgi.export.pkg>
     <camel.osgi.import.pkg>
       !org.apache.camel.component.websocket.jsr356.*,
       javax.websocket.*;version="[1.1,2)";resolution:=optional,
diff --git a/components/camel-websocket/pom.xml b/components/camel-websocket/pom.xml
index 7c0e5aa..8cfa67b 100644
--- a/components/camel-websocket/pom.xml
+++ b/components/camel-websocket/pom.xml
@@ -34,9 +34,6 @@
   <description>Camel WebSocket using Jetty</description>
 
   <properties>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.websocket.*;${camel.osgi.version}
-    </camel.osgi.export.pkg>
     <camel.osgi.import.pkg>
       !org.apache.camel.component.websocket.*,
       org.eclipse.jetty.util.ssl;version="[9.2,10)";resolution:=optional,
diff --git a/components/camel-wordpress/pom.xml b/components/camel-wordpress/pom.xml
index b86d93c..aa790db 100644
--- a/components/camel-wordpress/pom.xml
+++ b/components/camel-wordpress/pom.xml
@@ -36,9 +36,6 @@
 
 	<properties>
 		<hamcrest-version>1.3</hamcrest-version>
-		<camel.osgi.export.pkg>
-			org.apache.camel.component.wordpress.*,
-		</camel.osgi.export.pkg>
 	</properties>
 
 	<dependencies>
diff --git a/components/camel-xchange/pom.xml b/components/camel-xchange/pom.xml
index c5863a1..8fdf8d2 100644
--- a/components/camel-xchange/pom.xml
+++ b/components/camel-xchange/pom.xml
@@ -32,7 +32,6 @@
   <description>Camel XChange support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.xchange.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-xmlsecurity/pom.xml b/components/camel-xmlsecurity/pom.xml
index a5ad8f0..fbfab21 100644
--- a/components/camel-xmlsecurity/pom.xml
+++ b/components/camel-xmlsecurity/pom.xml
@@ -33,10 +33,6 @@
     <description>Camel Partial XML Encryption/Decryption and XML Signature support</description>
 
     <properties>
-        <camel.osgi.export.pkg>
-             org.apache.camel.component.xmlsecurity.*;${camel.osgi.version},
-             org.apache.camel.dataformat.xmlsecurity.*
-        </camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-xmpp/pom.xml b/components/camel-xmpp/pom.xml
index 26de598..8b19e56 100644
--- a/components/camel-xmpp/pom.xml
+++ b/components/camel-xmpp/pom.xml
@@ -33,7 +33,6 @@
   <description>Camel XMPP support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.xmpp.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-xstream/pom.xml b/components/camel-xstream/pom.xml
index 2c6d4d9..99c1392 100644
--- a/components/camel-xstream/pom.xml
+++ b/components/camel-xstream/pom.xml
@@ -33,7 +33,6 @@
   <description>Camel XStream support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.dataformat.xstream.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-yammer/pom.xml b/components/camel-yammer/pom.xml
index 5ea7040..2d43d06 100644
--- a/components/camel-yammer/pom.xml
+++ b/components/camel-yammer/pom.xml
@@ -32,7 +32,6 @@
  <description>Camel Yammer Component</description>
 
  <properties>
-  <camel.osgi.export.pkg>org.apache.camel.component.yammer.*</camel.osgi.export.pkg>
  </properties>
 
  <dependencies>
diff --git a/components/camel-zipfile/pom.xml b/components/camel-zipfile/pom.xml
index ea22783..0ed9284 100644
--- a/components/camel-zipfile/pom.xml
+++ b/components/camel-zipfile/pom.xml
@@ -32,16 +32,6 @@
   <description>Camel Zip file support</description>
 
   <properties>
-    <camel.osgi.import>
-    	!org.apache.camel.dataformat.zipfile,
-    	!org.apache.camel.processor.aggregate.zipfile,
-    	*
-    </camel.osgi.import>
-    <camel.osgi.export>
-    	org.apache.camel.dataformat.zipfile;${camel.osgi.version},
-    	org.apache.camel.processor.aggregate.zipfile;${camel.osgi.version}
-    </camel.osgi.export>
-    
   </properties>
 
   <dependencies>
diff --git a/components/camel-zipkin/pom.xml b/components/camel-zipkin/pom.xml
index 2831e44..79c5871 100644
--- a/components/camel-zipkin/pom.xml
+++ b/components/camel-zipkin/pom.xml
@@ -37,8 +37,6 @@
     <!-- use by camel-catalog -->
     <firstVersion>2.18.0</firstVersion>
     <label>monitoring,microservice</label>
-
-    <camel.osgi.export.pkg>org.apache.camel.zipkin.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
@@ -111,18 +109,6 @@
           </environmentVariables>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>org.apache.camel.zipkin*</Export-Package>
-            <Import-Package>!com.github.kristofa.brave.internal,!zipkin2.internal,!zipkin.internal,*</Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/components/camel-zookeeper-master/pom.xml b/components/camel-zookeeper-master/pom.xml
index 0bdc717..8957611 100644
--- a/components/camel-zookeeper-master/pom.xml
+++ b/components/camel-zookeeper-master/pom.xml
@@ -38,10 +38,6 @@
       !org.apache.camel.component.zookeepermaster.group,
       *
     </camel.osgi.import>
-    <camel.osgi.export.pkg>
-      org.apache.camel.component.zookeepermaster,
-      org.apache.camel.component.zookeepermaster.group
-    </camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/components/camel-zookeeper/pom.xml b/components/camel-zookeeper/pom.xml
index aad1c4f..447e721 100644
--- a/components/camel-zookeeper/pom.xml
+++ b/components/camel-zookeeper/pom.xml
@@ -33,7 +33,6 @@
   <description>Camel Zookeeper Support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.zookeeper.*</camel.osgi.export.pkg>
   </properties>
 
   <dependencies>
diff --git a/parent/pom.xml b/parent/pom.xml
index fc1cac8..46eb29d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -775,7 +775,7 @@
     <camel.osgi.failok>false</camel.osgi.failok>
     <camel.osgi.private.pkg>!*</camel.osgi.private.pkg>
     <camel.osgi.export.pkg>{local-packages}</camel.osgi.export.pkg>
-    <camel.osgi.export>${camel.osgi.export.pkg};${camel.osgi.version}</camel.osgi.export>
+    <camel.osgi.export>${camel.osgi.export.pkg};-noimport:=true;${camel.osgi.version}</camel.osgi.export>
     <camel.osgi.version>version=${project.version}</camel.osgi.version>
     <camel.osgi.split.pkg>-split-package:=first</camel.osgi.split.pkg>
     <camel.osgi.import>${camel.osgi.import.pkg}</camel.osgi.import>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 0cfb2f5..a266b72 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2230,6 +2230,7 @@
     <feature version='${project.version}'>camel-core</feature>
     <bundle dependency='true'>mvn:io.undertow/undertow-core/${undertow-version}</bundle>
     <bundle dependency='true'>mvn:org.jboss.xnio/xnio-api/${jboss-xnio-version}</bundle>
+    <bundle dependency='true'>mvn:org.jboss.xnio/xnio-nio/${jboss-xnio-version}</bundle>
     <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-undertow/${project.version}</bundle>
@@ -2321,18 +2322,6 @@
     <bundle dependency='true'>wrap:mvn:com.github.mmazi/rescu/${rescu-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-xchange/${project.version}</bundle>
   </feature>
-  <feature name='camel-xmljson' version='${project.version}' start-level='50'>
-     <!-- NOTICE: XOM cannot be included by default due to an incompatible license; please review its license model and install the dependency manually if you agree. -->
-    <details>Before using this feature make sure to install this bundle first manually: mvn:xom/xom/${xom-version}</details>
-    <feature version='${project.version}'>camel-core</feature>
-    <bundle dependency='true'>mvn:commons-beanutils/commons-beanutils/${commons-beanutils-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ezmorph/${ezmorph-bundle-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json-lib/${jsonlib-bundle-version}</bundle>
-    <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
-    <bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
-    <bundle>mvn:org.apache.camel/camel-xmljson/${project.version}</bundle>
-  </feature>
   <feature name='camel-xmlsecurity' version='${project.version}' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>