This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch util in repository https://gitbox.apache.org/repos/asf/maven-artifact-plugin.git
commit faff9dbf8b2d91f76377392eee4416c9e1e8ece7 Author: Elliotte Rusty Harold <elh...@ibiblio.org> AuthorDate: Sun Jan 17 12:22:52 2021 -0500 use UTF-8 and JDK Charsets --- .../org/apache/maven/plugins/artifact/buildinfo/BuildinfoMojo.java | 6 +++--- .../maven/plugins/artifact/buildinfo/ReferenceBuildinfoUtil.java | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildinfoMojo.java b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildinfoMojo.java index b704fa5..f199e5b 100644 --- a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildinfoMojo.java +++ b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/BuildinfoMojo.java @@ -19,7 +19,6 @@ package org.apache.maven.plugins.artifact.buildinfo; * under the License. */ -import org.apache.commons.codec.Charsets; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; @@ -45,6 +44,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.PrintWriter; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -228,7 +228,7 @@ public class BuildinfoMojo buildinfoFile.getParentFile().mkdirs(); try ( PrintWriter p = new PrintWriter( new BufferedWriter( - new OutputStreamWriter( new FileOutputStream( buildinfoFile ), Charsets.ISO_8859_1 ) ) ) ) + new OutputStreamWriter( new FileOutputStream( buildinfoFile ), StandardCharsets.UTF_8 ) ) ) ) { BuildInfoWriter bi = new BuildInfoWriter( getLog(), p, mono ); bi.setIgnoreJavadoc( ignoreJavadoc ); @@ -340,7 +340,7 @@ public class BuildinfoMojo File compare = new File( buildinfoFile.getParentFile(), buildinfoFile.getName() + ".compare" ); try ( PrintWriter p = new PrintWriter( new BufferedWriter( new OutputStreamWriter( new FileOutputStream( compare ), - Charsets.ISO_8859_1 ) ) ) ) + StandardCharsets.UTF_8 ) ) ) ) { p.println( "version=" + project.getVersion() ); p.println( "ok=" + ok ); diff --git a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/ReferenceBuildinfoUtil.java b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/ReferenceBuildinfoUtil.java index cba3448..67e8920 100644 --- a/src/main/java/org/apache/maven/plugins/artifact/buildinfo/ReferenceBuildinfoUtil.java +++ b/src/main/java/org/apache/maven/plugins/artifact/buildinfo/ReferenceBuildinfoUtil.java @@ -19,14 +19,12 @@ package org.apache.maven.plugins.artifact.buildinfo; * under the License. */ -import org.apache.commons.codec.Charsets; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.resolver.ArtifactNotFoundException; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.logging.Log; import org.apache.maven.project.MavenProject; -import org.apache.maven.shared.utils.WriterFactory; import org.apache.maven.shared.utils.io.IOUtil; import org.codehaus.plexus.util.FileUtils; import org.eclipse.aether.AbstractForwardingRepositorySystemSession; @@ -45,6 +43,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; +import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -153,7 +152,7 @@ class ReferenceBuildinfoUtil referenceBuildinfo = getReference( buildinfoFile ); try ( PrintWriter p = new PrintWriter( new BufferedWriter( new OutputStreamWriter( new FileOutputStream( referenceBuildinfo ), - Charsets.ISO_8859_1 ) ) ) ) + StandardCharsets.UTF_8 ) ) ) ) { BuildInfoWriter bi = new BuildInfoWriter( log, p, mono ); @@ -232,7 +231,7 @@ class ReferenceBuildinfoUtil String entryName = "META-INF/maven/" + a.getGroupId() + '/' + a.getArtifactId() + "/pom.properties"; try ( InputStream in = jar.getInputStream( jar.getEntry( entryName ) ) ) { - String content = IOUtil.toString( in, WriterFactory.UTF_8 ); + String content = IOUtil.toString( in, StandardCharsets.UTF_8.name() ); log.debug( "Manifest content: " + content ); if ( content.contains( "\r\n" ) ) {