Changes the maven group ID to match apache org

This puts server assets under org.apache.zipkin and standalone libraries under org.apache.zipkin.zipkin2
abesto · Sep 10, 2019 · 31a5daa · 31a5daa
1 parent cee595f
commit 31a5daa
Show file tree

Hide file tree

Showing 23 changed files with 78 additions and 132 deletions.
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>io.zipkin.zipkin2</groupId>
+    <groupId>org.apache.zipkin</groupId>
     <artifactId>parent</artifactId>
     <version>2.13.0-SNAPSHOT</version>
   </parent>
@@ -62,8 +62,7 @@
     </dependency>
 
     <dependency>
-      <!-- TODO: group ID change: https://github.com/openzipkin/zipkin/issues/2132 -->
-      <groupId>io.zipkin.java</groupId>
+      <groupId>org.apache.zipkin</groupId>
       <artifactId>zipkin-server</artifactId>
       <version>${project.version}</version>
     </dependency>

diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,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>
 
-  <groupId>io.zipkin.zipkin2</groupId>
+  <groupId>org.apache.zipkin</groupId>
   <artifactId>parent</artifactId>
   <version>2.13.0-SNAPSHOT</version>
   <packaging>pom</packaging>
@@ -152,62 +152,6 @@
 
   <dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>io.zipkin.zipkin2</groupId>
-        <artifactId>zipkin</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.zipkin.zipkin2</groupId>
-        <artifactId>zipkin</artifactId>
-        <type>test-jar</type>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.zipkin.zipkin2</groupId>
-        <artifactId>zipkin-collector</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.zipkin.zipkin2</groupId>
-        <artifactId>zipkin-junit</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.zipkin.zipkin2</groupId>
-        <artifactId>zipkin-collector-kafka08</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.zipkin.zipkin2</groupId>
-        <artifactId>zipkin-collector-scribe</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.zipkin.zipkin2</groupId>
-        <artifactId>zipkin-lens</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <!-- TODO: group ID change: https://github.com/openzipkin/zipkin/issues/2132 -->
-        <groupId>io.zipkin.java</groupId>
-        <artifactId>zipkin-ui</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <!-- TODO: group ID change: https://github.com/openzipkin/zipkin/issues/2132 -->
-        <groupId>io.zipkin.java</groupId>
-        <artifactId>zipkin-server</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
       <dependency>
         <groupId>javax.annotation</groupId>
         <artifactId>javax.annotation-api</artifactId>
@@ -405,6 +349,7 @@
         <artifactId>brave</artifactId>
         <version>${brave.version}</version>
         <exclusions>
+          <!-- TODO: this exclusion will drift when brave switches to apache zipkin -->
           <exclusion>
             <groupId>io.zipkin.zipkin2</groupId>
             <artifactId>zipkin</artifactId>

diff --git a/zipkin-autoconfigure/collector-kafka08/pom.xml b/zipkin-autoconfigure/collector-kafka08/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>io.zipkin.java</groupId>
+    <groupId>org.apache.zipkin</groupId>
     <artifactId>zipkin-autoconfigure</artifactId>
     <version>2.13.0-SNAPSHOT</version>
   </parent>
@@ -32,8 +32,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>io.zipkin.zipkin2</groupId>
+      <groupId>${project.groupId}.zipkin2</groupId>
       <artifactId>zipkin-collector-kafka08</artifactId>
+      <version>${project.version}</version>
       <exclusions>
         <exclusion>
           <groupId>log4j</groupId>
@@ -68,11 +69,11 @@
           <excludes>
             <!-- excludes direct dependency instead of the group id, as otherwise we'd exclude ourselves -->
             <exclude>
-              <groupId>io.zipkin.zipkin2</groupId>
+              <groupId>${project.groupId}.zipkin2</groupId>
               <artifactId>zipkin</artifactId>
             </exclude>
             <exclude>
-              <groupId>io.zipkin.zipkin2</groupId>
+              <groupId>${project.groupId}.zipkin2</groupId>
               <artifactId>zipkin-collector</artifactId>
             </exclude>
             <!-- excludes already packaged logging libraries in the server. Can't use group ID or we

diff --git a/zipkin-autoconfigure/collector-scribe/pom.xml b/zipkin-autoconfigure/collector-scribe/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>io.zipkin.java</groupId>
+    <groupId>org.apache.zipkin</groupId>
     <artifactId>zipkin-autoconfigure</artifactId>
     <version>2.13.0-SNAPSHOT</version>
   </parent>
@@ -32,8 +32,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>io.zipkin.zipkin2</groupId>
+      <groupId>${project.groupId}.zipkin2</groupId>
       <artifactId>zipkin-collector-scribe</artifactId>
+      <version>${project.version}</version>
       <exclusions>
         <!-- com.facebook.swift:swift-service brings an old version which
              leads to javax.validation.ValidationException. Exclude it!
