[fix][build] duplicate entry when merging services (apache#17659)

This closes apache#17047. Upstream patch is apache/maven-shade-plugin#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]>
datastax · Sep 15, 2022 · 2865007 · 2865007
1 parent a98f025
commit 2865007
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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>
     <netty.version>4.1.77.Final</netty.version>

diff --git a/pom.xml b/pom.xml
@@ -260,7 +260,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.2.0</nifi-nar-maven-plugin.version>