Enabling camel-zipkin in mojo
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3783ab11 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3783ab11 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3783ab11 Branch: refs/heads/master Commit: 3783ab11d639c569b9867d5b5286202e87e2a5b3 Parents: 45710b3 Author: Nicola Ferraro <ni.ferr...@gmail.com> Authored: Wed Mar 15 13:39:04 2017 +0100 Committer: Nicola Ferraro <ni.ferr...@gmail.com> Committed: Wed Mar 15 13:56:43 2017 +0100 ---------------------------------------------------------------------- .../camel-zipkin-starter/pom.xml | 18 ++++++++++++------ .../src/main/resources/META-INF/spring.provides | 18 ++++++++++++++++++ .../maven/packaging/SpringBootStarterMojo.java | 2 +- 3 files changed, 31 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3783ab11/platforms/spring-boot/components-starter/camel-zipkin-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-zipkin-starter/pom.xml b/platforms/spring-boot/components-starter/camel-zipkin-starter/pom.xml index 573d4cc..ca3e863 100644 --- a/platforms/spring-boot/components-starter/camel-zipkin-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-zipkin-starter/pom.xml @@ -15,8 +15,7 @@ See the License for the specific language governing permissions and 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> @@ -24,8 +23,9 @@ <version>2.19.0-SNAPSHOT</version> </parent> <artifactId>camel-zipkin-starter</artifactId> + <packaging>jar</packaging> <name>Spring-Boot Starter :: Camel :: Zipkin</name> - <description>Spring-Boot Starter for Camel Zipkin Support</description> + <description>Spring-Boot Starter for Distributed message tracing using Zipkin</description> <dependencies> <dependency> <groupId>org.springframework.boot</groupId> @@ -34,12 +34,18 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot</artifactId> + <artifactId>camel-zipkin</artifactId> + <version>${project.version}</version> </dependency> + <!--START OF GENERATED CODE--> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-zipkin</artifactId> + <artifactId>camel-core-starter</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-spring-boot-starter</artifactId> </dependency> + <!--END OF GENERATED CODE--> </dependencies> </project> - http://git-wip-us.apache.org/repos/asf/camel/blob/3783ab11/platforms/spring-boot/components-starter/camel-zipkin-starter/src/main/resources/META-INF/spring.provides ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-zipkin-starter/src/main/resources/META-INF/spring.provides b/platforms/spring-boot/components-starter/camel-zipkin-starter/src/main/resources/META-INF/spring.provides new file mode 100644 index 0000000..a85c883 --- /dev/null +++ b/platforms/spring-boot/components-starter/camel-zipkin-starter/src/main/resources/META-INF/spring.provides @@ -0,0 +1,18 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +provides: camel-zipkin \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/3783ab11/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java index 1924b4e..5d99b3d 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java @@ -86,7 +86,7 @@ public class SpringBootStarterMojo extends AbstractMojo { /* Java EE -> */ "camel-cdi", "camel-ejb", /* deprecated (and not working perfectly) -> */ "camel-swagger", "camel-mina", "camel-ibatis", "camel-quartz", /* currently incompatible */ "camel-jclouds", "camel-spark-rest", - /* others (not managed) -> */ "camel-groovy-dsl", "camel-scala", "camel-zipkin"}; + /* others (not managed) -> */ "camel-groovy-dsl", "camel-scala"}; private static final boolean IGNORE_TEST_MODULES = true;