You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ra...@apache.org on 2016/03/30 20:45:57 UTC

[3/3] camel git commit: CAMEL-9764 Update maven-bundle-plugin to 3.0.1 to allow JDK8 lambdas.

CAMEL-9764 Update maven-bundle-plugin to 3.0.1 to allow JDK8 lambdas.


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

Branch: refs/heads/master
Commit: 7ae918f23c269c8ad78fc8e536b53342af569dec
Parents: 8f0bcd8
Author: Raúl Kripalani <ra...@apache.org>
Authored: Wed Mar 30 19:39:45 2016 +0100
Committer: Raúl Kripalani <ra...@apache.org>
Committed: Wed Mar 30 19:43:09 2016 +0100

----------------------------------------------------------------------
 camel-core/pom.xml                              |   3 +-
 components/camel-ahc-ws/pom.xml                 |   2 +-
 components/camel-ahc/pom.xml                    |   2 +-
 components/camel-amqp/pom.xml                   |   2 +-
 components/camel-apns/pom.xml                   |   2 +-
 components/camel-atmos/pom.xml                  |   2 +-
 components/camel-atmosphere-websocket/pom.xml   |   2 +-
 components/camel-atom/pom.xml                   |   2 +-
 components/camel-avro/pom.xml                   |   2 +-
 components/camel-aws/pom.xml                    |   2 +-
 components/camel-bam/pom.xml                    |   2 +-
 components/camel-barcode/pom.xml                |   2 +-
 components/camel-base64/pom.xml                 |   2 +-
 components/camel-bean-validator/pom.xml         |   2 +-
 components/camel-beanio/pom.xml                 |   2 +-
 components/camel-beanstalk/pom.xml              |   2 +-
 components/camel-bindy/pom.xml                  |   2 +-
 components/camel-blueprint/pom.xml              |  56 ++++-
 components/camel-boon/pom.xml                   |   2 +-
 components/camel-box/pom.xml                    |   2 +-
 components/camel-braintree/pom.xml              |   2 +-
 components/camel-cache/pom.xml                  |   2 +-
 components/camel-cassandraql/pom.xml            |   2 +-
 components/camel-castor/pom.xml                 |   2 +-
 components/camel-cdi/pom.xml                    |   2 +-
 components/camel-chunk/pom.xml                  |   2 +-
 components/camel-cm-sms/pom.xml                 |   2 +-
 components/camel-cmis/pom.xml                   |   2 +-
 components/camel-coap/pom.xml                   |   2 +-
 components/camel-cometd/pom.xml                 |   2 +-
 components/camel-context/pom.xml                |   2 +-
 components/camel-core-osgi/pom.xml              |   2 +-
 components/camel-core-xml/pom.xml               |   6 +
 components/camel-couchdb/pom.xml                |   2 +-
 components/camel-crypto/pom.xml                 |   2 +-
 components/camel-csv/pom.xml                    |   2 +-
 components/camel-cxf-transport/pom.xml          |   2 +-
 components/camel-cxf/pom.xml                    |   3 +-
 components/camel-disruptor/pom.xml              |   2 +-
 components/camel-dns/pom.xml                    |   2 +-
 components/camel-docker/pom.xml                 |   2 +-
 components/camel-dozer/pom.xml                  |   2 +-
 components/camel-dropbox/pom.xml                |   2 +-
 components/camel-eclipse/pom.xml                |   2 +-
 components/camel-ejb/pom.xml                    |   2 +-
 components/camel-elasticsearch/pom.xml          |   2 +-
 components/camel-elsql/pom.xml                  |   2 +-
 components/camel-etcd/pom.xml                   |   2 +-
 components/camel-eventadmin/pom.xml             |   2 +-
 components/camel-exec/pom.xml                   |   2 +-
 components/camel-facebook/pom.xml               |   2 +-
 components/camel-flatpack/pom.xml               |   2 +-
 components/camel-fop/pom.xml                    |   2 +-
 components/camel-freemarker/pom.xml             |   2 +-
 components/camel-ftp/pom.xml                    |   2 +-
 components/camel-gae/pom.xml                    | 211 +++++++++++++++++++
 components/camel-ganglia/pom.xml                |   2 +-
 components/camel-geocoder/pom.xml               |   2 +-
 components/camel-git/pom.xml                    |   2 +-
 components/camel-github/pom.xml                 |   2 +-
 components/camel-google-calendar/pom.xml        |   2 +-
 components/camel-google-drive/pom.xml           |   2 +-
 components/camel-google-mail/pom.xml            |   2 +-
 components/camel-gora/pom.xml                   |   2 +-
 components/camel-grape/pom.xml                  |   1 +
 components/camel-groovy/pom.xml                 |   2 +-
 components/camel-gson/pom.xml                   |   2 +-
 components/camel-guava-eventbus/pom.xml         |   2 +-
 components/camel-guice/pom.xml                  |   2 +-
 components/camel-hawtdb/pom.xml                 |   2 +-
 components/camel-hazelcast/pom.xml              |   2 +-
 components/camel-hbase/pom.xml                  |   2 +-
 components/camel-hdfs/pom.xml                   |   2 +-
 components/camel-hdfs2/pom.xml                  |   2 +-
 components/camel-hessian/pom.xml                |   2 +-
 components/camel-hipchat/pom.xml                |   2 +-
 components/camel-hl7/pom.xml                    |   2 +-
 components/camel-http-common/pom.xml            |   2 +-
 components/camel-http/pom.xml                   |   2 +-
 components/camel-http4/pom.xml                  |   2 +-
 components/camel-hystrix/pom.xml                |   2 +-
 components/camel-ibatis/pom.xml                 |   2 +-
 components/camel-ical/pom.xml                   |   2 +-
 components/camel-ignite/pom.xml                 |   2 +-
 components/camel-infinispan/pom.xml             |   2 +-
 components/camel-irc/pom.xml                    |   2 +-
 components/camel-ironmq/pom.xml                 |   2 +-
 components/camel-jackson/pom.xml                |   2 +-
 components/camel-jacksonxml/pom.xml             |   2 +-
 components/camel-javaspace/pom.xml              |   2 +-
 components/camel-jaxb/pom.xml                   |   2 +-
 components/camel-jbpm/pom.xml                   |   2 +-
 components/camel-jcache/pom.xml                 |   2 +-
 components/camel-jclouds/pom.xml                |   2 +-
 components/camel-jcr/pom.xml                    |   2 +-
 components/camel-jdbc/pom.xml                   |   2 +-
 components/camel-jetty-common/pom.xml           |   2 +-
 components/camel-jetty/pom.xml                  |   2 +-
 components/camel-jetty8/pom.xml                 |   2 +-
 components/camel-jetty9/pom.xml                 |   2 +-
 components/camel-jgroups/pom.xml                |   2 +-
 components/camel-jibx/pom.xml                   |   2 +-
 components/camel-jing/pom.xml                   |   2 +-
 components/camel-jira/pom.xml                   |   2 +-
 components/camel-jms/pom.xml                    |   2 +-
 components/camel-jmx/pom.xml                    |   2 +-
 components/camel-jolt/pom.xml                   |   2 +-
 components/camel-josql/pom.xml                  |   2 +-
 components/camel-jpa/pom.xml                    |   2 +-
 components/camel-jsch/pom.xml                   |   2 +-
 components/camel-jsonpath/pom.xml               |   2 +-
 components/camel-jt400/pom.xml                  |   2 +-
 components/camel-juel/pom.xml                   |   2 +-
 components/camel-jxpath/pom.xml                 |   2 +-
 components/camel-kafka/pom.xml                  |   2 +-
 components/camel-kestrel/pom.xml                |   2 +-
 components/camel-krati/pom.xml                  |   2 +-
 components/camel-kubernetes/pom.xml             |   2 +-
 components/camel-kura/pom.xml                   |   2 +-
 components/camel-ldap/pom.xml                   |   2 +-
 components/camel-leveldb/pom.xml                |   2 +-
 .../camel-linkedin/camel-linkedin-api/pom.xml   |   2 +-
 .../camel-linkedin-component/pom.xml            |   2 +-
 components/camel-lucene/pom.xml                 |   2 +-
 components/camel-lzf/pom.xml                    |   2 +-
 components/camel-mail/pom.xml                   |   2 +-
 components/camel-metrics/pom.xml                |   2 +-
 components/camel-mina/pom.xml                   |   2 +-
 components/camel-mina2/pom.xml                  |   2 +-
 components/camel-mllp/pom.xml                   |   2 +-
 components/camel-mongodb-gridfs/pom.xml         |   2 +-
 components/camel-mongodb/pom.xml                |   2 +-
 components/camel-mqtt/pom.xml                   |   2 +-
 components/camel-msv/pom.xml                    |   2 +-
 components/camel-mustache/pom.xml               |   2 +-
 components/camel-mvel/pom.xml                   |   2 +-
 components/camel-mybatis/pom.xml                |   2 +-
 components/camel-nagios/pom.xml                 |   2 +-
 components/camel-nats/pom.xml                   |   2 +-
 components/camel-netty-http/pom.xml             |   2 +-
 components/camel-netty/pom.xml                  |   2 +-
 components/camel-netty4-http/pom.xml            |   2 +-
 components/camel-netty4/pom.xml                 |   2 +-
 components/camel-ognl/pom.xml                   |   2 +-
 .../camel-olingo2/camel-olingo2-api/pom.xml     |   2 +-
 .../camel-olingo2-component/pom.xml             |   2 +-
 components/camel-openshift/pom.xml              |   2 +-
 components/camel-optaplanner/pom.xml            |   2 +-
 components/camel-paho/pom.xml                   |   2 +-
 components/camel-paxlogging/pom.xml             |   2 +-
 components/camel-pdf/pom.xml                    |   2 +-
 components/camel-pgevent/pom.xml                |   2 +-
 components/camel-printer/pom.xml                |   2 +-
 components/camel-protobuf/pom.xml               |   2 +-
 components/camel-quartz/pom.xml                 |   2 +-
 components/camel-quartz2/pom.xml                |   2 +-
 components/camel-quickfix/pom.xml               |   2 +-
 components/camel-rabbitmq/pom.xml               |   2 +-
 components/camel-restlet/pom.xml                |   2 +-
 components/camel-rmi/pom.xml                    |   2 +-
 components/camel-routebox/pom.xml               |   2 +-
 components/camel-rss/pom.xml                    |   2 +-
 components/camel-ruby/pom.xml                   |   2 +-
 components/camel-rx/pom.xml                     |   2 +-
 .../camel-salesforce-component/pom.xml          |   2 +-
 .../camel-salesforce-maven-plugin/pom.xml       |  23 ++
 components/camel-sap-netweaver/pom.xml          |   2 +-
 components/camel-saxon/pom.xml                  |   2 +-
 components/camel-scala/pom.xml                  |   2 +-
 components/camel-schematron/pom.xml             |   2 +-
 components/camel-scr/pom.xml                    |   2 +-
 components/camel-script/pom.xml                 |   2 +-
 components/camel-servicenow/pom.xml             |   2 +-
 components/camel-servlet/pom.xml                |   2 +-
 components/camel-servletlistener/pom.xml        |   2 +-
 components/camel-shiro/pom.xml                  |   2 +-
 components/camel-sip/pom.xml                    |   2 +-
 components/camel-sjms/pom.xml                   |   2 +-
 components/camel-slack/pom.xml                  |   2 +-
 components/camel-smpp/pom.xml                   |   2 +-
 components/camel-snakeyaml/pom.xml              |   2 +-
 components/camel-snmp/pom.xml                   |   2 +-
 components/camel-soap/pom.xml                   |   2 +-
 components/camel-solr/pom.xml                   |   2 +-
 components/camel-spark-rest/pom.xml             |   2 +-
 components/camel-spark/pom.xml                  |   2 +-
 components/camel-splunk/pom.xml                 |   2 +-
 components/camel-spring-batch/pom.xml           |   2 +-
 components/camel-spring-boot-starter/pom.xml    |   4 +
 components/camel-spring-boot/pom.xml            |   4 +
 components/camel-spring-integration/pom.xml     |   2 +-
 components/camel-spring-javaconfig/pom.xml      |   2 +-
 components/camel-spring-ldap/pom.xml            |   2 +-
 components/camel-spring-redis/pom.xml           |   2 +-
 components/camel-spring-security/pom.xml        |   2 +-
 components/camel-spring-ws/pom.xml              |   2 +-
 components/camel-spring/pom.xml                 |  54 ++++-
 components/camel-sql/pom.xml                    |   2 +-
 components/camel-ssh/pom.xml                    |   2 +-
 components/camel-stax/pom.xml                   |   2 +-
 components/camel-stomp/pom.xml                  |   2 +-
 components/camel-stream/pom.xml                 |   2 +-
 components/camel-stringtemplate/pom.xml         |   2 +-
 components/camel-swagger-java/pom.xml           |   2 +-
 components/camel-swagger/pom.xml                |   2 +-
 components/camel-syslog/pom.xml                 |   2 +-
 components/camel-tagsoup/pom.xml                |   2 +-
 components/camel-tarfile/pom.xml                |   2 +-
 components/camel-test-blueprint/pom.xml         |   2 +-
 components/camel-test-cdi/pom.xml               |   2 +-
 components/camel-test-spring/pom.xml            |   2 +-
 components/camel-test-spring40/pom.xml          |   2 +-
 components/camel-test/pom.xml                   |   2 +-
 components/camel-testng/pom.xml                 |   2 +-
 components/camel-twitter/pom.xml                |   2 +-
 components/camel-undertow/pom.xml               |   2 +-
 components/camel-univocity-parsers/pom.xml      |   2 +-
 components/camel-urlrewrite/pom.xml             |   2 +-
 components/camel-velocity/pom.xml               |   2 +-
 components/camel-vertx/pom.xml                  |   2 +-
 components/camel-weather/pom.xml                |   2 +-
 components/camel-websocket/pom.xml              |   2 +-
 components/camel-xmlbeans/pom.xml               |   2 +-
 components/camel-xmljson/pom.xml                |   2 +-
 components/camel-xmlrpc/pom.xml                 |   2 +-
 components/camel-xmlsecurity/pom.xml            |   2 +-
 components/camel-xmpp/pom.xml                   |   2 +-
 components/camel-xstream/pom.xml                |   2 +-
 components/camel-yammer/pom.xml                 |   2 +-
 components/camel-zipfile/pom.xml                |   2 +-
 components/camel-zookeeper/pom.xml              |   2 +-
 examples/camel-example-aggregate/pom.xml        |   2 +-
 examples/camel-example-bam/pom.xml              |   6 +-
 examples/camel-example-box-osgi/pom.xml         |  28 +--
 examples/camel-example-cafe/pom.xml             |   2 +-
 examples/camel-example-cdi-osgi/pom.xml         |   2 +-
 examples/camel-example-cdi-properties/pom.xml   |   7 +-
 examples/camel-example-cxf-blueprint/pom.xml    |  26 +--
 examples/camel-example-cxf-osgi/pom.xml         |  82 ++++---
 examples/camel-example-cxf-proxy/pom.xml        |   2 +-
 examples/camel-example-etl/pom.xml              |   2 +-
 examples/camel-example-jdbc/pom.xml             |   2 +-
 examples/camel-example-jmx/pom.xml              |   2 +-
 examples/camel-example-loan-broker/pom.xml      |   2 +-
 examples/camel-example-management/pom.xml       |   2 +-
 examples/camel-example-mybatis/pom.xml          |   2 +-
 .../camel-example-netty-http/myapp-one/pom.xml  |  36 ++--
 .../camel-example-netty-http/myapp-two/pom.xml  |  36 ++--
 .../shared-netty-http-server/pom.xml            |  35 +--
 examples/camel-example-osgi-rmi/pom.xml         |   2 +-
 examples/camel-example-osgi/pom.xml             |   2 +-
 examples/camel-example-pojo-messaging/pom.xml   |   2 +-
 .../pom.xml                                     |  91 ++++----
 examples/camel-example-route-throttling/pom.xml |   2 +-
 .../pom.xml                                     |  34 +--
 .../camel-example-simplejirabot/javadsl/pom.xml |   2 +-
 .../camel-example-spring-javaconfig/pom.xml     |   2 +-
 examples/camel-example-spring-jms/pom.xml       |   2 +-
 examples/camel-example-spring-xquery/pom.xml    |   2 +-
 examples/camel-example-spring/pom.xml           |   2 +-
 examples/camel-example-sql-blueprint/pom.xml    |   2 +-
 examples/camel-example-sql/pom.xml              |   2 +-
 examples/camel-example-ssh-security/pom.xml     |   2 +-
 examples/camel-example-ssh/pom.xml              |   2 +-
 examples/camel-example-tracer/pom.xml           |   2 +-
 .../pom.xml                                     |  38 ++--
 examples/pom.xml                                |   1 +
 parent/pom.xml                                  | 107 ++++++----
 platforms/catalog-lucene/pom.xml                |   2 +-
 platforms/catalog/pom.xml                       |   2 +-
 platforms/commands/commands-core/pom.xml        |   2 +-
 platforms/commands/commands-jolokia/pom.xml     |   2 +-
 platforms/commands/commands-spring-boot/pom.xml |   4 +
 platforms/karaf/commands-catalog/pom.xml        |   2 +-
 platforms/karaf/commands/pom.xml                |   2 +-
 platforms/pom.xml                               |   1 +
 tests/pom.xml                                   |   4 +
 tests/test-bundles/mock-javamail_1.7/pom.xml    |   2 +-
 tooling/apt/pom.xml                             |   2 -
 .../__artifactId__-component/pom.xml            |   2 +-
 .../main/resources/archetype-resources/pom.xml  |   2 +-
 .../main/resources/archetype-resources/pom.xml  |   2 +-
 .../main/resources/archetype-resources/pom.xml  |   2 +-
 .../main/resources/archetype-resources/pom.xml  |   2 +-
 .../main/resources/archetype-resources/pom.xml  |   2 +-
 .../main/resources/archetype-resources/pom.xml  |   2 +-
 .../main/resources/archetype-resources/pom.xml  |   2 +-
 tooling/maven/pom.xml                           |  29 +++
 tooling/pom.xml                                 |   4 +
 289 files changed, 877 insertions(+), 579 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/camel-core/pom.xml
