You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2022/08/01 19:38:05 UTC

[maven-shade-plugin] branch MSHADE-423 updated (bfef7c1 -> 5ae83a0)

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

khmarbaise pushed a change to branch MSHADE-423
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git


 discard bfef7c1  [MSHADE-423] - Get rid of commons-lang3
     add 617950c  Bump mrm-maven-plugin from 1.2.0 to 1.4.1
     new 5ae83a0  [MSHADE-423] - Get rid of commons-lang3

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (bfef7c1)
            \
             N -- N -- N   refs/heads/MSHADE-423 (5ae83a0)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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.


Summary of changes:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


[maven-shade-plugin] 01/01: [MSHADE-423] - Get rid of commons-lang3

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

khmarbaise pushed a commit to branch MSHADE-423
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git

commit 5ae83a04d570416f9e5604e400fb8aa4c633f331
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Mon Aug 1 21:33:02 2022 +0200

    [MSHADE-423] - Get rid of commons-lang3
---
 pom.xml                                                         | 5 -----
 src/main/java/org/apache/maven/plugins/shade/DefaultShader.java | 5 ++---
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index dae7b09..1b14315 100644
--- a/pom.xml
+++ b/pom.xml
@@ -209,11 +209,6 @@
       <artifactId>jdependency</artifactId>
       <version>2.7.0</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.8.1</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-collections4</artifactId>
diff --git a/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java b/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
index 6b032ca..e8505c5 100644
--- a/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
+++ b/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
@@ -55,7 +55,6 @@ import javax.inject.Singleton;
 
 import org.apache.commons.collections4.MultiValuedMap;
 import org.apache.commons.collections4.multimap.HashSetValuedHashMap;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.shade.filter.Filter;
 import org.apache.maven.plugins.shade.relocation.Relocator;
@@ -442,8 +441,8 @@ public class DefaultShader
             all.addAll( resources );
 
             logger.warn(
-                StringUtils.join( jarzS, ", " ) + " define " + all.size()
-                + " overlapping " + StringUtils.join( overlaps, " and " ) + ": " );
+                String.join( ", ", jarzS ) + " define " + all.size()
+                + " overlapping " + String.join( " and ", overlaps ) + ": " );
             //CHECKSTYLE_ON: LineLength
 
             Collections.sort( all );