This is an automated email from the ASF dual-hosted git repository.
wuzhiguo 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 8eb5b0fb69 AMBARI-25737: Update pom.xml to ignore
dependency-reduced-pom.xml for maven-shade-plugin (#3371)
8eb5b0fb69 is described below
commit 8eb5b0fb69049895e52779425b3158bf1057a133
Author: timyuer <[email protected]>
AuthorDate: Thu Sep 29 14:24:16 2022 +0800
AMBARI-25737: Update pom.xml to ignore dependency-reduced-pom.xml for
maven-shade-plugin (#3371)
---
ambari-agent/pom.xml | 4 ++-
.../fast-hdfs-resource/dependency-reduced-pom.xml | 41 ----------------------
contrib/fast-hdfs-resource/pom.xml | 3 ++
pom.xml | 1 -
4 files changed, 6 insertions(+), 43 deletions(-)
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index 4afb9158a8..03fcc0c36b 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -439,6 +439,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
+ <configuration>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
+ </configuration>
<version>3.4.0</version>
<executions>
<execution>
@@ -655,7 +658,6 @@
<exclude>**/*.json</exclude>
<exclude>**/*.pydevproject</exclude>
<exclude>src/main/package/choco/ambari-agent.nuspec</exclude>
- <exclude>**/dependency-reduced-pom.xml</exclude>
</excludes>
</configuration>
<executions>
diff --git a/contrib/fast-hdfs-resource/dependency-reduced-pom.xml
b/contrib/fast-hdfs-resource/dependency-reduced-pom.xml
deleted file mode 100644
index cc1b32718f..0000000000
--- a/contrib/fast-hdfs-resource/dependency-reduced-pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.ambari</groupId>
- <artifactId>fast-hdfs-resource</artifactId>
- <name>fast-hdfs-resource</name>
- <version>0.0.1-SNAPSHOT</version>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <version>2.3</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <transformers>
- <transformer>
-
<mainClass>org.apache.ambari.fast_hdfs_resource.Runner</mainClass>
- </transformer>
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <repositories>
- <repository>
- <id>hdp.internal</id>
- <url>http://repo1.maven.org/maven2</url>
- </repository>
- </repositories>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-</project>
-
diff --git a/contrib/fast-hdfs-resource/pom.xml
b/contrib/fast-hdfs-resource/pom.xml
index 869fa4fe65..b7d4bbf77a 100644
--- a/contrib/fast-hdfs-resource/pom.xml
+++ b/contrib/fast-hdfs-resource/pom.xml
@@ -90,6 +90,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
+ <configuration>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
+ </configuration>
<version>3.4.0</version>
<executions>
<execution>
diff --git a/pom.xml b/pom.xml
index c624d48f6d..1bb6f9a671 100644
--- a/pom.xml
+++ b/pom.xml
@@ -286,7 +286,6 @@
<exclude>CHANGES.txt</exclude>
<exclude>pass.txt</exclude>
<exclude>contrib/ambari-scom/msi/src/GUI_Ambari.sln</exclude>
-
<exclude>contrib/fast-hdfs-resource/dependency-reduced-pom.xml</exclude>
<exclude>contrib/agent-simulator/docker_image/package_list.txt</exclude>
<exclude>contrib/agent-simulator/config/cluster.txt</exclude>
<exclude>version</exclude>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