@@ -65,11 +66,11 @@
           <!-- excludes direct dependency instead of the group id, as otherwise we'd exclude ourselves -->
           <excludes>
             <exclude>
-              <groupId>io.zipkin.zipkin2</groupId>
+              <groupId>${project.groupId}.zipkin2</groupId>
               <artifactId>zipkin</artifactId>
             </exclude>
             <exclude>
-              <groupId>io.zipkin.zipkin2</groupId>
+              <groupId>${project.groupId}.zipkin2</groupId>
               <artifactId>zipkin-collector</artifactId>
             </exclude>
           </excludes>

diff --git a/zipkin-autoconfigure/pom.xml b/zipkin-autoconfigure/pom.xml
@@ -18,13 +18,11 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>io.zipkin.zipkin2</groupId>
+    <groupId>org.apache.zipkin</groupId>
     <artifactId>parent</artifactId>
     <version>2.13.0-SNAPSHOT</version>
   </parent>
 
-  <!-- TODO: group ID change: https://github.com/openzipkin/zipkin/issues/2132 -->
-  <groupId>io.zipkin.java</groupId>
   <artifactId>zipkin-autoconfigure</artifactId>
   <name>Auto Configuration</name>
   <packaging>pom</packaging>

diff --git a/zipkin-collector/core/pom.xml b/zipkin-collector/core/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>io.zipkin.zipkin2</groupId>
+    <groupId>org.apache.zipkin.zipkin2</groupId>
     <artifactId>zipkin-collector-parent</artifactId>
     <version>2.13.0-SNAPSHOT</version>
   </parent>

diff --git a/zipkin-collector/kafka/pom.xml b/zipkin-collector/kafka/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>io.zipkin.zipkin2</groupId>
+    <groupId>org.apache.zipkin.zipkin2</groupId>
     <artifactId>zipkin-collector-parent</artifactId>
     <version>2.13.0-SNAPSHOT</version>
   </parent>
@@ -36,6 +36,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>zipkin-collector</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>

diff --git a/zipkin-collector/kafka08/pom.xml b/zipkin-collector/kafka08/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>io.zipkin.zipkin2</groupId>
+    <groupId>org.apache.zipkin.zipkin2</groupId>
     <artifactId>zipkin-collector-parent</artifactId>
     <version>2.13.0-SNAPSHOT</version>
   </parent>
@@ -37,6 +37,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>zipkin-collector</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>

diff --git a/zipkin-collector/pom.xml b/zipkin-collector/pom.xml
@@ -18,11 +18,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>io.zipkin.zipkin2</groupId>
+    <groupId>org.apache.zipkin</groupId>
     <artifactId>parent</artifactId>
     <version>2.13.0-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.zipkin.zipkin2</groupId>
   <artifactId>zipkin-collector-parent</artifactId>
   <name>Collector</name>
   <packaging>pom</packaging>
@@ -45,6 +46,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>zipkin</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <!-- For test objects and integration tests -->

diff --git a/zipkin-collector/rabbitmq/pom.xml b/zipkin-collector/rabbitmq/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>io.zipkin.zipkin2</groupId>
+    <groupId>org.apache.zipkin.zipkin2</groupId>
     <artifactId>zipkin-collector-parent</artifactId>
     <version>2.13.0-SNAPSHOT</version>
   </parent>
@@ -36,6 +36,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>zipkin-collector</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>

diff --git a/zipkin-collector/scribe/pom.xml b/zipkin-collector/scribe/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>io.zipkin.zipkin2</groupId>
+    <groupId>org.apache.zipkin.zipkin2</groupId>
     <artifactId>zipkin-collector-parent</artifactId>
     <version>2.13.0-SNAPSHOT</version>
   </parent>
@@ -34,6 +34,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>zipkin-collector</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>

diff --git a/zipkin-junit/pom.xml b/zipkin-junit/pom.xml
@@ -18,11 +18,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>io.zipkin.zipkin2</groupId>
+    <groupId>org.apache.zipkin</groupId>
     <artifactId>parent</artifactId>
     <version>2.13.0-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.zipkin.zipkin2</groupId>
   <artifactId>zipkin-junit</artifactId>
   <name>Zipkin JUnit</name>
   <description>JUnit rule to spin-up a Zipkin server during tests</description>
@@ -33,12 +34,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>io.zipkin.zipkin2</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>zipkin</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>io.zipkin.zipkin2</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>zipkin-collector</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
@@ -57,8 +60,9 @@
     </dependency>
 
     <dependency>
-      <groupId>io.zipkin.zipkin2</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>zipkin</artifactId>
+      <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

diff --git a/zipkin-lens/pom.xml b/zipkin-lens/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>io.zipkin.zipkin2</groupId>
+    <groupId>org.apache.zipkin</groupId>
     <artifactId>parent</artifactId>
     <version>2.13.0-SNAPSHOT</version>
   </parent>