----------------------------------------------------------------------
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index 51b7273..92abf73 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>camel-core</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: Core</name>
   <description>The Core Camel Java DSL based router</description>
 
@@ -213,7 +213,6 @@
         </plugins>
     </pluginManagement>
     <plugins>
-
       <!-- shade concurrent hashmap for faster Camel and spi-annotations as needed by everybody -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-ahc-ws/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ahc-ws/pom.xml b/components/camel-ahc-ws/pom.xml
index 0dc6397..208c73d 100644
--- a/components/camel-ahc-ws/pom.xml
+++ b/components/camel-ahc-ws/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-ahc-ws</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: AHC-WS</name>
   <description>Camel Websocket Client support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-ahc/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ahc/pom.xml b/components/camel-ahc/pom.xml
index 52b485f..0c39e87 100644
--- a/components/camel-ahc/pom.xml
+++ b/components/camel-ahc/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-ahc</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: AHC</name>
   <description>Camel Async Http Client support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-amqp/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml
index 52dc1e8..70986ab 100644
--- a/components/camel-amqp/pom.xml
+++ b/components/camel-amqp/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-amqp</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: AMQP</name>
   <description>Camel AMQP component which is based on the Apache Qid project</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-apns/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-apns/pom.xml b/components/camel-apns/pom.xml
