This is an automated email from the ASF dual-hosted git repository.
jialiang pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new b7f2de0446 AMBARI-26125: Fix rpm packaging errors for ambari-web and
ambari-views (#3821)
b7f2de0446 is described below
commit b7f2de04465d9ba8639d52bb19e29e2870e72d74
Author: timyuer <[email protected]>
AuthorDate: Thu Sep 12 08:36:44 2024 +0800
AMBARI-26125: Fix rpm packaging errors for ambari-web and ambari-views
(#3821)
* AMBARI-26125: Fix rpm packaging errors for ambari-web and ambari-views
---
ambari-agent/pom.xml | 1 -
ambari-server/pom.xml | 1 -
.../services/YARN/package/alerts/alert_ats_hbase.py | 2 +-
.../3.2.0/services/YARN/package/scripts/functions.py | 2 +-
.../services/YARN/package/scripts/hbase_service.py | 2 +-
ambari-serviceadvisor/pom.xml | 17 -----------------
ambari-views/pom.xml | 9 ---------
ambari-web/pom.xml | 16 ----------------
pom.xml | 4 ++--
9 files changed, 5 insertions(+), 49 deletions(-)
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index 1f98701e55..3033031820 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -300,7 +300,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rpm-maven-plugin</artifactId>
- <version>2.1.4</version>
<executions>
<execution>
<!-- unbinds rpm creation from maven lifecycle -->
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 8c128d0c36..5e5595e8db 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -515,7 +515,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rpm-maven-plugin</artifactId>
- <version>2.1.4</version>
<executions>
<execution>
<!-- unbinds rpm creation from maven lifecycle -->
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/YARN/package/alerts/alert_ats_hbase.py
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/YARN/package/alerts/alert_ats_hbase.py
index 118062a5cf..7ad8c959a4 100755
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/YARN/package/alerts/alert_ats_hbase.py
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/YARN/package/alerts/alert_ats_hbase.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
Licensed to the Apache Software Foundation (ASF) under one
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/YARN/package/scripts/functions.py
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/YARN/package/scripts/functions.py
index c436c62ac3..282a4ab6ce 100755
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/YARN/package/scripts/functions.py
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/YARN/package/scripts/functions.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/YARN/package/scripts/hbase_service.py
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/YARN/package/scripts/hbase_service.py
index 8e9e69a2ea..fb03a2cb1e 100755
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/YARN/package/scripts/hbase_service.py
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/YARN/package/scripts/hbase_service.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
diff --git a/ambari-serviceadvisor/pom.xml b/ambari-serviceadvisor/pom.xml
index e2574bf748..ab76742884 100644
--- a/ambari-serviceadvisor/pom.xml
+++ b/ambari-serviceadvisor/pom.xml
@@ -128,23 +128,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rpm-maven-plugin</artifactId>
- <version>2.0.1</version>
- <executions>
- <execution>
- <!-- unbinds rpm creation from maven lifecycle -->
- <phase>none</phase>
- <goals>
- <goal>rpm</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <copyright>2012, Apache Software Foundation</copyright>
- <group>Development</group>
- <disabled>true</disabled>
- <description>Maven Recipe: RPM Package.</description>
- <mappings/>
- </configuration>
</plugin>
<plugin>
<groupId>org.vafer</groupId>
diff --git a/ambari-views/pom.xml b/ambari-views/pom.xml
index 8f63dbd218..6122705db0 100644
--- a/ambari-views/pom.xml
+++ b/ambari-views/pom.xml
@@ -142,15 +142,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rpm-maven-plugin</artifactId>
- <version>2.0.1</version>
- <executions>
- <execution>
- <phase>none</phase>
- <goals>
- <goal>rpm</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
diff --git a/ambari-web/pom.xml b/ambari-web/pom.xml
index 458fefd719..76b43fcafa 100644
--- a/ambari-web/pom.xml
+++ b/ambari-web/pom.xml
@@ -69,22 +69,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rpm-maven-plugin</artifactId>
- <version>2.0.1</version>
- <executions>
- <execution>
- <!-- unbinds rpm creation from maven lifecycle -->
- <phase>none</phase>
- <goals>
- <goal>attached-rpm</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <copyright>2012, Apache Software Foundation</copyright>
- <group>Development</group>
- <description>Maven Recipe: RPM Package.</description>
- <mappings/>
- </configuration>
</plugin>
<plugin>
<groupId>com.github.eirslett</groupId>
diff --git a/pom.xml b/pom.xml
index cad72176fd..ca5fccf017 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,6 +96,7 @@
<distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
<assemblyPhase>package</assemblyPhase> <!-- use -DassemblyPhase=none to
skip building tarball, useful when you want purely compile jar -->
<eclipselink.version>2.6.2</eclipselink.version>
+ <rpm-maven-plugin.version>2.1.4</rpm-maven-plugin.version>
</properties>
<pluginRepositories>
<pluginRepository>
@@ -169,7 +170,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rpm-maven-plugin</artifactId>
- <version>2.0.1</version>
+ <version>${rpm-maven-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.vafer</groupId>
@@ -250,7 +251,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rpm-maven-plugin</artifactId>
- <version>2.1.4</version>
<executions>
<execution>
<!-- unbinds rpm creation from maven lifecycle -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
