Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- [terry@got ~/gitrepos]$ diff -Nrux .git m2release-plugin/ m2release-plugin-new/
- diff -Nrux .git m2release-plugin/src/main/java/org/jvnet/hudson/plugins/m2release/M2ReleaseBuildWrapper.java m2release-plugin-new/src/main/java/org/jvnet/hudson/plugins/m2release/M2ReleaseBuildWrapper.java
- --- m2release-plugin/src/main/java/org/jvnet/hudson/plugins/m2release/M2ReleaseBuildWrapper.java 2012-01-09 14:43:06.000000000 +1100
- +++ m2release-plugin-new/src/main/java/org/jvnet/hudson/plugins/m2release/M2ReleaseBuildWrapper.java 2012-01-09 14:42:36.000000000 +1100
- @@ -106,13 +106,15 @@
- public String releaseGoals = DescriptorImpl.DEFAULT_RELEASE_GOALS;
- public boolean selectCustomScmCommentPrefix = DescriptorImpl.DEFAULT_SELECT_CUSTOM_SCM_COMMENT_PREFIX;
- public boolean selectAppendHudsonUsername = DescriptorImpl.DEFAULT_SELECT_APPEND_HUDSON_USERNAME;
- -
- + public int buildsToKeep = DescriptorImpl.DEFAULT_BUILDS_TO_KEEP;
- +
- @DataBoundConstructor
- - public M2ReleaseBuildWrapper(String releaseGoals, boolean selectCustomScmCommentPrefix, boolean selectAppendHudsonUsername) {
- + public M2ReleaseBuildWrapper(String releaseGoals, boolean selectCustomScmCommentPrefix, boolean selectAppendHudsonUsername, int buildsToKeep) {
- super();
- this.releaseGoals = releaseGoals;
- this.selectCustomScmCommentPrefix = selectCustomScmCommentPrefix;
- this.selectAppendHudsonUsername = selectAppendHudsonUsername;
- + this.buildsToKeep = buildsToKeep;
- }
- @@ -193,7 +195,7 @@
- if (bld.getResult().isBetterOrEqualTo(Result.SUCCESS)) {
- // keep this build.
- lstnr.getLogger().println("[M2Release] marking build to keep until the next release build");
- - bld.keepLog();
- + bld.keepLog();
- for (Run run: (RunList<? extends Run>) (bld.getProject().getBuilds())) {
- M2ReleaseBadgeAction a = run.getAction(M2ReleaseBadgeAction.class);
- @@ -423,6 +425,8 @@
- public static final boolean DEFAULT_SELECT_CUSTOM_SCM_COMMENT_PREFIX = false;
- public static final boolean DEFAULT_SELECT_APPEND_HUDSON_USERNAME = false;
- + public static final int DEFAULT_BUILDS_TO_KEEP = 1;
- +
- private boolean nexusSupport = false;
- private String nexusURL = null;
- private String nexusUser = "deployment"; //$NON-NLS-1$
- diff -Nrux .git m2release-plugin/src/main/resources/org/jvnet/hudson/plugins/m2release/M2ReleaseBuildWrapper/config.jelly m2release-plugin-new/src/main/resources/org/jvnet/hudson/plugins/m2release/M2ReleaseBuildWrapper/config.jelly
- --- m2release-plugin/src/main/resources/org/jvnet/hudson/plugins/m2release/M2ReleaseBuildWrapper/config.jelly 2012-01-09 14:43:06.000000000 +1100
- +++ m2release-plugin-new/src/main/resources/org/jvnet/hudson/plugins/m2release/M2ReleaseBuildWrapper/config.jelly 2012-01-09 11:30:15.000000000 +1100
- @@ -26,4 +26,12 @@
- <f:entry title="Preselect append Hudson username" help="/plugin/m2release/help-projectConfig-selectAppendHudsonUsername.html">
- <f:checkbox name="selectAppendHudsonUsername" checked="${h.defaulted(instance.selectAppendHudsonUsername,descriptor.DEFAULT_SELECT_APPEND_HUDSON_USERNAME)}"/>
- </f:entry>
- +
- + <f:entry title="How many Release Builds to keep" help="/plugin/m2release/help-projectConfig-buildsToKeep.html">
- + <!--
- + Creates a text field that shows the value of the "releaseGoals" property.
- + When submitted, it will be passed to the corresponding constructor parameter.
- + -->
- + <f:textbox field="buildsToKeep" value="${h.defaulted(instance.buildsToKeep,descriptor.DEFAULT_BUILDS_TO_KEEP)}"/>
- + </f:entry>
- </j:jelly>
- diff -Nrux .git m2release-plugin/src/main/webapp/help-projectConfig-buildsToKeep.html m2release-plugin-new/src/main/webapp/help-projectConfig-buildsToKeep.html
- --- m2release-plugin/src/main/webapp/help-projectConfig-buildsToKeep.html 1970-01-01 10:00:00.000000000 +1000
- +++ m2release-plugin-new/src/main/webapp/help-projectConfig-buildsToKeep.html 2012-01-09 14:46:02.000000000 +1100
- @@ -0,0 +1,4 @@
- +<div>
- + Enter the amount of release builds you wish to keep.
- + Default is 1. Enter 0 for unlimited (need to be removed manually).
- +</div>
Add Comment
Please, Sign In to add comment