From commits-return-228-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 9B1D11807A6 for ; Thu, 31 Jan 2019 11:26:50 +0100 (CET) Received: (qmail 15939 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 15798 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 81C9A85794; Thu, 31 Jan 2019 10:26:40 +0000 (UTC) Date: Thu, 31 Jan 2019 10:27:19 +0000 To: "commits@zipkin.apache.org" Subject: [incubator-zipkin-brave-karaf] 40/43: Uses ASF parent and moves to ASF group IDs (#12) 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: 9b18b454479d9be98fbbfb4d592b983d962bcd7b X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20190131102640.81C9A85794@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 9b18b454479d9be98fbbfb4d592b983d962bcd7b Author: Adrian Cole AuthorDate: Wed Jan 30 17:59:17 2019 +0100 Uses ASF parent and moves to ASF group IDs (#12) --- build-support/pom-no-crossmodule-dependencies.xsl | 2 +- exporter-sender-kafka/pom.xml | 2 +- exporter-sender-okhttp/pom.xml | 2 +- exporter/pom.xml | 2 +- features/pom.xml | 2 +- features/src/main/resources/features.xml | 6 +++--- itests/pom.xml | 8 ++++---- itests/src/test/java/io/zipkin/brave/itests/BraveTest.java | 2 +- pom.xml | 8 +++++++- 9 files changed, 20 insertions(+), 14 deletions(-) diff --git a/build-support/pom-no-crossmodule-dependencies.xsl b/build-support/pom-no-crossmodule-dependencies.xsl index c2cc56d..bb7a4b3 100644 --- a/build-support/pom-no-crossmodule-dependencies.xsl +++ b/build-support/pom-no-crossmodule-dependencies.xsl @@ -24,6 +24,6 @@ - + diff --git a/exporter-sender-kafka/pom.xml b/exporter-sender-kafka/pom.xml index 93d9415..5857b82 100644 --- a/exporter-sender-kafka/pom.xml +++ b/exporter-sender-kafka/pom.xml @@ -19,7 +19,7 @@ --> - io.zipkin.brave.karaf + org.apache.zipkin.brave.karaf brave-karaf-parent 0.1.2-SNAPSHOT diff --git a/exporter-sender-okhttp/pom.xml b/exporter-sender-okhttp/pom.xml index d349186..dafb41b 100644 --- a/exporter-sender-okhttp/pom.xml +++ b/exporter-sender-okhttp/pom.xml @@ -19,7 +19,7 @@ --> - io.zipkin.brave.karaf + org.apache.zipkin.brave.karaf brave-karaf-parent 0.1.2-SNAPSHOT diff --git a/exporter/pom.xml b/exporter/pom.xml index 82c5c22..637bf43 100644 --- a/exporter/pom.xml +++ b/exporter/pom.xml @@ -19,7 +19,7 @@ --> - io.zipkin.brave.karaf + org.apache.zipkin.brave.karaf brave-karaf-parent 0.1.2-SNAPSHOT diff --git a/features/pom.xml b/features/pom.xml index a4a1a82..837ebfc 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -20,7 +20,7 @@ 4.0.0 - io.zipkin.brave.karaf + org.apache.zipkin.brave.karaf brave-karaf-parent 0.1.2-SNAPSHOT ../pom.xml diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml index ab19bde..0c2d711 100644 --- a/features/src/main/resources/features.xml +++ b/features/src/main/resources/features.xml @@ -28,14 +28,14 @@ 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} + mvn:org.apache.zipkin.brave.karaf/brave-exporter/${project.version} brave mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/2.0.0_1 mvn:io.zipkin.reporter2/zipkin-sender-kafka11/${zipkin-reporter.version} - mvn:io.zipkin.brave.karaf/brave-exporter-sender-kafka/${project.version} + mvn:org.apache.zipkin.brave.karaf/brave-exporter-sender-kafka/${project.version} @@ -45,6 +45,6 @@ mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsr305/3.0.2_1 mvn:io.zipkin.reporter2/zipkin-sender-okhttp3/${zipkin-reporter.version} - mvn:io.zipkin.brave.karaf/brave-exporter-sender-okhttp/${project.version} + mvn:org.apache.zipkin.brave.karaf/brave-exporter-sender-okhttp/${project.version} diff --git a/itests/pom.xml b/itests/pom.xml index 8d4564d..bd447a4 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -20,7 +20,7 @@ 4.0.0 - io.zipkin.brave.karaf + org.apache.zipkin.brave.karaf brave-karaf-parent 0.1.2-SNAPSHOT ../pom.xml @@ -35,7 +35,7 @@ - io.zipkin.brave.karaf + org.apache.zipkin.brave.karaf brave-exporter @@ -48,7 +48,7 @@ - io.zipkin.brave.karaf + org.apache.zipkin.brave.karaf brave-exporter-sender-kafka @@ -57,7 +57,7 @@ - io.zipkin.brave.karaf + org.apache.zipkin.brave.karaf brave-exporter-sender-okhttp 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 604f21c..456649a 100644 --- a/itests/src/test/java/io/zipkin/brave/itests/BraveTest.java +++ b/itests/src/test/java/io/zipkin/brave/itests/BraveTest.java @@ -63,7 +63,7 @@ public class BraveTest { .type("zip") .version(getVersionFromMaven("org.apache.karaf.features/org.apache.karaf.features.core")); MavenUrlReference brave = - maven().groupId("io.zipkin.brave.karaf").artifactId("brave-features").type("xml") + maven().groupId("org.apache.zipkin.brave.karaf").artifactId("brave-features").type("xml") .classifier("features").version(getBraveKarafVersion()); return new Option[] { karafDistributionConfiguration().frameworkUrl(karaf).useDeployFolder(false), diff --git a/pom.xml b/pom.xml index 7af9ba2..1cf4581 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,13 @@ 4.0.0 - io.zipkin.brave.karaf + + org.apache + apache + 10 + + + org.apache.zipkin.brave.karaf brave-karaf-parent 0.1.2-SNAPSHOT pom