This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 6c8b55f Replace plexus-utils FileUtils, IOUtil and StringUtils in
main code with JDK calls
6c8b55f is described below
commit 6c8b55fc7ab0cd1ece36c694e0f33a8dc4cb5710
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Sat Nov 14 13:21:34 2026 +0100
Replace plexus-utils FileUtils, IOUtil and StringUtils in main code with
JDK calls
The archiver dot file is still written in the platform default charset, as
FileUtils.fileWrite did.
---
.../remote/AbstractProcessRemoteResourcesMojo.java | 18 ++++++++----------
.../resources/remote/BundleRemoteResourcesMojo.java | 11 +++++++----
.../resources/remote/ModelInheritanceAssembler.java | 16 +++++++++-------
3 files changed, 24 insertions(+), 21 deletions(-)
diff --git
a/src/main/java/org/apache/maven/plugin/resources/remote/AbstractProcessRemoteResourcesMojo.java
b/src/main/java/org/apache/maven/plugin/resources/remote/AbstractProcessRemoteResourcesMojo.java
index 53f0dc2..82a4deb 100644
---
a/src/main/java/org/apache/maven/plugin/resources/remote/AbstractProcessRemoteResourcesMojo.java
+++
b/src/main/java/org/apache/maven/plugin/resources/remote/AbstractProcessRemoteResourcesMojo.java
@@ -97,9 +97,6 @@ import org.apache.velocity.exception.VelocityException;
import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
import org.codehaus.plexus.resource.ResourceManager;
import org.codehaus.plexus.resource.loader.FileResourceLoader;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.io.CachingOutputStream;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -507,8 +504,9 @@ public abstract class AbstractProcessRemoteResourcesMojo
extends AbstractMojo {
//
----------------------------------------------------------------------------
try {
File dotFile = new File(project.getBuild().getDirectory(),
".plxarc");
- FileUtils.mkdir(dotFile.getParentFile().getAbsolutePath());
- FileUtils.fileWrite(dotFile.getAbsolutePath(),
outputDirectory.getName());
+ Files.createDirectories(dotFile.getParentFile().toPath());
+ // platform default charset, as the plexus-utils
FileUtils.fileWrite call used
+ Files.write(dotFile.toPath(),
outputDirectory.getName().getBytes(Charset.defaultCharset()));
} catch (IOException e) {
throw new MojoExecutionException("Error creating dot file
for archiving instructions.", e);
}
@@ -674,7 +672,8 @@ public abstract class AbstractProcessRemoteResourcesMojo
extends AbstractMojo {
for (MavenProject p : projects) {
if (p.getOrganization() != null
- && StringUtils.isNotEmpty(p.getOrganization().getName())) {
+ && p.getOrganization().getName() != null
+ && !p.getOrganization().getName().isEmpty()) {
List<MavenProject> sortedProjects =
organizations.get(p.getOrganization());
if (sortedProjects == null) {
sortedProjects = new ArrayList<>();
@@ -1114,7 +1113,7 @@ public abstract class AbstractProcessRemoteResourcesMojo
extends AbstractMojo {
File outputFile = resolveOutputFile(outputDirectory,
projectResource, canonicalOutputDirectory);
- FileUtils.mkdir(outputFile.getParentFile().getAbsolutePath());
+ Files.createDirectories(outputFile.getParentFile().toPath());
// resource exists in project resources
if (copyResourceIfExists(outputFile, projectResource, context,
bundle.getSourceEncoding())) {
@@ -1149,9 +1148,8 @@ public abstract class AbstractProcessRemoteResourcesMojo
extends AbstractMojo {
if (appendedResourceFile.exists()) {
getLog().info("Copying appended resource: " +
projectResource);
- try (InputStream in =
Files.newInputStream(appendedResourceFile.toPath());
- OutputStream out = new
FileOutputStream(outputFile, true)) {
- IOUtil.copy(in, out);
+ try (OutputStream out = new FileOutputStream(outputFile,
true)) {
+ Files.copy(appendedResourceFile.toPath(), out);
}
} else if (appendedVmResourceFile.exists()) {
diff --git
a/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
b/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
index 0b2900b..13f9e59 100644
---
a/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
+++
b/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
@@ -23,6 +23,7 @@ import java.io.FileWriter;
import java.io.IOException;
import java.io.Writer;
import java.nio.charset.Charset;
+import java.nio.file.Files;
import java.util.Comparator;
import java.util.List;
@@ -33,8 +34,6 @@ import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.codehaus.plexus.util.DirectoryScanner;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
/**
* Bundle up resources that should be considered as a remote-resource,
@@ -135,7 +134,7 @@ public class BundleRemoteResourcesMojo extends AbstractMojo
{
String[] includedFiles = scanner.getIncludedFiles();
for (String resource : includedFiles) {
-
remoteResourcesBundle.addRemoteResource(StringUtils.replace(resource, '\\',
'/'));
+ remoteResourcesBundle.addRemoteResource(resource.replace('\\',
'/'));
}
int n = remoteResourcesBundle.getRemoteResources().size();
@@ -145,7 +144,11 @@ public class BundleRemoteResourcesMojo extends
AbstractMojo {
File f = new File(outputDirectory, RESOURCES_MANIFEST);
- FileUtils.mkdir(f.getParentFile().getAbsolutePath());
+ try {
+ Files.createDirectories(f.getParentFile().toPath());
+ } catch (IOException e) {
+ throw new MojoExecutionException("Error creating remote resources
manifest.", e);
+ }
try (Writer writer = new FileWriter(f)) {
w.write(writer, remoteResourcesBundle);
diff --git
a/src/main/java/org/apache/maven/plugin/resources/remote/ModelInheritanceAssembler.java
b/src/main/java/org/apache/maven/plugin/resources/remote/ModelInheritanceAssembler.java
index cfc75d1..e0ebd29 100644
---
a/src/main/java/org/apache/maven/plugin/resources/remote/ModelInheritanceAssembler.java
+++
b/src/main/java/org/apache/maven/plugin/resources/remote/ModelInheritanceAssembler.java
@@ -40,7 +40,6 @@ import org.apache.maven.model.Reporting;
import org.apache.maven.model.Resource;
import org.apache.maven.model.Scm;
import org.apache.maven.model.Site;
-import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
@@ -126,18 +125,17 @@ public class ModelInheritanceAssembler {
child.setScm(childScm);
}
- if (StringUtils.isEmpty(childScm.getConnection()) &&
!StringUtils.isEmpty(parentScm.getConnection())) {
+ if (isEmpty(childScm.getConnection()) &&
!isEmpty(parentScm.getConnection())) {
childScm.setConnection(
appendPath(parentScm.getConnection(),
child.getArtifactId(), childPathAdjustment, appendPaths));
}
- if (StringUtils.isEmpty(childScm.getDeveloperConnection())
- &&
!StringUtils.isEmpty(parentScm.getDeveloperConnection())) {
+ if (isEmpty(childScm.getDeveloperConnection()) &&
!isEmpty(parentScm.getDeveloperConnection())) {
childScm.setDeveloperConnection(appendPath(
parentScm.getDeveloperConnection(),
child.getArtifactId(), childPathAdjustment, appendPaths));
}
- if (StringUtils.isEmpty(childScm.getUrl()) &&
!StringUtils.isEmpty(parentScm.getUrl())) {
+ if (isEmpty(childScm.getUrl()) && !isEmpty(parentScm.getUrl())) {
childScm.setUrl(
appendPath(parentScm.getUrl(), child.getArtifactId(),
childPathAdjustment, appendPaths));
}
@@ -296,7 +294,7 @@ public class ModelInheritanceAssembler {
childReporting.setExcludeDefaults(parentReporting.isExcludeDefaults());
- if (StringUtils.isEmpty(childReporting.getOutputDirectory())) {
+ if (isEmpty(childReporting.getOutputDirectory())) {
childReporting.setOutputDirectory(parentReporting.getOutputDirectory());
}
@@ -519,7 +517,7 @@ public class ModelInheritanceAssembler {
}
}
- if (StringUtils.isEmpty(childDistMgmt.getDownloadUrl())) {
+ if (isEmpty(childDistMgmt.getDownloadUrl())) {
childDistMgmt.setDownloadUrl(parentDistMgmt.getDownloadUrl());
}
@@ -544,6 +542,10 @@ public class ModelInheritanceAssembler {
return repository;
}
+ private static boolean isEmpty(String str) {
+ return str == null || str.isEmpty();
+ }
+
// TODO This should eventually be migrated to DefaultPathTranslator.
protected String appendPath(String parentPath, String childPath, String
pathAdjustment, boolean appendPaths) {
String uncleanPath = parentPath;