You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sedona.apache.org by ji...@apache.org on 2023/05/25 17:34:15 UTC
[sedona] branch master updated: [SEDONA-284] Substitute property values in dependency-reduced-pom.xml for shaded submodules (#841)
This is an automated email from the ASF dual-hosted git repository.
jiayu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sedona.git
The following commit(s) were added to refs/heads/master by this push:
new c35a1d57 [SEDONA-284] Substitute property values in dependency-reduced-pom.xml for shaded submodules (#841)
c35a1d57 is described below
commit c35a1d57626c2298003a226a2cd2338835f9648a
Author: Kristin Cowalcijk <mo...@yeah.net>
AuthorDate: Fri May 26 01:34:08 2023 +0800
[SEDONA-284] Substitute property values in dependency-reduced-pom.xml for shaded submodules (#841)
---
flink-shaded/pom.xml | 16 +++++++++++++++-
pom.xml | 5 +++++
spark-shaded/pom.xml | 16 +++++++++++++++-
3 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/flink-shaded/pom.xml b/flink-shaded/pom.xml
index 9fc14bc7..8886a1ee 100644
--- a/flink-shaded/pom.xml
+++ b/flink-shaded/pom.xml
@@ -51,10 +51,24 @@
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<plugins>
+ <plugin>
+ <!-- Skip running resolved-pom-maven-plugin since shade will
+ generate dependency reduced pom which substitudes property
+ values. resolved-pom-maven-plugin will break pom
+ installation when working with maven-shade-plugin. -->
+ <groupId>io.paradoxical</groupId>
+ <artifactId>resolved-pom-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>resolve-my-pom</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.1</version>
<executions>
<execution>
<phase>package</phase>
diff --git a/pom.xml b/pom.xml
index c44256d5..d1ddef4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -355,6 +355,11 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>3.4.1</version>
+ </plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
diff --git a/spark-shaded/pom.xml b/spark-shaded/pom.xml
index ca6ffc4c..fd940bee 100644
--- a/spark-shaded/pom.xml
+++ b/spark-shaded/pom.xml
@@ -98,10 +98,24 @@
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<plugins>
+ <plugin>
+ <!-- Skip running resolved-pom-maven-plugin since shade will
+ generate dependency reduced pom which substitudes property
+ values. resolved-pom-maven-plugin will break pom
+ installation when working with maven-shade-plugin. -->
+ <groupId>io.paradoxical</groupId>
+ <artifactId>resolved-pom-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>resolve-my-pom</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.1</version>
<executions>
<execution>
<phase>package</phase>