From 3ec9be80e5a68ddf10f294cd57f84050d0b68d84 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Fri, 20 Sep 2024 22:35:50 +0200
Subject: [PATCH] [SUREFIRE-2267] Packages for commons-codec should be
 relocated in surefire-shared-utils

---
 surefire-shadefire/pom.xml    |  4 ++++
 surefire-shared-utils/pom.xml | 26 ++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/surefire-shadefire/pom.xml b/surefire-shadefire/pom.xml
index cafa27e17e..f7d39ff17e 100644
--- a/surefire-shadefire/pom.xml
+++ b/surefire-shadefire/pom.xml
@@ -84,6 +84,10 @@
                   <include>org.apache.maven.surefire:common-junit3</include>
                   <include>org.apache.maven.surefire:surefire-junit3</include>
                 </includes>
+                <excludes>
+                  <!-- with rebuild old shaded artifact is used -->
+                  <exclude>${project.groupId}:${project.artifactId}</exclude>
+                </excludes>
               </artifactSet>
               <relocations>
                 <relocation>
diff --git a/surefire-shared-utils/pom.xml b/surefire-shared-utils/pom.xml
index 4de4b27e9e..380a75daa9 100644
--- a/surefire-shared-utils/pom.xml
+++ b/surefire-shared-utils/pom.xml
@@ -71,11 +71,30 @@
               <goal>shade</goal>
             </goals>
             <configuration>
+              <artifactSet>
+                <excludes>
+                  <!-- with rebuild old shaded artifact is used -->
+                  <exclude>${project.groupId}:${project.artifactId}</exclude>
+                </excludes>
+              </artifactSet>
+              <filters>
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>**/module-info.class</exclude>
+                    <exclude>META-INF/MANIFEST.MF</exclude>
+                  </excludes>
+                </filter>
+              </filters>
               <relocations>
                 <relocation>
                   <pattern>org.apache.maven.shared.utils</pattern>
                   <shadedPattern>org.apache.maven.surefire.shared.utils</shadedPattern>
                 </relocation>
+                <relocation>
+                  <pattern>org.apache.commons.codec</pattern>
+                  <shadedPattern>org.apache.maven.surefire.shared.codec</shadedPattern>
+                </relocation>
                 <relocation>
                   <pattern>org.apache.commons.io</pattern>
                   <shadedPattern>org.apache.maven.surefire.shared.io</shadedPattern>
@@ -89,6 +108,13 @@
                   <shadedPattern>org.apache.maven.surefire.shared.compress</shadedPattern>
                 </relocation>
               </relocations>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" />
+                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                  <resource>META-INF/DEPENDENCIES</resource>
+                </transformer>
+              </transformers>
             </configuration>
           </execution>
         </executions>