This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/tomcat-maven-plugin.git
The following commit(s) were added to refs/heads/trunk by this push:
new f45575b Replace StringUtils with equivalent code
f45575b is described below
commit f45575b066618a4c6633ab4b571d63610fecab3f
Author: remm <[email protected]>
AuthorDate: Fri Apr 10 22:13:42 2026 +0200
Replace StringUtils with equivalent code
---
pom.xml | 5 ----
.../tomcat/maven/common/config/AbstractWebapp.java | 4 +--
.../maven/common/deployer/TomcatManager.java | 4 +--
.../run/DefaultClassLoaderEntriesCalculator.java | 4 +--
.../maven/plugin/tomcat/AbstractCatalinaMojo.java | 4 +--
.../plugin/tomcat/run/AbstractExecWarMojo.java | 34 +++++++++++-----------
.../maven/plugin/tomcat/run/AbstractRunMojo.java | 10 +++----
.../tomcat/run/AbstractStandaloneWarMojo.java | 16 +++++-----
.../tomcat/maven/plugin/tomcat/run/RunMojo.java | 4 +--
9 files changed, 40 insertions(+), 45 deletions(-)
diff --git a/pom.xml b/pom.xml
index cc470fe..3313fbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -609,11 +609,6 @@
<artifactId>commons-io</artifactId>
<version>2.21.0</version>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.20.0</version>
- </dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
diff --git
a/src/main/java/org/apache/tomcat/maven/common/config/AbstractWebapp.java
b/src/main/java/org/apache/tomcat/maven/common/config/AbstractWebapp.java
index 171d056..9aeaef3 100644
--- a/src/main/java/org/apache/tomcat/maven/common/config/AbstractWebapp.java
+++ b/src/main/java/org/apache/tomcat/maven/common/config/AbstractWebapp.java
@@ -19,7 +19,7 @@ package org.apache.tomcat.maven.common.config;
* under the License.
*/
-import org.apache.commons.lang3.StringUtils;
+
import org.apache.maven.artifact.Artifact;
import java.io.File;
@@ -133,7 +133,7 @@ public abstract class AbstractWebapp
public String getContextPath()
{
- if ( StringUtils.isEmpty( contextPath ) )
+ if ( contextPath == null || contextPath.isEmpty() )
{
return this.artifactId;
}
diff --git
a/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
b/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
index 9cc216f..201e2ff 100644
--- a/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
+++ b/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
@@ -33,7 +33,7 @@ import java.util.Locale;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
+
import org.apache.http.Header;
import org.apache.http.HttpHost;
import org.apache.http.HttpResponse;
@@ -194,7 +194,7 @@ public class TomcatManager
poolingClientConnectionManager.setMaxTotal( 5 );
this.httpClient = new DefaultHttpClient(
poolingClientConnectionManager );
- if ( StringUtils.isNotEmpty( username ) )
+ if ( username != null && !username.isEmpty() )
{
Credentials creds = new UsernamePasswordCredentials( username,
password );
diff --git
a/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
b/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
index 55b16b2..12b9957 100644
---
a/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
+++
b/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
@@ -30,7 +30,7 @@ import org.codehaus.plexus.archiver.manager.ArchiverManager;
import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.util.StringUtils;
+
import java.io.File;
import java.io.FilenameFilter;
@@ -251,7 +251,7 @@ public class DefaultClassLoaderEntriesCalculator
project.getProjectReferences().values();
for ( MavenProject mavenProject : mavenProjects )
{
- if ( StringUtils.equals( mavenProject.getId(), artifact.getId() ) )
+ if ( mavenProject.getId() != null && mavenProject.getId().equals(
artifact.getId() ) )
{
return true;
}
diff --git
a/src/main/java/org/apache/tomcat/maven/plugin/tomcat/AbstractCatalinaMojo.java
b/src/main/java/org/apache/tomcat/maven/plugin/tomcat/AbstractCatalinaMojo.java
index 6c8e308..890c536 100644
---
a/src/main/java/org/apache/tomcat/maven/plugin/tomcat/AbstractCatalinaMojo.java
+++
b/src/main/java/org/apache/tomcat/maven/plugin/tomcat/AbstractCatalinaMojo.java
@@ -26,7 +26,7 @@ import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.tomcat.maven.common.deployer.TomcatManager;
import org.apache.tomcat.maven.common.deployer.TomcatManagerException;
-import org.codehaus.plexus.util.StringUtils;
+
import java.io.IOException;
import java.net.MalformedURLException;
@@ -211,7 +211,7 @@ public abstract class AbstractCatalinaMojo
}
// if userName/password are defined in the mojo or the cli they
override
- if ( !StringUtils.isEmpty( this.username ) )
+ if ( this.username != null && !this.username.isEmpty() )
{
userName = this.username;
password = this.password == null ? "" : this.password;
diff --git
a/src/main/java/org/apache/tomcat/maven/plugin/tomcat/run/AbstractExecWarMojo.java
b/src/main/java/org/apache/tomcat/maven/plugin/tomcat/run/AbstractExecWarMojo.java
index 1d82485..e45d976 100644
---
a/src/main/java/org/apache/tomcat/maven/plugin/tomcat/run/AbstractExecWarMojo.java
+++
b/src/main/java/org/apache/tomcat/maven/plugin/tomcat/run/AbstractExecWarMojo.java
@@ -38,7 +38,7 @@ import
org.apache.commons.compress.archivers.ArchiveStreamFactory;
import org.apache.commons.compress.archivers.jar.JarArchiveEntry;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -298,11 +298,12 @@ public abstract class AbstractExecWarMojo
if ( "war".equals( project.getPackaging() ) )
{
- os.putArchiveEntry( new JarArchiveEntry(
StringUtils.removeStart( path, "/" ) + ".war" ) );
+ String pathWithoutSlash = path.startsWith( "/" ) ?
path.substring( 1 ) : path;
+ os.putArchiveEntry( new JarArchiveEntry( pathWithoutSlash +
".war" ) );
IOUtils.copy( new FileInputStream( projectArtifact.getFile()
), os );
os.closeArchiveEntry();
- properties.put( TomcatRunner.WARS_KEY,
StringUtils.removeStart( path, "/" ) + ".war|" + path );
+ properties.put( TomcatRunner.WARS_KEY, pathWithoutSlash +
".war|" + path );
}
else if ( warRunDependencies != null &&
!warRunDependencies.isEmpty() )
{
@@ -312,12 +313,12 @@ public abstract class AbstractExecWarMojo
{
Dependency dependency = warRunDependency.dependency;
String version = dependency.getVersion();
- if ( StringUtils.isEmpty( version ) )
+ if ( version == null || version.isEmpty() )
{
version = findArtifactVersion( dependency );
}
- if ( StringUtils.isEmpty( version ) )
+if ( version == null || version.isEmpty() )
{
throw new MojoExecutionException(
"Dependency '" + dependency.getGroupId() +
"':'" + dependency.getArtifactId()
@@ -344,7 +345,7 @@ public abstract class AbstractExecWarMojo
os.closeArchiveEntry();
String propertyWarValue = properties.getProperty(
TomcatRunner.WARS_KEY );
String contextPath =
- StringUtils.isEmpty( warRunDependency.contextPath
) ? "/" : warRunDependency.contextPath;
+ warRunDependency.contextPath == null ||
warRunDependency.contextPath.isEmpty() ? "/" : warRunDependency.contextPath;
if ( propertyWarValue != null )
{
properties.put( TomcatRunner.WARS_KEY,
@@ -386,12 +387,11 @@ public abstract class AbstractExecWarMojo
// add tomcat classes
for ( Artifact pluginArtifact : pluginArtifacts )
{
- if ( StringUtils.equals( "org.apache.tomcat",
pluginArtifact.getGroupId() ) //
- || StringUtils.equals( "org.apache.tomcat.embed",
pluginArtifact.getGroupId() ) //
- || StringUtils.equals( "org.eclipse.jdt.core.compiler",
pluginArtifact.getGroupId() ) //
- || StringUtils.equals( "commons-cli",
pluginArtifact.getArtifactId() ) //
- || StringUtils.equals( "tomcat-maven-plugin",
pluginArtifact.getArtifactId() ) )
- {
+ if ("org.apache.tomcat".equals(pluginArtifact.getGroupId()) //
+ ||
"org.apache.tomcat.embed".equals(pluginArtifact.getGroupId()) //
+ ||
"org.eclipse.jdt.core.compiler".equals(pluginArtifact.getGroupId()) //
+ ||
"commons-cli".equals(pluginArtifact.getArtifactId()) //
+ ||
"tomcat-maven-plugin".equals(pluginArtifact.getArtifactId())) {
JarFile jarFile = new JarFile( pluginArtifact.getFile() );
extractJarToArchive( jarFile, os, null );
}
@@ -403,12 +403,12 @@ public abstract class AbstractExecWarMojo
for ( Dependency dependency : extraDependencies )
{
String version = dependency.getVersion();
- if ( StringUtils.isEmpty( version ) )
+ if ( version == null || version.isEmpty() )
{
version = findArtifactVersion( dependency );
}
- if ( StringUtils.isEmpty( version ) )
+ if ( version == null || version.isEmpty() )
{
throw new MojoExecutionException(
"Dependency '" + dependency.getGroupId() + "':'" +
dependency.getArtifactId()
@@ -530,8 +530,8 @@ public abstract class AbstractExecWarMojo
protected boolean sameDependencyWithoutVersion( Dependency that,
Dependency dependency )
{
- return StringUtils.equals( that.getGroupId(), dependency.getGroupId()
) && StringUtils.equals(
- that.getArtifactId(), dependency.getArtifactId() );
+ return that.getGroupId() != null &&
that.getGroupId().equals(dependency.getGroupId()) &&
+ that.getArtifactId() != null &&
that.getArtifactId().equals(dependency.getArtifactId());
}
protected void copyDirectoryContentIntoArchive( File sourceFolder, String
destinationPath,
@@ -660,7 +660,7 @@ public abstract class AbstractExecWarMojo
}
}
- if ( StringUtils.equalsIgnoreCase( j.getName(),
"META-INF/MANIFEST.MF" ) )
+ if ( "META-INF/MANIFEST.MF".equalsIgnoreCase( j.getName() ) )
{
continue;
}
diff --git
a/src/main/java/org/apache/tomcat/maven/plugin/tomcat/run/AbstractRunMojo.java
b/src/main/java/org/apache/tomcat/maven/plugin/tomcat/run/AbstractRunMojo.java
index acaa003..73883df 100644
---
a/src/main/java/org/apache/tomcat/maven/plugin/tomcat/run/AbstractRunMojo.java
+++
b/src/main/java/org/apache/tomcat/maven/plugin/tomcat/run/AbstractRunMojo.java
@@ -56,7 +56,7 @@ import org.apache.catalina.startup.CatalinaProperties;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.valves.AccessLogValve;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -751,16 +751,16 @@ public abstract class AbstractRunMojo
while ( true )
{
- if ( tag == XMLStreamConstants.START_ELEMENT &&
StringUtils.equals( "Context", reader.getLocalName() ) )
+ if ( tag == XMLStreamConstants.START_ELEMENT &&
"Context".equals( reader.getLocalName() ) )
{
String path = reader.getAttributeValue( null, "path" );
- if ( StringUtils.isNotBlank( path ) )
+ if ( path != null && !path.isEmpty() )
{
standardContext.setPath( path );
}
String docBase = reader.getAttributeValue( null, "docBase"
);
- if ( StringUtils.isNotBlank( docBase ) )
+ if ( docBase != null && !docBase.isEmpty() )
{
standardContext.setDocBase( docBase );
}
@@ -1515,7 +1515,7 @@ public abstract class AbstractRunMojo
vr = VersionRange.createFromVersion( additionalWebapp.getVersion()
);
}
- if ( StringUtils.isEmpty( additionalWebapp.getClassifier() ) )
+ if ( additionalWebapp.getClassifier() == null ||
additionalWebapp.getClassifier().isEmpty() )
{
artifact =
factory.createDependencyArtifact(
additionalWebapp.getGroupId(), additionalWebapp.getArtifactId(), vr,
diff --git
a/src/main/java/org/apache/tomcat/maven/plugin/tomcat/run/AbstractStandaloneWarMojo.java
b/src/main/java/org/apache/tomcat/maven/plugin/tomcat/run/AbstractStandaloneWarMojo.java
index 117efa5..38f73c7 100644
---
a/src/main/java/org/apache/tomcat/maven/plugin/tomcat/run/AbstractStandaloneWarMojo.java
+++
b/src/main/java/org/apache/tomcat/maven/plugin/tomcat/run/AbstractStandaloneWarMojo.java
@@ -30,7 +30,7 @@ import
org.apache.commons.compress.archivers.ArchiveOutputStream;
import org.apache.commons.compress.archivers.ArchiveStreamFactory;
import org.apache.commons.compress.archivers.jar.JarArchiveEntry;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
@@ -175,11 +175,11 @@ public abstract class AbstractStandaloneWarMojo
// add tomcat classes
for ( Artifact pluginArtifact : pluginArtifacts )
{
- if ( StringUtils.equals( "org.apache.tomcat",
pluginArtifact.getGroupId() ) //
- || StringUtils.equals( "org.apache.tomcat.embed",
pluginArtifact.getGroupId() ) //
- || StringUtils.equals( "org.eclipse.jdt.core.compiler",
pluginArtifact.getGroupId() ) //
- || StringUtils.equals( "commons-cli",
pluginArtifact.getArtifactId() ) //
- || StringUtils.equals( "tomcat-maven-plugin",
pluginArtifact.getArtifactId() ) )
+if ( "org.apache.tomcat".equals( pluginArtifact.getGroupId() ) //
+ || "org.apache.tomcat.embed".equals(
pluginArtifact.getGroupId() ) //
+ || "org.eclipse.jdt.core.compiler".equals(
pluginArtifact.getGroupId() ) //
+ || "commons-cli".equals(
pluginArtifact.getArtifactId() ) //
+ || "tomcat-maven-plugin".equals(
pluginArtifact.getArtifactId() ) )
{
JarFile jarFile = new JarFile( pluginArtifact.getFile() );
extractJarToArchive( jarFile, os, null );
@@ -192,12 +192,12 @@ public abstract class AbstractStandaloneWarMojo
for ( Dependency dependency : extraDependencies )
{
String version = dependency.getVersion();
- if ( StringUtils.isEmpty( version ) )
+ if ( version == null || version.isEmpty() )
{
version = findArtifactVersion( dependency );
}
- if ( StringUtils.isEmpty( version ) )
+ if ( version == null || version.isEmpty() )
{
throw new MojoExecutionException(
"Dependency '" + dependency.getGroupId() + "':'" +
dependency.getArtifactId()
diff --git
a/src/main/java/org/apache/tomcat/maven/plugin/tomcat/run/RunMojo.java
b/src/main/java/org/apache/tomcat/maven/plugin/tomcat/run/RunMojo.java
index 395304d..2b81eb5 100644
--- a/src/main/java/org/apache/tomcat/maven/plugin/tomcat/run/RunMojo.java
+++ b/src/main/java/org/apache/tomcat/maven/plugin/tomcat/run/RunMojo.java
@@ -38,7 +38,7 @@ import org.apache.catalina.webresources.EmptyResource;
import org.apache.catalina.webresources.FileResourceSet;
import org.apache.catalina.webresources.StandardRoot;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.MojoExecutionException;
@@ -445,7 +445,7 @@ public class RunMojo
{
URI uri = new URI( classLoaderEntry );
File file = new File( uri );
- if ( !file.isDirectory() &&
StringUtils.endsWithIgnoreCase(file.getName(), ".jar"))
+ if ( !file.isDirectory() &&
file.getName().toLowerCase().endsWith( ".jar" ) )
{
jarPaths.add( file.getAbsolutePath() );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
