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/06/19 03:48:47 UTC
[3/8] commons-release-plugin git commit: (fix) findbugs, javadoc
(fix) findbugs, javadoc
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/731a2893
Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/731a2893
Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/731a2893
Branch: refs/heads/master
Commit: 731a2893803ab57f3eef2e5ac9e02fcd0aa8214d
Parents: 598aa43
Author: Rob Tompkins <ch...@apache.org>
Authored: Fri Jun 15 10:17:52 2018 -0400
Committer: Rob Tompkins <ch...@apache.org>
Committed: Fri Jun 15 10:17:52 2018 -0400
----------------------------------------------------------------------
pom.xml | 5 +++-
.../mojos/CommonsDistributionStagingMojo.java | 30 ++++++++++++--------
2 files changed, 22 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/731a2893/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9aef126..69d3733 100755
--- a/pom.xml
+++ b/pom.xml
@@ -108,6 +108,9 @@
<project.build.sourceEncoding>${commons.encoding}</project.build.sourceEncoding>
<!-- This is used by reporting plugins -->
<project.reporting.outputEncoding>${commons.encoding}</project.reporting.outputEncoding>
+
+ <!-- Including commons release plugin older version -->
+ <commons.release.isDistModule>true</commons.release.isDistModule>
</properties>
<dependencies>
@@ -428,7 +431,7 @@
<plugin>
<groupId>org.apache.commons</groupId>
<artifactId>commons-release-plugin</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
<configuration>
<distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/commons-release-plugin
</distSvnStagingUrl>
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/731a2893/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 09d4def..d3e0034 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
@@ -193,7 +193,7 @@ public class CommonsDistributionStagingMojo extends AbstractMojo {
getLog().info("Checking out dist from: " + distSvnStagingUrl);
provider.checkOut(repository, scmFileSet);
File copiedReleaseNotes = copyReleaseNotesToWorkingDirectory();
- List<File> filesToCommit = copyDistributionsIntoScmDirectoryStructureAndAddToSvn(copiedReleaseNotes,
+ copyDistributionsIntoScmDirectoryStructureAndAddToSvn(copiedReleaseNotes,
provider, repository);
List<File> filesToAdd = new ArrayList<>();
listNotHiddenFilesAndDirectories(distCheckoutDirectory, filesToAdd);
@@ -272,19 +272,25 @@ public class CommonsDistributionStagingMojo extends AbstractMojo {
* the directory structure of the distribution staging repository. Specifically:
* <ul>
* <li>root:</li>
- * <ul>
- * <li>site</li>
- * <li>site.zip</li>
- * <li>RELEASE-NOTES.txt</li>
- * <li>source:</li>
- * <ul>
- * <li>-src artifacts....</li>
- * </ul>
- * <li>binaries:</li>
+ * <li>
* <ul>
- * <li>-bin artifacts....</li>
+ * <li>site</li>
+ * <li>site.zip</li>
+ * <li>RELEASE-NOTES.txt</li>
+ * <li>source:</li>
+ * <li>
+ * <ul>
+ * <li>-src artifacts....</li>
+ * </ul>
+ * </li>
+ * <li>binaries:</li>
+ * <li>
+ * <ul>
+ * <li>-bin artifacts....</li>
+ * </ul>
+ * </li>
* </ul>
- * </ul>
+ * </li>
* </ul>
*
* @param copiedReleaseNotes is the RELEASE-NOTES.txt file that exists in the