This is an automated email from the ASF dual-hosted git repository.
zixuan pushed a commit to branch branch-2.11
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.11 by this push:
new 5f6e17b898c [fix][build] duplicate entry when merging services (#17659)
5f6e17b898c is described below
commit 5f6e17b898cfc598b692bb651126cc928c018a54
Author: tison <[email protected]>
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 <[email protected]>
Signed-off-by: tison <[email protected]>
(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 4309f575c90..8f4e03786fb 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 ac81cdbc5c2..a1dd2abfa4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -264,7 +264,7 @@ flexible messaging model and an intuitive client
API.</description>
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
<maven-dependency-plugin.version>3.3.0</maven-dependency-plugin.version>
<maven-modernizer-plugin.version>2.3.0</maven-modernizer-plugin.version>
- <maven-shade-plugin>3.3.0</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.5.0</nifi-nar-maven-plugin.version>
