You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by ji...@apache.org on 2022/09/26 03:04:06 UTC
[pulsar] branch branch-2.10 updated: [fix][build] duplicate entry when merging services (#17659)
This is an automated email from the ASF dual-hosted git repository.
jianghaiting pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.10 by this push:
new f53c9d5f7eb [fix][build] duplicate entry when merging services (#17659)
f53c9d5f7eb is described below
commit f53c9d5f7eb283608f398e9a8f135761829f4ba1
Author: tison <wa...@gmail.com>
AuthorDate: Thu Sep 15 13:10:12 2022 +0800
[fix][build] duplicate entry when merging services (#17659)
This closes #17047.
Upstream patch is https://github.com/apache/maven-shade-plugin/pull/150.
Bump maven-shade-plugin version to 3.4.0 for the upstream fix.
Signed-off-by: tison <wa...@gmail.com>
Signed-off-by: tison <wa...@gmail.com>
(cherry picked from commit 286500751a0a1d8b3da063cebaf5427ef187c229)
---
buildtools/pom.xml | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/buildtools/pom.xml b/buildtools/pom.xml
index 44df2dc85d5..5b18fdb29e9 100644
--- a/buildtools/pom.xml
+++ b/buildtools/pom.xml
@@ -43,7 +43,7 @@
<slf4j.version>1.7.32</slf4j.version>
<testng.version>7.3.0</testng.version>
<commons-lang3.version>3.11</commons-lang3.version>
- <maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
+ <maven-shade-plugin.version>3.4.0</maven-shade-plugin.version>
<puppycrawl.checkstyle.version>8.37</puppycrawl.checkstyle.version>
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
<guice.version>4.2.3</guice.version>
diff --git a/pom.xml b/pom.xml
index 08cd26f2e1e..d4b43a8bafd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -246,7 +246,7 @@ flexible messaging model and an intuitive client API.</description>
<maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
<maven-modernizer-plugin.version>2.3.0</maven-modernizer-plugin.version>
- <maven-shade-plugin>3.2.4</maven-shade-plugin>
+ <maven-shade-plugin>3.4.0</maven-shade-plugin>
<maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
<properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
<nifi-nar-maven-plugin.version>1.2.0</nifi-nar-maven-plugin.version>