index 326758e..fa6db8e 100644
--- a/components/camel-apns/pom.xml
+++ b/components/camel-apns/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-apns</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
 
   <name>Camel :: APNS</name>
   <description>A Camel Apple Push Notification Server Component</description>

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-atmos/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-atmos/pom.xml b/components/camel-atmos/pom.xml
index 42669a3..033200f 100644
--- a/components/camel-atmos/pom.xml
+++ b/components/camel-atmos/pom.xml
@@ -26,7 +26,7 @@
   </parent>
 
   <artifactId>camel-atmos</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: Atmos</name>
   <description>Camel Atmos support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-atmosphere-websocket/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml
index 32f99df..f74778f 100644
--- a/components/camel-atmosphere-websocket/pom.xml
+++ b/components/camel-atmosphere-websocket/pom.xml
@@ -26,7 +26,7 @@
     </parent>
 
     <artifactId>camel-atmosphere-websocket</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: Atmosphere WebSocket Servlet</name>
     <description>Camel Atmosphere WebSocket Servlet</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-atom/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-atom/pom.xml b/components/camel-atom/pom.xml
index b17469e..635432f 100644
--- a/components/camel-atom/pom.xml
+++ b/components/camel-atom/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-atom</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: Atom</name>
   <description>Camel Atom support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-avro/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-avro/pom.xml b/components/camel-avro/pom.xml
index 537352b..51a0e94 100644
--- a/components/camel-avro/pom.xml
+++ b/components/camel-avro/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>camel-avro</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: Avro</name>
     <description>Camel Avro data format</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-aws/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-aws/pom.xml b/components/camel-aws/pom.xml
index ae88c64..e54209e 100644
--- a/components/camel-aws/pom.xml
+++ b/components/camel-aws/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>camel-aws</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <name>Camel :: AWS</name>
     <description>A Camel Amazon Web Services Components</description>

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-bam/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-bam/pom.xml b/components/camel-bam/pom.xml
index 4a44c79..2f53550 100644
--- a/components/camel-bam/pom.xml
+++ b/components/camel-bam/pom.xml
@@ -24,7 +24,7 @@
   </parent>
 
   <artifactId>camel-bam</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: BAM</name>
   <description>Camel Business Activity Monitor support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-barcode/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-barcode/pom.xml b/components/camel-barcode/pom.xml
