camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ra...@apache.org
Subject [1/3] camel git commit: CAMEL-9764 Update maven-bundle-plugin to 3.0.1 to allow JDK8 lambdas.
Date Wed, 30 Mar 2016 18:45:55 GMT
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>


Mime
View raw message