apache#5922 - Update poms to use project.groupId instead of org.apach…

…e.pulsar where applicable (apache#7548)
wanghhao · Jul 16, 2020 · 4acf775 · 4acf775
1 parent 224f2f5
commit 4acf775
Show file tree

Hide file tree

Showing 62 changed files with 119 additions and 123 deletions.
diff --git a/bouncy-castle/bc-shaded/pom.xml b/bouncy-castle/bc-shaded/pom.xml
@@ -29,13 +29,12 @@
   <artifactId>bouncy-castle-bc-shaded</artifactId>
   <packaging>jar</packaging>
   <name>Apache Pulsar :: Bouncy Castle :: BC Shaded</name>
-  <version>2.7.0-SNAPSHOT</version>
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>bouncy-castle-bc</artifactId>
-      <version>2.7.0-SNAPSHOT</version>
+      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
   </dependencies>

diff --git a/bouncy-castle/bc/pom.xml b/bouncy-castle/bc/pom.xml
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-common</artifactId>
-      <version>${project.parent.version}</version>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
 

diff --git a/bouncy-castle/bcfips-include-test/pom.xml b/bouncy-castle/bcfips-include-test/pom.xml
@@ -34,7 +34,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>testmocks</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

diff --git a/bouncy-castle/bcfips-nar-test/pom.xml b/bouncy-castle/bcfips-nar-test/pom.xml
@@ -34,7 +34,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>testmocks</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

diff --git a/bouncy-castle/bcfips/pom.xml b/bouncy-castle/bcfips/pom.xml
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-common</artifactId>
-      <version>${project.parent.version}</version>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
 

diff --git a/dashboard/pom.xml b/dashboard/pom.xml
@@ -27,7 +27,6 @@
     <relativePath>../docker</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.pulsar</groupId>
   <artifactId>dashboard-docker-image</artifactId>
   <name>Apache Pulsar :: Docker Images :: Pulsar Dashboard</name>
   <packaging>pom</packaging>

diff --git a/distribution/io/pom.xml b/distribution/io/pom.xml
@@ -35,12 +35,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-io-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-io-docs</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>

diff --git a/distribution/offloaders/pom.xml b/distribution/offloaders/pom.xml
@@ -35,7 +35,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>managed-ledger</artifactId>
       <version>${project.version}</version>
     </dependency>

diff --git a/distribution/server/pom.xml b/distribution/server/pom.xml
@@ -35,37 +35,37 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-broker</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-discovery-service</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-proxy</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-broker-auth-sasl</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-client-auth-sasl</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-client-tools</artifactId>
       <version>${project.version}</version>
       <exclusions>
@@ -77,7 +77,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-testclient</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -130,15 +130,15 @@
 
     <!-- function examples -->
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-functions-api-examples</artifactId>
       <version>${project.version}</version>
       <!-- make sure the api examples are compiled before assembly -->
       <scope>provided</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-functions-worker</artifactId>
       <version>${project.version}</version>
       <exclusions>
@@ -156,7 +156,7 @@
 
     <!-- runtime-all -->
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-functions-runtime-all</artifactId>
       <version>${project.version}</version>
       <!-- make sure the api examples are compiled before assembly -->
@@ -165,7 +165,7 @@
 
     <!-- local-runner -->
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-functions-local-runner-original</artifactId>
       <version>${project.version}</version>
       <exclusions>

diff --git a/docker/grafana/pom.xml b/docker/grafana/pom.xml
@@ -26,7 +26,6 @@
     <version>2.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.pulsar</groupId>
   <artifactId>grafana-docker-image</artifactId>
   <name>Apache Pulsar :: Docker Images :: Grafana</name>
   <packaging>pom</packaging>

diff --git a/docker/pom.xml b/docker/pom.xml
@@ -28,7 +28,6 @@
     <artifactId>pulsar</artifactId>
     <version>2.7.0-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.pulsar</groupId>
   <artifactId>docker-images</artifactId>
   <name>Apache Pulsar :: Docker Images</name>
   <modules>

diff --git a/docker/pulsar-all/pom.xml b/docker/pulsar-all/pom.xml
@@ -32,14 +32,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-io-distribution</artifactId>
       <version>${project.parent.version}</version>
       <type>pom</type>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-offloader-distribution</artifactId>
       <version>${project.parent.version}</version>
       <classifier>bin</classifier>
@@ -54,9 +54,9 @@
       <!-- include the docker image only when docker profile is active -->
       <dependencies>
         <dependency>
-          <groupId>org.apache.pulsar</groupId>
+          <groupId>${project.groupId}</groupId>
           <artifactId>pulsar-docker-image</artifactId>
-          <version>${project.parent.version}</version>
+          <version>${project.version}</version>
           <classifier>docker-info</classifier>
         </dependency>
       </dependencies>

diff --git a/docker/pulsar-standalone/pom.xml b/docker/pulsar-standalone/pom.xml
@@ -26,7 +26,6 @@
     <version>2.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.pulsar</groupId>
   <artifactId>pulsar-standalone-docker-image</artifactId>
   <name>Apache Pulsar :: Docker Images :: Pulsar Standalone</name>
   <packaging>pom</packaging>
@@ -37,9 +36,9 @@
       <!-- include the docker image only when docker profile is active -->
       <dependencies>
         <dependency>
-          <groupId>org.apache.pulsar</groupId>
+          <groupId>${project.groupId}</groupId>
           <artifactId>pulsar-all-docker-image</artifactId>
-          <version>${project.parent.version}</version>
+          <version>${project.version}</version>
           <classifier>docker-info</classifier>
         </dependency>
       </dependencies>

diff --git a/docker/pulsar/pom.xml b/docker/pulsar/pom.xml
@@ -26,16 +26,15 @@
     <version>2.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.pulsar</groupId>
   <artifactId>pulsar-docker-image</artifactId>
   <name>Apache Pulsar :: Docker Images :: Pulsar Latest Version</name>
   <packaging>pom</packaging>
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-server-distribution</artifactId>
-      <version>${project.parent.version}</version>
+      <version>${project.version}</version>
       <classifier>bin</classifier>
       <type>tar.gz</type>
       <scope>provided</scope>

diff --git a/examples/flink/pom.xml b/examples/flink/pom.xml
@@ -27,14 +27,12 @@
     <version>2.7.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.apache.pulsar.examples</groupId>
   <artifactId>flink</artifactId>
   <name>Pulsar Examples :: Flink</name>
 
   <properties>
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
-    <log4j2.version>2.10.0</log4j2.version>
   </properties>
 
   <dependencies>
@@ -74,6 +72,12 @@
       <version>${project.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.pulsar</groupId>
+      <artifactId>buildtools</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
   </dependencies>
 
   <build>

diff --git a/examples/spark/pom.xml b/examples/spark/pom.xml
@@ -23,8 +23,8 @@
   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>
-    <artifactId>pulsar-examples</artifactId>
     <groupId>org.apache.pulsar.examples</groupId>
+    <artifactId>pulsar-examples</artifactId>
     <version>2.7.0-SNAPSHOT</version>
   </parent>
 

diff --git a/managed-ledger/pom.xml b/managed-ledger/pom.xml
@@ -56,13 +56,13 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-common</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-metadata</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -73,7 +73,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>testmocks</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

diff --git a/protobuf-shaded/pom.xml b/protobuf-shaded/pom.xml
@@ -32,7 +32,6 @@
 
   <artifactId>protobuf-shaded</artifactId>
   <name>Apache Pulsar :: Protobuf shaded</name>
-  <version>2.7.0-SNAPSHOT</version>
 
   <dependencies>
     <dependency>

diff --git a/pulsar-broker-auth-athenz/pom.xml b/pulsar-broker-auth-athenz/pom.xml
@@ -42,7 +42,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>testmocks</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

diff --git a/pulsar-broker-auth-sasl/pom.xml b/pulsar-broker-auth-sasl/pom.xml
@@ -83,7 +83,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>testmocks</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml
@@ -60,7 +60,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>protobuf-shaded</artifactId>
       <version>${pulsar.protobuf.shaded.version}</version>
     </dependency>
@@ -72,7 +72,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-client-original</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -120,7 +120,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>testmocks</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
@@ -157,14 +157,14 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-functions-local-runner-original</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-client-messagecrypto-bc</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>