rtyler
/
m2release-plugin
1
0
Fork 0
Code Issues 24 Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into JENKINS-21063 

* upstream/master:
  ReleasesCauses are now userIdCause - so update RSS appropriatly.
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release m2release-0.13.0
  Fixed a few UI text items in the project configuration dialog to align with text items in release dialog.
  [FIXED JENKINS-20983] Improve help text for "Preselect append Jenkins username" option
  [FIXED JENKINS-21060] Improve help text of "Number of successful release builds to keep"
This commit is contained in:
Anders Hammar 2014-02-18 06:08:37 +01:00
parent 1f8dc39b7b 50bdcffd3d
commit 35d201a67b
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<groupId>org.jenkins-ci.plugins.m2release</groupId>
<artifactId>m2release</artifactId>
<packaging>hpi</packaging>
<version>0.13.0-SNAPSHOT</version>
<version>0.14.0-SNAPSHOT</version>
<parent>
<groupId>org.jenkins-ci.plugins</groupId>

5
src/main/java/org/jvnet/hudson/plugins/m2release/dashboard/RecentReleasesPortlet.java
View File

@ -7,6 +7,7 @@
import hudson.tasks.Mailer;
import hudson.util.RunList;
import org.jvnet.hudson.plugins.m2release.M2ReleaseBadgeAction;
import org.jvnet.hudson.plugins.m2release.ReleaseCause;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
@ -150,8 +151,8 @@ public String getEntryAuthor(Run entry) {
// and report rss entry as user who kicked off build
List<Cause> causes = entry.getCauses();
for (Cause cause : causes) {
if (cause instanceof Cause.UserCause) {
return User.get(((Cause.UserCause) cause).getUserName()).getFullName();
if (cause instanceof ReleaseCause) {
return ((ReleaseCause) cause).getUserName();
}
}

6
src/main/resources/org/jvnet/hudson/plugins/m2release/M2ReleaseBuildWrapper/config.jelly
View File

@ -26,15 +26,15 @@
</select>
</f:entry>
<f:entry title="Preselect custom SCM comment prefix" help="/plugin/m2release/help-projectConfig-selectCustomScmCommentPrefix.html">
<f:entry title="Preselect 'Specify custom SCM comment prefix'" help="/plugin/m2release/help-projectConfig-selectCustomScmCommentPrefix.html">
<f:checkbox name="selectCustomScmCommentPrefix" checked="${h.defaulted(instance.selectCustomScmCommentPrefix,descriptor.DEFAULT_SELECT_CUSTOM_SCM_COMMENT_PREFIX)}"/>
</f:entry>
<f:entry title="Preselect append Jenkins username" help="/plugin/m2release/help-projectConfig-selectAppendHudsonUsername.html">
<f:entry title="Preselect 'Append Jenkins 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="Preselect 'specify SCM login/password'" help="/plugin/m2release/help-projectConfig-selectScmCredentials.html">
<f:entry title="Preselect 'Specify SCM login/password'" help="/plugin/m2release/help-projectConfig-selectScmCredentials.html">
<f:checkbox name="selectScmCredentials" checked="${h.defaulted(instance.selectScmCredentials,descriptor.DEFAULT_SELECT_SCM_CREDENTIALS)}"/>
</f:entry>

3
src/main/webapp/help-projectConfig-numberOfReleaseBuildsToKeep.html
View File

@ -1,4 +1,5 @@
<div>
Specify the number of successful release builds to keep forever.
A value of <tt>-1</tt> will lock all successful release builds, <tt>0</tt> will not lock any builds.
A value of <tt>-1</tt> will lock all successful release builds, <tt>0</tt> will not lock any builds.<br />
Note: Any change to this configuration will be applied during the next release build.
</div>

2
src/main/webapp/help-projectConfig-selectAppendHudsonUsername.html
View File

@ -1,3 +1,3 @@
<div>
Enable this to have the "Append Jenkins username" option selected by default in the "Perform Maven Release" view.
Enable this to have the "Append Jenkins Username" option (part of the "Specify custom SCM comment prefix" configuration) selected by default in the "Perform Maven Release" view.
</div>