Repository: commons-release-plugin Updated Branches: refs/heads/master 9e2ebcd71 -> 97afb3679
(fix) minor nits breaking travis build 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/97afb367 Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/97afb367 Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/97afb367 Branch: refs/heads/master Commit: 97afb3679828f698bc6a68bb3229cf9e916c36d7 Parents: 9e2ebcd Author: Rob Tompkins <chtom...@apache.org> Authored: Wed Mar 21 20:19:34 2018 -0400 Committer: Rob Tompkins <chtom...@apache.org> Committed: Wed Mar 21 20:19:34 2018 -0400 ---------------------------------------------------------------------- fb-excludes.xml | 2 +- .../plugin/mojos/CommonsDistributionDetachmentMojo.java | 9 ++++----- .../plugin/mojos/CommonsDistributionStagingMojo.java | 7 ++++--- .../release/plugin/mojos/CommonsSiteCompressionMojo.java | 4 ++-- .../plugin/mojos/CommonsDistributionDetachmentMojoTest.java | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/97afb367/fb-excludes.xml ---------------------------------------------------------------------- diff --git a/fb-excludes.xml b/fb-excludes.xml index 9e64cdc..a04edec 100644 --- a/fb-excludes.xml +++ b/fb-excludes.xml @@ -37,7 +37,7 @@ </Match> <Match> <Class name="~.*\.*CommonsDistributionStagingMojo.*" /> - <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE" /> + <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE,URF_UNREAD_FIELD" /> </Match> <Match> <Class name="~.*\.*CommonsSiteCompressionMojo.*" /> http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/97afb367/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.java ---------------------------------------------------------------------- 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 c5536fd..38cca8c 100644 --- a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.java +++ b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.java @@ -16,22 +16,21 @@ */ package org.apache.commons.release.plugin.mojos; -import java.nio.file.Files; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.release.plugin.SharedFunctions; +import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; -import org.apache.maven.artifact.Artifact; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.PrintWriter; +import java.nio.file.Files; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -103,8 +102,8 @@ public class CommonsDistributionDetachmentMojo extends AbstractMojo { @Override public void execute() throws MojoExecutionException { if (!isDistModule) { - getLog().info("This module is marked as a non distribution " + - "or assembly module, and the plugin will not run."); + getLog().info("This module is marked as a non distribution " + + "or assembly module, and the plugin will not run."); return; } if (StringUtils.isEmpty(distSvnStagingUrl)) { http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/97afb367/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 8b7c7f1..2fd30b7 100644 --- a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java +++ b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java @@ -129,8 +129,8 @@ public class CommonsDistributionStagingMojo extends AbstractMojo { @Override public void execute() throws MojoExecutionException, MojoFailureException { if (!isDistModule) { - getLog().info("This module is marked as a non distribution " + - "or assembly module, and the plugin will not run."); + getLog().info("This module is marked as a non distribution " + + "or assembly module, and the plugin will not run."); return; } if (StringUtils.isEmpty(distSvnStagingUrl)) { @@ -238,7 +238,8 @@ public class CommonsDistributionStagingMojo extends AbstractMojo { * {@link ScmFileSet}. * @throws MojoExecutionException if an {@link IOException} occurrs so that Maven can handle it properly. */ - private List<File> copyDistributionsIntoScmDirectoryStructure(File copiedReleaseNotes) throws MojoExecutionException { + private List<File> copyDistributionsIntoScmDirectoryStructure(File copiedReleaseNotes) + throws MojoExecutionException { List<File> workingDirectoryFiles = Arrays.asList(workingDirectory.listFiles()); String scmBinariesRoot = buildDistBinariesRoot(); String scmSourceRoot = buildDistSourceRoot(); http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/97afb367/src/main/java/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojo.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojo.java b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojo.java index b313089..b020d08 100644 --- a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojo.java +++ b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojo.java @@ -95,8 +95,8 @@ public class CommonsSiteCompressionMojo extends AbstractMojo { @Override public void execute() throws MojoExecutionException, MojoFailureException { if (!isDistModule) { - getLog().info("This module is marked as a non distribution " + - "or assembly module, and the plugin will not run."); + getLog().info("This module is marked as a non distribution " + + "or assembly module, and the plugin will not run."); return; } if (StringUtils.isEmpty(distSvnStagingUrl)) { http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/97afb367/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojoTest.java ---------------------------------------------------------------------- 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 d59e582..554432f 100644 --- a/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojoTest.java +++ b/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojoTest.java @@ -34,7 +34,7 @@ import static org.junit.Assert.assertNotNull; * @author chtompki */ public class CommonsDistributionDetachmentMojoTest { - + private static final String COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH = "target/testing-commons-release-plugin"; @Rule
