You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ac...@apache.org on 2017/08/22 12:35:53 UTC
[1/2] servicemix-bundles git commit: [SM-3464] Create OSGi bundle for
Brave-zipkin 4.5.2
Repository: servicemix-bundles
Updated Branches:
refs/heads/master 2e21af30f -> 830fd1b2c
[SM-3464] Create OSGi bundle for Brave-zipkin 4.5.2
Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/32b24b76
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/32b24b76
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/32b24b76
Branch: refs/heads/master
Commit: 32b24b7697527e32aa1a6a99244b2fc527979e0e
Parents: 2e21af3
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Aug 22 14:33:11 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Aug 22 14:33:11 2017 +0200
----------------------------------------------------------------------
brave-zipkin-4.5.2/pom.xml | 129 +++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 ++
pom.xml | 1 +
3 files changed, 141 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/32b24b76/brave-zipkin-4.5.2/pom.xml
----------------------------------------------------------------------
diff --git a/brave-zipkin-4.5.2/pom.xml b/brave-zipkin-4.5.2/pom.xml
new file mode 100644
index 0000000..b1fc0d6
--- /dev/null
+++ b/brave-zipkin-4.5.2/pom.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>bundles-pom</artifactId>
+ <version>12</version>
+ <relativePath>../bundles-pom/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.brave-zipkin</artifactId>
+ <version>4.5.2_1-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
+ <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
+
+ <scm>
+ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-bundles.git</url>
+ <tag>HEAD</tag>
+ </scm>
+
+ <properties>
+ <pkgGroupId>io.zipkin.brave</pkgGroupId>
+ <pkgArtifactId>brave-core</pkgArtifactId>
+ <pkgVersion>4.5.2</pkgVersion>
+ <servicemix.osgi.export.pkg>
+ com.github.kristofa.brave,
+ com.github.kristofa.brave.internal,
+ com.github.kristofa.brave.scribe,
+ com.twitter.zipkin.gen
+ </servicemix.osgi.export.pkg>
+ <servicemix.osgi.import.pkg>
+ !brave.*,!brave,*
+ </servicemix.osgi.import.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.zipkin.brave</groupId>
+ <artifactId>brave-spancollector-scribe</artifactId>
+ <version>${pkgVersion}</version>
+ </dependency>
+ <!-- sources -->
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>${pkgGroupId}:${pkgArtifactId}</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+ <includes>
+ <include>META-INF/services/**</include>
+ </includes>
+ </filter>
+ </filters>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.5.3</version>
+ <extensions>true</extensions>
+ <inherited>false</inherited>
+ <configuration>
+ <instructions>
+ <Embed-Dependency>*;artifactId=io.zipkin.brave.brave-spancollector-scribe;inline=true</Embed-Dependency>
+ <Export-Package>${servicemix.osgi.export}</Export-Package>
+ <Import-Package>${servicemix.osgi.import.pkg}</Import-Package>
+ <Bundle-NativeCode>*</Bundle-NativeCode>
+ <_exportcontents>com.github.kristofa.brave.scribe</_exportcontents>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/32b24b76/brave-zipkin-4.5.2/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/brave-zipkin-4.5.2/src/main/resources/OSGI-INF/bundle.info b/brave-zipkin-4.5.2/src/main/resources/OSGI-INF/bundle.info
new file mode 100644
index 0000000..fcfbe4d
--- /dev/null
+++ b/brave-zipkin-4.5.2/src/main/resources/OSGI-INF/bundle.info
@@ -0,0 +1,11 @@
+\u001B[1mSYNOPSIS\u001B[0m
+ ${project.description}
+
+ Original Maven URL:
+ \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+ Zipkin is a distributed tracing system. It helps gather timing data needed to troubleshoot latency problems in microservice architectures.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mhttp://zipkin.io\u001B[0m
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/32b24b76/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c2b4462..4d2d98f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,7 @@
<module>fastjson-1.2.37</module>
<module>xstream-1.4.10-java8</module>
<module>hystrix-serialization-1.5.12</module>
+ <module>brave-zipkin-4.5.2</module>
</modules>
</project>
[2/2] servicemix-bundles git commit: [SM-3462] Fix brave zipkin 4.2.0
bundle version
Posted by ac...@apache.org.
[SM-3462] Fix brave zipkin 4.2.0 bundle version
Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/830fd1b2
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/830fd1b2
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/830fd1b2
Branch: refs/heads/master
Commit: 830fd1b2c27d616504ae7dc6531154a4fcff4b26
Parents: 32b24b7
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Aug 22 14:35:22 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Aug 22 14:35:22 2017 +0200
----------------------------------------------------------------------
brave-zipkin-4.2.0/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/830fd1b2/brave-zipkin-4.2.0/pom.xml
----------------------------------------------------------------------
diff --git a/brave-zipkin-4.2.0/pom.xml b/brave-zipkin-4.2.0/pom.xml
index 5e161fe..135624a 100644
--- a/brave-zipkin-4.2.0/pom.xml
+++ b/brave-zipkin-4.2.0/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.brave-zipkin</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.2.0_1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>