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:55 UTC
[1/3] camel git commit: CAMEL-9764 Update maven-bundle-plugin to
3.0.1 to allow JDK8 lambdas.
Repository: camel
Updated Branches:
refs/heads/master 8f0bcd803 -> 7ae918f23
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-cxf-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-osgi/pom.xml b/examples/camel-example-cxf-osgi/pom.xml
index 1c92b7d..e423f2c 100644
--- a/examples/camel-example-cxf-osgi/pom.xml
+++ b/examples/camel-example-cxf-osgi/pom.xml
@@ -28,7 +28,43 @@
<artifactId>camel-example-cxf-osgi</artifactId>
<name>Camel :: Example :: CXF :: OSGI</name>
<description>An example which use a CXF consumer and the OSGI HTTP Service</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
+
+ <properties>
+ <camel.osgi.import.pkg>
+ org.apache.cxf,
+ org.apache.cxf.binding,
+ org.apache.cxf.binding.corba,
+ org.apache.cxf.binding.soap,
+ org.apache.cxf.binding.soap.spring,
+ org.apache.cxf.bus,
+ org.apache.cxf.bus.resource,
+ org.apache.cxf.bus.spring,
+ org.apache.cxf.buslifecycle,
+ org.apache.cxf.catalog,
+ org.apache.cxf.configuration,
+ org.apache.cxf.configuration.spring,
+ org.apache.cxf.endpoint,
+ org.apache.cxf.headers,
+ org.apache.cxf.management,
+ org.apache.cxf.management.jmx,
+ org.apache.cxf.phase,
+ org.apache.cxf.resource,
+ org.apache.cxf.service.factory,
+ org.apache.cxf.transport,
+ org.apache.cxf.transport.http,
+ org.apache.cxf.transport.http.policy,
+ org.apache.cxf.transport.http_jetty,
+ org.apache.cxf.transport.jms,
+ org.apache.cxf.workqueue,
+ org.apache.cxf.wsdl,
+ org.apache.cxf.wsdl11,
+ *
+ </camel.osgi.import.pkg>
+ <camel.osgi.export.pkg>
+ org.apache.camel.example.reportincident*
+ </camel.osgi.export.pkg>
+ </properties>
<dependencies>
<dependency>
@@ -106,50 +142,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>
- org.apache.cxf,
- org.apache.cxf.binding,
- org.apache.cxf.binding.corba,
- org.apache.cxf.binding.soap,
- org.apache.cxf.binding.soap.spring,
- org.apache.cxf.bus,
- org.apache.cxf.bus.resource,
- org.apache.cxf.bus.spring,
- org.apache.cxf.buslifecycle,
- org.apache.cxf.catalog,
- org.apache.cxf.configuration,
- org.apache.cxf.configuration.spring,
- org.apache.cxf.endpoint,
- org.apache.cxf.headers,
- org.apache.cxf.management,
- org.apache.cxf.management.jmx,
- org.apache.cxf.phase,
- org.apache.cxf.resource,
- org.apache.cxf.service.factory,
- org.apache.cxf.transport,
- org.apache.cxf.transport.http,
- org.apache.cxf.transport.http.policy,
- org.apache.cxf.transport.http_jetty,
- org.apache.cxf.transport.jms,
- org.apache.cxf.workqueue,
- org.apache.cxf.wsdl,
- org.apache.cxf.wsdl11,
- *
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-cxf-proxy/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-proxy/pom.xml b/examples/camel-example-cxf-proxy/pom.xml
index e767074..fd8720b 100755
--- a/examples/camel-example-cxf-proxy/pom.xml
+++ b/examples/camel-example-cxf-proxy/pom.xml
@@ -28,7 +28,7 @@
<artifactId>camel-example-cxf-proxy</artifactId>
<name>Camel :: Example :: CXF :: Proxy</name>
<description>An example which uses Camel to proxy a web service</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<properties>
<camel.osgi.export.pkg>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-etl/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-etl/pom.xml b/examples/camel-example-etl/pom.xml
index d8d189e..61a9815 100644
--- a/examples/camel-example-etl/pom.xml
+++ b/examples/camel-example-etl/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-example-etl</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Example :: ETL</name>
<description>An example showing how to use Camel as an Extract Transform and Load (ETL) tool</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-jdbc/pom.xml b/examples/camel-example-jdbc/pom.xml
index b35c2d1..d9ffc3b 100644
--- a/examples/camel-example-jdbc/pom.xml
+++ b/examples/camel-example-jdbc/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-example-jdbc</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Example :: JDBC</name>
<description>An example for showing Camel using JDBC component</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-jmx/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-jmx/pom.xml b/examples/camel-example-jmx/pom.xml
index 89c4a84..b87d58f 100644
--- a/examples/camel-example-jmx/pom.xml
+++ b/examples/camel-example-jmx/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-example-jmx</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Example :: JMX</name>
<description>An example showing how to work with Camel and JMX</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-loan-broker/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-loan-broker/pom.xml b/examples/camel-example-loan-broker/pom.xml
index 41ec985..7a6a2d4 100644
--- a/examples/camel-example-loan-broker/pom.xml
+++ b/examples/camel-example-loan-broker/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-example-loan-broker</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Example :: Loan-Broker</name>
<description>An example that shows the EPI's loan broker demo</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-management/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-management/pom.xml b/examples/camel-example-management/pom.xml
index abf26e5..53c8612 100644
--- a/examples/camel-example-management/pom.xml
+++ b/examples/camel-example-management/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-example-management</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Example :: Management</name>
<description>An example for showing Camel JMX management</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-mybatis/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-mybatis/pom.xml b/examples/camel-example-mybatis/pom.xml
index fb128db..34bff89 100644
--- a/examples/camel-example-mybatis/pom.xml
+++ b/examples/camel-example-mybatis/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-example-mybatis</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Example :: MyBatis</name>
<description>An example for showing Camel using MyBatis SQL mapper component</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-netty-http/myapp-one/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-netty-http/myapp-one/pom.xml b/examples/camel-example-netty-http/myapp-one/pom.xml
index 6631a64..316604e 100644
--- a/examples/camel-example-netty-http/myapp-one/pom.xml
+++ b/examples/camel-example-netty-http/myapp-one/pom.xml
@@ -25,30 +25,18 @@
<artifactId>camel-example-netty-myapp-one</artifactId>
<name>Camel :: Example :: Netty HTTP :: My Application One</name>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
- <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>
- <Import-Package>
- org.apache.camel.component.netty,
- org.apache.camel.component.netty.http,
- org.osgi.service.blueprint
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
+ <properties>
+ <camel.osgi.import.pkg>
+ org.apache.camel.component.netty,
+ org.apache.camel.component.netty.http,
+ org.osgi.service.blueprint,
+ *
+ </camel.osgi.import.pkg>
+ <camel.osgi.export.pkg>
+ *
+ </camel.osgi.export.pkg>
+ </properties>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-netty-http/myapp-two/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-netty-http/myapp-two/pom.xml b/examples/camel-example-netty-http/myapp-two/pom.xml
index 332db22..c590ae9 100644
--- a/examples/camel-example-netty-http/myapp-two/pom.xml
+++ b/examples/camel-example-netty-http/myapp-two/pom.xml
@@ -25,30 +25,18 @@
<artifactId>camel-example-netty-myapp-two</artifactId>
<name>Camel :: Example :: Netty HTTP :: My Application Two</name>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
- <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>
- <Import-Package>
- org.apache.camel.component.netty,
- org.apache.camel.component.netty.http,
- org.osgi.service.blueprint
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
+ <properties>
+ <camel.osgi.import.pkg>
+ org.apache.camel.component.netty,
+ org.apache.camel.component.netty.http,
+ org.osgi.service.blueprint,
+ *
+ </camel.osgi.import.pkg>
+ <camel.osgi.export.pkg>
+ *
+ </camel.osgi.export.pkg>
+ </properties>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-netty-http/shared-netty-http-server/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-netty-http/shared-netty-http-server/pom.xml b/examples/camel-example-netty-http/shared-netty-http-server/pom.xml
index 9b528b9..1921037 100644
--- a/examples/camel-example-netty-http/shared-netty-http-server/pom.xml
+++ b/examples/camel-example-netty-http/shared-netty-http-server/pom.xml
@@ -25,30 +25,17 @@
<artifactId>camel-example-netty-http-shared</artifactId>
<name>Camel :: Example :: Netty HTTP :: Shared Netty HTTP Server</name>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
- <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>
- <Import-Package>
- org.apache.camel.component.netty,
- org.apache.camel.component.netty.http,
- org.osgi.service.blueprint
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
+ <properties>
+ <camel.osgi.import.pkg>
+ org.apache.camel.component.netty,
+ org.apache.camel.component.netty.http,
+ org.osgi.service.blueprint
+ </camel.osgi.import.pkg>
+ <camel.osgi.export.pkg>
+ *
+ </camel.osgi.export.pkg>
+ </properties>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-osgi-rmi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-osgi-rmi/pom.xml b/examples/camel-example-osgi-rmi/pom.xml
index 5b90b91..394df63 100644
--- a/examples/camel-example-osgi-rmi/pom.xml
+++ b/examples/camel-example-osgi-rmi/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-example-osgi-rmi</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Example :: OSGi RMI</name>
<description>A OSGi example which exposes a RMI service.</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-osgi/pom.xml b/examples/camel-example-osgi/pom.xml
index e30f1d6..b625d62 100644
--- a/examples/camel-example-osgi/pom.xml
+++ b/examples/camel-example-osgi/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-example-osgi</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Example :: OSGi</name>
<description>A simple OSGi example which creates a bundle that can be dropped into any OSGi container</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-pojo-messaging/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-pojo-messaging/pom.xml b/examples/camel-example-pojo-messaging/pom.xml
index 003e98c..d509af4 100644
--- a/examples/camel-example-pojo-messaging/pom.xml
+++ b/examples/camel-example-pojo-messaging/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-example-pojo-messaging</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Example :: POJO Messaging</name>
<description>An example showing how to produce and consume messages from Camel endpoints using annotated POJOs</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-reportincident-wssecurity/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-reportincident-wssecurity/pom.xml b/examples/camel-example-reportincident-wssecurity/pom.xml
index b988c3a..774b21a 100644
--- a/examples/camel-example-reportincident-wssecurity/pom.xml
+++ b/examples/camel-example-reportincident-wssecurity/pom.xml
@@ -30,8 +30,45 @@
<description>An example based on real life use case for reporting incidents using webservice that are transformed
and send as emails to a backing system. Client calling the WebService is authentified through WS-Security
</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
+ <properties>
+ <camel.osgi.import.pkg>
+ META-INF.cxf,
+ org.apache.cxf,
+ org.apache.cxf.binding,
+ org.apache.cxf.binding.corba,
+ org.apache.cxf.binding.soap,
+ org.apache.cxf.binding.soap.spring,
+ org.apache.cxf.bus,
+ org.apache.cxf.bus.resource,
+ org.apache.cxf.bus.spring,
+ org.apache.cxf.buslifecycle,
+ org.apache.cxf.catalog,
+ org.apache.cxf.configuration,
+ org.apache.cxf.configuration.spring,
+ org.apache.cxf.endpoint,
+ org.apache.cxf.headers,
+ org.apache.cxf.management,
+ org.apache.cxf.management.jmx,
+ org.apache.cxf.phase,
+ org.apache.cxf.resource,
+ org.apache.cxf.transport,
+ org.apache.cxf.transport.http.policy,
+ org.apache.cxf.transport.http_jetty,
+ org.apache.cxf.transport.jms,
+ org.apache.cxf.workqueue,
+ org.apache.cxf.wsdl,
+ org.apache.cxf.wsdl11,
+ org.springframework.beans.factory.config,
+ org.springframework.mail.javamail,
+ *
+ </camel.osgi.import.pkg>
+ <camel.osgi.export.pkg>
+ org.apache.camel.example.reportincident*
+ </camel.osgi.export.pkg>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -170,56 +207,10 @@
<plugin>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-maven-plugin</artifactId>
- <version>${project.version}</version>
+ <artifactId>camel-maven-plugin</artifactId>
+ <version>${project.version}</version>
</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.artifactId}</Bundle-SymbolicName>
- <Export-Package>org.apache.camel.example.reportincident*</Export-Package>
- <Import-Package>
- META-INF.cxf,
- org.apache.cxf,
- org.apache.cxf.binding,
- org.apache.cxf.binding.corba,
- org.apache.cxf.binding.soap,
- org.apache.cxf.binding.soap.spring,
- org.apache.cxf.bus,
- org.apache.cxf.bus.resource,
- org.apache.cxf.bus.spring,
- org.apache.cxf.buslifecycle,
- org.apache.cxf.catalog,
- org.apache.cxf.configuration,
- org.apache.cxf.configuration.spring,
- org.apache.cxf.endpoint,
- org.apache.cxf.headers,
- org.apache.cxf.management,
- org.apache.cxf.management.jmx,
- org.apache.cxf.phase,
- org.apache.cxf.resource,
- org.apache.cxf.transport,
- org.apache.cxf.transport.http.policy,
- org.apache.cxf.transport.http_jetty,
- org.apache.cxf.transport.jms,
- org.apache.cxf.workqueue,
- org.apache.cxf.wsdl,
- org.apache.cxf.wsdl11,
- org.springframework.beans.factory.config,
- org.springframework.mail.javamail,
- *
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
-
- </plugins>
+ </plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-route-throttling/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-route-throttling/pom.xml b/examples/camel-example-route-throttling/pom.xml
index 4623893..4cb0aa1 100644
--- a/examples/camel-example-route-throttling/pom.xml
+++ b/examples/camel-example-route-throttling/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-example-route-throttling</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Example :: Route :: Throttling</name>
<description>A client-server example using JMS transport where we on the server side can throttle the Camel
route dynamically based on the flow of messages</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-servlet-rest-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-servlet-rest-blueprint/pom.xml b/examples/camel-example-servlet-rest-blueprint/pom.xml
index b48b7f9..5c8bf07 100755
--- a/examples/camel-example-servlet-rest-blueprint/pom.xml
+++ b/examples/camel-example-servlet-rest-blueprint/pom.xml
@@ -28,7 +28,16 @@
<artifactId>camel-example-servlet-rest-blueprint</artifactId>
<name>Camel :: Example :: Servlet REST Blueprint</name>
<description>An example using Servlet REST with OSGi Blueprint</description>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
+
+ <properties>
+ <camel.osgi.import.pkg>
+ *
+ </camel.osgi.import.pkg>
+ <camel.osgi.export.pkg>
+ *
+ </camel.osgi.export.pkg>
+ </properties>
<dependencies>
@@ -77,27 +86,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.rest*</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-simplejirabot/javadsl/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-simplejirabot/javadsl/pom.xml b/examples/camel-example-simplejirabot/javadsl/pom.xml
index f82d531..dc303c9 100644
--- a/examples/camel-example-simplejirabot/javadsl/pom.xml
+++ b/examples/camel-example-simplejirabot/javadsl/pom.xml
@@ -25,6 +25,6 @@
<artifactId>camel-example-simplejirabot-javadsl</artifactId>
<name>Camel :: Example :: Simple Jira Bot :: Java DSL</name>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-spring-javaconfig/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-javaconfig/pom.xml b/examples/camel-example-spring-javaconfig/pom.xml
index 78b50b7..2e19ff9 100644
--- a/examples/camel-example-spring-javaconfig/pom.xml
+++ b/examples/camel-example-spring-javaconfig/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-example-spring-javaconfig</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Example :: Spring :: JavaConfig</name>
<description>An example showing how to work with Camel and Spring Java Config</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-spring-jms/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-jms/pom.xml b/examples/camel-example-spring-jms/pom.xml
index 29b9262..d889444 100644
--- a/examples/camel-example-spring-jms/pom.xml
+++ b/examples/camel-example-spring-jms/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-example-spring-jms</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Example :: Spring :: JMS</name>
<description>An example using Spring XML to talk to the JMS server from different kind of client techniques</description>
<properties>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-spring-xquery/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-xquery/pom.xml b/examples/camel-example-spring-xquery/pom.xml
index 50e6594..6431685 100755
--- a/examples/camel-example-spring-xquery/pom.xml
+++ b/examples/camel-example-spring-xquery/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-example-spring-xquery</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Example :: Spring :: XQuery</name>
<description>An example using Spring XML to transform a message using XQuery</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-spring/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring/pom.xml b/examples/camel-example-spring/pom.xml
index c70c978..d8ef0bd 100755
--- a/examples/camel-example-spring/pom.xml
+++ b/examples/camel-example-spring/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-example-spring</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Example :: Spring</name>
<description>An example showing how to work with Camel and Spring</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-sql-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-sql-blueprint/pom.xml b/examples/camel-example-sql-blueprint/pom.xml
index 5580420..585d7e5 100644
--- a/examples/camel-example-sql-blueprint/pom.xml
+++ b/examples/camel-example-sql-blueprint/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-example-sql-blueprint</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Example :: SQL :: Blueprint</name>
<description>An example for showing Camel using SQL component with blueprint</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-sql/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-sql/pom.xml b/examples/camel-example-sql/pom.xml
index 4a8541b..52758a4 100644
--- a/examples/camel-example-sql/pom.xml
+++ b/examples/camel-example-sql/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-example-sql</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Example :: SQL</name>
<description>An example for showing Camel using SQL component</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-ssh-security/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-ssh-security/pom.xml b/examples/camel-example-ssh-security/pom.xml
index 2741e62..bd0893b 100644
--- a/examples/camel-example-ssh-security/pom.xml
+++ b/examples/camel-example-ssh-security/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-example-ssh-security</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Example :: SSH :: Security</name>
<description>A Certificate secured SSH example that creates a bundle that can be dropped into any OSGi container
</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-ssh/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-ssh/pom.xml b/examples/camel-example-ssh/pom.xml
index 17e8b54..658ddde 100644
--- a/examples/camel-example-ssh/pom.xml
+++ b/examples/camel-example-ssh/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-example-ssh</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Example :: SSH</name>
<description>A simple SSH example which creates a bundle that can be dropped into any OSGi container</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-tracer/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-tracer/pom.xml b/examples/camel-example-tracer/pom.xml
index 76e90dc..8279305 100644
--- a/examples/camel-example-tracer/pom.xml
+++ b/examples/camel-example-tracer/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-example-tracer</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Example :: Tracer</name>
<description>An example showing how to persist Camel trace event messages using JPA</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-twitter-websocket-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-twitter-websocket-blueprint/pom.xml b/examples/camel-example-twitter-websocket-blueprint/pom.xml
index c68f550..b862419 100644
--- a/examples/camel-example-twitter-websocket-blueprint/pom.xml
+++ b/examples/camel-example-twitter-websocket-blueprint/pom.xml
@@ -28,32 +28,18 @@
<artifactId>camel-example-twitter-websocket-blueprint</artifactId>
<name>Camel :: Example :: Twitter WebSocket using OSGi Blueprint</name>
<description>An example that pushes new tweets to a web page using web-socket</description>
- <packaging>bundle</packaging>
-
- <!-- there is no maven dependencies needed as the Camel application has no Java code,
+ <packaging>jar</packaging>
+
+ <properties>
+ <camel.osgi.import.pkg>
+ *
+ </camel.osgi.import.pkg>
+ <camel.osgi.export.pkg>
+ *
+ </camel.osgi.export.pkg>
+ </properties>
+
+ <!-- there are no maven dependencies needed as the Camel application has no Java code,
and its all defined in the src/main/resources/OSGI-INF/blueprint/camel-twitter.xml file -->
- <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.twitter*</Export-Package>
- <Import-Package>
- *
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index e57c383..de08c2c 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -101,6 +101,7 @@
<!-- as having org.apache.camel as prefix is not needed and makes the name very long -->
<camel.osgi.symbolic.name>${project.artifactId}</camel.osgi.symbolic.name>
<skip.starting.camel.context>false</skip.starting.camel.context>
+ <camel.osgi.export.pkg />
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 4e9ae22..58c2a17 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -379,14 +379,15 @@
<maven-archetype-plugin-version>2.0</maven-archetype-plugin-version>
<maven-archetype-packaging-version>2.0</maven-archetype-packaging-version>
<maven-bundle-version>${maven-bundle-plugin-version}</maven-bundle-version>
- <!-- problems by upgrading to maven-bundle-plugin 2.4.0 -->
- <maven-bundle-plugin-version>2.3.7</maven-bundle-plugin-version>
+ <!-- Staying in 2.x because 3.x causes trouble. -->
+ <maven-bundle-plugin-version>3.0.1</maven-bundle-plugin-version>
<maven-checkstyle-plugin-version>2.16</maven-checkstyle-plugin-version>
<!-- AtomicException.java causes a problem with Checksyle > 6.6 due to
https://github.com/checkstyle/checkstyle/issues/1903
-->
<maven-checkstyle-version>6.6</maven-checkstyle-version>
<maven-eclipse-plugin-version>2.10</maven-eclipse-plugin-version>
+ <maven-jar-plugin-version>2.6</maven-jar-plugin-version>
<maven-javadoc-plugin-version>2.9.1</maven-javadoc-plugin-version>
<maven-jboss-as-maven-plugin-version>7.7.Final</maven-jboss-as-maven-plugin-version>
<maven-remote-resources-plugin-version>1.4</maven-remote-resources-plugin-version>
@@ -2833,6 +2834,16 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${maven-jar-plugin-version}</version>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>${scala-maven-plugin-version}</version>
@@ -3199,6 +3210,7 @@
<goals>
<goal>cleanVersions</goal>
<goal>package</goal>
+ <goal>manifest</goal>
</goals>
</pluginExecutionFilter>
<action>
@@ -3232,47 +3244,6 @@
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle-plugin-version}</version>
- <extensions>true</extensions>
- <configuration>
- <excludeDependencies>${camel.osgi.exclude.dependencies}</excludeDependencies>
- <instructions>
- <Bundle-Name>${project.artifactId}</Bundle-Name>
- <Bundle-SymbolicName>${camel.osgi.symbolic.name}</Bundle-SymbolicName>
- <Bundle-Activator>${camel.osgi.activator}</Bundle-Activator>
- <Export-Package>${camel.osgi.export}</Export-Package>
- <Import-Package>${camel.osgi.import}</Import-Package>
- <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
- <Private-Package>${camel.osgi.private.pkg}</Private-Package>
- <Import-Service>${camel.osgi.import.service}</Import-Service>
- <Export-Service>${camel.osgi.export.service}</Export-Service>
- <Require-Capability>${camel.osgi.require.capability}</Require-Capability>
- <Provide-Capability>${camel.osgi.provide.capability}</Provide-Capability>
- <Implementation-Title>Apache Camel</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Karaf-Info>Camel;${project.artifactId}=${project.version}</Karaf-Info>
- <_versionpolicy>${camel.osgi.import.default.version}</_versionpolicy>
- <_failok>${camel.osgi.failok}</_failok>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>versions</id>
- <phase>validate</phase>
- <goals>
- <goal>cleanVersions</goal>
- </goals>
- <configuration>
- <versions>
- <camel.osgi.version.clean>${project.version}</camel.osgi.version.clean>
- </versions>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin-version}</version>
@@ -3316,6 +3287,55 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${maven-bundle-plugin-version}</version>
+ <extensions>false</extensions>
+ <configuration>
+ <excludeDependencies>${camel.osgi.exclude.dependencies}</excludeDependencies>
+ <instructions>
+ <Bundle-Name>${project.artifactId}</Bundle-Name>
+ <Bundle-SymbolicName>${camel.osgi.symbolic.name}</Bundle-SymbolicName>
+ <Bundle-Activator>${camel.osgi.activator}</Bundle-Activator>
+ <Export-Package>${camel.osgi.export}</Export-Package>
+ <Import-Package>${camel.osgi.import}</Import-Package>
+ <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
+ <Private-Package>${camel.osgi.private.pkg}</Private-Package>
+ <Import-Service>${camel.osgi.import.service}</Import-Service>
+ <Export-Service>${camel.osgi.export.service}</Export-Service>
+ <Require-Capability>${camel.osgi.require.capability}</Require-Capability>
+ <Provide-Capability>${camel.osgi.provide.capability}</Provide-Capability>
+ <Implementation-Title>Apache Camel</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Karaf-Info>Camel;${project.artifactId}=${project.version}</Karaf-Info>
+ <_versionpolicy>${camel.osgi.import.default.version}</_versionpolicy>
+ <_failok>${camel.osgi.failok}</_failok>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>versions</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>cleanVersions</goal>
+ </goals>
+ <configuration>
+ <versions>
+ <camel.osgi.version.clean>${project.version}</camel.osgi.version.clean>
+ </versions>
+ </configuration>
+ </execution>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -3366,6 +3386,7 @@
</reporting>
<profiles>
+
<profile>
<id>nochecks</id>
<activation>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/platforms/catalog-lucene/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/catalog-lucene/pom.xml b/platforms/catalog-lucene/pom.xml
index e9edcf3..f4abee5 100644
--- a/platforms/catalog-lucene/pom.xml
+++ b/platforms/catalog-lucene/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-catalog-lucene</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Platforms :: Catalog :: Lucene</name>
<description>Camel Catalog Lucene</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/platforms/catalog/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/catalog/pom.xml b/platforms/catalog/pom.xml
index 02beb31a..a2e869c 100644
--- a/platforms/catalog/pom.xml
+++ b/platforms/catalog/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>camel-catalog</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Platforms :: Catalog</name>
<description>Camel Catalog</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/platforms/commands/commands-core/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/pom.xml b/platforms/commands/commands-core/pom.xml
index ad00498..fb8f942 100644
--- a/platforms/commands/commands-core/pom.xml
+++ b/platforms/commands/commands-core/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-commands-core</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Platforms :: Commands :: Core</name>
<description>Core Camel Commands</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/platforms/commands/commands-jolokia/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-jolokia/pom.xml b/platforms/commands/commands-jolokia/pom.xml
index e68db67..debc15b 100644
--- a/platforms/commands/commands-jolokia/pom.xml
+++ b/platforms/commands/commands-jolokia/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>camel-commands-jolokia</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Platforms :: Commands :: Jolokia</name>
<description>Camel Commands using Jolokia</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/platforms/commands/commands-spring-boot/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-spring-boot/pom.xml b/platforms/commands/commands-spring-boot/pom.xml
index e3c7193..8629756 100755
--- a/platforms/commands/commands-spring-boot/pom.xml
+++ b/platforms/commands/commands-spring-boot/pom.xml
@@ -30,6 +30,10 @@
<description>Camel Commands using Spring Boot Shell</description>
<modelVersion>4.0.0</modelVersion>
+ <properties>
+ <camel.osgi.export.pkg />
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/platforms/karaf/commands-catalog/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands-catalog/pom.xml b/platforms/karaf/commands-catalog/pom.xml
index cbbf589..e2aa32f 100644
--- a/platforms/karaf/commands-catalog/pom.xml
+++ b/platforms/karaf/commands-catalog/pom.xml
@@ -27,7 +27,7 @@
<groupId>org.apache.camel.karaf</groupId>
<artifactId>camel-karaf-commands-catalog</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Platforms :: Apache Karaf :: Commands :: Catalog</name>
<properties>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/platforms/karaf/commands/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands/pom.xml b/platforms/karaf/commands/pom.xml
index 36377f5..871bcd9 100644
--- a/platforms/karaf/commands/pom.xml
+++ b/platforms/karaf/commands/pom.xml
@@ -27,7 +27,7 @@
<groupId>org.apache.camel.karaf</groupId>
<artifactId>camel-karaf-commands</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Platforms :: Apache Karaf :: Commands</name>
<properties>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/platforms/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 418eb44..2665dd6 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -37,4 +37,5 @@
<module>commands</module>
<module>karaf</module>
</modules>
+
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/pom.xml b/tests/pom.xml
index f31b8b4..0390dd2 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -31,6 +31,10 @@
<description>Camel Integration Tests</description>
<packaging>pom</packaging>
+ <properties>
+ <camel.osgi.export.pkg />
+ </properties>
+
<modules>
<module>test-bundles</module>
<module>camel-itest-standalone</module>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/tests/test-bundles/mock-javamail_1.7/pom.xml
----------------------------------------------------------------------
diff --git a/tests/test-bundles/mock-javamail_1.7/pom.xml b/tests/test-bundles/mock-javamail_1.7/pom.xml
index 641dd6e..b75699e 100644
--- a/tests/test-bundles/mock-javamail_1.7/pom.xml
+++ b/tests/test-bundles/mock-javamail_1.7/pom.xml
@@ -27,7 +27,7 @@
<groupId>org.apache.camel.tests</groupId>
<artifactId>org.apache.camel.tests.mock-javamail_1.7</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel :: Integration Tests :: Test Bundles: ${pkgArtifactId}-${pkgVersion}</name>
<description>
This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/tooling/apt/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/apt/pom.xml b/tooling/apt/pom.xml
index fe06b97..33803c7 100644
--- a/tooling/apt/pom.xml
+++ b/tooling/apt/pom.xml
@@ -26,7 +26,6 @@
<version>2.18-SNAPSHOT</version>
</parent>
-
<artifactId>apt</artifactId>
<name>Camel :: Annotation Processor</name>
<description>Processes Camel endpoint source code</description>
@@ -60,7 +59,6 @@
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
index a552eeb..b1d0c88 100644
--- a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
+++ b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>${artifactId}</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>Camel ${name} Component</name>
<description>Camel Component for ${name}</description>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
index 55ab8cf..15f71a3 100644
--- a/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
+++ b/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
@@ -21,7 +21,7 @@
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<version>${version}</version>
<name>Camel Blueprint Route</name>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
index cb57110..520302c 100644
--- a/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
+++ b/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
@@ -21,7 +21,7 @@
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<version>${version}</version>
<name>Camel ${name} Component</name>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/tooling/archetypes/camel-archetype-cxf-code-first-blueprint/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-cxf-code-first-blueprint/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-cxf-code-first-blueprint/src/main/resources/archetype-resources/pom.xml
index f85a8dc..c7f5d52 100644
--- a/tooling/archetypes/camel-archetype-cxf-code-first-blueprint/src/main/resources/archetype-resources/pom.xml
+++ b/tooling/archetypes/camel-archetype-cxf-code-first-blueprint/src/main/resources/archetype-resources/pom.xml
@@ -21,7 +21,7 @@
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<version>${version}</version>
<name>A Camel CXF Blueprint Route</name>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/tooling/archetypes/camel-archetype-cxf-contract-first-blueprint/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-cxf-contract-first-blueprint/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-cxf-contract-first-blueprint/src/main/resources/archetype-resources/pom.xml
index 924e214..63be453 100644
--- a/tooling/archetypes/camel-archetype-cxf-contract-first-blueprint/src/main/resources/archetype-resources/pom.xml
+++ b/tooling/archetypes/camel-archetype-cxf-contract-first-blueprint/src/main/resources/archetype-resources/pom.xml
@@ -21,7 +21,7 @@
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<version>${version}</version>
<name>A Camel CXF Blueprint Route</name>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml
index 2fea3f5..f956cca 100644
--- a/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml
+++ b/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml
@@ -21,7 +21,7 @@
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<version>${version}</version>
<name>Camel ${name} Data format</name>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml
index a2e5310..bea2cf2 100644
--- a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml
+++ b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml
@@ -22,7 +22,7 @@
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<version>${version}</version>
<name>Camel SCR route</name>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml
index 56cdf48..8063266 100644
--- a/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml
+++ b/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml
@@ -21,7 +21,7 @@
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<version>${version}</version>
<name>A Camel Spring-DM Route</name>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/tooling/maven/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/maven/pom.xml b/tooling/maven/pom.xml
index f78982e..6408cca 100644
--- a/tooling/maven/pom.xml
+++ b/tooling/maven/pom.xml
@@ -37,4 +37,33 @@
<module>camel-api-component-maven-plugin</module>
</modules>
+ <!-- Apply to children. -->
+ <build>
+ <pluginManagement>
+ <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>
+ </plugins>
+ </pluginManagement>
+ </build>
+
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/tooling/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/pom.xml b/tooling/pom.xml
index f070b77..0425218 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -31,6 +31,10 @@
<description>Camel Tooling</description>
<packaging>pom</packaging>
+ <properties>
+ <camel.osgi.export.pkg />
+ </properties>
+
<modules>
<module>parent</module>
<module>spi-annotations</module>
[2/3] camel git commit: CAMEL-9764 Update maven-bundle-plugin to
3.0.1 to allow JDK8 lambdas.
Posted by ra...@apache.org.
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>
[3/3] camel git commit: CAMEL-9764 Update maven-bundle-plugin to
3.0.1 to allow JDK8 lambdas.
Posted by ra...@apache.org.
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>