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:56 UTC
[2/3] camel git commit: CAMEL-9764 Update maven-bundle-plugin to
3.0.1 to allow JDK8 lambdas.
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jms/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml
index 07a91e0..63a344c 100644
--- a/components/camel-jms/pom.xml
+++ b/components/camel-jms/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-jms</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: JMS</name>
<description>Camel JMS support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jmx/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml
index 1a8f2fb..69dda09 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-jmx</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: JMX</name>
<description>Camel JMX support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jolt/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jolt/pom.xml b/components/camel-jolt/pom.xml
index e44f9f6..d74e09b 100644
--- a/components/camel-jolt/pom.xml
+++ b/components/camel-jolt/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-jolt</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Jolt</name>
<description>Camel Jolt Support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-josql/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-josql/pom.xml b/components/camel-josql/pom.xml
index 4463651..975a6d8 100644
--- a/components/camel-josql/pom.xml
+++ b/components/camel-josql/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-josql</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: JoSQL</name>
<description>Camel JoSQL support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index 8c020a2..4a8a180 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-jpa</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: JPA</name>
<description>Camel JPA support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jsch/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml
index d82effc..002475b 100644
--- a/components/camel-jsch/pom.xml
+++ b/components/camel-jsch/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>camel-jsch</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Jsch</name>
<description>Camel SCP Support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jsonpath/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jsonpath/pom.xml b/components/camel-jsonpath/pom.xml
index 7bee585..3d24dc6 100644
--- a/components/camel-jsonpath/pom.xml
+++ b/components/camel-jsonpath/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-jsonpath</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: JSon Path</name>
<description>Camel JSON Path Language</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jt400/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jt400/pom.xml b/components/camel-jt400/pom.xml
index d3281aa..b135b0a 100644
--- a/components/camel-jt400/pom.xml
+++ b/components/camel-jt400/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-jt400</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Java Toolbox for AS/400</name>
<description>Camel AS/400 support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-juel/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-juel/pom.xml b/components/camel-juel/pom.xml
index 7c7322b..ab3db28 100644
--- a/components/camel-juel/pom.xml
+++ b/components/camel-juel/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-juel</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: JUEL</name>
<description>Camel JUEL support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jxpath/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jxpath/pom.xml b/components/camel-jxpath/pom.xml
index 88b9902..53da26f 100644
--- a/components/camel-jxpath/pom.xml
+++ b/components/camel-jxpath/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-jxpath</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: JXPath</name>
<description>Camel JXPath support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-kafka/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml
index e31c0a4..5cb899f 100644
--- a/components/camel-kafka/pom.xml
+++ b/components/camel-kafka/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-kafka</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Kafka</name>
<description>Camel Kafka support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-kestrel/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-kestrel/pom.xml b/components/camel-kestrel/pom.xml
index 30d122b..0df23fe 100644
--- a/components/camel-kestrel/pom.xml
+++ b/components/camel-kestrel/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-kestrel</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Kestrel (deprecated)</name>
<description>Camel Kestrel support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-krati/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-krati/pom.xml b/components/camel-krati/pom.xml
index 7b82da4..cd64b64 100644
--- a/components/camel-krati/pom.xml
+++ b/components/camel-krati/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-krati</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Krati</name>
<description>Camel Krati support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-kubernetes/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/pom.xml b/components/camel-kubernetes/pom.xml
index 672126f..1d39ba4 100644
--- a/components/camel-kubernetes/pom.xml
+++ b/components/camel-kubernetes/pom.xml
@@ -20,7 +20,7 @@
</parent>
<artifactId>camel-kubernetes</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Kubernetes</name>
<properties>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-kura/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-kura/pom.xml b/components/camel-kura/pom.xml
index 977a9f3..1e4558c 100644
--- a/components/camel-kura/pom.xml
+++ b/components/camel-kura/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>camel-kura</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Kura</name>
<description>Camel Kura support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-ldap/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ldap/pom.xml b/components/camel-ldap/pom.xml
index a40127a..1a3a113 100644
--- a/components/camel-ldap/pom.xml
+++ b/components/camel-ldap/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>camel-ldap</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: LDAP</name>
<description>Camel LDAP support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-leveldb/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml
index 76e0867..5947f45 100644
--- a/components/camel-leveldb/pom.xml
+++ b/components/camel-leveldb/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-leveldb</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: LevelDB</name>
<description>Camel LevelDB Support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-linkedin/camel-linkedin-api/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-linkedin/camel-linkedin-api/pom.xml b/components/camel-linkedin/camel-linkedin-api/pom.xml
index c99e03e..97cdeb0 100644
--- a/components/camel-linkedin/camel-linkedin-api/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-api/pom.xml
@@ -28,7 +28,7 @@
<artifactId>camel-linkedin-api</artifactId>
<name>Camel :: LinkedIn :: API</name>
<description>Camel LinkedIn API</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.linkedin.api*</camel.osgi.export.pkg>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-linkedin/camel-linkedin-component/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-linkedin/camel-linkedin-component/pom.xml b/components/camel-linkedin/camel-linkedin-component/pom.xml
index 2416383..1dd0feb 100644
--- a/components/camel-linkedin/camel-linkedin-component/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-component/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-linkedin</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: LinkedIn :: Component</name>
<description>Camel LinkedIn component</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-lucene/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-lucene/pom.xml b/components/camel-lucene/pom.xml
index f1846cb..72e3cc9 100644
--- a/components/camel-lucene/pom.xml
+++ b/components/camel-lucene/pom.xml
@@ -24,7 +24,7 @@
</parent>
<artifactId>camel-lucene</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Lucene</name>
<description>Camel Lucene based search component</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-lzf/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-lzf/pom.xml b/components/camel-lzf/pom.xml
index 51df5fd..f647167 100644
--- a/components/camel-lzf/pom.xml
+++ b/components/camel-lzf/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-lzf</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: LZF</name>
<description>Camel LZF support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-mail/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml
index 727cbe3..2405c1d 100644
--- a/components/camel-mail/pom.xml
+++ b/components/camel-mail/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-mail</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Mail</name>
<description>Camel Mail support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-metrics/pom.xml b/components/camel-metrics/pom.xml
index 44f3d54..64f8d4a 100644
--- a/components/camel-metrics/pom.xml
+++ b/components/camel-metrics/pom.xml
@@ -24,7 +24,7 @@
</parent>
<artifactId>camel-metrics</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Metrics</name>
<description>Camel Metrics based monitoring component</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-mina/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-mina/pom.xml b/components/camel-mina/pom.xml
index a25fe5b..8606f97 100644
--- a/components/camel-mina/pom.xml
+++ b/components/camel-mina/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-mina</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: MINA (deprecated)</name>
<description>Camel MINA support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-mina2/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-mina2/pom.xml b/components/camel-mina2/pom.xml
index 408ba13..787ee7f 100644
--- a/components/camel-mina2/pom.xml
+++ b/components/camel-mina2/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-mina2</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: MINA-2</name>
<description>Camel MINA 2.x support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-mllp/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-mllp/pom.xml b/components/camel-mllp/pom.xml
index 4dce008..35f5588 100644
--- a/components/camel-mllp/pom.xml
+++ b/components/camel-mllp/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>camel-mllp</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: MLLP</name>
<description>Camel MLLP Component</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-mongodb-gridfs/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-mongodb-gridfs/pom.xml b/components/camel-mongodb-gridfs/pom.xml
index a258461..1492292 100644
--- a/components/camel-mongodb-gridfs/pom.xml
+++ b/components/camel-mongodb-gridfs/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>camel-mongodb-gridfs</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: MongoDB GridFS</name>
<description>Camel MongoDB GridFS component</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-mongodb/pom.xml b/components/camel-mongodb/pom.xml
index 117387f..99c40bc5 100644
--- a/components/camel-mongodb/pom.xml
+++ b/components/camel-mongodb/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>camel-mongodb</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: MongoDB</name>
<description>Camel MongoDB component</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-mqtt/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-mqtt/pom.xml b/components/camel-mqtt/pom.xml
index 60c9b96..e712707 100644
--- a/components/camel-mqtt/pom.xml
+++ b/components/camel-mqtt/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-mqtt</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: MQTT</name>
<description>Camel MQTT client</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-msv/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-msv/pom.xml b/components/camel-msv/pom.xml
index 5984491..715631f 100644
--- a/components/camel-msv/pom.xml
+++ b/components/camel-msv/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-msv</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: MSV</name>
<description>Camel MSV support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-mustache/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-mustache/pom.xml b/components/camel-mustache/pom.xml
index 3b5b826..aba667d 100644
--- a/components/camel-mustache/pom.xml
+++ b/components/camel-mustache/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-mustache</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Mustache</name>
<description>Camel Mustache support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-mvel/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-mvel/pom.xml b/components/camel-mvel/pom.xml
index 88ab9fe..d6dc2b4 100644
--- a/components/camel-mvel/pom.xml
+++ b/components/camel-mvel/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-mvel</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: MVEL</name>
<description>Camel MVEL support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-mybatis/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-mybatis/pom.xml b/components/camel-mybatis/pom.xml
index c13ab6d..96aeff0 100644
--- a/components/camel-mybatis/pom.xml
+++ b/components/camel-mybatis/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-mybatis</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: MyBatis</name>
<description>Camel MyBatis support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-nagios/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-nagios/pom.xml b/components/camel-nagios/pom.xml
index fce7fe9..efc9f80 100644
--- a/components/camel-nagios/pom.xml
+++ b/components/camel-nagios/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-nagios</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Nagios</name>
<description>Camel Nagios support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-nats/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-nats/pom.xml b/components/camel-nats/pom.xml
index e3fda10..6ca8079 100644
--- a/components/camel-nats/pom.xml
+++ b/components/camel-nats/pom.xml
@@ -20,7 +20,7 @@
</parent>
<artifactId>camel-nats</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Nats</name>
<properties>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-netty-http/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-netty-http/pom.xml b/components/camel-netty-http/pom.xml
index f47362e..6b93d1c 100644
--- a/components/camel-netty-http/pom.xml
+++ b/components/camel-netty-http/pom.xml
@@ -24,7 +24,7 @@
</parent>
<artifactId>camel-netty-http</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Netty HTTP (deprecated)</name>
<description>Camel Netty HTTP support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-netty/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-netty/pom.xml b/components/camel-netty/pom.xml
index 3d9e908..53c350d 100644
--- a/components/camel-netty/pom.xml
+++ b/components/camel-netty/pom.xml
@@ -24,7 +24,7 @@
</parent>
<artifactId>camel-netty</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Netty (deprecated)</name>
<description>Camel Netty NIO based socket communication component</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-netty4-http/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-netty4-http/pom.xml b/components/camel-netty4-http/pom.xml
index 6247cc7..ff4e893 100644
--- a/components/camel-netty4-http/pom.xml
+++ b/components/camel-netty4-http/pom.xml
@@ -24,7 +24,7 @@
</parent>
<artifactId>camel-netty4-http</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Netty4 HTTP</name>
<description>Camel Netty4 HTTP support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-netty4/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-netty4/pom.xml b/components/camel-netty4/pom.xml
index a6b7ebe..c9ff493 100644
--- a/components/camel-netty4/pom.xml
+++ b/components/camel-netty4/pom.xml
@@ -24,7 +24,7 @@
</parent>
<artifactId>camel-netty4</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Netty4</name>
<description>Camel Netty NIO based socket communication component</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-ognl/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ognl/pom.xml b/components/camel-ognl/pom.xml
index c1a4a57..24d0e10 100644
--- a/components/camel-ognl/pom.xml
+++ b/components/camel-ognl/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-ognl</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: OGNL</name>
<description>Camel OGNL support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-olingo2/camel-olingo2-api/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-olingo2/camel-olingo2-api/pom.xml b/components/camel-olingo2/camel-olingo2-api/pom.xml
index 2e2868f..2656cbf 100644
--- a/components/camel-olingo2/camel-olingo2-api/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-api/pom.xml
@@ -28,7 +28,7 @@
<artifactId>camel-olingo2-api</artifactId>
<name>Camel :: Olingo2 :: API</name>
<description>Camel Olingo2 API</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.olingo2.api*</camel.osgi.export.pkg>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-olingo2/camel-olingo2-component/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml
index 34ddc84..58c84b5 100644
--- a/components/camel-olingo2/camel-olingo2-component/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-component/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-olingo2</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Olingo2 :: Component</name>
<description>Camel Olingo2 component</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-openshift/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-openshift/pom.xml b/components/camel-openshift/pom.xml
index 65aea3e..9b0c81b 100644
--- a/components/camel-openshift/pom.xml
+++ b/components/camel-openshift/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-openshift</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: OpenShift</name>
<description>Camel OpenShift 2.x support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-optaplanner/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-optaplanner/pom.xml b/components/camel-optaplanner/pom.xml
index a174de7..d94363e 100644
--- a/components/camel-optaplanner/pom.xml
+++ b/components/camel-optaplanner/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-optaplanner</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: OptaPlanner</name>
<description>Camel OptaPlanner support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-paho/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-paho/pom.xml b/components/camel-paho/pom.xml
index cf36424..0eac4ca 100644
--- a/components/camel-paho/pom.xml
+++ b/components/camel-paho/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-paho</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Paho</name>
<description>Camel Eclipse Paho support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-paxlogging/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-paxlogging/pom.xml b/components/camel-paxlogging/pom.xml
index 66b5830..7f7af25 100644
--- a/components/camel-paxlogging/pom.xml
+++ b/components/camel-paxlogging/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-paxlogging</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Pax Logging</name>
<description>Camel OSGi PaxLogging support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-pdf/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-pdf/pom.xml b/components/camel-pdf/pom.xml
index d2b3c55..c912962 100644
--- a/components/camel-pdf/pom.xml
+++ b/components/camel-pdf/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-pdf</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: PDF</name>
<description>Camel PDF support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-pgevent/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-pgevent/pom.xml b/components/camel-pgevent/pom.xml
index 1b24501..947fd10 100644
--- a/components/camel-pgevent/pom.xml
+++ b/components/camel-pgevent/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-pgevent</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: PgEvent</name>
<description>Component for sending/receiving notifications in PostgreSQL via the pgjdbc-ng driver</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-printer/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-printer/pom.xml b/components/camel-printer/pom.xml
index 6cd1696..3dd2cd7 100644
--- a/components/camel-printer/pom.xml
+++ b/components/camel-printer/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-printer</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Printer</name>
<description>Camel Printer support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-protobuf/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-protobuf/pom.xml b/components/camel-protobuf/pom.xml
index d49f632..9952719 100755
--- a/components/camel-protobuf/pom.xml
+++ b/components/camel-protobuf/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-protobuf</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Protobuf</name>
<properties>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-quartz/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-quartz/pom.xml b/components/camel-quartz/pom.xml
index b996631..4d259be 100644
--- a/components/camel-quartz/pom.xml
+++ b/components/camel-quartz/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-quartz</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Quartz (deprecated)</name>
<description>Camel Quartz support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-quartz2/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-quartz2/pom.xml b/components/camel-quartz2/pom.xml
index 8561526..eaa9310 100644
--- a/components/camel-quartz2/pom.xml
+++ b/components/camel-quartz2/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-quartz2</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Quartz2</name>
<description>Camel Quartz2 support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-quickfix/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-quickfix/pom.xml b/components/camel-quickfix/pom.xml
index 1f9040b..7a6ee80 100644
--- a/components/camel-quickfix/pom.xml
+++ b/components/camel-quickfix/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-quickfix</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: QuickFIX/J</name>
<description>Camel QuickFIX/J support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-rabbitmq/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/pom.xml b/components/camel-rabbitmq/pom.xml
index 04f1212..bf7573e 100644
--- a/components/camel-rabbitmq/pom.xml
+++ b/components/camel-rabbitmq/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-rabbitmq</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: RabbitMQ</name>
<description>Camel RabbitMQ Component</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-restlet/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-restlet/pom.xml b/components/camel-restlet/pom.xml
index aa8f565..dfb75c7 100644
--- a/components/camel-restlet/pom.xml
+++ b/components/camel-restlet/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-restlet</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Restlet</name>
<description>Camel REST (Restlet based) Component</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-rmi/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-rmi/pom.xml b/components/camel-rmi/pom.xml
index 6baea3f..f8f731a 100644
--- a/components/camel-rmi/pom.xml
+++ b/components/camel-rmi/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-rmi</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: RMI</name>
<description>Camel RMI support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-routebox/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-routebox/pom.xml b/components/camel-routebox/pom.xml
index d7c67e7..6e90eda 100644
--- a/components/camel-routebox/pom.xml
+++ b/components/camel-routebox/pom.xml
@@ -27,7 +27,7 @@
<artifactId>camel-routebox</artifactId>
<name>Camel :: Routebox (deprecated)</name>
<description>Camel Routebox component to encapsulate routes</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-rss/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-rss/pom.xml b/components/camel-rss/pom.xml
index 264ee35..2b87adc 100644
--- a/components/camel-rss/pom.xml
+++ b/components/camel-rss/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-rss</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: RSS</name>
<description>Camel RSS support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-ruby/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ruby/pom.xml b/components/camel-ruby/pom.xml
index a8a1df7..b1b4e35 100644
--- a/components/camel-ruby/pom.xml
+++ b/components/camel-ruby/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-ruby</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Ruby</name>
<description>Camel Ruby support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-rx/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-rx/pom.xml b/components/camel-rx/pom.xml
index b954815..281b125 100644
--- a/components/camel-rx/pom.xml
+++ b/components/camel-rx/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-rx</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: RX</name>
<description>Camel Reactive Extensions support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-salesforce/camel-salesforce-component/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml
index fbda70d..a16e6f5 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-salesforce</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Salesforce</name>
<description>Camel Salesforce support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
index b28bbd5..6ca701c 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
@@ -147,6 +147,29 @@
<build>
<plugins>
+ <!-- maven-jar-plugin config for Maven plugins. -->
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <archive combine.self="override">
+ <manifestFile/>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+
<!-- Generate plugin help -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-sap-netweaver/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-sap-netweaver/pom.xml b/components/camel-sap-netweaver/pom.xml
index c2bb561..ae0993c 100644
--- a/components/camel-sap-netweaver/pom.xml
+++ b/components/camel-sap-netweaver/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-sap-netweaver</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: SAP NetWeaver</name>
<description>Camel SAP NetWeaver support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-saxon/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-saxon/pom.xml b/components/camel-saxon/pom.xml
index 1538d0b..cf94627 100644
--- a/components/camel-saxon/pom.xml
+++ b/components/camel-saxon/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-saxon</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Saxon</name>
<description>Camel Saxon (XQuery/XPath) support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-scala/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-scala/pom.xml b/components/camel-scala/pom.xml
index e4cd4fb..5eb4f3b 100644
--- a/components/camel-scala/pom.xml
+++ b/components/camel-scala/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-scala</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Scala</name>
<description>Camel Scala DSL</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-schematron/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-schematron/pom.xml b/components/camel-schematron/pom.xml
index 41b49ec..394435a 100644
--- a/components/camel-schematron/pom.xml
+++ b/components/camel-schematron/pom.xml
@@ -26,7 +26,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.camel</groupId>
<artifactId>camel-schematron</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Schematron</name>
<description>Camel Schematron support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-scr/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-scr/pom.xml b/components/camel-scr/pom.xml
index d46710b..3730380 100644
--- a/components/camel-scr/pom.xml
+++ b/components/camel-scr/pom.xml
@@ -27,7 +27,7 @@
<artifactId>camel-scr</artifactId>
<name>Camel :: SCR</name>
<description>Camel SCR support</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<properties>
<camel.osgi.export.pkg>org.apache.camel.scr</camel.osgi.export.pkg>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-script/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-script/pom.xml b/components/camel-script/pom.xml
index 61ac9c1..c8fcbc8 100644
--- a/components/camel-script/pom.xml
+++ b/components/camel-script/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-script</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Script</name>
<description>Camel Script support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-servicenow/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-servicenow/pom.xml b/components/camel-servicenow/pom.xml
index 8ea683e..0eaa8c1 100644
--- a/components/camel-servicenow/pom.xml
+++ b/components/camel-servicenow/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-servicenow</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: ServiceNow</name>
<description>Camel ServiceNow support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-servlet/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml
index d6c9807..f1f84f1 100644
--- a/components/camel-servlet/pom.xml
+++ b/components/camel-servlet/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-servlet</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Servlet</name>
<description>Camel servlet transport support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-servletlistener/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-servletlistener/pom.xml b/components/camel-servletlistener/pom.xml
index c61c212..556a78b 100644
--- a/components/camel-servletlistener/pom.xml
+++ b/components/camel-servletlistener/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-servletlistener</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Servlet Listener</name>
<description>Camel servlet listener for bootstrapping Camel in Web Applications</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-shiro/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-shiro/pom.xml b/components/camel-shiro/pom.xml
index fa71925..13e00a0 100644
--- a/components/camel-shiro/pom.xml
+++ b/components/camel-shiro/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-shiro</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Shiro </name>
<description>Camel Shiro Security support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-sip/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-sip/pom.xml b/components/camel-sip/pom.xml
index d373a01..8ea24be 100644
--- a/components/camel-sip/pom.xml
+++ b/components/camel-sip/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-sip</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: SIP</name>
<description>Camel SIP protocol based communication component</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-sjms/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-sjms/pom.xml b/components/camel-sjms/pom.xml
index 197e4d1..3fc47c7 100644
--- a/components/camel-sjms/pom.xml
+++ b/components/camel-sjms/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-sjms</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Simple JMS</name>
<description>A pure Java JMS Camel Component</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-slack/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-slack/pom.xml b/components/camel-slack/pom.xml
index 939d001..4d9b3bc 100644
--- a/components/camel-slack/pom.xml
+++ b/components/camel-slack/pom.xml
@@ -26,7 +26,7 @@ limitations under the License.
</parent>
<artifactId>camel-slack</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Slack</name>
<description>Camel Slack Support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-smpp/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-smpp/pom.xml b/components/camel-smpp/pom.xml
index 3bbb215..54301d9 100644
--- a/components/camel-smpp/pom.xml
+++ b/components/camel-smpp/pom.xml
@@ -24,7 +24,7 @@
</parent>
<artifactId>camel-smpp</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: SMPP</name>
<description>Camel SMPP support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-snakeyaml/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-snakeyaml/pom.xml b/components/camel-snakeyaml/pom.xml
index faf3747..ec594a0 100644
--- a/components/camel-snakeyaml/pom.xml
+++ b/components/camel-snakeyaml/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-snakeyaml</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: SnakeYAML</name>
<description>Camel SnakeYAML support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-snmp/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-snmp/pom.xml b/components/camel-snmp/pom.xml
index 22c30bdf..0e0819d 100644
--- a/components/camel-snmp/pom.xml
+++ b/components/camel-snmp/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-snmp</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: SNMP</name>
<description>Camel SNMP support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-soap/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index 853c841..7d97428 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-soap</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: SOAP</name>
<description>Camel SOAP support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-solr/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-solr/pom.xml b/components/camel-solr/pom.xml
index 50fce1c..4fd4b59 100644
--- a/components/camel-solr/pom.xml
+++ b/components/camel-solr/pom.xml
@@ -24,7 +24,7 @@
</parent>
<artifactId>camel-solr</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Solr</name>
<description>Camel Solr Support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-spark-rest/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spark-rest/pom.xml b/components/camel-spark-rest/pom.xml
index 3c85f28..7c771b7 100644
--- a/components/camel-spark-rest/pom.xml
+++ b/components/camel-spark-rest/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-spark-rest</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Spark REST</name>
<description>Camel Spark (REST DSL) support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-spark/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spark/pom.xml b/components/camel-spark/pom.xml
index 5578ae7..cdaeb03 100644
--- a/components/camel-spark/pom.xml
+++ b/components/camel-spark/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>camel-spark</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Apache Spark</name>
<description>Camel Apache Spark Support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-splunk/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-splunk/pom.xml b/components/camel-splunk/pom.xml
index f80bd4e..5961ec0 100644
--- a/components/camel-splunk/pom.xml
+++ b/components/camel-splunk/pom.xml
@@ -27,7 +27,7 @@
<name>Camel :: Splunk</name>
<artifactId>camel-splunk</artifactId>
<description>Camel :: Splunk component</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<properties>
<camel.osgi.import.before.defaults>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-spring-batch/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-batch/pom.xml b/components/camel-spring-batch/pom.xml
index 5ce584c..38c59d1 100644
--- a/components/camel-spring-batch/pom.xml
+++ b/components/camel-spring-batch/pom.xml
@@ -24,7 +24,7 @@
</parent>
<artifactId>camel-spring-batch</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Spring Batch</name>
<description>Camel Spring Batch support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-spring-boot-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot-starter/pom.xml b/components/camel-spring-boot-starter/pom.xml
index 2c71e43..c99f8e3 100644
--- a/components/camel-spring-boot-starter/pom.xml
+++ b/components/camel-spring-boot-starter/pom.xml
@@ -29,6 +29,10 @@
<name>Camel :: Spring Boot :: Starter</name>
<description>Spring Boot Apache Camel Starter</description>
+ <properties>
+ <camel.osgi.export.pkg />
+ </properties>
+
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-spring-boot/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/pom.xml b/components/camel-spring-boot/pom.xml
index 84e1055..035bcff 100644
--- a/components/camel-spring-boot/pom.xml
+++ b/components/camel-spring-boot/pom.xml
@@ -29,6 +29,10 @@
<artifactId>camel-spring-boot</artifactId>
<description>Camel :: Spring Boot</description>
+ <properties>
+ <camel.osgi.export.pkg />
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-spring-integration/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-integration/pom.xml b/components/camel-spring-integration/pom.xml
index 5103f03..13bdc68 100644
--- a/components/camel-spring-integration/pom.xml
+++ b/components/camel-spring-integration/pom.xml
@@ -27,7 +27,7 @@
<artifactId>camel-spring-integration</artifactId>
<name>Camel :: Spring Integration</name>
<description>Camel Spring Integration support</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.spring.integration.*</camel.osgi.export.pkg>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-spring-javaconfig/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-javaconfig/pom.xml b/components/camel-spring-javaconfig/pom.xml
index d7c27a8..1742d38 100644
--- a/components/camel-spring-javaconfig/pom.xml
+++ b/components/camel-spring-javaconfig/pom.xml
@@ -27,7 +27,7 @@
<artifactId>camel-spring-javaconfig</artifactId>
<name>Camel :: Spring JavaConfig</name>
<description>Camel Spring JavaConfig support</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<properties>
<!-- camel-spring uses spring-dm that is spring 3.x -->
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-spring-ldap/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-ldap/pom.xml b/components/camel-spring-ldap/pom.xml
index 2fcfb9c..737a0ca 100644
--- a/components/camel-spring-ldap/pom.xml
+++ b/components/camel-spring-ldap/pom.xml
@@ -24,7 +24,7 @@
</parent>
<artifactId>camel-spring-ldap</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Spring LDAP</name>
<description>Camel support for Spring LDAP</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-spring-redis/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-redis/pom.xml b/components/camel-spring-redis/pom.xml
index 09c2f3d..b3146da 100755
--- a/components/camel-spring-redis/pom.xml
+++ b/components/camel-spring-redis/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-spring-redis</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Redis</name>
<description>Camel Spring Redis Component</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-spring-security/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-security/pom.xml b/components/camel-spring-security/pom.xml
index f3c1240..cc0cb48 100644
--- a/components/camel-spring-security/pom.xml
+++ b/components/camel-spring-security/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-spring-security</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Spring Security</name>
<description>Camel Spring Security support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-spring-ws/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml
index 388b062..2cb7c26 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>camel-spring-ws</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Spring Web Services</name>
<description>Camel support for Spring Web Services</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-spring/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index c96ed73..5b79d0e 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -27,7 +27,7 @@
<artifactId>camel-spring</artifactId>
<name>Camel :: Spring</name>
<description>Camel Spring support</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<properties>
<!-- spring-dm only supports spring 3.x so we need to import that range -->
@@ -37,6 +37,8 @@
!org.apache.camel.component,
!org.apache.camel.component.event,
!org.apache.camel.language.spel,
+ !org.apache.camel.core.osgi*,
+ !org.apache.camel.core.xml*,
org.apache.camel.*;${camel.osgi.import.strict.version},
org.springframework.osgi.*;version="[1.2,2)",
org.springframework*;version="${spring-dm-version-range}",
@@ -51,10 +53,6 @@
org.apache.camel.component.event;${camel.osgi.split.pkg};${camel.osgi.version},
org.apache.camel.language.spel;${camel.osgi.split.pkg};${camel.osgi.version}
</camel.osgi.export>
- <camel.osgi.private.pkg>
- org.apache.camel.core.osgi*,
- org.apache.camel.core.xml*
- </camel.osgi.private.pkg>
<camel.osgi.export.service>
org.apache.camel.spi.ComponentResolver;component=spring-event,
org.apache.camel.spi.LanguageResolver;language=spel
@@ -240,6 +238,52 @@
<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>
+
+ <!-- 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>
+
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-sql/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-sql/pom.xml b/components/camel-sql/pom.xml
index 260a572..39fbee8 100644
--- a/components/camel-sql/pom.xml
+++ b/components/camel-sql/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-sql</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: SQL</name>
<description>Camel SQL support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-ssh/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ssh/pom.xml b/components/camel-ssh/pom.xml
index 0668821..0b97aa7 100644
--- a/components/camel-ssh/pom.xml
+++ b/components/camel-ssh/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-ssh</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: SSH</name>
<description>Camel SSH support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-stax/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-stax/pom.xml b/components/camel-stax/pom.xml
index 8d55949..5e322bc 100644
--- a/components/camel-stax/pom.xml
+++ b/components/camel-stax/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-stax</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: StAX</name>
<description>Camel StAX support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-stomp/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-stomp/pom.xml b/components/camel-stomp/pom.xml
index 004d623..b984b08 100644
--- a/components/camel-stomp/pom.xml
+++ b/components/camel-stomp/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-stomp</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Stomp</name>
<description>Camel Stomp client</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-stream/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-stream/pom.xml b/components/camel-stream/pom.xml
index d306046..7316ff0 100644
--- a/components/camel-stream/pom.xml
+++ b/components/camel-stream/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-stream</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Stream</name>
<description>Camel Stream (System.in, System.out, System.err) support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-stringtemplate/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-stringtemplate/pom.xml b/components/camel-stringtemplate/pom.xml
index eb023c9..ce81e8b 100644
--- a/components/camel-stringtemplate/pom.xml
+++ b/components/camel-stringtemplate/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-stringtemplate</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: StringTemplate</name>
<description>Camel StringTemplate support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-swagger-java/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/pom.xml b/components/camel-swagger-java/pom.xml
index 001b4f8..65df0db 100644
--- a/components/camel-swagger-java/pom.xml
+++ b/components/camel-swagger-java/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-swagger-java</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Swagger Java</name>
<description>Camel Swagger Java support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-swagger/pom.xml b/components/camel-swagger/pom.xml
index f85e00d..7063fbe 100644
--- a/components/camel-swagger/pom.xml
+++ b/components/camel-swagger/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-swagger</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Swagger (deprecated)</name>
<description>Camel Swagger support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-syslog/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-syslog/pom.xml b/components/camel-syslog/pom.xml
index 48ef529..9d8c6d8 100644
--- a/components/camel-syslog/pom.xml
+++ b/components/camel-syslog/pom.xml
@@ -24,7 +24,7 @@
</parent>
<artifactId>camel-syslog</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Syslog</name>
<description>Camel Syslog support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-tagsoup/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-tagsoup/pom.xml b/components/camel-tagsoup/pom.xml
index 6f1560d..1ced2b7 100644
--- a/components/camel-tagsoup/pom.xml
+++ b/components/camel-tagsoup/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-tagsoup</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: TagSoup</name>
<description>Camel TagSoup support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-tarfile/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-tarfile/pom.xml b/components/camel-tarfile/pom.xml
index 6078cb4..2df83db 100644
--- a/components/camel-tarfile/pom.xml
+++ b/components/camel-tarfile/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-tarfile</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Tar File</name>
<description>Camel Tar file support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-test-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-test-blueprint/pom.xml b/components/camel-test-blueprint/pom.xml
index 36cf3f8..965d14a 100644
--- a/components/camel-test-blueprint/pom.xml
+++ b/components/camel-test-blueprint/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-test-blueprint</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Test :: Blueprint</name>
<description>Camel Testing Blueprint Library using JUnit</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-test-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-test-cdi/pom.xml b/components/camel-test-cdi/pom.xml
index 3641f4a..0500f2e 100644
--- a/components/camel-test-cdi/pom.xml
+++ b/components/camel-test-cdi/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-test-cdi</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Test :: CDI</name>
<description>Camel Testing Library using JUnit and CDI</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-test-spring/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-test-spring/pom.xml b/components/camel-test-spring/pom.xml
index c7bd018..bcf3fe5 100644
--- a/components/camel-test-spring/pom.xml
+++ b/components/camel-test-spring/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-test-spring</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Test :: Spring 4.1+</name>
<description>Camel Testing Library using JUnit and Spring 4.1+</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-test-spring40/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-test-spring40/pom.xml b/components/camel-test-spring40/pom.xml
index 2cd694b..ea1d599 100644
--- a/components/camel-test-spring40/pom.xml
+++ b/components/camel-test-spring40/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-test-spring40</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Test :: Spring 4.0 (deprecated)</name>
<description>Camel Testing Library using JUnit and Spring 4.0</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-test/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-test/pom.xml b/components/camel-test/pom.xml
index e574826..da05a2b 100644
--- a/components/camel-test/pom.xml
+++ b/components/camel-test/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-test</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Test</name>
<description>Camel Testing Library using JUnit</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-testng/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-testng/pom.xml b/components/camel-testng/pom.xml
index abe8481..076186a 100644
--- a/components/camel-testng/pom.xml
+++ b/components/camel-testng/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-testng</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: TestNG</name>
<description>Camel Testing Library using TestNG</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-twitter/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-twitter/pom.xml b/components/camel-twitter/pom.xml
index 5eb21d5..2488c0f 100644
--- a/components/camel-twitter/pom.xml
+++ b/components/camel-twitter/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-twitter</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Twitter</name>
<description>Camel Twitter support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-undertow/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-undertow/pom.xml b/components/camel-undertow/pom.xml
index 6811821..ca6779c 100644
--- a/components/camel-undertow/pom.xml
+++ b/components/camel-undertow/pom.xml
@@ -26,7 +26,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>camel-undertow</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Undertow</name>
<properties>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-univocity-parsers/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-univocity-parsers/pom.xml b/components/camel-univocity-parsers/pom.xml
index f372c0c..9c05f7f 100644
--- a/components/camel-univocity-parsers/pom.xml
+++ b/components/camel-univocity-parsers/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-univocity-parsers</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: UniVocity Parsers</name>
<description>Camel UniVocity parsers data format support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-urlrewrite/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-urlrewrite/pom.xml b/components/camel-urlrewrite/pom.xml
index 9e1a8d9..ac45ef3 100644
--- a/components/camel-urlrewrite/pom.xml
+++ b/components/camel-urlrewrite/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-urlrewrite</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: URLRewrite</name>
<description>Camel URLRewrite support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-velocity/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-velocity/pom.xml b/components/camel-velocity/pom.xml
index 95dafa9..c5f88e6 100644
--- a/components/camel-velocity/pom.xml
+++ b/components/camel-velocity/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-velocity</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Velocity</name>
<description>Camel Velocity support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-vertx/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-vertx/pom.xml b/components/camel-vertx/pom.xml
index add20e1..14c1671 100644
--- a/components/camel-vertx/pom.xml
+++ b/components/camel-vertx/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-vertx</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Vertx</name>
<description>Camel Vertx support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-weather/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-weather/pom.xml b/components/camel-weather/pom.xml
index ac08bc7..5c4150d 100644
--- a/components/camel-weather/pom.xml
+++ b/components/camel-weather/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-weather</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Weather</name>
<description>Camel Weather support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-websocket/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-websocket/pom.xml b/components/camel-websocket/pom.xml
index a8d89eb..954115d 100644
--- a/components/camel-websocket/pom.xml
+++ b/components/camel-websocket/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-websocket</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: WebSocket</name>
<description>Camel WebSocket</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-xmlbeans/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-xmlbeans/pom.xml b/components/camel-xmlbeans/pom.xml
index db807e3..c40aa92 100644
--- a/components/camel-xmlbeans/pom.xml
+++ b/components/camel-xmlbeans/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-xmlbeans</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: XMLBeans</name>
<description>Camel XMLBeans support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-xmljson/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-xmljson/pom.xml b/components/camel-xmljson/pom.xml
index a6e339f..de655ce 100644
--- a/components/camel-xmljson/pom.xml
+++ b/components/camel-xmljson/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-xmljson</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: XML JSON</name>
<description>Camel XML JSON Data Format</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-xmlrpc/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-xmlrpc/pom.xml b/components/camel-xmlrpc/pom.xml
index c0b1053..43992e7 100644
--- a/components/camel-xmlrpc/pom.xml
+++ b/components/camel-xmlrpc/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-xmlrpc</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: XML RPC</name>
<description>Camel XML RPC support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-xmlsecurity/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/pom.xml b/components/camel-xmlsecurity/pom.xml
index 6c1000e..802f9df 100755
--- a/components/camel-xmlsecurity/pom.xml
+++ b/components/camel-xmlsecurity/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-xmlsecurity</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: XML Security</name>
<description>Camel Partial XML Encryption/Decryption and XML Signature support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-xmpp/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-xmpp/pom.xml b/components/camel-xmpp/pom.xml
index 0374529..4a33fab 100644
--- a/components/camel-xmpp/pom.xml
+++ b/components/camel-xmpp/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-xmpp</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: XMPP</name>
<description>Camel XMPP support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-xstream/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-xstream/pom.xml b/components/camel-xstream/pom.xml
index a37748d..8c0ccda 100644
--- a/components/camel-xstream/pom.xml
+++ b/components/camel-xstream/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-xstream</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: XStream</name>
<description>Camel XStream support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-yammer/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-yammer/pom.xml b/components/camel-yammer/pom.xml
index 69c3df5..89120ab 100644
--- a/components/camel-yammer/pom.xml
+++ b/components/camel-yammer/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-yammer</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Yammer</name>
<description>Camel Yammer Component</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-zipfile/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-zipfile/pom.xml b/components/camel-zipfile/pom.xml
index c4edc99..d387ffa 100644
--- a/components/camel-zipfile/pom.xml
+++ b/components/camel-zipfile/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-zipfile</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Zip File</name>
<description>Camel Zip file support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-zookeeper/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-zookeeper/pom.xml b/components/camel-zookeeper/pom.xml
index bbfad2d..03d652b 100644
--- a/components/camel-zookeeper/pom.xml
+++ b/components/camel-zookeeper/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-zookeeper</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Zookeeper</name>
<description>Camel Zookeeper Support</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-aggregate/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-aggregate/pom.xml b/examples/camel-example-aggregate/pom.xml
index 1902fc8..134eacc 100644
--- a/examples/camel-example-aggregate/pom.xml
+++ b/examples/camel-example-aggregate/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-example-aggregate</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Example :: Aggregate</name>
<description>Demonstrates the persistent support for the Camel aggregator</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-bam/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-bam/pom.xml b/examples/camel-example-bam/pom.xml
index f117f3c..9a5c1b2 100644
--- a/examples/camel-example-bam/pom.xml
+++ b/examples/camel-example-bam/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-example-bam</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Example :: BAM</name>
<description>An example showing how to use Camel as a Business Activity Monitoring tool</description>
@@ -38,7 +38,7 @@
org.apache.camel.bam.model
</camel.osgi.import.additional>
<!-- to avoid us import bunch other package -->
- <camel.osgi.dynamic>*</camel.osgi.dynamic>
+ <camel.osgi.dynamic>*</camel.osgi.dynamic>
</properties>
<dependencies>
@@ -93,7 +93,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkCount>1</forkCount>
- <reuseForks>false</reuseForks>
+ <reuseForks>false</reuseForks>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-box-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-box-osgi/pom.xml b/examples/camel-example-box-osgi/pom.xml
index 24167b2..703e647 100644
--- a/examples/camel-example-box-osgi/pom.xml
+++ b/examples/camel-example-box-osgi/pom.xml
@@ -28,7 +28,13 @@
<artifactId>camel-example-box-osgi</artifactId>
<name>Camel :: Example :: Box :: OSGI</name>
<description>An example which use a Box Endpoint in OSGi</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
+
+ <properties>
+ <camel.osgi.export.pkg>
+ org.apache.camel.example*
+ </camel.osgi.export.pkg>
+ </properties>
<dependencies>
<dependency>
@@ -62,24 +68,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <!-- to generate the MANIFEST-FILE of the bundle -->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>target/META-INF</manifestLocation>
- <instructions>
- <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
- <Export-Package>org.apache.camel.example*</Export-Package>
- <Import-Package>
- *
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-cafe/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-cafe/pom.xml b/examples/camel-example-cafe/pom.xml
index bf377a2..7a75ab8 100755
--- a/examples/camel-example-cafe/pom.xml
+++ b/examples/camel-example-cafe/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>camel-example-cafe</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Example :: Cafe</name>
<description>A cafe example showing how to work with Camel</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-cdi-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-cdi-osgi/pom.xml b/examples/camel-example-cdi-osgi/pom.xml
index aecbea9..535d733 100755
--- a/examples/camel-example-cdi-osgi/pom.xml
+++ b/examples/camel-example-cdi-osgi/pom.xml
@@ -29,7 +29,7 @@
<artifactId>camel-example-cdi-osgi</artifactId>
<name>Camel :: Example :: CDI :: OSGi</name>
<description>PAX CDI example</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<dependencies>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-cdi-properties/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-cdi-properties/pom.xml b/examples/camel-example-cdi-properties/pom.xml
index 0ab190b..940f185 100755
--- a/examples/camel-example-cdi-properties/pom.xml
+++ b/examples/camel-example-cdi-properties/pom.xml
@@ -31,6 +31,12 @@
<description>DeltaSpike configuration properties CDI example</description>
<packaging>jar</packaging>
+ <properties>
+ <camel.osgi.export.pkg>
+ org.apache.camel.example.cdi.properties*
+ </camel.osgi.export.pkg>
+ </properties>
+
<dependencies>
<!-- CDI API -->
@@ -89,7 +95,6 @@
<build>
<plugins>
-
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-maven-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-cxf-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-blueprint/pom.xml b/examples/camel-example-cxf-blueprint/pom.xml
index 1800708..b0dcd2a 100644
--- a/examples/camel-example-cxf-blueprint/pom.xml
+++ b/examples/camel-example-cxf-blueprint/pom.xml
@@ -28,7 +28,13 @@
<artifactId>camel-example-cxf-blueprint</artifactId>
<name>Camel :: Example :: CXF :: Blueprint</name>
<description>An example which use a CXF consumer and the OSGI HTTP Service</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
+
+ <properties>
+ <camel.osgi.export.pkg>
+ org.apache.camel.example.reportincident*
+ </camel.osgi.export.pkg>
+ </properties>
<dependencies>
<dependency>
@@ -96,24 +102,6 @@
</execution>
</executions>
</plugin>
-
- <!-- to generate the MANIFEST-FILE of the bundle -->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>target/META-INF</manifestLocation>
- <instructions>
- <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
- <Export-Package>org.apache.camel.example.reportincident*</Export-Package>
- <Import-Package>
- *
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
-
</plugins>
</build>