AMBARI-25819: Fix build failure when using -Dbuild-rpm due to rpm-mav…

…en-plugin upgrade
apache · Dec 16, 2022 · 0552296 · 0552296
1 parent 3765e73
commit 0552296
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/ambari-metrics-assembly/pom.xml b/ambari-metrics-assembly/pom.xml
@@ -207,6 +207,10 @@
               <defaultDirmode>755</defaultDirmode>
               <defaultUsername>root</defaultUsername>
               <defaultGroupname>root</defaultGroupname>
+              <defineStatements>
+                <defineStatement>__arch_install_post %{nil}</defineStatement>
+                <defineStatement>__os_install_post %{nil}</defineStatement>
+              </defineStatements>
             </configuration>
             <executions>
 
@@ -613,7 +617,7 @@
                     <require>${python.devel}</require>
                   </requires>
                   <preremoveScriptlet>
-                    <scriptFile>src/main/package/rpm/preremove.sh</scriptFile>
+                    <scriptFile>${monitor.dir}/src/main/package/rpm/preremove.sh</scriptFile>
                     <fileEncoding>utf-8</fileEncoding>
                   </preremoveScriptlet>
                   <mappings>

diff --git a/ambari-metrics-host-monitoring/pom.xml b/ambari-metrics-host-monitoring/pom.xml
@@ -30,9 +30,6 @@
   <artifactId>ambari-metrics-host-monitoring</artifactId>
   <name>Ambari Metrics Monitor</name>
   <properties>
-    <resmonitor.install.dir>
-      /usr/lib/python2.6/site-packages/resource_monitoring
-    </resmonitor.install.dir>
     <final.name>${project.artifactId}-${project.version}</final.name>
   </properties>
   <dependencies>