Repository: camel Updated Branches: refs/heads/master ce0853809 -> 002908264
CAMEL-11072 Remove non-Maven plugin related exe... ...cutions from Salesforce Maven POM This removes `bundle-jar` execution from `maven-jar-plugin` plugin, and disables all known executions of `maven-bundle-plugin` and `camel-package-maven-plugin` -- these are not relevant to this module as it is a Maven plugin not a Camel component. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/00290826 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/00290826 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/00290826 Branch: refs/heads/master Commit: 0029082640abf979572a30f157e813a2338334e6 Parents: ce08538 Author: Zoran Regvart <zregv...@apache.org> Authored: Mon Mar 27 09:33:46 2017 +0200 Committer: Zoran Regvart <zregv...@apache.org> Committed: Mon Mar 27 09:33:46 2017 +0200 ---------------------------------------------------------------------- .../camel-salesforce-maven-plugin/pom.xml | 41 +++++++++++++++++--- 1 file changed, 35 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/00290826/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 bf07f3e..9a2077f 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml @@ -189,12 +189,6 @@ <!-- maven-jar-plugin config for Maven plugins. --> <plugin> <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>bundle-jar</id> - <phase>package</phase> - </execution> - </executions> <configuration> <archive combine.self="override"> <manifestFile/> @@ -205,6 +199,41 @@ </archive> </configuration> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <executions> + <execution> + <phase>none</phase> + </execution> + <execution> + <id>versions</id> + <phase>none</phase> + </execution> + <execution> + <id>bundle-manifest</id> + <phase>none</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.camel</groupId> + <artifactId>camel-package-maven-plugin</artifactId> + <executions> + <execution> + <id>prepare</id> + <phase>none</phase> + </execution> + <execution> + <id>validate</id> + <phase>none</phase> + </execution> + <execution> + <id>readme</id> + <phase>none</phase> + </execution> + </executions> + </plugin> <!-- Generate plugin help --> <plugin>