From commits-return-65-archive-asf-public=cust-asf.ponee.io@zipkin.apache.org Wed Jan 30 17:06:52 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 739561807A1 for ; Wed, 30 Jan 2019 18:06:51 +0100 (CET) Received: (qmail 57035 invoked by uid 500); 30 Jan 2019 17:06:50 -0000 Mailing-List: contact commits-help@zipkin.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zipkin.apache.org Delivered-To: mailing list commits@zipkin.apache.org Received: (qmail 57026 invoked by uid 99); 30 Jan 2019 17:06:50 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Jan 2019 17:06:50 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 9EC6285731; Wed, 30 Jan 2019 17:06:49 +0000 (UTC) Date: Wed, 30 Jan 2019 17:06:52 +0000 To: "commits@zipkin.apache.org" Subject: [incubator-zipkin-brave-karaf] 04/37: Fixing feature uri and logging MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: abesto@apache.org In-Reply-To: <154886800866.26132.2518170867932446027@gitbox.apache.org> References: <154886800866.26132.2518170867932446027@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-zipkin-brave-karaf X-Git-Refname: refs/heads/jenkinsfile-wip X-Git-Reftype: branch X-Git-Rev: 49ea3de2f44b754276bd0665813a4ac25eb1f108 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20190130170649.9EC6285731@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. abesto pushed a commit to branch jenkinsfile-wip in repository https://gitbox.apache.org/repos/asf/incubator-zipkin-brave-karaf.git commit 49ea3de2f44b754276bd0665813a4ac25eb1f108 Author: Christian Schneider 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 @@ - - - - - mvn:org.apache.cxf.karaf/apache-cxf/3.1.8/xml/features - - - mvn:io.zipkin.java/zipkin/1.16.0 - mvn:io.zipkin.reporter/zipkin-reporter/${zipkin.reporter.version} - mvn:io.zipkin.reporter/zipkin-sender-urlconnection/${zipkin.reporter.version} - mvn:io.zipkin.brave/brave-core/3.16.0 - - - - brave-core - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/0.8.2.2_1 - mvn:io.zipkin.reporter/zipkin-sender-kafka08/${zipkin.reporter.version} - - - - brave-core - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/1_2 - mvn:io.zipkin.brave/brave-http/3.16.0 - mvn:io.zipkin.brave/brave-jaxrs2/3.16.0 - - - \ 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 @@ ../pom.xml brave-itests - 0.0.1-SNAPSHOT 4.5.0 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 @@ - - - test.log - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - 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 @@ 3.16.0 1.16.0 - 0.6.7 + 0.6.7 1.7.21 @@ -100,7 +100,7 @@ io.zipkin.reporter zipkin-reporter - ${zipkin-reporter.version} + ${zipkin.reporter.version} junit