[camel] branch master updated: Fix the build by making sure the current package plugin is always used

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch master updated: Fix the build by making sure the current package plugin is always used

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

gnodet 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 0a183fe  Fix the build by making sure the current package plugin is always used
0a183fe is described below

commit 0a183fe67cb3b701d35942ec63667d568ea3a4e1
Author: Guillaume Nodet <[hidden email]>
AuthorDate: Thu Feb 13 17:17:36 2020 +0100

    Fix the build by making sure the current package plugin is always used
---
 archetypes/pom.xml                                                  | 1 -
 catalog/camel-catalog-provider-karaf/pom.xml                        | 1 -
 catalog/camel-catalog/pom.xml                                       | 1 -
 components/camel-blueprint/pom.xml                                  | 1 -
 components/camel-cdi/pom.xml                                        | 1 -
 .../camel-debezium-common/camel-debezium-maven-plugin/pom.xml       | 1 -
 components/camel-jmx/pom.xml                                        | 1 -
 components/pom.xml                                                  | 1 -
 core/camel-core/pom.xml                                             | 1 -
 core/pom.xml                                                        | 1 -
 parent/pom.xml                                                      | 6 +++++-
 11 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 57af885..def9964 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -73,7 +73,6 @@
             <plugin>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-package-maven-plugin</artifactId>
-                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/catalog/camel-catalog-provider-karaf/pom.xml b/catalog/camel-catalog-provider-karaf/pom.xml
index 14f73bd..a345f36 100644
--- a/catalog/camel-catalog-provider-karaf/pom.xml
+++ b/catalog/camel-catalog-provider-karaf/pom.xml
@@ -81,7 +81,6 @@
             <plugin>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-package-maven-plugin</artifactId>
-                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/catalog/camel-catalog/pom.xml b/catalog/camel-catalog/pom.xml
index 694fcfd..68f8d1f 100644
--- a/catalog/camel-catalog/pom.xml
+++ b/catalog/camel-catalog/pom.xml
@@ -115,7 +115,6 @@
             <plugin>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-package-maven-plugin</artifactId>
-                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <!-- prepare the catalog, readme files, etc. -->
diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml
index ac62d1e..8fad90c 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -184,7 +184,6 @@
             <plugin>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-package-maven-plugin</artifactId>
-                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>jaxb-list</id>
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index ae104c2..7803cd5 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -207,7 +207,6 @@
             <plugin>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-package-maven-plugin</artifactId>
-                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>jaxb-list</id>
diff --git a/components/camel-debezium-common/camel-debezium-maven-plugin/pom.xml b/components/camel-debezium-common/camel-debezium-maven-plugin/pom.xml
index 1ded555..a67869b 100644
--- a/components/camel-debezium-common/camel-debezium-maven-plugin/pom.xml
+++ b/components/camel-debezium-common/camel-debezium-maven-plugin/pom.xml
@@ -49,7 +49,6 @@
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-package-maven-plugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml
index 81a51d4..bade9b9 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -74,7 +74,6 @@
             <plugin>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-package-maven-plugin</artifactId>
-                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>jaxb-list</id>
diff --git a/components/pom.xml b/components/pom.xml
index 473a8b3..3b878de 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -387,7 +387,6 @@
             <plugin>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-package-maven-plugin</artifactId>
-                <version>${project.version}</version>
                 <configuration>
                     <!-- set to true to make build fail fast if missing documentation in docs files -->
                     <failFast>false</failFast>
diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml
index 286a9d5..8845389 100644
--- a/core/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -252,7 +252,6 @@
             <plugin>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-package-maven-plugin</artifactId>
-                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate</id>
diff --git a/core/pom.xml b/core/pom.xml
index 2203672..cfb6c0d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -65,7 +65,6 @@
             <plugin>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-package-maven-plugin</artifactId>
-                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate</id>
diff --git a/parent/pom.xml b/parent/pom.xml
index 1b27089..dfe6511 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -3886,6 +3886,11 @@
             <plugins>
                 <plugin>
                     <groupId>org.apache.camel</groupId>
+                    <artifactId>camel-package-maven-plugin</artifactId>
+                    <version>${project.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.camel</groupId>
                     <artifactId>camel-javadoc-plugin</artifactId>
                     <version>${project.version}</version>
                 </plugin>
@@ -4670,7 +4675,6 @@
                         <plugin>
                             <groupId>org.apache.camel</groupId>
                             <artifactId>camel-package-maven-plugin</artifactId>
-                            <version>${project.version}</version>
                             <dependencies>
                                 <dependency>
                                     <groupId>jakarta.xml.bind</groupId>