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/02/20 15:29:27 UTC
[1/2] commons-release-plugin git commit: Adding aggregator = true to
mojos
Repository: commons-release-plugin
Updated Branches:
refs/heads/1.1 d2c28a505 -> d60d88dd9
Adding aggregator = true to mojos
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/034a25ab
Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/034a25ab
Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/034a25ab
Branch: refs/heads/1.1
Commit: 034a25ab725c5c08a9a2070376ac2039af255592
Parents: d2c28a5
Author: Rob Tompkins <ch...@gmail.com>
Authored: Tue Feb 20 10:25:44 2018 -0500
Committer: Rob Tompkins <ch...@gmail.com>
Committed: Tue Feb 20 10:29:14 2018 -0500
----------------------------------------------------------------------
.../plugin/mojos/CommonsDistributionDetachmentMojo.java | 5 ++++-
.../release/plugin/mojos/CommonsDistributionStagingMojo.java | 7 +++++--
.../release/plugin/mojos/CommonsSiteCompressionMojo.java | 5 ++++-
3 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/034a25ab/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 0fd58c9..6b79e0f 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
@@ -44,7 +44,10 @@ import java.util.Set;
* @author chtompki
* @since 1.0
*/
-@Mojo(name = "detach-distributions", defaultPhase = LifecyclePhase.VERIFY, threadSafe = true)
+@Mojo(name = "detach-distributions",
+ defaultPhase = LifecyclePhase.VERIFY,
+ threadSafe = true,
+ aggregator = true)
public class CommonsDistributionDetachmentMojo extends AbstractMojo {
/**
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/034a25ab/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 0fb23b6..1d7509d 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
@@ -49,7 +49,10 @@ import java.util.List;
* @author chtompki
* @since 1.0
*/
-@Mojo(name = "stage-distributions", defaultPhase = LifecyclePhase.DEPLOY, threadSafe = true)
+@Mojo(name = "stage-distributions",
+ defaultPhase = LifecyclePhase.VERIFY,
+ threadSafe = true,
+ aggregator = true)
public class CommonsDistributionStagingMojo extends AbstractMojo {
/**
@@ -131,8 +134,8 @@ public class CommonsDistributionStagingMojo extends AbstractMojo {
provider.checkOut(repository, scmFileSet);
copyReleaseNotesToWorkingDirectory();
List<File> filesToCommit = copyDistributionsIntoScmDirectoryStructure();
- ScmFileSet scmFileSetToCommit = new ScmFileSet(distCheckoutDirectory, filesToCommit);
if (!dryRun) {
+ ScmFileSet scmFileSetToCommit = new ScmFileSet(distCheckoutDirectory, filesToCommit);
AddScmResult addResult = provider.add(
repository,
scmFileSetToCommit,
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/034a25ab/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 7fa14a8..d9d6ec1 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
@@ -42,7 +42,10 @@ import java.util.zip.ZipOutputStream;
* @author chtompki
* @since 1.0
*/
-@Mojo(name = "compress-site", defaultPhase = LifecyclePhase.POST_SITE, threadSafe = true)
+@Mojo(name = "compress-site",
+ defaultPhase = LifecyclePhase.VERIFY,
+ threadSafe = true,
+ aggregator = true)
public class CommonsSiteCompressionMojo extends AbstractMojo {
/**
[2/2] commons-release-plugin git commit: clean up lifecycle phases
Posted by ch...@apache.org.
clean up lifecycle phases
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/d60d88dd
Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/d60d88dd
Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/d60d88dd
Branch: refs/heads/1.1
Commit: d60d88dd936564124f1a69a909b5935bacf13713
Parents: 034a25a
Author: Rob Tompkins <ch...@gmail.com>
Authored: Tue Feb 20 10:27:26 2018 -0500
Committer: Rob Tompkins <ch...@gmail.com>
Committed: Tue Feb 20 10:29:20 2018 -0500
----------------------------------------------------------------------
.../release/plugin/mojos/CommonsDistributionStagingMojo.java | 2 +-
.../commons/release/plugin/mojos/CommonsSiteCompressionMojo.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/d60d88dd/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 1d7509d..8e982ac 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
@@ -50,7 +50,7 @@ import java.util.List;
* @since 1.0
*/
@Mojo(name = "stage-distributions",
- defaultPhase = LifecyclePhase.VERIFY,
+ defaultPhase = LifecyclePhase.DEPLOY,
threadSafe = true,
aggregator = true)
public class CommonsDistributionStagingMojo extends AbstractMojo {
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/d60d88dd/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 d9d6ec1..8d67dda 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
@@ -43,7 +43,7 @@ import java.util.zip.ZipOutputStream;
* @since 1.0
*/
@Mojo(name = "compress-site",
- defaultPhase = LifecyclePhase.VERIFY,
+ defaultPhase = LifecyclePhase.POST_SITE,
threadSafe = true,
aggregator = true)
public class CommonsSiteCompressionMojo extends AbstractMojo {