Guest User

Untitled

a guest
May 20th, 2018
114
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Java 4.67 KB | None | 0 0
  1. [terry@got ~/gitrepos]$ diff -Nrux .git  m2release-plugin/ m2release-plugin-new/
  2. 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
  3. --- m2release-plugin/src/main/java/org/jvnet/hudson/plugins/m2release/M2ReleaseBuildWrapper.java        2012-01-09 14:43:06.000000000 +1100
  4. +++ m2release-plugin-new/src/main/java/org/jvnet/hudson/plugins/m2release/M2ReleaseBuildWrapper.java    2012-01-09 14:42:36.000000000 +1100
  5. @@ -106,13 +106,15 @@
  6.         public String                         releaseGoals                 = DescriptorImpl.DEFAULT_RELEASE_GOALS;
  7.         public boolean                        selectCustomScmCommentPrefix = DescriptorImpl.DEFAULT_SELECT_CUSTOM_SCM_COMMENT_PREFIX;
  8.         public boolean                        selectAppendHudsonUsername   = DescriptorImpl.DEFAULT_SELECT_APPEND_HUDSON_USERNAME;
  9. -
  10. +       public int                            buildsToKeep                 = DescriptorImpl.DEFAULT_BUILDS_TO_KEEP;
  11. +
  12.         @DataBoundConstructor
  13. -       public M2ReleaseBuildWrapper(String releaseGoals, boolean selectCustomScmCommentPrefix, boolean selectAppendHudsonUsername) {
  14. +       public M2ReleaseBuildWrapper(String releaseGoals, boolean selectCustomScmCommentPrefix, boolean selectAppendHudsonUsername, int buildsToKeep) {
  15.                 super();
  16.                 this.releaseGoals = releaseGoals;
  17.                 this.selectCustomScmCommentPrefix = selectCustomScmCommentPrefix;
  18.                 this.selectAppendHudsonUsername = selectAppendHudsonUsername;
  19. +               this.buildsToKeep = buildsToKeep;
  20.         }
  21.  
  22.  
  23. @@ -193,7 +195,7 @@
  24.                                 if (bld.getResult().isBetterOrEqualTo(Result.SUCCESS)) {
  25.                                     // keep this build.
  26.                                     lstnr.getLogger().println("[M2Release] marking build to keep until the next release build");
  27. -                    bld.keepLog();
  28. +                                   bld.keepLog();
  29.  
  30.                                     for (Run run: (RunList<? extends Run>) (bld.getProject().getBuilds())) {
  31.                                         M2ReleaseBadgeAction a = run.getAction(M2ReleaseBadgeAction.class);
  32. @@ -423,6 +425,8 @@
  33.                 public static final boolean    DEFAULT_SELECT_CUSTOM_SCM_COMMENT_PREFIX = false;
  34.                 public static final boolean    DEFAULT_SELECT_APPEND_HUDSON_USERNAME    = false;
  35.  
  36. +               public static final int        DEFAULT_BUILDS_TO_KEEP = 1;
  37. +
  38.                 private boolean nexusSupport  = false;
  39.                 private String  nexusURL      = null;
  40.                 private String  nexusUser     = "deployment";                                    //$NON-NLS-1$
  41. 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
  42. --- m2release-plugin/src/main/resources/org/jvnet/hudson/plugins/m2release/M2ReleaseBuildWrapper/config.jelly   2012-01-09 14:43:06.000000000 +1100
  43. +++ m2release-plugin-new/src/main/resources/org/jvnet/hudson/plugins/m2release/M2ReleaseBuildWrapper/config.jelly       2012-01-09 11:30:15.000000000 +1100
  44. @@ -26,4 +26,12 @@
  45.         <f:entry title="Preselect append Hudson username" help="/plugin/m2release/help-projectConfig-selectAppendHudsonUsername.html">
  46.                 <f:checkbox name="selectAppendHudsonUsername" checked="${h.defaulted(instance.selectAppendHudsonUsername,descriptor.DEFAULT_SELECT_APPEND_HUDSON_USERNAME)}"/>
  47.         </f:entry>
  48. +
  49. +        <f:entry title="How many Release Builds to keep" help="/plugin/m2release/help-projectConfig-buildsToKeep.html">
  50. +               <!--
  51. +                       Creates a text field that shows the value of the "releaseGoals" property.
  52. +                       When submitted, it will be passed to the corresponding constructor parameter.
  53. +               -->
  54. +               <f:textbox field="buildsToKeep" value="${h.defaulted(instance.buildsToKeep,descriptor.DEFAULT_BUILDS_TO_KEEP)}"/>
  55. +        </f:entry>
  56.  </j:jelly>
  57. diff -Nrux .git m2release-plugin/src/main/webapp/help-projectConfig-buildsToKeep.html m2release-plugin-new/src/main/webapp/help-projectConfig-buildsToKeep.html
  58. --- m2release-plugin/src/main/webapp/help-projectConfig-buildsToKeep.html       1970-01-01 10:00:00.000000000 +1000
  59. +++ m2release-plugin-new/src/main/webapp/help-projectConfig-buildsToKeep.html   2012-01-09 14:46:02.000000000 +1100
  60. @@ -0,0 +1,4 @@
  61. +<div>
  62. +       Enter the amount of release builds you wish to keep.
  63. +       Default is 1. Enter 0 for unlimited (need to be removed manually).
  64. +</div>
Add Comment
Please, Sign In to add comment