You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ch...@apache.org on 2018/05/16 21:22:52 UTC
commons-release-plugin git commit: COMMONSSITE-113: Use StringUtils
instead of ||
Repository: commons-release-plugin
Updated Branches:
refs/heads/master b341fce6e -> 46ed2ce15
COMMONSSITE-113: Use StringUtils instead of ||
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/46ed2ce1
Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/46ed2ce1
Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/46ed2ce1
Branch: refs/heads/master
Commit: 46ed2ce15e6377c989e0bbc0fd6e4cb203bcd639
Parents: b341fce
Author: Rob Tompkins <ch...@apache.org>
Authored: Wed May 16 17:22:45 2018 -0400
Committer: Rob Tompkins <ch...@apache.org>
Committed: Wed May 16 17:22:45 2018 -0400
----------------------------------------------------------------------
.../release/plugin/mojos/CommonsDistributionStagingMojo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/46ed2ce1/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 edd34f0..44a39ba 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
@@ -257,7 +257,7 @@ public class CommonsDistributionStagingMojo extends AbstractMojo {
copy = new File(scmBinariesRoot + "/" + file.getName());
SharedFunctions.copyFile(getLog(), file, copy);
filesForMavenScmFileSet.add(copy);
- } else if (file.getName().contains("scm") || file.getName().contains("sha1.properties")) {
+ } else if (StringUtils.containsAny(file.getName(), "scm", "sha1.properties")) {
getLog().debug("Not copying scm directory over to the scm directory because it is the scm directory.");
//do nothing because we are copying into scm
} else {