index 10ea375..c6269c2 100644
--- a/components/camel-barcode/pom.xml
+++ b/components/camel-barcode/pom.xml
@@ -26,7 +26,7 @@ limitations under the License.
     </parent>
 
     <artifactId>camel-barcode</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: Barcode</name>
     <description>Camel Barcode (e.g. QRcode, PDF417, DataMatrix) support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-base64/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-base64/pom.xml b/components/camel-base64/pom.xml
index 7aa9380..d366955 100644
--- a/components/camel-base64/pom.xml
+++ b/components/camel-base64/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-base64</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: Base64</name>
   <description>Camel Base64 data format support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-bean-validator/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-bean-validator/pom.xml b/components/camel-bean-validator/pom.xml
index 4768c84..984edfa 100644
--- a/components/camel-bean-validator/pom.xml
+++ b/components/camel-bean-validator/pom.xml
@@ -26,7 +26,7 @@
     <artifactId>camel-bean-validator</artifactId>
     <name>Camel :: Bean validator</name>
     <description>Camel bean validation support (JSR 303)</description>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <properties>
         <camel.osgi.export.pkg>org.apache.camel.component.bean.validator.*</camel.osgi.export.pkg>

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-beanio/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-beanio/pom.xml b/components/camel-beanio/pom.xml
index 86ca240..c7f94a7 100644
--- a/components/camel-beanio/pom.xml
+++ b/components/camel-beanio/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-beanio</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
 
   <name>Camel :: BeanIO</name>
   <description>Camel BeanIO data format support</description>

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-beanstalk/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-beanstalk/pom.xml b/components/camel-beanstalk/pom.xml
index 80479ac..ef9ff55 100644
--- a/components/camel-beanstalk/pom.xml
+++ b/components/camel-beanstalk/pom.xml
@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>camel-beanstalk</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: Beanstalk</name>
   <description>Camel Beanstalk component</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-bindy/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-bindy/pom.xml b/components/camel-bindy/pom.xml
index 8618ca2..8b136c6 100755
--- a/components/camel-bindy/pom.xml
+++ b/components/camel-bindy/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>camel-bindy</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: Bindy</name>
     <description>Camel Bindy data format support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml
index 733d342..b5f7a83 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -27,12 +27,14 @@
     <artifactId>camel-blueprint</artifactId>
     <name>Camel :: Blueprint</name>
     <description>Camel OSGi Blueprint support</description>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <properties>
         <camel.osgi.import>
             !org.apache.camel.blueprint.*,
             !org.apache.camel.util.blueprint.*,
+            !org.apache.camel.core.osgi.*,
+            !org.apache.camel.core.xml.*,
             org.apache.camel.*;${camel.osgi.import.strict.version},
             org.osgi.service.event*;resolution:=optional,
             org.apache.aries*;version="[1.0,2)",
@@ -43,10 +45,10 @@
             org.apache.camel.blueprint*;${camel.osgi.version},
             org.apache.camel.util.blueprint*;${camel.osgi.version}
         </camel.osgi.export>
-		<camel.osgi.private.pkg>
-			org.apache.camel.core.osgi*,
-			org.apache.camel.core.xml*
-		</camel.osgi.private.pkg>
+    		<camel.osgi.private.pkg>
+    			org.apache.camel.core.osgi*,
+    			org.apache.camel.core.xml*
+    		</camel.osgi.private.pkg>
     </properties>
 
     <dependencies>
@@ -120,6 +122,39 @@
         </resources>
 
         <plugins>
