You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zipkin.apache.org by ad...@apache.org on 2019/01/30 14:18:49 UTC
[incubator-zipkin-brave-karaf] 04/37: Fixing feature uri and logging
This is an automated email from the ASF dual-hosted git repository.
adriancole pushed a commit to branch rat
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin-brave-karaf.git
commit 49ea3de2f44b754276bd0665813a4ac25eb1f108
Author: Christian Schneider <ch...@die-schneider.net>
AuthorDate: Fri Dec 9 10:32:43 2016 +0100
Fixing feature uri and logging
---
.gitignore | 1 +
brave-features/target/classes/features.xml | 43 ----------------------
brave-itests/pom.xml | 1 -
.../java/io/zipkin/brave/itests/BraveTest.java | 4 +-
brave-itests/src/test/resources/logback.xml | 9 -----
brave-itests/test.log | 12 ------
pom.xml | 4 +-
7 files changed, 5 insertions(+), 69 deletions(-)
diff --git a/.gitignore b/.gitignore
index acd2dc3..40b20c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ hs_err_pid*
.project
.settings
+target
diff --git a/brave-features/target/classes/features.xml b/brave-features/target/classes/features.xml
deleted file mode 100644
index dbde578..0000000
--- a/brave-features/target/classes/features.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright 2016 The OpenZipkin Authors
-
- Licensed 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.
-
--->
-<features name="brave" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-
- <repository>mvn:org.apache.cxf.karaf/apache-cxf/3.1.8/xml/features</repository>
-
- <feature name="brave-core">
- <bundle dependency="true">mvn:io.zipkin.java/zipkin/1.16.0</bundle>
- <bundle dependency="true">mvn:io.zipkin.reporter/zipkin-reporter/${zipkin.reporter.version}</bundle>
- <bundle>mvn:io.zipkin.reporter/zipkin-sender-urlconnection/${zipkin.reporter.version}</bundle>
- <bundle>mvn:io.zipkin.brave/brave-core/3.16.0</bundle>
- </feature>
-
- <feature name="brave-kafka">
- <feature>brave-core</feature>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/0.8.2.2_1</bundle>
- <bundle>mvn:io.zipkin.reporter/zipkin-sender-kafka08/${zipkin.reporter.version}</bundle>
- </feature>
-
- <feature name="brave-jaxrs2">
- <feature>brave-core</feature>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/1_2</bundle>
- <bundle dependency="true">mvn:io.zipkin.brave/brave-http/3.16.0</bundle>
- <bundle>mvn:io.zipkin.brave/brave-jaxrs2/3.16.0</bundle>
- </feature>
-
-</features>
\ No newline at end of file
diff --git a/brave-itests/pom.xml b/brave-itests/pom.xml
index 158a9a7..2836630 100644
--- a/brave-itests/pom.xml
+++ b/brave-itests/pom.xml
@@ -24,7 +24,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>brave-itests</artifactId>
- <version>0.0.1-SNAPSHOT</version>
<properties>
<pax.exam.version>4.5.0</pax.exam.version>
diff --git a/brave-itests/src/test/java/io/zipkin/brave/itests/BraveTest.java b/brave-itests/src/test/java/io/zipkin/brave/itests/BraveTest.java
index 580bf4c..898817b 100644
--- a/brave-itests/src/test/java/io/zipkin/brave/itests/BraveTest.java
+++ b/brave-itests/src/test/java/io/zipkin/brave/itests/BraveTest.java
@@ -49,8 +49,8 @@ public class BraveTest {
public static Option[] configuration() throws Exception {
MavenArtifactUrlReference karaf = maven().groupId("org.apache.karaf").artifactId("apache-karaf")
.type("zip").version("4.0.7");
- MavenUrlReference brave = maven().groupId("net.lr.brave.osgi").artifactId("brave-features").type("xml")
- .classifier("features").version("0.0.1-SNAPSHOT");
+ MavenUrlReference brave = maven().groupId("io.zipkin.brave.karaf").artifactId("brave-features").type("xml")
+ .classifier("features").version("1.0.0-SNAPSHOT");
return new Option[] //
{
karafDistributionConfiguration().frameworkUrl(karaf).useDeployFolder(false),
diff --git a/brave-itests/src/test/resources/logback.xml b/brave-itests/src/test/resources/logback.xml
index c35d3ca..7f3f081 100644
--- a/brave-itests/src/test/resources/logback.xml
+++ b/brave-itests/src/test/resources/logback.xml
@@ -8,17 +8,8 @@
</encoder>
</appender>
- <!-- log to file test.log -->
- <appender name="TEST_LOG" class="ch.qos.logback.core.FileAppender">
- <file>test.log</file>
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
-
<root level="INFO">
<appender-ref ref="STDOUT" />
- <appender-ref ref="TEST_LOG" />
</root>
<logger name="org.ops4j.pax.exam" level="INFO" />
diff --git a/brave-itests/test.log b/brave-itests/test.log
deleted file mode 100644
index 816493b..0000000
--- a/brave-itests/test.log
+++ /dev/null
@@ -1,12 +0,0 @@
-18:31:51.236 [main] INFO o.o.pax.exam.spi.DefaultExamSystem - Pax Exam System (Version: 4.5.0) created.
-18:31:51.259 [main] INFO o.o.pax.exam.junit.impl.ProbeRunner - creating PaxExam runner for class io.zipkin.brave.itests.BraveTest
-18:31:51.296 [main] INFO o.o.pax.exam.junit.impl.ProbeRunner - running test class io.zipkin.brave.itests.BraveTest
-18:31:51.887 [main] INFO o.o.p.e.k.c.i.KarafTestContainer - Wait for test container to finish its initialization [ RelativeTimeout value = 180000 ]
-18:31:51.887 [main] INFO o.o.p.e.r.c.RemoteBundleContextClient - Waiting for remote bundle context.. on 21000 name: 8e7b7902-4f23-4c53-b6ce-f0e9726bb409 timout: [ RelativeTimeout value = 180000 ]
-18:31:55.829 [main] INFO o.o.p.e.spi.reactors.ReactorManager - suite finished
-18:34:24.681 [main] INFO o.o.pax.exam.spi.DefaultExamSystem - Pax Exam System (Version: 4.5.0) created.
-18:34:24.706 [main] INFO o.o.pax.exam.junit.impl.ProbeRunner - creating PaxExam runner for class io.zipkin.brave.itests.BraveTest
-18:34:24.748 [main] INFO o.o.pax.exam.junit.impl.ProbeRunner - running test class io.zipkin.brave.itests.BraveTest
-18:34:25.317 [main] INFO o.o.p.e.k.c.i.KarafTestContainer - Wait for test container to finish its initialization [ RelativeTimeout value = 180000 ]
-18:34:25.318 [main] INFO o.o.p.e.r.c.RemoteBundleContextClient - Waiting for remote bundle context.. on 21000 name: a46215d8-24fb-41ee-b43b-6abd9c827388 timout: [ RelativeTimeout value = 180000 ]
-18:34:29.355 [main] INFO o.o.p.e.spi.reactors.ReactorManager - suite finished
diff --git a/pom.xml b/pom.xml
index fe8f27a..89d7f78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
<brave.version>3.16.0</brave.version>
<zipkin.version>1.16.0</zipkin.version>
- <zipkin-reporter.version>0.6.7</zipkin-reporter.version>
+ <zipkin.reporter.version>0.6.7</zipkin.reporter.version>
<slf4j.version>1.7.21</slf4j.version>
</properties>
@@ -100,7 +100,7 @@
<dependency>
<groupId>io.zipkin.reporter</groupId>
<artifactId>zipkin-reporter</artifactId>
- <version>${zipkin-reporter.version}</version>
+ <version>${zipkin.reporter.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>