Repository: camel Updated Branches: refs/heads/master b4d736211 -> 3e9f91137
Polish tooling build Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3e9f9113 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3e9f9113 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3e9f9113 Branch: refs/heads/master Commit: 3e9f91137db41a5629f581c648f1c9d7d3c7a6dc Parents: b4d7362 Author: lburgazzoli <lburgazz...@gmail.com> Authored: Wed Sep 21 14:58:06 2016 +0200 Committer: lburgazzoli <lburgazz...@gmail.com> Committed: Wed Sep 21 14:58:47 2016 +0200 ---------------------------------------------------------------------- .../maven/bom-generator-maven-plugin/pom.xml | 16 +++++++---- .../pom.xml | 2 -- tooling/maven/camel-maven-plugin/pom.xml | 2 -- .../maven/camel-package-maven-plugin/pom.xml | 18 ++++++++---- tooling/maven/guice-maven-plugin/pom.xml | 1 - tooling/maven/pom.xml | 30 ++++++++++++++++++++ 6 files changed, 54 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3e9f9113/tooling/maven/bom-generator-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/maven/bom-generator-maven-plugin/pom.xml b/tooling/maven/bom-generator-maven-plugin/pom.xml index c9908b4..f878c24 100644 --- a/tooling/maven/bom-generator-maven-plugin/pom.xml +++ b/tooling/maven/bom-generator-maven-plugin/pom.xml @@ -88,15 +88,21 @@ <!-- logging --> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>test</scope> </dependency> </dependencies> - </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/3e9f9113/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml index e9d7a66..688a998 100644 --- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml +++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml @@ -170,8 +170,6 @@ </plugin> </plugins> </pluginManagement> - <plugins> - </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/3e9f9113/tooling/maven/camel-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-maven-plugin/pom.xml b/tooling/maven/camel-maven-plugin/pom.xml index a76e6fb..8931b1a 100644 --- a/tooling/maven/camel-maven-plugin/pom.xml +++ b/tooling/maven/camel-maven-plugin/pom.xml @@ -88,7 +88,5 @@ <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> - </dependencies> - </project> http://git-wip-us.apache.org/repos/asf/camel/blob/3e9f9113/tooling/maven/camel-package-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml index de96be4..bf9b0dd 100644 --- a/tooling/maven/camel-package-maven-plugin/pom.xml +++ b/tooling/maven/camel-package-maven-plugin/pom.xml @@ -123,17 +123,25 @@ <!-- logging --> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>test</scope> + </dependency> + + <!-- camel --> + <dependency> <groupId>org.apache.camel</groupId> <artifactId>spi-annotations</artifactId> </dependency> </dependencies> - </project> http://git-wip-us.apache.org/repos/asf/camel/blob/3e9f9113/tooling/maven/guice-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/maven/guice-maven-plugin/pom.xml b/tooling/maven/guice-maven-plugin/pom.xml index f8085c3..9d631b6 100644 --- a/tooling/maven/guice-maven-plugin/pom.xml +++ b/tooling/maven/guice-maven-plugin/pom.xml @@ -65,5 +65,4 @@ </dependency> </dependencies> - </project> http://git-wip-us.apache.org/repos/asf/camel/blob/3e9f9113/tooling/maven/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/maven/pom.xml b/tooling/maven/pom.xml index 4942f81..9911c2a 100644 --- a/tooling/maven/pom.xml +++ b/tooling/maven/pom.xml @@ -63,8 +63,38 @@ </archive> </configuration> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>none</phase> + </execution> + <execution> + <id>versions</id> + <phase>none</phase> + </execution> + </executions> + </plugin> </plugins> </pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>none</phase> + </execution> + <execution> + <id>versions</id> + <phase>none</phase> + </execution> + </executions> + </plugin> + </plugins> </build> </project>
