servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject servicemix-bundles git commit: [SM-3530] Create OSGi bundle for brave-zipkin 4.8.1
Date Mon, 16 Oct 2017 16:50:03 GMT
Repository: servicemix-bundles
Updated Branches:
  refs/heads/master 19e3a59bb -> 77ddddeba


[SM-3530] Create OSGi bundle for brave-zipkin 4.8.1


Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/77ddddeb
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/77ddddeb
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/77ddddeb

Branch: refs/heads/master
Commit: 77ddddebac33f9f159de96d4a9a03a9a2e2fff4a
Parents: 19e3a59
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Mon Oct 16 18:49:34 2017 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Mon Oct 16 18:49:34 2017 +0200

----------------------------------------------------------------------
 brave-zipkin-3.7.0/pom.xml                      | 132 -------------------
 .../src/main/resources/OSGI-INF/bundle.info     |  11 --
 brave-zipkin-4.5.2/pom.xml                      | 129 ------------------
 .../src/main/resources/OSGI-INF/bundle.info     |  11 --
 brave-zipkin-4.8.1/pom.xml                      | 128 ++++++++++++++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  11 ++
 pom.xml                                         |   1 +
 7 files changed, 140 insertions(+), 283 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/77ddddeb/brave-zipkin-3.7.0/pom.xml
----------------------------------------------------------------------
diff --git a/brave-zipkin-3.7.0/pom.xml b/brave-zipkin-3.7.0/pom.xml
deleted file mode 100644
index dc097d5..0000000
--- a/brave-zipkin-3.7.0/pom.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?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>3.7.0_2-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>com.github.kristofa</pkgGroupId>
-        <pkgArtifactId>brave-core</pkgArtifactId>
-        <pkgVersion>3.7.0</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.private.pkg>
-            com.github.kristofa.brave.internal.zipkin.*
-        </servicemix.osgi.private.pkg>
-        <servicemix.osgi.import.pkg>
-        *
-        </servicemix.osgi.import.pkg>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>${pkgArtifactId}</artifactId>
-            <version>${pkgVersion}</version>
-        </dependency>
-            <dependency>
-      <groupId>com.github.kristofa</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=com.github.kristofa.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/77ddddeb/brave-zipkin-3.7.0/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/brave-zipkin-3.7.0/src/main/resources/OSGI-INF/bundle.info b/brave-zipkin-3.7.0/src/main/resources/OSGI-INF/bundle.info
deleted file mode 100644
index fcfbe4d..0000000
--- a/brave-zipkin-3.7.0/src/main/resources/OSGI-INF/bundle.info
+++ /dev/null
@@ -1,11 +0,0 @@
-\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/77ddddeb/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
deleted file mode 100644
index 999215c..0000000
--- a/brave-zipkin-4.5.2/pom.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?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_2-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/77ddddeb/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
deleted file mode 100644
index fcfbe4d..0000000
--- a/brave-zipkin-4.5.2/src/main/resources/OSGI-INF/bundle.info
+++ /dev/null
@@ -1,11 +0,0 @@
-\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/77ddddeb/brave-zipkin-4.8.1/pom.xml
----------------------------------------------------------------------
diff --git a/brave-zipkin-4.8.1/pom.xml b/brave-zipkin-4.8.1/pom.xml
new file mode 100644
index 0000000..2830ac3
--- /dev/null
+++ b/brave-zipkin-4.8.1/pom.xml
@@ -0,0 +1,128 @@
+<?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>13</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.servicemix.bundles</groupId>
+    <artifactId>org.apache.servicemix.bundles.brave-zipkin</artifactId>
+    <version>4.8.1_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>
+    </scm>
+
+    <properties>
+        <pkgGroupId>io.zipkin.brave</pkgGroupId>
+        <pkgArtifactId>brave-core</pkgArtifactId>
+        <pkgVersion>4.8.1</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/77ddddeb/brave-zipkin-4.8.1/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/brave-zipkin-4.8.1/src/main/resources/OSGI-INF/bundle.info b/brave-zipkin-4.8.1/src/main/resources/OSGI-INF/bundle.info
new file mode 100644
index 0000000..fcfbe4d
--- /dev/null
+++ b/brave-zipkin-4.8.1/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/77ddddeb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c150011..34d7e29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,7 @@
         <module>jruby-9.1.13.0</module>
         <module>saxon-9.8.0-5</module>
         <module>spring-ldap-2.3.2.RELEASE</module>
+        <module>brave-zipkin-4.8.1</module>
     </modules>
 
 </project>


Mime
View raw message