You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2024/09/20 20:36:34 UTC

(maven-surefire) branch SUREFIRE-2267 created (now 3ec9be80e)

This is an automated email from the ASF dual-hosted git repository.

sjaranowski pushed a change to branch SUREFIRE-2267
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git


      at 3ec9be80e [SUREFIRE-2267] Packages for commons-codec should be relocated in surefire-shared-utils

This branch includes the following new commits:

     new 3ec9be80e [SUREFIRE-2267] Packages for commons-codec should be relocated in surefire-shared-utils

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



(maven-surefire) 01/01: [SUREFIRE-2267] Packages for commons-codec should be relocated in surefire-shared-utils

Posted by sj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sjaranowski pushed a commit to branch SUREFIRE-2267
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git

commit 3ec9be80e5a68ddf10f294cd57f84050d0b68d84
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Fri Sep 20 22:35:50 2024 +0200

    [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 cafa27e17..f7d39ff17 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 4de4b27e9..380a75daa 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>