[camel] branch master updated: Move camel-bundle-plugin to up-front so its built first and the entire project can build again.

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 4498041  Move camel-bundle-plugin to up-front so its built first and 
the entire project can build again.
4498041 is described below

commit 4498041401c3bb642c05db850a95467c09e8a3ef
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Jan 23 16:54:58 2019 +0100

    Move camel-bundle-plugin to up-front so its built first and the entire 
project can build again.
---
 pom.xml                                            |  1 +
 .../camel-bundle-plugin/pom.xml                    |  4 ++--
 .../org/apache/camel/maven/bundle/CamelPlugin.java |  0
 .../camel-bundle-plugin => tooling-bundle}/pom.xml | 26 ++++++++++++----------
 tooling/maven/pom.xml                              |  1 -
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3067040..176dec4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,6 +140,7 @@
 
   <modules>
     <module>parent</module>
+    <module>tooling-bundle</module>
     <module>etc</module>
     <module>bom</module>
     <module>buildingtools</module>
diff --git a/tooling/maven/camel-bundle-plugin/pom.xml 
b/tooling-bundle/camel-bundle-plugin/pom.xml
similarity index 93%
copy from tooling/maven/camel-bundle-plugin/pom.xml
copy to tooling-bundle/camel-bundle-plugin/pom.xml
index c82dd69..fb42133 100644
--- a/tooling/maven/camel-bundle-plugin/pom.xml
+++ b/tooling-bundle/camel-bundle-plugin/pom.xml
@@ -22,12 +22,12 @@
 
   <parent>
     <groupId>org.apache.camel</groupId>
-    <artifactId>maven-plugins</artifactId>
+    <artifactId>tooling-bundle</artifactId>
     <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-bundle-plugin</artifactId>
-  <name>Camel :: Maven Plugins :: Camel Bundle Plugin</name>
+  <name>Camel :: Tooling OSGi Bundle :: Camel Bundle Plugin</name>
   <description>Plugin for the maven-bundle-plugin</description>
 
   <dependencies>
diff --git 
a/tooling/maven/camel-bundle-plugin/src/main/java/org/apache/camel/maven/bundle/CamelPlugin.java
 
b/tooling-bundle/camel-bundle-plugin/src/main/java/org/apache/camel/maven/bundle/CamelPlugin.java
similarity index 100%
rename from 
tooling/maven/camel-bundle-plugin/src/main/java/org/apache/camel/maven/bundle/CamelPlugin.java
rename to 
tooling-bundle/camel-bundle-plugin/src/main/java/org/apache/camel/maven/bundle/CamelPlugin.java
diff --git a/tooling/maven/camel-bundle-plugin/pom.xml b/tooling-bundle/pom.xml
similarity index 65%
rename from tooling/maven/camel-bundle-plugin/pom.xml
rename to tooling-bundle/pom.xml
index c82dd69..ab4bb95 100644
--- a/tooling/maven/camel-bundle-plugin/pom.xml
+++ b/tooling-bundle/pom.xml
@@ -17,26 +17,28 @@
     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";>
+<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>maven-plugins</artifactId>
+    <artifactId>camel-parent</artifactId>
     <version>3.0.0-SNAPSHOT</version>
+    <relativePath>../parent</relativePath>
   </parent>
 
-  <artifactId>camel-bundle-plugin</artifactId>
-  <name>Camel :: Maven Plugins :: Camel Bundle Plugin</name>
-  <description>Plugin for the maven-bundle-plugin</description>
+  <artifactId>tooling-bundle</artifactId>
+  <name>Camel :: Tooling OSGi Bundle</name>
+  <description>Camel OSGi Tooling</description>
+  <packaging>pom</packaging>
 
-  <dependencies>
+  <properties>
+    <camel.osgi.export.pkg />
+  </properties>
 
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>maven-bundle-plugin</artifactId>
-      <version>${maven-bundle-plugin-version}</version>
-    </dependency>
-  </dependencies>
+  <modules>
+    <module>camel-bundle-plugin</module>
+  </modules>
 
 </project>
diff --git a/tooling/maven/pom.xml b/tooling/maven/pom.xml
index 801e61a..6feeb8e 100644
--- a/tooling/maven/pom.xml
+++ b/tooling/maven/pom.xml
@@ -38,7 +38,6 @@
     <module>camel-api-component-maven-plugin</module>
     <module>bom-generator-maven-plugin</module>
     <module>camel-restdsl-swagger-plugin</module>
-    <module>camel-bundle-plugin</module>
   </modules>
 
   <!-- Apply to children. -->