You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2023/05/15 11:11:44 UTC
[maven-shade-plugin] branch master updated: [MNG-6829] Replace StringUtils#isEmpty(String) and #isNotEmpty(String) (#187)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new b598aef [MNG-6829] Replace StringUtils#isEmpty(String) and #isNotEmpty(String) (#187)
b598aef is described below
commit b598aef734daf361c4eb5f81b1df97d95406198a
Author: Tim te Beek <ti...@gmail.com>
AuthorDate: Mon May 15 13:11:39 2023 +0200
[MNG-6829] Replace StringUtils#isEmpty(String) and #isNotEmpty(String) (#187)
* [MNG-6829] Replace StringUtils#isEmpty(String) and #isNotEmpty(String)
Use this link to re-run the recipe: https://public.moderne.io/recipes/org.openrewrite.java.migrate.apache.commons.lang.IsNotEmptyToJdk?organizationId=QXBhY2hlIE1hdmVu
Co-authored-by: Moderne <te...@moderne.io>
* Revert changes to src/it/projects/MSHADE-36-inject-dep-reduced-pom-in-final/src/main/java/com/example/Main.java
---------
Co-authored-by: Moderne <te...@moderne.io>
---
.../plugins/shade/resource/ApacheNoticeResourceTransformer.java | 5 ++---
.../maven/plugins/shade/resource/DontIncludeResourceTransformer.java | 3 +--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java b/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
index 4b31d32..a850a3a 100644
--- a/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
+++ b/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
@@ -36,7 +36,6 @@ import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
import org.apache.maven.plugins.shade.relocation.Relocator;
-import org.codehaus.plexus.util.StringUtils;
/**
* Merges <code>META-INF/NOTICE.TXT</code> files.
@@ -106,7 +105,7 @@ public class ApacheNoticeResourceTransformer extends AbstractCompatibilityTransf
}
BufferedReader reader;
- if (StringUtils.isNotEmpty(encoding)) {
+ if (encoding != null && !encoding.isEmpty()) {
reader = new BufferedReader(new InputStreamReader(is, encoding));
} else {
reader = new BufferedReader(new InputStreamReader(is));
@@ -178,7 +177,7 @@ public class ApacheNoticeResourceTransformer extends AbstractCompatibilityTransf
jos.putNextEntry(jarEntry);
Writer writer;
- if (StringUtils.isNotEmpty(encoding)) {
+ if (encoding != null && !encoding.isEmpty()) {
writer = new OutputStreamWriter(jos, encoding);
} else {
writer = new OutputStreamWriter(jos);
diff --git a/src/main/java/org/apache/maven/plugins/shade/resource/DontIncludeResourceTransformer.java b/src/main/java/org/apache/maven/plugins/shade/resource/DontIncludeResourceTransformer.java
index 406171e..0be64df 100644
--- a/src/main/java/org/apache/maven/plugins/shade/resource/DontIncludeResourceTransformer.java
+++ b/src/main/java/org/apache/maven/plugins/shade/resource/DontIncludeResourceTransformer.java
@@ -24,7 +24,6 @@ import java.util.List;
import java.util.jar.JarOutputStream;
import org.apache.maven.plugins.shade.relocation.Relocator;
-import org.codehaus.plexus.util.StringUtils;
/**
* A resource processor that prevents the inclusion of an arbitrary
@@ -36,7 +35,7 @@ public class DontIncludeResourceTransformer extends AbstractCompatibilityTransfo
List<String> resources;
public boolean canTransformResource(String r) {
- if (StringUtils.isNotEmpty(resource) && r.endsWith(resource)) {
+ if ((resource != null && !resource.isEmpty()) && r.endsWith(resource)) {
return true;
}