This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-release-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new cf379d1 Minor Improvement: (#34)
cf379d1 is described below
commit cf379d1ff144236d12ef7b9cdf378265a425d954
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Sun Feb 7 22:34:49 2021 +0100
Minor Improvement: (#34)
* Add final
* Use Standard Charset
---
src/main/java/org/apache/commons/release/plugin/SharedFunctions.java | 4 ++--
.../release/plugin/mojos/CommonsDistributionDetachmentMojo.java | 2 +-
.../commons/release/plugin/mojos/CommonsDistributionStagingMojo.java | 5 +++--
.../release/plugin/mojos/CommonsDistributionDetachmentMojoTest.java | 2 +-
.../release/plugin/mojos/CommonsDistributionStagingMojoTest.java | 2 +-
.../commons/release/plugin/mojos/CommonsSiteCompressionMojoTest.java | 2 +-
.../commons/release/plugin/mojos/CommonsStagingCleanupMojoTest.java | 2 +-
7 files changed, 10 insertions(+), 9 deletions(-)
diff --git
a/src/main/java/org/apache/commons/release/plugin/SharedFunctions.java
b/src/main/java/org/apache/commons/release/plugin/SharedFunctions.java
index fb04950..df12e03 100755
--- a/src/main/java/org/apache/commons/release/plugin/SharedFunctions.java
+++ b/src/main/java/org/apache/commons/release/plugin/SharedFunctions.java
@@ -64,7 +64,7 @@ public final class SharedFunctions {
if (workingDirectory.exists()) {
try {
FileUtils.deleteDirectory(workingDirectory);
- } catch (IOException | NullPointerException e) {
+ } catch (final IOException | NullPointerException e) {
final String message = String.format("Unable to remove
directory %s: %s", workingDirectory,
e.getMessage());
log.error(message);
@@ -88,7 +88,7 @@ public final class SharedFunctions {
public static void copyFile(final Log log, final File fromFile, final File
toFile) throws MojoExecutionException {
try {
FileUtils.copyFile(fromFile, toFile);
- } catch (IOException | NullPointerException e) {
+ } catch (final IOException | NullPointerException e) {
final String message = String.format("Unable to copy file %s tp
%s: %s", fromFile, toFile, e.getMessage());
log.error(message);
throw new MojoExecutionException(message, e);
diff --git
a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.java
b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.java
index 265bf5a..9719314 100755
---
a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.java
+++
b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.java
@@ -221,7 +221,7 @@ public class CommonsDistributionDetachmentMojo extends
AbstractMojo {
if
(!artifact.getFile().getName().toLowerCase(Locale.ROOT).contains("asc")) {
final String artifactKey = getArtifactKey(artifact);
try {
- String digest;
+ final String digest;
// SHA-512
digest =
artifactSha512s.getProperty(artifactKey.toString());
getLog().info(artifact.getFile().getName() + " sha512: " +
digest);
diff --git
a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java
b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java
index a2b4850..8e6095a 100755
---
a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java
+++
b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java
@@ -21,6 +21,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
@@ -440,7 +441,7 @@ public class CommonsDistributionStagingMojo extends
AbstractMojo {
//
// HEADER file
//
- try (Writer headerWriter = new OutputStreamWriter(new
FileOutputStream(headerFile), "UTF-8")) {
+ try (Writer headerWriter = new OutputStreamWriter(new
FileOutputStream(headerFile), StandardCharsets.UTF_8)) {
HeaderHtmlVelocityDelegate.builder().build().render(headerWriter);
} catch (final IOException e) {
final String message = "Could not build HEADER html file " +
headerFile;
@@ -452,7 +453,7 @@ public class CommonsDistributionStagingMojo extends
AbstractMojo {
// README file
//
final File readmeFile = new File(distRcVersionDirectory,
README_FILE_NAME);
- try (Writer readmeWriter = new OutputStreamWriter(new
FileOutputStream(readmeFile), "UTF-8")) {
+ try (Writer readmeWriter = new OutputStreamWriter(new
FileOutputStream(readmeFile), StandardCharsets.UTF_8)) {
// @formatter:off
final ReadmeHtmlVelocityDelegate readmeHtmlVelocityDelegate =
ReadmeHtmlVelocityDelegate.builder()
.withArtifactId(project.getArtifactId())
diff --git
a/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojoTest.java
b/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojoTest.java
index 8110dc5..4b6dbb4 100755
---
a/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojoTest.java
+++
b/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojoTest.java
@@ -38,7 +38,7 @@ public class CommonsDistributionDetachmentMojoTest {
private static final String COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH =
"target/testing-commons-release-plugin";
@Rule
- public MojoRule rule = new MojoRule() {
+ public final MojoRule rule = new MojoRule() {
@Override
protected void before() throws Throwable {
// noop
diff --git
a/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojoTest.java
b/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojoTest.java
index 5046562..e9e0423 100755
---
a/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojoTest.java
+++
b/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojoTest.java
@@ -39,7 +39,7 @@ public class CommonsDistributionStagingMojoTest {
private static final String COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH =
"target/testing-commons-release-plugin";
@Rule
- public MojoRule rule = new MojoRule() {
+ public final MojoRule rule = new MojoRule() {
@Override
protected void before() throws Throwable {
// noop
diff --git
a/src/test/java/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojoTest.java
b/src/test/java/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojoTest.java
index ccdd9a5..a2f1aad 100755
---
a/src/test/java/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojoTest.java
+++
b/src/test/java/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojoTest.java
@@ -42,7 +42,7 @@ public class CommonsSiteCompressionMojoTest {
private static final String COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH =
"target/testing-commons-release-plugin";
@Rule
- public MojoRule rule = new MojoRule() {
+ public final MojoRule rule = new MojoRule() {
@Override
protected void before() throws Throwable {
// noop
diff --git
a/src/test/java/org/apache/commons/release/plugin/mojos/CommonsStagingCleanupMojoTest.java
b/src/test/java/org/apache/commons/release/plugin/mojos/CommonsStagingCleanupMojoTest.java
index 128db4b..2e7df23 100755
---
a/src/test/java/org/apache/commons/release/plugin/mojos/CommonsStagingCleanupMojoTest.java
+++
b/src/test/java/org/apache/commons/release/plugin/mojos/CommonsStagingCleanupMojoTest.java
@@ -38,7 +38,7 @@ public class CommonsStagingCleanupMojoTest {
private static final String COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH =
"target/testing-commons-release-plugin";
@Rule
- public MojoRule rule = new MojoRule() {
+ public final MojoRule rule = new MojoRule() {
@Override
protected void before() throws Throwable {
// noop
