You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2018/05/30 17:28:46 UTC
commons-release-plugin git commit: Refactor duplicate strings.
Repository: commons-release-plugin
Updated Branches:
refs/heads/master 36408526e -> 6491f51f4
Refactor duplicate strings.
Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/6491f51f
Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/6491f51f
Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/6491f51f
Branch: refs/heads/master
Commit: 6491f51f4c165c1e9e2fcaf2a4d536c4b3955834
Parents: 3640852
Author: Gary Gregory <ga...@gmail.com>
Authored: Wed May 30 11:28:43 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Wed May 30 11:28:43 2018 -0600
----------------------------------------------------------------------
.../mojos/CommonsDistributionStagingMojo.java | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/6491f51f/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java
----------------------------------------------------------------------
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 dc4a180..36ccd33 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
@@ -61,6 +61,10 @@ import org.apache.maven.scm.repository.ScmRepository;
aggregator = true)
public class CommonsDistributionStagingMojo extends AbstractMojo {
+ private static final String README_FILE_NAME = "README.html";
+
+ private static final String HEADER_FILE_NAME = "HEADER.html";
+
/**
* The {@link MavenProject} object is essentially the context of the maven build at
* a given time.
@@ -296,7 +300,7 @@ public class CommonsDistributionStagingMojo extends AbstractMojo {
*/
private List<File> buildReadmeAndHeaderHtmlFiles() throws MojoExecutionException {
List<File> headerAndReadmeFiles = new ArrayList<>();
- File headerFile = new File(distCheckoutDirectory, "HEADER.html");
+ File headerFile = new File(distCheckoutDirectory, HEADER_FILE_NAME);
//
// HEADER file
//
@@ -311,7 +315,7 @@ public class CommonsDistributionStagingMojo extends AbstractMojo {
//
// README file
//
- File readmeFile = new File(distCheckoutDirectory, "README.html");
+ File readmeFile = new File(distCheckoutDirectory, README_FILE_NAME);
try (Writer readmeWriter = new OutputStreamWriter(new FileOutputStream(readmeFile), "UTF-8")) {
// @formatter:off
ReadmeHtmlVelocityDelegate readmeHtmlVelocityDelegate = ReadmeHtmlVelocityDelegate.builder()
@@ -346,10 +350,10 @@ public class CommonsDistributionStagingMojo extends AbstractMojo {
List<File> symbolicLinkFiles = new ArrayList<>();
File sourceRoot = new File(buildDistSourceRoot());
File binariesRoot = new File(buildDistBinariesRoot());
- File sourceHeaderFile = new File(sourceRoot, "HEADER.html");
- File sourceReadmeFile = new File(sourceRoot, "README.html");
- File binariesHeaderFile = new File(binariesRoot, "HEADER.html");
- File binariesReadmeFile = new File(binariesRoot, "README.html");
+ File sourceHeaderFile = new File(sourceRoot, HEADER_FILE_NAME);
+ File sourceReadmeFile = new File(sourceRoot, README_FILE_NAME);
+ File binariesHeaderFile = new File(binariesRoot, HEADER_FILE_NAME);
+ File binariesReadmeFile = new File(binariesRoot, README_FILE_NAME);
SharedFunctions.copyFile(getLog(), headerFile, sourceHeaderFile);
symbolicLinkFiles.add(sourceHeaderFile);
SharedFunctions.copyFile(getLog(), readmeFile, sourceReadmeFile);