From 2f4417082135c395f2873684c34552a37ec73b0a Mon Sep 17 00:00:00 2001
From: jialiang <2510095164@qq.com>
Date: Sat, 8 Apr 2023 02:10:52 +0800
Subject: [PATCH] AMBARI-25920: Fix ambari server build failed due to
 ambari-serviceadvisor version (#3679)

---
 ambari-server/pom.xml         |  2 +-
 ambari-serviceadvisor/pom.xml | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index b9ceac5b65e..fee41287474 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1790,7 +1790,7 @@
     <dependency>
       <groupId>org.apache.ambari</groupId>
       <artifactId>ambari-serviceadvisor</artifactId>
-      <version>1.0.0.0-SNAPSHOT</version>
+      <version>${revision}</version>
       <exclusions>
         <exclusion>
           <groupId>commons-httpclient</groupId>
diff --git a/ambari-serviceadvisor/pom.xml b/ambari-serviceadvisor/pom.xml
index e860d0a2f99..e2574bf7487 100644
--- a/ambari-serviceadvisor/pom.xml
+++ b/ambari-serviceadvisor/pom.xml
@@ -24,10 +24,16 @@
   To test independently without needing the rest of Ambari, simply compile and run as,
   java -jar ambari-serviceadvisor-$VERSION.jar [ACTION] [HOSTS_FILE.json] [SERVICES_FILE.json]
   -->
+  <parent>
+    <groupId>org.apache.ambari</groupId>
+    <artifactId>ambari-project</artifactId>
+    <version>${revision}</version>
+    <relativePath>../ambari-project</relativePath>
+  </parent>
+
   <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-serviceadvisor</artifactId>
   <name>Ambari Service Advisor</name>
-  <version>2.8.0.0.0</version>
   <description>Service Advisor</description>
   <properties>
     <jdk.version>1.8</jdk.version>
@@ -111,6 +117,14 @@
           <target>${jdk.version}</target>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>${project.parent.basedir}/src/main/assemblies/empty.xml</descriptor>
+          </descriptors>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>rpm-maven-plugin</artifactId>