Skip to content
Permalink
Browse files
(fix) minor nits breaking travis build
  • Loading branch information
chtompki committed Mar 22, 2018
1 parent 9e2ebcd commit 97afb3679828f698bc6a68bb3229cf9e916c36d7
Showing 5 changed files with 12 additions and 12 deletions.
@@ -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.*" />
@@ -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)) {
@@ -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 @@ private File copyReleaseNotesToWorkingDirectory() throws MojoExecutionException
* {@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();
@@ -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)) {
@@ -34,7 +34,7 @@
* @author chtompki
*/
public class CommonsDistributionDetachmentMojoTest {

private static final String COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH = "target/testing-commons-release-plugin";

@Rule

0 comments on commit 97afb36

Please sign in to comment.