From b91d9a4a48ef3d6f46329409f0e1c050f5cf24ea Mon Sep 17 00:00:00 2001
From: Le-Zheng <30695225+Le-Zheng@users.noreply.github.com>
Date: Thu, 14 Oct 2021 01:52:02 +0100
Subject: [PATCH] update artifact id pom (#4954)

---
 MigrationGuidance.md                          |  6 +++---
 scala/assembly/src/main/assembly/assembly.xml | 20 +++++++++----------
 scala/dllib/pom.xml                           |  2 +-
 scala/friesian.serving/pom.xml                | 10 +++++-----
 scala/friesian/pom.xml                        |  6 +++---
 scala/grpc/pom.xml                            |  4 ++--
 scala/orca/pom.xml                            |  4 ++--
 scala/pom.xml                                 |  2 +-
 scala/serving/pom.xml                         |  6 +++---
 9 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/MigrationGuidance.md b/MigrationGuidance.md
index 8d5a0f25349..429aedfd4ec 100644
--- a/MigrationGuidance.md
+++ b/MigrationGuidance.md
@@ -20,7 +20,7 @@ This guidance is used to provide guidance to BigDL and Analytics zoo users to mi
    ```
    <dependency>
        <groupId>com.intel.analytics.bigdl</groupId>
-       <artifactId>bigdl-dllib_{spark_version}</artifactId>
+       <artifactId>bigdl-dllib-spark_{spark_version}</artifactId>
        <version>${BIGDL_VERSION}</version>
    </dependency>
    ```
@@ -62,7 +62,7 @@ If you are a maven user and add above modules as dependency to your own project.
    ```
    <dependency>
        <groupId>com.intel.analytics.bigdl</groupId>
-       <artifactId>bigdl-dllib_{spark_version}</artifactId>
+       <artifactId>bigdl-dllib-spark_{spark_version}</artifactId>
        <version>${BIGDL_VERSION}</version>
    </dependency>
    ```
@@ -80,7 +80,7 @@ If you are a maven user and add above modules as dependency to your own project.
    ```
    <dependency>
        <groupId>com.intel.analytics.bigdl</groupId>
-       <artifactId>bigdl-orca_{spark_version}</artifactId>
+       <artifactId>bigdl-orca-spark_{spark_version}</artifactId>
        <version>${BIGDL_VERSION}</version>
    </dependency>
    ```
diff --git a/scala/assembly/src/main/assembly/assembly.xml b/scala/assembly/src/main/assembly/assembly.xml
index 1aa7eba437d..565fcc0d164 100644
--- a/scala/assembly/src/main/assembly/assembly.xml
+++ b/scala/assembly/src/main/assembly/assembly.xml
@@ -19,64 +19,64 @@
       <outputDirectory>/jars</outputDirectory>
       <directory>${project.parent.basedir}/dllib/target</directory>
       <includes>
-          <include>bigdl-dllib-*-jar-with-dependencies.jar</include>
+          <include>bigdl-dllib*-jar-with-dependencies.jar</include>
       </includes>
     </fileSet>
     <fileSet>
       <outputDirectory>/jars</outputDirectory>
       <directory>${project.parent.basedir}/orca/target</directory>
       <includes>
-          <include>bigdl-orca-*-jar-with-dependencies.jar</include>
+          <include>bigdl-orca*-jar-with-dependencies.jar</include>
       </includes>
     </fileSet>
     <fileSet>
       <outputDirectory>/jars</outputDirectory>
       <directory>${project.parent.basedir}/friesian/target</directory>
       <includes>
-          <include>bigdl-friesian-*-jar-with-dependencies.jar</include>
+          <include>bigdl-friesian*-jar-with-dependencies.jar</include>
       </includes>
     </fileSet>
     <fileSet>
       <outputDirectory>/jars</outputDirectory>
       <directory>${project.parent.basedir}/friesian.serving/target</directory>
       <includes>
-          <include>bigdl-friesian-serving-*.jar</include>
-          <include>/serving/target/bigdl-serving-*-jar-with-dependencies.jar</include>
+          <include>bigdl-friesian-serving*.jar</include>
+          <include>/serving/target/bigdl-serving*-jar-with-dependencies.jar</include>
       </includes>
     </fileSet>
     <fileSet>
       <outputDirectory>/jars</outputDirectory>
       <directory>${project.parent.basedir}/serving/target</directory>
       <includes>
-          <include>/serving/target/bigdl-serving-*-serving.jar</include>
+          <include>/serving/target/bigdl-serving*-serving.jar</include>
       </includes>
     </fileSet>
     <fileSet>
       <outputDirectory>/python</outputDirectory>
       <directory>${project.parent.basedir}/dllib/target</directory>
       <includes>
-          <include>bigdl-dllib-*-python-api.zip</include>
+          <include>bigdl-dllib*-python-api.zip</include>
       </includes>
     </fileSet>
     <fileSet>
       <outputDirectory>/python</outputDirectory>
       <directory>${project.parent.basedir}/orca/target</directory>
       <includes>
-          <include>bigdl-orca-*-python-api.zip</include>
+          <include>bigdl-orca*-python-api.zip</include>
       </includes>
     </fileSet>
     <fileSet>
       <outputDirectory>/python</outputDirectory>
       <directory>${project.parent.basedir}/friesian/target</directory>
       <includes>
-          <include>bigdl-friesian-*-python-api.zip</include>
+          <include>bigdl-friesian*-python-api.zip</include>
       </includes>
     </fileSet>
     <fileSet>
       <outputDirectory>/python</outputDirectory>
       <directory>${project.parent.basedir}/serving/target</directory>
       <includes>
-          <include>bigdl-serving-*-python-api.zip</include>
+          <include>bigdl-serving*-python-api.zip</include>
       </includes>
     </fileSet>
   </fileSets>
diff --git a/scala/dllib/pom.xml b/scala/dllib/pom.xml
index f97920cba0f..8958ef2dc44 100644
--- a/scala/dllib/pom.xml
+++ b/scala/dllib/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>bigdl-dllib_${spark.version}</artifactId>
+    <artifactId>bigdl-dllib-spark_${spark.version}</artifactId>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/scala/friesian.serving/pom.xml b/scala/friesian.serving/pom.xml
index 8706d404cd2..8cb86fabc86 100644
--- a/scala/friesian.serving/pom.xml
+++ b/scala/friesian.serving/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>bigdl-friesian-serving_${spark.version}</artifactId>
+    <artifactId>bigdl-friesian-serving-spark_${spark.version}</artifactId>
     <packaging>jar</packaging>
 
     <properties>
@@ -63,17 +63,17 @@
         </dependency>
         <dependency>
             <groupId>com.intel.analytics.bigdl</groupId>
-            <artifactId>bigdl-dllib_${spark.version}</artifactId>
+            <artifactId>bigdl-dllib-spark_${spark.version}</artifactId>
             <version>0.14.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.intel.analytics.bigdl</groupId>
-            <artifactId>bigdl-orca_${spark.version}</artifactId>
+            <artifactId>bigdl-orca-spark_${spark.version}</artifactId>
             <version>0.14.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.intel.analytics.bigdl</groupId>
-            <artifactId>bigdl-grpc_${spark.version}</artifactId>
+            <artifactId>bigdl-grpc-spark_${spark.version}</artifactId>
             <version>0.14.0-SNAPSHOT</version>
         </dependency>
         <dependency>
@@ -199,4 +199,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/scala/friesian/pom.xml b/scala/friesian/pom.xml
index ef86c64adbc..b663bd547bf 100644
--- a/scala/friesian/pom.xml
+++ b/scala/friesian/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>bigdl-friesian_${spark.version}</artifactId>
+    <artifactId>bigdl-friesian-spark_${spark.version}</artifactId>
     <packaging>jar</packaging>
 
     <properties>
@@ -25,13 +25,13 @@
     <dependencies>
         <dependency>
             <groupId>com.intel.analytics.bigdl</groupId>
-            <artifactId>bigdl-dllib_${spark.version}</artifactId>
+            <artifactId>bigdl-dllib-spark_${spark.version}</artifactId>
             <version>0.14.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.intel.analytics.bigdl</groupId>
-            <artifactId>bigdl-orca_${spark.version}</artifactId>
+            <artifactId>bigdl-orca-spark_${spark.version}</artifactId>
             <version>0.14.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
diff --git a/scala/grpc/pom.xml b/scala/grpc/pom.xml
index 39ef83d33ba..667245739cb 100644
--- a/scala/grpc/pom.xml
+++ b/scala/grpc/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>bigdl-grpc_${spark.version}</artifactId>
+    <artifactId>bigdl-grpc-spark_${spark.version}</artifactId>
     <packaging>jar</packaging>
 
     <properties>
@@ -55,4 +55,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/scala/orca/pom.xml b/scala/orca/pom.xml
index 320b96eb881..edaa2db587e 100644
--- a/scala/orca/pom.xml
+++ b/scala/orca/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>bigdl-orca_${spark.version}</artifactId>
+    <artifactId>bigdl-orca-spark_${spark.version}</artifactId>
     <packaging>jar</packaging>
 
     <properties>
@@ -25,7 +25,7 @@
     <dependencies>
         <dependency>
             <groupId>com.intel.analytics.bigdl</groupId>
-            <artifactId>bigdl-dllib_${spark.version}</artifactId>
+            <artifactId>bigdl-dllib-spark_${spark.version}</artifactId>
             <version>0.14.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
diff --git a/scala/pom.xml b/scala/pom.xml
index a4bf80ba118..9a6b799b38e 100644
--- a/scala/pom.xml
+++ b/scala/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.intel.analytics.bigdl</groupId>
-    <artifactId>bigdl-parent</artifactId>
+    <artifactId>bigdl-parent-spark_${spark.version}</artifactId>
     <packaging>pom</packaging>
     <version>0.14.0-SNAPSHOT</version>
 
diff --git a/scala/serving/pom.xml b/scala/serving/pom.xml
index 1ec1413871d..09b8d05e527 100644
--- a/scala/serving/pom.xml
+++ b/scala/serving/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>bigdl-serving_${spark.version}</artifactId>
+    <artifactId>bigdl-serving-spark_${spark.version}</artifactId>
     <packaging>jar</packaging>
 
     <properties>
@@ -25,12 +25,12 @@
         </dependency>
         <dependency>
             <groupId>com.intel.analytics.bigdl</groupId>
-            <artifactId>bigdl-dllib_${spark.version}</artifactId>
+            <artifactId>bigdl-dllib-spark_${spark.version}</artifactId>
             <version>0.14.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.intel.analytics.bigdl</groupId>
-            <artifactId>bigdl-orca_${spark.version}</artifactId>
+            <artifactId>bigdl-orca-spark_${spark.version}</artifactId>
             <version>0.14.0-SNAPSHOT</version>
         </dependency>
         <dependency>