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 07cd84e Replace plexus-utils StringUtils and FileUtils calls with the
JDK
07cd84e is described below
commit 07cd84e037e9b680238b89e7369a6a180e8dd495
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Wed Nov 18 04:57:43 2026 +0000
Replace plexus-utils StringUtils and FileUtils calls with the JDK
---
.../maven/plugin/resources/remote/it/ITAttachToTestOnly.java | 6 ++++--
.../maven/plugin/resources/remote/it/ITBadDependencyPoms.java | 5 +++--
.../plugin/resources/remote/it/ITCustomFilterDelimiter.java | 5 +++--
.../plugin/resources/remote/it/ITFilterLocalOverride.java | 5 +++--
.../plugin/resources/remote/it/ITGenerateFromBundle.java | 5 +++--
.../remote/it/ITGenerateFromBundleWithTypeAndClassifier.java | 5 +++--
.../resources/remote/it/ITGenerateFromManagedBundle.java | 5 +++--
.../plugin/resources/remote/it/ITGenerateFromOverride.java | 5 +++--
.../plugin/resources/remote/it/ITGetDependencyProjects.java | 5 +++--
.../plugin/resources/remote/it/ITRunOnlyAtExecutionRoot.java | 5 +++--
.../maven/plugin/resources/remote/it/ITSpdxLicenseId.java | 5 +++--
.../plugin/resources/remote/it/ITSupplementalArtifact.java | 5 +++--
.../plugin/resources/remote/stub/MavenProjectBasicStub.java | 5 +++--
.../plugin/resources/remote/stub/MavenProjectBuildStub.java | 11 ++++++-----
14 files changed, 46 insertions(+), 31 deletions(-)
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITAttachToTestOnly.java
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITAttachToTestOnly.java
index 6f74662..7ffef62 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITAttachToTestOnly.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITAttachToTestOnly.java
@@ -21,11 +21,11 @@ package org.apache.maven.plugin.resources.remote.it;
import java.io.File;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.util.jar.JarFile;
import org.apache.maven.plugin.resources.remote.it.support.MavenRunner;
import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
-import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
import org.junit.jupiter.api.Test;
@@ -54,7 +54,9 @@ public class ITAttachToTestOnly extends AbstractIT {
verifier.execute();
verifier.verifyErrorFreeLog();
- String testResource = FileUtils.fileRead(new File(projectDir,
"target/test-classes/META-INF/beans.xml"));
+ String testResource = new String(
+ Files.readAllBytes(new File(projectDir,
"target/test-classes/META-INF/beans.xml").toPath()),
+ StandardCharsets.UTF_8);
assertTrue(testResource.contains("from bundle"), testResource);
File[] jars = new File(projectDir, "target").listFiles((d, name) ->
name.endsWith(".jar"));
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITBadDependencyPoms.java
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITBadDependencyPoms.java
index 5e5af06..a40c86e 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITBadDependencyPoms.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITBadDependencyPoms.java
@@ -19,10 +19,11 @@
package org.apache.maven.plugin.resources.remote.it;
import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import org.apache.maven.plugin.resources.remote.it.support.MavenRunner;
import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
-import org.codehaus.plexus.util.FileUtils;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -47,7 +48,7 @@ public class ITBadDependencyPoms extends AbstractIT {
"[WARNING] Invalid project model for artifact
[test:invalid:0.1]. It will be ignored by the remote resources Mojo");
File output = new File(dir,
"target/maven-shared-archive-resources/DEPENDENCIES");
- String content = FileUtils.fileRead(output);
+ String content = new String(Files.readAllBytes(output.toPath()),
StandardCharsets.UTF_8);
assertTrue(content.contains("Dependency Id: test:pom:0.2"));
}
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITCustomFilterDelimiter.java
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITCustomFilterDelimiter.java
index 0ddd9c6..1550c57 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITCustomFilterDelimiter.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITCustomFilterDelimiter.java
@@ -19,10 +19,11 @@
package org.apache.maven.plugin.resources.remote.it;
import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import org.apache.maven.plugin.resources.remote.it.support.MavenRunner;
import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
-import org.codehaus.plexus.util.FileUtils;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -40,7 +41,7 @@ public class ITCustomFilterDelimiter extends AbstractIT {
verifier.verifyErrorFreeLog();
File output = new File(dir,
"target/maven-shared-archive-resources/DEPENDENCIES");
- String content = FileUtils.fileRead(output);
+ String content = new String(Files.readAllBytes(output.toPath()),
StandardCharsets.UTF_8);
assertTrue(content.contains("Override: custom-filter-delim"));
}
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITFilterLocalOverride.java
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITFilterLocalOverride.java
index de6e3dc..8a571b8 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITFilterLocalOverride.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITFilterLocalOverride.java
@@ -19,10 +19,11 @@
package org.apache.maven.plugin.resources.remote.it;
import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import org.apache.maven.plugin.resources.remote.it.support.MavenRunner;
import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
-import org.codehaus.plexus.util.FileUtils;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -38,7 +39,7 @@ public class ITFilterLocalOverride extends AbstractIT {
verifier.verifyErrorFreeLog();
File output = new File(dir,
"target/maven-shared-archive-resources/DEPENDENCIES");
- String content = FileUtils.fileRead(output);
+ String content = new String(Files.readAllBytes(output.toPath()),
StandardCharsets.UTF_8);
assertTrue(content.contains("Override: filter-local-override"));
}
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromBundle.java
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromBundle.java
index 55a9d23..0d8da23 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromBundle.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromBundle.java
@@ -19,10 +19,11 @@
package org.apache.maven.plugin.resources.remote.it;
import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import org.apache.maven.plugin.resources.remote.it.support.MavenRunner;
import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
-import org.codehaus.plexus.util.FileUtils;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -38,7 +39,7 @@ public class ITGenerateFromBundle extends AbstractIT {
verifier.verifyErrorFreeLog();
File output = new File(dir,
"target/maven-shared-archive-resources/DEPENDENCIES");
- String content = FileUtils.fileRead(output);
+ String content = new String(Files.readAllBytes(output.toPath()),
StandardCharsets.UTF_8);
assertTrue(content.contains("Built-In:"));
assertTrue(content.contains("Dependency Id:
org.apache.commons:commons-csv:1.10.0"));
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromBundleWithTypeAndClassifier.java
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromBundleWithTypeAndClassifier.java
index 0321b88..b5efb03 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromBundleWithTypeAndClassifier.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromBundleWithTypeAndClassifier.java
@@ -19,10 +19,11 @@
package org.apache.maven.plugin.resources.remote.it;
import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import org.apache.maven.plugin.resources.remote.it.support.MavenRunner;
import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
-import org.codehaus.plexus.util.FileUtils;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -39,7 +40,7 @@ public class ITGenerateFromBundleWithTypeAndClassifier
extends AbstractIT {
verifier.verifyErrorFreeLog();
File output = new File(dir,
"target/maven-shared-archive-resources/DEPENDENCIES");
- String content = FileUtils.fileRead(output);
+ String content = new String(Files.readAllBytes(output.toPath()),
StandardCharsets.UTF_8);
assertTrue(content.contains("Built-In:"));
}
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromManagedBundle.java
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromManagedBundle.java
index 130d643..eea0e6d 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromManagedBundle.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromManagedBundle.java
@@ -19,10 +19,11 @@
package org.apache.maven.plugin.resources.remote.it;
import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import org.apache.maven.plugin.resources.remote.it.support.MavenRunner;
import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
-import org.codehaus.plexus.util.FileUtils;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -38,7 +39,7 @@ public class ITGenerateFromManagedBundle extends AbstractIT {
verifier.verifyErrorFreeLog();
File output = new File(dir,
"target/maven-shared-archive-resources/DEPENDENCIES");
- String content = FileUtils.fileRead(output);
+ String content = new String(Files.readAllBytes(output.toPath()),
StandardCharsets.UTF_8);
assertTrue(content.contains("Built-In:"));
}
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromOverride.java
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromOverride.java
index 253247a..c0d707b 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromOverride.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromOverride.java
@@ -19,10 +19,11 @@
package org.apache.maven.plugin.resources.remote.it;
import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import org.apache.maven.plugin.resources.remote.it.support.MavenRunner;
import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
-import org.codehaus.plexus.util.FileUtils;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -38,7 +39,7 @@ public class ITGenerateFromOverride extends AbstractIT {
verifier.verifyErrorFreeLog();
File output = new File(dir,
"target/maven-shared-archive-resources/DEPENDENCIES");
- String content = FileUtils.fileRead(output);
+ String content = new String(Files.readAllBytes(output.toPath()),
StandardCharsets.UTF_8);
assertTrue(content.contains("Override:"));
}
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGetDependencyProjects.java
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGetDependencyProjects.java
index 2e640de..56a06e7 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGetDependencyProjects.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGetDependencyProjects.java
@@ -19,10 +19,11 @@
package org.apache.maven.plugin.resources.remote.it;
import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import org.apache.maven.plugin.resources.remote.it.support.MavenRunner;
import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
-import org.codehaus.plexus.util.FileUtils;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -52,7 +53,7 @@ public class ITGetDependencyProjects extends AbstractIT {
verifier.verifyErrorFreeLog();
File output = new File(projectDir,
"target/maven-shared-archive-resources/DEPENDENCIES");
- String content = FileUtils.fileRead(output);
+ String content = new String(Files.readAllBytes(output.toPath()),
StandardCharsets.UTF_8);
assertTrue(content.contains("Dependency Id:
org.apache.maven.plugin.rresource.it.gdp:release:1.0"));
assertTrue(content.contains("Dependency Id:
org.apache.maven.plugin.rresource.it.gdp:snapshot:1.0-SNAPSHOT"));
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITRunOnlyAtExecutionRoot.java
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITRunOnlyAtExecutionRoot.java
index 3472682..c12b1e6 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITRunOnlyAtExecutionRoot.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITRunOnlyAtExecutionRoot.java
@@ -19,10 +19,11 @@
package org.apache.maven.plugin.resources.remote.it;
import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import org.apache.maven.plugin.resources.remote.it.support.MavenRunner;
import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
-import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.Os;
import org.junit.jupiter.api.Test;
@@ -75,7 +76,7 @@ public class ITRunOnlyAtExecutionRoot extends AbstractIT {
assertFalse(new File(dir, "child1/" + depResource).exists());
assertFalse(new File(dir, "child2/" + depResource).exists());
- String content = FileUtils.fileRead(output);
+ String content = new String(Files.readAllBytes(output.toPath()),
StandardCharsets.UTF_8);
assertTrue(content.contains("Dependency Id:
org.apache.maven.plugin.rresource.it.mrr41:release:1.0"));
assertTrue(content.contains("Dependency Id:
org.apache.maven.plugin.rresource.it.mrr41:snapshot:1.0-SNAPSHOT"));
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITSpdxLicenseId.java
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITSpdxLicenseId.java
index 8cc8d5f..f79e404 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITSpdxLicenseId.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITSpdxLicenseId.java
@@ -19,10 +19,11 @@
package org.apache.maven.plugin.resources.remote.it;
import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import org.apache.maven.plugin.resources.remote.it.support.MavenRunner;
import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
-import org.codehaus.plexus.util.FileUtils;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -46,7 +47,7 @@ public class ITSpdxLicenseId extends AbstractIT {
verifier.verifyErrorFreeLog();
File output = new File(projectDir,
"target/maven-shared-archive-resources/DEPENDENCIES");
- String content = FileUtils.fileRead(output).replace("\r\n", "\n");
+ String content = new String(Files.readAllBytes(output.toPath()),
StandardCharsets.UTF_8).replace("\r\n", "\n");
assertTrue(content.contains("a-name: Apache-2.0\n"), content);
assertTrue(content.contains("b-url: Apache-2.0\n"), content);
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITSupplementalArtifact.java
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITSupplementalArtifact.java
index dfe716e..4145d08 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITSupplementalArtifact.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITSupplementalArtifact.java
@@ -19,10 +19,11 @@
package org.apache.maven.plugin.resources.remote.it;
import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import org.apache.maven.plugin.resources.remote.it.support.MavenRunner;
import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
-import org.codehaus.plexus.util.FileUtils;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -53,7 +54,7 @@ public class ITSupplementalArtifact extends AbstractIT {
verifier.verifyErrorFreeLog();
File output = new File(dir,
"target/maven-shared-archive-resources/DEPENDENCIES");
- String content = FileUtils.fileRead(output);
+ String content = new String(Files.readAllBytes(output.toPath()),
StandardCharsets.UTF_8);
assertTrue(content.contains("From: 'Deficient Tooling, Inc.'
(http://www.deficient-tools.us/)"));
assertTrue(
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBasicStub.java
b/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBasicStub.java
index 4dcf2ee..2b7d76c 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBasicStub.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBasicStub.java
@@ -19,6 +19,8 @@
package org.apache.maven.plugin.resources.remote.stub;
import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.Properties;
@@ -26,7 +28,6 @@ import java.util.Properties;
import org.apache.maven.api.plugin.testing.MojoExtension;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.FileUtils;
/**
* Stub
@@ -59,7 +60,7 @@ public class MavenProjectBasicStub extends MavenProject {
testRootDir = MojoExtension.getBasedir() +
"/target/test-classes/unit/test-dir/" + identifier;
if (!new File(testRootDir).exists()) {
- FileUtils.mkdir(testRootDir);
+ Files.createDirectories(Paths.get(testRootDir));
}
artifact.populate(this);
diff --git
a/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBuildStub.java
b/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBuildStub.java
index f13f065..dcbdcd3 100644
---
a/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBuildStub.java
+++
b/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBuildStub.java
@@ -21,12 +21,13 @@ package org.apache.maven.plugin.resources.remote.stub;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import org.apache.maven.model.Build;
-import org.codehaus.plexus.util.FileUtils;
/**
* Stub
@@ -167,11 +168,11 @@ public class MavenProjectBuildStub extends
MavenProjectBasicStub {
// setup src dir
if (!new File(resourcesDirectory).exists()) {
- FileUtils.mkdir(resourcesDirectory);
+ Files.createDirectories(Paths.get(resourcesDirectory));
}
if (!new File(testResourcesDirectory).exists()) {
- FileUtils.mkdir(testResourcesDirectory);
+ Files.createDirectories(Paths.get(testResourcesDirectory));
}
createDirectories(resourcesDirectory, testResourcesDirectory);
@@ -180,11 +181,11 @@ public class MavenProjectBuildStub extends
MavenProjectBasicStub {
// setup target dir
if (!new File(outputDirectory).exists()) {
- FileUtils.mkdir(outputDirectory);
+ Files.createDirectories(Paths.get(outputDirectory));
}
if (!new File(testOutputDirectory).exists()) {
- FileUtils.mkdir(testOutputDirectory);
+ Files.createDirectories(Paths.get(testOutputDirectory));
}
setupTargetFiles();