This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MASSEMBLY-1010
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
commit 0f4e2c49c12934f396e858dc10d509be15d626fe
Author: Slawomir Jaranowski <s.jaranow...@gmail.com>
AuthorDate: Sat Nov 25 19:54:15 2023 +0100
[MASSEMBLY-1010] Use IOUtils from commons-io instead of plexus
---
pom.xml | 5 +++-
.../filter/SimpleAggregatingDescriptorHandler.java | 4 +--
.../plugins/assembly/io/DefaultAssemblyReader.java | 5 ----
.../archive/ManifestCreationFinalizerTest.java | 6 ++--
.../assembly/utils/LineEndingsUtilsTest.java | 34 +++++-----------------
.../utils/LinuxLineFeedInputStreamTest.java | 12 ++------
.../utils/WindowsLineFeedInputStreamTest.java | 12 ++------
7 files changed, 20 insertions(+), 58 deletions(-)
diff --git a/pom.xml b/pom.xml
index c9bad77d..7258251a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -179,7 +179,10 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-xml</artifactId>
</dependency>
<!-- Test -->
diff --git
a/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java
b/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java
index 8246e156..21fd5138 100644
---
a/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java
+++
b/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java
@@ -36,12 +36,12 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
+import org.apache.commons.io.IOUtils;
import org.apache.maven.plugins.assembly.utils.AssemblyFileUtils;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.UnArchiver;
import org.codehaus.plexus.components.io.fileselectors.FileInfo;
-import org.codehaus.plexus.util.IOUtil;
/**
* <code>file-aggregator</code>: Generic aggregating handler, configured with
filePattern and outputPath.
@@ -163,7 +163,7 @@ public class SimpleAggregatingDescriptorHandler implements
ContainerDescriptorHa
? new InputStreamReader(fileInfo.getContents(),
StandardCharsets.ISO_8859_1)
: new InputStreamReader(fileInfo.getContents())) //
platform encoding
{
- IOUtil.copy(reader, writer);
+ IOUtils.copy(reader, writer);
final String content = writer.toString();
aggregateWriter.write("\n");
aggregateWriter.write(content);
diff --git
a/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java
b/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java
index 1def909b..bc4cbf32 100644
---
a/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java
+++
b/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java
@@ -58,7 +58,6 @@ import
org.codehaus.plexus.interpolation.fixed.InterpolationState;
import org.codehaus.plexus.interpolation.fixed.PrefixedObjectValueSource;
import org.codehaus.plexus.interpolation.fixed.PrefixedPropertiesValueSource;
import org.codehaus.plexus.util.DirectoryScanner;
-import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -278,13 +277,9 @@ public class DefaultAssemblyReader implements
AssemblyReader {
AssemblyInterpolator.checkErrors(AssemblyId.createAssemblyId(assembly), is,
LOGGER);
- reader.close();
- reader = null;
} catch (final IOException | XmlPullParserException e) {
throw new AssemblyReadException(
"Error reading descriptor: " + locationDescription + ": "
+ e.getMessage(), e);
- } finally {
- IOUtil.close(reader);
}
if (assembly.isIncludeSiteDirectory()) {
diff --git
a/src/test/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizerTest.java
b/src/test/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizerTest.java
index e5b298a1..a9d77cfe 100644
---
a/src/test/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizerTest.java
+++
b/src/test/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizerTest.java
@@ -30,12 +30,12 @@ import java.nio.file.Path;
import java.util.Arrays;
import java.util.Collections;
+import org.apache.commons.io.IOUtils;
import org.apache.maven.archiver.MavenArchiveConfiguration;
import org.apache.maven.model.Model;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.ArchiveFinalizer;
import org.codehaus.plexus.archiver.jar.JarArchiver;
-import org.codehaus.plexus.util.IOUtil;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@@ -93,7 +93,7 @@ public class ManifestCreationFinalizerTest {
StringWriter writer = new StringWriter();
- IOUtil.copy(reader, writer);
+ IOUtils.copy(reader, writer);
assertTrue(writer.toString().contains("Main-Class: Stuff"));
@@ -128,7 +128,7 @@ public class ManifestCreationFinalizerTest {
StringWriter writer = new StringWriter();
- IOUtil.copy(reader, writer);
+ IOUtils.copy(reader, writer);
assertTrue(writer.toString().contains(testKey + ": " + testValue));
diff --git
a/src/test/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtilsTest.java
b/src/test/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtilsTest.java
index 0205c9f1..2827142f 100644
---
a/src/test/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtilsTest.java
+++
b/src/test/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtilsTest.java
@@ -26,8 +26,8 @@ import java.io.StringReader;
import java.io.StringWriter;
import java.nio.file.Files;
+import org.apache.commons.io.IOUtils;
import org.apache.maven.plugins.assembly.format.AssemblyFormattingException;
-import org.codehaus.plexus.util.IOUtil;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -222,38 +222,18 @@ public class LineEndingsUtilsTest {
File dest = Files.createTempFile("line-conversion-test-out.",
"").toFile();
dest.deleteOnExit();
- FileWriter sourceWriter = null;
- StringReader sourceReader = new StringReader(test);
- try {
- sourceWriter = new FileWriter(source);
-
- IOUtil.copy(sourceReader, sourceWriter);
-
- sourceWriter.close();
- sourceWriter = null;
- } finally {
- IOUtil.close(sourceWriter);
+ try (StringReader sourceReader = new StringReader(test);
+ FileWriter sourceWriter = new FileWriter(source)) {
+ IOUtils.copy(sourceReader, sourceWriter);
}
// Using platform encoding for the conversion tests in this class is OK
LineEndingsUtils.convertLineEndings(source, dest, lineEndingChars,
eof, null);
- FileReader destReader = null;
- StringWriter destWriter = new StringWriter();
- try {
- destReader = new FileReader(dest);
-
- IOUtil.copy(destReader, destWriter);
-
+ try (FileReader destReader = new FileReader(dest);
+ StringWriter destWriter = new StringWriter()) {
+ IOUtils.copy(destReader, destWriter);
assertEquals(check, destWriter.toString());
-
- destWriter.close();
- destWriter = null;
- destReader.close();
- destReader = null;
- } finally {
- IOUtil.close(destWriter);
- IOUtil.close(destReader);
}
}
}
diff --git
a/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java
b/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java
index 11d6205d..3630a2a9 100644
---
a/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java
+++
b/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java
@@ -21,7 +21,6 @@ package org.apache.maven.plugins.assembly.utils;
import java.io.ByteArrayInputStream;
import java.io.IOException;
-import org.codehaus.plexus.util.IOUtil;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -71,17 +70,10 @@ public class LinuxLineFeedInputStreamTest {
private String roundtrip(String msg, boolean ensure) throws IOException {
ByteArrayInputStream baos = new ByteArrayInputStream(msg.getBytes());
- LinuxLineFeedInputStream lf = null;
- try {
- lf = new LinuxLineFeedInputStream(baos, ensure);
+ try (LinuxLineFeedInputStream lf = new LinuxLineFeedInputStream(baos,
ensure)) {
byte[] buf = new byte[100];
final int read = lf.read(buf);
- final String string = new String(buf, 0, read);
- lf.close();
- lf = null;
- return string;
- } finally {
- IOUtil.close(lf);
+ return new String(buf, 0, read);
}
}
}
diff --git
a/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java
b/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java
index 97c9cc8f..55ab114e 100644
---
a/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java
+++
b/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java
@@ -21,7 +21,6 @@ package org.apache.maven.plugins.assembly.utils;
import java.io.ByteArrayInputStream;
import java.io.IOException;
-import org.codehaus.plexus.util.IOUtil;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -72,17 +71,10 @@ public class WindowsLineFeedInputStreamTest {
private String roundtrip(String msg, boolean ensure) throws IOException {
ByteArrayInputStream baos = new ByteArrayInputStream(msg.getBytes());
- WindowsLineFeedInputStream lf = null;
- try {
- lf = new WindowsLineFeedInputStream(baos, ensure);
+ try (WindowsLineFeedInputStream lf = new
WindowsLineFeedInputStream(baos, ensure)) {
byte[] buf = new byte[100];
final int read = lf.read(buf);
- final String string = new String(buf, 0, read);
- lf.close();
- lf = null;
- return string;
- } finally {
- IOUtil.close(lf);
+ return new String(buf, 0, read);
}
}
}
