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 <[email protected]> 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 @@ </xsl:copy> </xsl:template> - <xsl:template match="pom:dependency[pom:groupId = 'io.zipkin.brave.karaf']" /> + <xsl:template match="pom:dependency[pom:groupId = 'org.apache.zipkin.brave.karaf']" /> <xsl:template match="pom:dependency[pom:groupId = '${project.groupId}']" /> </xsl:stylesheet> 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 @@ --> <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";> <parent> - <groupId>io.zipkin.brave.karaf</groupId> + <groupId>org.apache.zipkin.brave.karaf</groupId> <artifactId>brave-karaf-parent</artifactId> <version>0.1.2-SNAPSHOT</version> </parent> 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 @@ --> <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";> <parent> - <groupId>io.zipkin.brave.karaf</groupId> + <groupId>org.apache.zipkin.brave.karaf</groupId> <artifactId>brave-karaf-parent</artifactId> <version>0.1.2-SNAPSHOT</version> </parent> 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 @@ --> <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";> <parent> - <groupId>io.zipkin.brave.karaf</groupId> + <groupId>org.apache.zipkin.brave.karaf</groupId> <artifactId>brave-karaf-parent</artifactId> <version>0.1.2-SNAPSHOT</version> </parent> 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 @@ <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";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>io.zipkin.brave.karaf</groupId> + <groupId>org.apache.zipkin.brave.karaf</groupId> <artifactId>brave-karaf-parent</artifactId> <version>0.1.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> 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 @@ <bundle>mvn:io.zipkin.reporter2/zipkin-sender-urlconnection/${zipkin-reporter.version}</bundle> <bundle>mvn:io.zipkin.brave/brave/${brave.version}</bundle> <bundle>mvn:io.zipkin.brave/brave-instrumentation-http/${brave.version}</bundle> - <bundle>mvn:io.zipkin.brave.karaf/brave-exporter/${project.version}</bundle> + <bundle>mvn:org.apache.zipkin.brave.karaf/brave-exporter/${project.version}</bundle> </feature> <feature name="brave-sender-kafka"> <feature>brave</feature> <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/2.0.0_1</bundle> <bundle>mvn:io.zipkin.reporter2/zipkin-sender-kafka11/${zipkin-reporter.version}</bundle> - <bundle>mvn:io.zipkin.brave.karaf/brave-exporter-sender-kafka/${project.version}</bundle> + <bundle>mvn:org.apache.zipkin.brave.karaf/brave-exporter-sender-kafka/${project.version}</bundle> </feature> <feature name="brave-sender-okhttp"> @@ -45,6 +45,6 @@ <!-- for javax.annotation.Nullable used by OkHttp. Lacking this is a problem in JDK 11 --> <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsr305/3.0.2_1</bundle> <bundle>mvn:io.zipkin.reporter2/zipkin-sender-okhttp3/${zipkin-reporter.version}</bundle> - <bundle>mvn:io.zipkin.brave.karaf/brave-exporter-sender-okhttp/${project.version}</bundle> + <bundle>mvn:org.apache.zipkin.brave.karaf/brave-exporter-sender-okhttp/${project.version}</bundle> </feature> </features> 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 @@ <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";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>io.zipkin.brave.karaf</groupId> + <groupId>org.apache.zipkin.brave.karaf</groupId> <artifactId>brave-karaf-parent</artifactId> <version>0.1.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> @@ -35,7 +35,7 @@ <dependencies> <dependency> - <groupId>io.zipkin.brave.karaf</groupId> + <groupId>org.apache.zipkin.brave.karaf</groupId> <artifactId>brave-exporter</artifactId> </dependency> <dependency> @@ -48,7 +48,7 @@ </dependency> <dependency> - <groupId>io.zipkin.brave.karaf</groupId> + <groupId>org.apache.zipkin.brave.karaf</groupId> <artifactId>brave-exporter-sender-kafka</artifactId> </dependency> <dependency> @@ -57,7 +57,7 @@ </dependency> <dependency> - <groupId>io.zipkin.brave.karaf</groupId> + <groupId>org.apache.zipkin.brave.karaf</groupId> <artifactId>brave-exporter-sender-okhttp</artifactId> </dependency> <dependency> 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 @@ <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";> <modelVersion>4.0.0</modelVersion> - <groupId>io.zipkin.brave.karaf</groupId> + <parent> + <groupId>org.apache</groupId> + <artifactId>apache</artifactId> + <version>10</version> + </parent> + + <groupId>org.apache.zipkin.brave.karaf</groupId> <artifactId>brave-karaf-parent</artifactId> <version>0.1.2-SNAPSHOT</version> <packaging>pom</packaging>
