Skip to content

Commit

Permalink
[SUREFIRE-2267] Packages for commons-codec should be relocated in sur…
Browse files Browse the repository at this point in the history
…efire-shared-utils
  • Loading branch information
slawekjaranowski committed Sep 23, 2024
1 parent a928255 commit b2aa8a6
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 0 deletions.
4 changes: 4 additions & 0 deletions surefire-shadefire/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
26 changes: 26 additions & 0 deletions surefire-shared-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down

0 comments on commit b2aa8a6

Please sign in to comment.