+            <!-- Inline the contents of camel-core-osgi and camel-core-xml into this bundle. -->
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-dependency-plugin</artifactId>
+              <version>2.10</version>
+              <executions>
+                <execution>
+                  <id>unpack</id>
+                  <phase>prepare-package</phase>
+                  <goals>
+                    <goal>unpack</goal>
+                  </goals>
+                  <configuration>
+                    <artifactItems>
+                      <artifactItem>
+                        <groupId>org.apache.camel</groupId>
+                        <artifactId>camel-core-xml</artifactId>
+                        <version>${project.version}</version>
+                        <includes>org/apache/camel/**</includes>
+                        <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                      </artifactItem>
+                      <artifactItem>
+                        <groupId>org.apache.camel</groupId>
+                        <artifactId>camel-core-osgi</artifactId>
+                        <version>${project.version}</version>
+                        <includes>org/apache/camel/**</includes>
+                        <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                      </artifactItem>
+                    </artifactItems>
+                  </configuration>
+                </execution>
+              </executions>
+            </plugin>
 
             <!-- add the sources from camel-core-osgi and camel-core-xml as source code in the camel-blueprint-sources.jar -->
             <plugin>
@@ -165,6 +200,17 @@
               </executions>
             </plugin>
 
+            <!-- Push the execution order of the maven-bundle-plugin further to the end. That's why we add it here again. -->
+            <plugin>
+              <groupId>org.apache.felix</groupId>
+              <artifactId>maven-bundle-plugin</artifactId>
+              <executions>
+                <execution>
+                  <id>bundle-manifest</id>
+                  <phase>prepare-package</phase>
+                </execution>
+              </executions>
+            </plugin>
 
         </plugins>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-boon/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-boon/pom.xml b/components/camel-boon/pom.xml
index 1a23823..f2fd97e 100644
--- a/components/camel-boon/pom.xml
+++ b/components/camel-boon/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>camel-boon</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: Boon</name>
     <description>Camel Boon support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-box/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-box/pom.xml b/components/camel-box/pom.xml
index a64d5a4..d021354 100644
--- a/components/camel-box/pom.xml
+++ b/components/camel-box/pom.xml
@@ -26,7 +26,7 @@
   </parent>
 
   <artifactId>camel-box</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: Box.com</name>
   <description>Camel Component for Box.com</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-braintree/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-braintree/pom.xml b/components/camel-braintree/pom.xml
index 420d523..4f19a0b 100644
--- a/components/camel-braintree/pom.xml
+++ b/components/camel-braintree/pom.xml
@@ -26,7 +26,7 @@
   </parent>
 
   <artifactId>camel-braintree</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: Braintree</name>
   <description>Camel Braintree support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-cache/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cache/pom.xml b/components/camel-cache/pom.xml
index d3a75d6..7e753bb 100755
--- a/components/camel-cache/pom.xml
+++ b/components/camel-cache/pom.xml
@@ -26,7 +26,7 @@
     </parent>
 
     <artifactId>camel-cache</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: Cache</name>
     <description>Camel Cache support based on ehCache</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-cassandraql/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cassandraql/pom.xml b/components/camel-cassandraql/pom.xml
index 71afc05..2cea9b1 100644
--- a/components/camel-cassandraql/pom.xml
+++ b/components/camel-cassandraql/pom.xml
@@ -26,7 +26,7 @@
   </parent>
   
   <artifactId>camel-cassandraql</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
 
   <name>Camel :: Cassandra CQL</name>
   <description>Cassandra CQL3 support</description>

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-castor/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-castor/pom.xml b/components/camel-castor/pom.xml
index 77495d4..b6b5caa 100644
--- a/components/camel-castor/pom.xml
+++ b/components/camel-castor/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>camel-castor</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: Castor</name>
     <description>Camel Castor data format support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index 8a648a8..a9ca2fb 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-cdi</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: CDI</name>
   <description>Camel Contexts and Dependency Injection Support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-chunk/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-chunk/pom.xml b/components/camel-chunk/pom.xml
index bb43e06..152b6ec 100644
--- a/components/camel-chunk/pom.xml
+++ b/components/camel-chunk/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-chunk</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: Chunk</name>
   <description>Camel Chunk support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-cm-sms/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cm-sms/pom.xml b/components/camel-cm-sms/pom.xml
index abb9363..d990119 100644
--- a/components/camel-cm-sms/pom.xml
+++ b/components/camel-cm-sms/pom.xml
@@ -26,7 +26,7 @@
   </parent>
 
   <artifactId>camel-cm-sms</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
 
   <name>Camel :: CM SMS</name>
   <description>Camel CM SMS Gateway Component</description>

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-cmis/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cmis/pom.xml b/components/camel-cmis/pom.xml
index 1101c9a..18ad327 100644
--- a/components/camel-cmis/pom.xml
+++ b/components/camel-cmis/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>camel-cmis</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: CMIS</name>
     <description>Camel CMIS which is based on Apache Chemistry support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-coap/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-coap/pom.xml b/components/camel-coap/pom.xml
index a765330..a801a1f 100644
--- a/components/camel-coap/pom.xml
+++ b/components/camel-coap/pom.xml
@@ -26,7 +26,7 @@
   </parent>
 
   <artifactId>camel-coap</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: CoAP</name>
   <description>Camel CoAP support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-cometd/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml
index 0a4f2c1..82a94f5 100644
--- a/components/camel-cometd/pom.xml
+++ b/components/camel-cometd/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>camel-cometd</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: Cometd</name>
     <description>Camel Cometd support based on Jetty </description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-context/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-context/pom.xml b/components/camel-context/pom.xml
index f2bf700..544a1ea 100644
--- a/components/camel-context/pom.xml
+++ b/components/camel-context/pom.xml
@@ -27,7 +27,7 @@
     <artifactId>camel-context</artifactId>
     <name>Camel :: Context (deprecated)</name>
     <description>Camel Context component to expose CamelContext objects as a black box Component for use in other routes</description>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <properties>
         <camel.osgi.export.pkg>org.apache.camel.component.context.*</camel.osgi.export.pkg>

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-core-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-core-osgi/pom.xml b/components/camel-core-osgi/pom.xml
index 79b7b5c..c27edc9 100644
--- a/components/camel-core-osgi/pom.xml
+++ b/components/camel-core-osgi/pom.xml
@@ -26,7 +26,7 @@
 
   <artifactId>camel-core-osgi</artifactId>
   <name>Camel :: Core OSGi</name>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <description>Camel Core OSGi support</description>
   
   <properties>

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-core-xml/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-core-xml/pom.xml b/components/camel-core-xml/pom.xml
index 7ac2fc2..a7da334 100644
--- a/components/camel-core-xml/pom.xml
+++ b/components/camel-core-xml/pom.xml
@@ -28,6 +28,12 @@
   <name>Camel :: Core XML</name>
   <description>Camel Core XML support</description>
 
+  <properties>
+    <camel.osgi.export.pkg>
+      org.apache.camel.core.xml.*
+    </camel.osgi.export.pkg>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.camel</groupId>

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-couchdb/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-couchdb/pom.xml b/components/camel-couchdb/pom.xml
index 51a83ff..e069f3d 100644
--- a/components/camel-couchdb/pom.xml
+++ b/components/camel-couchdb/pom.xml
@@ -25,7 +25,7 @@
 	</parent>
 
 	<artifactId>camel-couchdb</artifactId>
-	<packaging>bundle</packaging>
+	<packaging>jar</packaging>
 	<name>Camel :: CouchDB</name>
 	<description>Camel CouchDB component</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-crypto/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-crypto/pom.xml b/components/camel-crypto/pom.xml
index fd54c0c..6bb8fc8 100644
--- a/components/camel-crypto/pom.xml
+++ b/components/camel-crypto/pom.xml
@@ -25,7 +25,7 @@
 	</parent>
 
 	<artifactId>camel-crypto</artifactId>
-	<packaging>bundle</packaging>
+	<packaging>jar</packaging>
 	<name>Camel :: Crypto</name>
 	<description>Camel Cryptographic Support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-csv/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-csv/pom.xml b/components/camel-csv/pom.xml
index 32049ee..02bda31 100644
--- a/components/camel-csv/pom.xml
+++ b/components/camel-csv/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-csv</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: CSV</name>
   <description>Camel CSV data format support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-cxf-transport/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml
index 16f1366..4fbdeb4 100644
--- a/components/camel-cxf-transport/pom.xml
+++ b/components/camel-cxf-transport/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-cxf-transport</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: CXF :: Transport</name>
   <description>Camel Transport for CXF </description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-cxf/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index 5779943..55622d3 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-cxf</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: CXF</name>
   <description>Camel CXF support</description>
 
@@ -40,6 +40,7 @@
       !org.apache.camel.component.cxf.jaxrs,
       !org.apache.camel.component.cxf.spring,
       !org.apache.camel.component.cxf.util,
+      !org.apache.camel.blueprint,
       javax.activation*;version="[0.0,2)",
       javax.annotation*;version="[0.0,2)",
       javax.jws*;version="[0.0,3)",

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-disruptor/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-disruptor/pom.xml b/components/camel-disruptor/pom.xml
index 4b3d7d0..d6591da 100644
--- a/components/camel-disruptor/pom.xml
+++ b/components/camel-disruptor/pom.xml
@@ -28,7 +28,7 @@
     <name>Camel :: Disruptor</name>
     <artifactId>camel-disruptor</artifactId>
     <description>Camel :: Disruptor component</description>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <properties>
         <camel.osgi.export.pkg>org.apache.camel.component.disruptor.*</camel.osgi.export.pkg>

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-dns/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-dns/pom.xml b/components/camel-dns/pom.xml
index d57491c..a5cd1fd 100644
--- a/components/camel-dns/pom.xml
+++ b/components/camel-dns/pom.xml
@@ -27,7 +27,7 @@
   <name>Camel :: DNS</name>
   <artifactId>camel-dns</artifactId>
   <description>Camel DNS support</description>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
 
   <properties>
     <camel.osgi.export.pkg>

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-docker/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-docker/pom.xml b/components/camel-docker/pom.xml
index 03f2a53..36e6f8c 100644
--- a/components/camel-docker/pom.xml
+++ b/components/camel-docker/pom.xml
@@ -26,7 +26,7 @@
   </parent>
     
   <artifactId>camel-docker</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: Docker</name>
   <description>Camel Docker Support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-dozer/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-dozer/pom.xml b/components/camel-dozer/pom.xml
index 9231185..9a8fdb7 100644
--- a/components/camel-dozer/pom.xml
+++ b/components/camel-dozer/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>camel-dozer</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: Dozer</name>
     <description>Camel Support for the Dozer type conversion framework</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-dropbox/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-dropbox/pom.xml b/components/camel-dropbox/pom.xml
index d2703d2..908d4a8 100755
--- a/components/camel-dropbox/pom.xml
+++ b/components/camel-dropbox/pom.xml
@@ -26,7 +26,7 @@
     </parent>
 
     <artifactId>camel-dropbox</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: Dropbox</name>
     <description>Camel Dropbox support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-eclipse/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-eclipse/pom.xml b/components/camel-eclipse/pom.xml
index a324e43..7cdb49e 100644
--- a/components/camel-eclipse/pom.xml
+++ b/components/camel-eclipse/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-eclipse</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: Eclipse</name>
   <description>Camel Eclipse support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-ejb/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ejb/pom.xml b/components/camel-ejb/pom.xml
index 5e41421..c4e4492 100644
--- a/components/camel-ejb/pom.xml
+++ b/components/camel-ejb/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>camel-ejb</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: EJB</name>
     <description>Camel EJB support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-elasticsearch/pom.xml b/components/camel-elasticsearch/pom.xml
index 438a43d..2642a4c 100644
--- a/components/camel-elasticsearch/pom.xml
+++ b/components/camel-elasticsearch/pom.xml
@@ -26,7 +26,7 @@
   </parent>
 
   <artifactId>camel-elasticsearch</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: ElasticSearch</name>
   <description>Camel Elasticsearch support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-elsql/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-elsql/pom.xml b/components/camel-elsql/pom.xml
index 0bb3140..de12045 100644
--- a/components/camel-elsql/pom.xml
+++ b/components/camel-elsql/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-elsql</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: ElSql</name>
   <description>Camel ElSql support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-etcd/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-etcd/pom.xml b/components/camel-etcd/pom.xml
index f9a33ad..7045614 100644
--- a/components/camel-etcd/pom.xml
+++ b/components/camel-etcd/pom.xml
@@ -26,7 +26,7 @@
   </parent>
 
   <artifactId>camel-etcd</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: Etcd</name>
   <description>Camel Etcd support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-eventadmin/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-eventadmin/pom.xml b/components/camel-eventadmin/pom.xml
index 8812015..6929669 100644
--- a/components/camel-eventadmin/pom.xml
+++ b/components/camel-eventadmin/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>camel-eventadmin</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: Event Admin</name>
     <description>Camel OSGi Event Admin support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-exec/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-exec/pom.xml b/components/camel-exec/pom.xml
index 59eb7fe..5ae589b 100644
--- a/components/camel-exec/pom.xml
+++ b/components/camel-exec/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-exec</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: Exec</name>
   <description>Camel support for system command execution</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-facebook/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-facebook/pom.xml b/components/camel-facebook/pom.xml
index 4d27d62..759eb99 100644
--- a/components/camel-facebook/pom.xml
+++ b/components/camel-facebook/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-facebook</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: Facebook</name>
   <description>Camel Facebook Support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-flatpack/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-flatpack/pom.xml b/components/camel-flatpack/pom.xml
index baa2870..b8d9fae 100644
--- a/components/camel-flatpack/pom.xml
+++ b/components/camel-flatpack/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-flatpack</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: FlatPack</name>
   <description>Camel FlatPack support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-fop/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-fop/pom.xml b/components/camel-fop/pom.xml
index f1b19d0..1579a39 100644
--- a/components/camel-fop/pom.xml
+++ b/components/camel-fop/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>camel-fop</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: FOP</name>
     <description>Camel FOP support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-freemarker/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-freemarker/pom.xml b/components/camel-freemarker/pom.xml
index 0ab538b..c670e16 100644
--- a/components/camel-freemarker/pom.xml
+++ b/components/camel-freemarker/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>camel-freemarker</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: Freemarker</name>
     <description>Camel Freemarker support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-ftp/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index 522ad17..301a662 100644
--- a/components/camel-ftp/pom.xml
+++ b/components/camel-ftp/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-ftp</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: FTP</name>
   <description>Camel FTP support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-gae/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-gae/pom.xml b/components/camel-gae/pom.xml
new file mode 100644
index 0000000..2590d28
--- /dev/null
+++ b/components/camel-gae/pom.xml
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.camel</groupId>
+    <artifactId>components</artifactId>
+    <version>2.18-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>camel-gae</artifactId>
+  <packaging>jar</packaging>
+  <name>Camel :: GAE</name>
+  <description>Camel GAE support (deprecated)</description>
+
+  <properties>
+    <camel.osgi.import.before.defaults>
+      javax.servlet.*;version="${servlet-version-range}"
+    </camel.osgi.import.before.defaults>
+    <camel.osgi.export.pkg>org.apache.camel.component.gae.*</camel.osgi.export.pkg>
+    <camel.osgi.export.service>
+      org.apache.camel.spi.ComponentResolver;component=gauth,
+      org.apache.camel.spi.ComponentResolver;component=ghttp,
+      org.apache.camel.spi.ComponentResolver;component=ghttps,
+      org.apache.camel.spi.ComponentResolver;component=glogin,
+      org.apache.camel.spi.ComponentResolver;component=gmail,
+      org.apache.camel.spi.ComponentResolver;component=gtask
+    </camel.osgi.export.service>
+  </properties>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-servlet</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-api-1.0-sdk</artifactId>
+      <version>${google-app-engine-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-api-labs</artifactId>
+      <version>${google-app-engine-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.gdata</groupId>
+      <artifactId>core</artifactId>
+      <version>1.47.1</version>
+    </dependency>
+
+    <!-- need to exclude dependencies as they are not in maven central -->
+    <dependency>
+      <groupId>org.openengsb.wrapped</groupId>
+      <artifactId>com.google.gdata</artifactId>
+      <version>${google-gdata-version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.gdata</groupId>
+          <artifactId>gdata-contacts-3.0</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.google.gdata</groupId>
+          <artifactId>gdata-calendar-2.0</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.google.gdata</groupId>
+          <artifactId>gdata-client-1.0</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.google.gdata</groupId>
+          <artifactId>gdata-core-1.0</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.openengsb.wrapped</groupId>
+      <artifactId>com.google.gdata-contacts</artifactId>
+      <version>${google-gdata-version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.gdata</groupId>
+          <artifactId>gdata-contacts-3.0</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.google.gdata</groupId>
+          <artifactId>gdata-client-1.0</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.google.gdata</groupId>
+          <artifactId>gdata-core-1.0</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.openengsb.wrapped</groupId>
+      <artifactId>com.google.gdata-calendar</artifactId>
+      <version>${google-gdata-version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.gdata</groupId>
+          <artifactId>gdata-client-1.0</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.google.gdata</groupId>
+          <artifactId>gdata-calendar-2.0</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.google.gdata</groupId>
+          <artifactId>gdata-core-1.0</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <!-- testing -->
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-api-stubs</artifactId>
+      <version>${google-app-engine-version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-testing</artifactId>
+      <version>${google-app-engine-version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <version>${jetty-version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>${jetty-version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-spring</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>httpunit</groupId>
+      <artifactId>httpunit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-ganglia/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ganglia/pom.xml b/components/camel-ganglia/pom.xml
index 556f879..5610173 100644
--- a/components/camel-ganglia/pom.xml
+++ b/components/camel-ganglia/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-ganglia</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: Ganglia</name>
   <description>Camel Ganglia support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-geocoder/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-geocoder/pom.xml b/components/camel-geocoder/pom.xml
index ffe354e..606820c 100644
--- a/components/camel-geocoder/pom.xml
+++ b/components/camel-geocoder/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-geocoder</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: Geocoder</name>
   <description>Camel GeoCoder support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-git/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-git/pom.xml b/components/camel-git/pom.xml
index df55eb9..bfc7081 100644
--- a/components/camel-git/pom.xml
+++ b/components/camel-git/pom.xml
@@ -20,7 +20,7 @@
   </parent>
 
   <artifactId>camel-git</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: Git</name>
 
    <properties>

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-github/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-github/pom.xml b/components/camel-github/pom.xml
index 7fa5133..bbda744 100644
--- a/components/camel-github/pom.xml
+++ b/components/camel-github/pom.xml
@@ -20,7 +20,7 @@
   </parent>
 
   <artifactId>camel-github</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: GitHub</name>
 
    <properties>

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-google-calendar/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-google-calendar/pom.xml b/components/camel-google-calendar/pom.xml
index a19f382..af21370 100644
--- a/components/camel-google-calendar/pom.xml
+++ b/components/camel-google-calendar/pom.xml
@@ -26,7 +26,7 @@
   </parent>
 
   <artifactId>camel-google-calendar</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: GoogleCalendar</name>
   <description>Camel Component for GoogleCalendar</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-google-drive/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/pom.xml b/components/camel-google-drive/pom.xml
index 12a7faa..c462a94 100644
--- a/components/camel-google-drive/pom.xml
+++ b/components/camel-google-drive/pom.xml
@@ -26,7 +26,7 @@
   </parent>
 
   <artifactId>camel-google-drive</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: GoogleDrive</name>
   <description>Camel Component for GoogleDrive</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-google-mail/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-google-mail/pom.xml b/components/camel-google-mail/pom.xml
index 479b876..6ae5c6e 100644
--- a/components/camel-google-mail/pom.xml
+++ b/components/camel-google-mail/pom.xml
@@ -26,7 +26,7 @@
   </parent>
 
   <artifactId>camel-google-mail</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: GoogleMail</name>
   <description>Camel Component for GoogleMail</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-gora/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-gora/pom.xml b/components/camel-gora/pom.xml
index cd97630..c795c58 100644
--- a/components/camel-gora/pom.xml
+++ b/components/camel-gora/pom.xml
@@ -24,7 +24,7 @@
     </parent>
 
     <artifactId>camel-gora</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: Gora</name>
 
     <description>

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-grape/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-grape/pom.xml b/components/camel-grape/pom.xml
index 25b66fb..affddcc 100644
--- a/components/camel-grape/pom.xml
+++ b/components/camel-grape/pom.xml
@@ -33,6 +33,7 @@
     <groovy-eclipse-batch.version>2.4.3-01</groovy-eclipse-batch.version>
     <groovy-eclipse-compiler.version>2.9.2-01</groovy-eclipse-compiler.version>
     <plexus-compiler-api.version>2.7</plexus-compiler-api.version>
+    <camel.osgi.export.pkg />
   </properties>
 
   <dependencies>

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-groovy/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-groovy/pom.xml b/components/camel-groovy/pom.xml
index c68a4ee..53c2de0 100644
--- a/components/camel-groovy/pom.xml
+++ b/components/camel-groovy/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-groovy</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: Groovy</name>
   <description>Camel Groovy support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-gson/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-gson/pom.xml b/components/camel-gson/pom.xml
index 29df956..26b3020 100644
--- a/components/camel-gson/pom.xml
+++ b/components/camel-gson/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>camel-gson</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: Gson</name>
     <description>Camel Gson support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-guava-eventbus/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-guava-eventbus/pom.xml b/components/camel-guava-eventbus/pom.xml
index dcc15cd..993ee2f 100644
--- a/components/camel-guava-eventbus/pom.xml
+++ b/components/camel-guava-eventbus/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>camel-guava-eventbus</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: Guava-EventBus</name>
     <description>Camel Guava EventBus support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-guice/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-guice/pom.xml b/components/camel-guice/pom.xml
index 6fa4547..9efc7f4 100644
--- a/components/camel-guice/pom.xml
+++ b/components/camel-guice/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-guice</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: Guice</name>
   <description>Camel Guice</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-hawtdb/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-hawtdb/pom.xml b/components/camel-hawtdb/pom.xml
index 4dff8e6..9a0741c 100644
--- a/components/camel-hawtdb/pom.xml
+++ b/components/camel-hawtdb/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>camel-hawtdb</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: HawtDB</name>
     <description>Camel HawtDB Support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-hazelcast/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-hazelcast/pom.xml b/components/camel-hazelcast/pom.xml
index 16552d3..0c03585 100644
--- a/components/camel-hazelcast/pom.xml
+++ b/components/camel-hazelcast/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-hazelcast</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: HazelCast</name>
   <description>Camel HazelCast based work queue implementation</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-hbase/pom.xml b/components/camel-hbase/pom.xml
index 638d0ff..380af38a 100644
--- a/components/camel-hbase/pom.xml
+++ b/components/camel-hbase/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>camel-hbase</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: Hbase</name>
     <description>Camel HBase component</description>
     <properties>

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-hdfs/pom.xml b/components/camel-hdfs/pom.xml
index a9ffb17..5f572d9 100644
--- a/components/camel-hdfs/pom.xml
+++ b/components/camel-hdfs/pom.xml
@@ -27,7 +27,7 @@
     </parent>
 
     <artifactId>camel-hdfs</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: HDFS</name>
     <description>Camel HDFS support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-hdfs2/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-hdfs2/pom.xml b/components/camel-hdfs2/pom.xml
index 28b1fa9..74601e6 100644
--- a/components/camel-hdfs2/pom.xml
+++ b/components/camel-hdfs2/pom.xml
@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>camel-hdfs2</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: HDFS2</name>
   <description>Camel HDFS support with Hadoop 2.x libraries</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-hessian/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-hessian/pom.xml b/components/camel-hessian/pom.xml
index cb5fdde..e0183c0 100644
--- a/components/camel-hessian/pom.xml
+++ b/components/camel-hessian/pom.xml
@@ -28,7 +28,7 @@
     </parent>
 
     <artifactId>camel-hessian</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: Hessian</name>
     <description>Hessian serialization support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-hipchat/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-hipchat/pom.xml b/components/camel-hipchat/pom.xml
index 28ee583..79d3476 100644
--- a/components/camel-hipchat/pom.xml
+++ b/components/camel-hipchat/pom.xml
@@ -26,7 +26,7 @@
   </parent>
 
   <artifactId>camel-hipchat</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
 
   <name>Camel :: Hipchat</name>
   <description>Camel Hipchat Component</description>

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-hl7/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-hl7/pom.xml b/components/camel-hl7/pom.xml
index efd663e..5e05659 100644
--- a/components/camel-hl7/pom.xml
+++ b/components/camel-hl7/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>camel-hl7</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: HL7</name>
     <description>Camel HL7 support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-http-common/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-http-common/pom.xml b/components/camel-http-common/pom.xml
index b29c15c..7d3dd87 100644
--- a/components/camel-http-common/pom.xml
+++ b/components/camel-http-common/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-http-common</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: HTTP :: Common</name>
   <description>Camel HTTP common</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-http/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-http/pom.xml b/components/camel-http/pom.xml
index 32c2711..2a698bb 100644
--- a/components/camel-http/pom.xml
+++ b/components/camel-http/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-http</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: HTTP</name>
   <description>Camel HTTP support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-http4/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-http4/pom.xml b/components/camel-http4/pom.xml
index ceaa0b0..fa3a96e 100644
--- a/components/camel-http4/pom.xml
+++ b/components/camel-http4/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-http4</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: HTTP4</name>
   <description>Camel HTTP (Apache HttpClient 4.x) support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-hystrix/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-hystrix/pom.xml b/components/camel-hystrix/pom.xml
index 47cc9f2..64ece05 100644
--- a/components/camel-hystrix/pom.xml
+++ b/components/camel-hystrix/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>camel-hystrix</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: Hystrix</name>
     <description>Camel Hystrix support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-ibatis/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ibatis/pom.xml b/components/camel-ibatis/pom.xml
index b142a39..7353bf2 100644
--- a/components/camel-ibatis/pom.xml
+++ b/components/camel-ibatis/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-ibatis</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: iBatis (deprecated)</name>
   <description>Camel iBatis support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-ical/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ical/pom.xml b/components/camel-ical/pom.xml
index 12da458..6ddbb3a 100644
--- a/components/camel-ical/pom.xml
+++ b/components/camel-ical/pom.xml
@@ -26,7 +26,7 @@
   </parent>
 
   <artifactId>camel-ical</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: iCal</name>
   <description>Camel iCal component</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-ignite/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ignite/pom.xml b/components/camel-ignite/pom.xml
index 3ebd2a2..a144387 100644
--- a/components/camel-ignite/pom.xml
+++ b/components/camel-ignite/pom.xml
@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>camel-ignite</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: Ignite</name>
   <description>Camel Ignite component</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-infinispan/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/pom.xml b/components/camel-infinispan/pom.xml
index db95c94..ab9be43 100644
--- a/components/camel-infinispan/pom.xml
+++ b/components/camel-infinispan/pom.xml
@@ -26,7 +26,7 @@
     </parent>
 
     <artifactId>camel-infinispan</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: Infinispan</name>
     <description>Camel Infinispan support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-irc/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-irc/pom.xml b/components/camel-irc/pom.xml
index 12bf13a..c9faea5 100644
--- a/components/camel-irc/pom.xml
+++ b/components/camel-irc/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-irc</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: IRC</name>
   <description>Camel IRC support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-ironmq/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ironmq/pom.xml b/components/camel-ironmq/pom.xml
index f388eea..45acde4 100644
--- a/components/camel-ironmq/pom.xml
+++ b/components/camel-ironmq/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-ironmq</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
 
   <name>Camel :: IronMQ</name>
   <description>Camel IronMQ component</description>

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jackson/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jackson/pom.xml b/components/camel-jackson/pom.xml
index 45af47d..e79d11b 100644
--- a/components/camel-jackson/pom.xml
+++ b/components/camel-jackson/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>camel-jackson</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: Jackson</name>
     <description>Camel Jackson support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jacksonxml/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jacksonxml/pom.xml b/components/camel-jacksonxml/pom.xml
index aca1094..abd9187 100644
--- a/components/camel-jacksonxml/pom.xml
+++ b/components/camel-jacksonxml/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-jacksonxml</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: Jackson XML</name>
   <description>Camel Jackson XML support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-javaspace/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-javaspace/pom.xml b/components/camel-javaspace/pom.xml
index 3646761..1eb16b1 100644
--- a/components/camel-javaspace/pom.xml
+++ b/components/camel-javaspace/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>camel-javaspace</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: Javaspace (deprecated)</name>
     <description>Camel Javaspace support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jaxb/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jaxb/pom.xml b/components/camel-jaxb/pom.xml
index 80e8484..9813c83 100644
--- a/components/camel-jaxb/pom.xml
+++ b/components/camel-jaxb/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>camel-jaxb</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: JAXB</name>
     <description>Camel JAXB support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jbpm/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jbpm/pom.xml b/components/camel-jbpm/pom.xml
index e2ac8f4..fa5f2d6 100644
--- a/components/camel-jbpm/pom.xml
+++ b/components/camel-jbpm/pom.xml
@@ -26,7 +26,7 @@
     </parent>
 
     <artifactId>camel-jbpm</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: JBPM</name>
     <description>Camel JBPM support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jcache/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jcache/pom.xml b/components/camel-jcache/pom.xml
index 0a47afd..4184d86 100644
--- a/components/camel-jcache/pom.xml
+++ b/components/camel-jcache/pom.xml
@@ -26,7 +26,7 @@
   </parent>
 
   <artifactId>camel-jcache</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: JCache</name>
   <description>Camel JCache support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jclouds/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jclouds/pom.xml b/components/camel-jclouds/pom.xml
index 9b9d439..84bbdff 100644
--- a/components/camel-jclouds/pom.xml
+++ b/components/camel-jclouds/pom.xml
@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>camel-jclouds</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: JClouds</name>
   <description>Camel JClouds support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jcr/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jcr/pom.xml b/components/camel-jcr/pom.xml
index f823089..81c5521 100644
--- a/components/camel-jcr/pom.xml
+++ b/components/camel-jcr/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-jcr</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: JCR</name>
   <description>Camel JCR support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jdbc/pom.xml b/components/camel-jdbc/pom.xml
index b37e8e8..851725e 100644
--- a/components/camel-jdbc/pom.xml
+++ b/components/camel-jdbc/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-jdbc</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: JDBC</name>
   <description>Camel JDBC support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jetty-common/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jetty-common/pom.xml b/components/camel-jetty-common/pom.xml
index 358fd81..aa852e7 100644
--- a/components/camel-jetty-common/pom.xml
+++ b/components/camel-jetty-common/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>camel-jetty-common</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: Jetty :: Common</name>
     <description>Camel Jetty 8.x/9.x support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jetty/pom.xml b/components/camel-jetty/pom.xml
index 5daeed8..ac27b92 100644
--- a/components/camel-jetty/pom.xml
+++ b/components/camel-jetty/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>camel-jetty</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: Jetty</name>
     <description>Camel Jetty Component</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jetty8/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jetty8/pom.xml b/components/camel-jetty8/pom.xml
index 92a3a9a..bed1fa7 100644
--- a/components/camel-jetty8/pom.xml
+++ b/components/camel-jetty8/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-jetty8</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: Jetty8 (deprecated)</name>
   <description>Camel Jetty8 support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jetty9/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/pom.xml b/components/camel-jetty9/pom.xml
index a418c81..e5f5c30 100644
--- a/components/camel-jetty9/pom.xml
+++ b/components/camel-jetty9/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>camel-jetty9</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: Jetty9</name>
   <description>Camel Jetty9 support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jgroups/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jgroups/pom.xml b/components/camel-jgroups/pom.xml
index c18a693..5cb5ac1 100644
--- a/components/camel-jgroups/pom.xml
+++ b/components/camel-jgroups/pom.xml
@@ -26,7 +26,7 @@
     </parent>
 
     <artifactId>camel-jgroups</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: JGroups</name>
     <description>Camel JGroups support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jibx/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jibx/pom.xml b/components/camel-jibx/pom.xml
index 40af8a2..118a75e 100644
--- a/components/camel-jibx/pom.xml
+++ b/components/camel-jibx/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>camel-jibx</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: Jibx</name>
     <description>Camel Jibx support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jing/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jing/pom.xml b/components/camel-jing/pom.xml
index e5a58e9..eacd265 100644
--- a/components/camel-jing/pom.xml
+++ b/components/camel-jing/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>camel-jing</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>Camel :: Jing</name>
     <description>Camel Jing support</description>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jira/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jira/pom.xml b/components/camel-jira/pom.xml
index 04ba542..ee37f59 100644
--- a/components/camel-jira/pom.xml
+++ b/components/camel-jira/pom.xml
@@ -20,7 +20,7 @@
   </parent>
 
   <artifactId>camel-jira</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: JIRA</name>
 
    <properties>