From commits-return-230-archive-asf-public=cust-asf.ponee.io@zipkin.apache.org Thu Jan 31 10:26: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 9E5C01807AC for ; Thu, 31 Jan 2019 11:26:50 +0100 (CET) Received: (qmail 15984 invoked by uid 500); 31 Jan 2019 10:26:41 -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 15826 invoked by uid 99); 31 Jan 2019 10:26:41 -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; Thu, 31 Jan 2019 10:26:41 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 3885285780; Thu, 31 Jan 2019 10:26:40 +0000 (UTC) Date: Thu, 31 Jan 2019 10:27:05 +0000 To: "commits@zipkin.apache.org" Subject: [incubator-zipkin-brave-karaf] 26/43: Fix type and update to karaf 4.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: abesto@apache.org In-Reply-To: <154893039963.1974.10943537260093250828@gitbox.apache.org> References: <154893039963.1974.10943537260093250828@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-zipkin-brave-karaf X-Git-Refname: refs/heads/jenkinsfile-tweaks X-Git-Reftype: branch X-Git-Rev: ead68b7516d339a6a7a831b70e419c2635178db0 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20190131102640.3885285780@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. abesto pushed a commit to branch jenkinsfile-tweaks in repository https://gitbox.apache.org/repos/asf/incubator-zipkin-brave-karaf.git commit ead68b7516d339a6a7a831b70e419c2635178db0 Author: Christian Schneider AuthorDate: Wed Aug 1 11:26:51 2018 +0200 Fix type and update to karaf 4.2.0 --- .gitignore | 5 +++++ features/src/main/resources/features.xml | 8 ++++---- itests/src/test/java/io/zipkin/brave/itests/BraveTest.java | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e1f45e2..fb3a2f5 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,8 @@ target/ # macOS .DS_Store + +# Eclipse +.classpath +.project +.settings/ diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml index 72377d7..b8a827a 100644 --- a/features/src/main/resources/features.xml +++ b/features/src/main/resources/features.xml @@ -21,13 +21,13 @@ scr mvn:io.zipkin.zipkin2/zipkin/${zipkin.version} - mvn:io.zipkin.reporter2/zipkin-reporter/${zipkin.reporter.version} - mvn:io.zipkin.reporter2/zipkin-sender-urlconnection/${zipkin.reporter.version} + mvn:io.zipkin.reporter2/zipkin-reporter/${zipkin-reporter.version} + mvn:io.zipkin.reporter2/zipkin-sender-urlconnection/${zipkin-reporter.version} mvn:io.zipkin.brave/brave/${brave.version} mvn:io.zipkin.brave/brave-instrumentation-http/${brave.version} mvn:io.zipkin.brave.karaf/brave-exporter/${project.version} - + brave mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/1.1.0_1 @@ -41,4 +41,4 @@ mvn:io.zipkin.reporter2/zipkin-sender-okhttp3/${zipkin.reporter.version} mvn:io.zipkin.brave.karaf/brave-exporter-sender-okhttp/${project.version} - \ No newline at end of file + diff --git a/itests/src/test/java/io/zipkin/brave/itests/BraveTest.java b/itests/src/test/java/io/zipkin/brave/itests/BraveTest.java index 6698d4e..6552801 100644 --- a/itests/src/test/java/io/zipkin/brave/itests/BraveTest.java +++ b/itests/src/test/java/io/zipkin/brave/itests/BraveTest.java @@ -53,7 +53,7 @@ public class BraveTest { @Configuration public static Option[] configuration() { MavenArtifactUrlReference karaf = maven().groupId("org.apache.karaf").artifactId("apache-karaf") - .type("zip").version("4.0.7"); + .type("zip").version("4.2.0"); MavenUrlReference brave = maven().groupId("io.zipkin.brave.karaf").artifactId("brave-features").type("xml") .classifier("features").version("0.1.0-SNAPSHOT");