Merge branch 'release/1.4.7'

jenkinsci · Oct 31, 2019 · 6d86fd5 · 6d86fd5
2 parents 4d1b203 + 054697e
commit 6d86fd5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,11 @@
-# [](https://github.com/jenkinsci/rocketchatnotifier-plugin/compare/v1.4.0...v) (2019-10-11)
+# [](https://github.com/jenkinsci/rocketchatnotifier-plugin/compare/v1.4.0...v) (2019-10-31)
 
 
 ### Bug Fixes
 
 * **API:** Use latest info REST API ([e756c22](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/e756c22))
 * **Config:** Correct jelly rocketServerURL value ([#69](https://github.com/jenkinsci/rocketchatnotifier-plugin/issues/69)) ([08d33e0](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/08d33e0))
+* **Config:** Resolve config param naming error [JENKINS-59503] ([f35f535](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/f35f535))
 * **Config:** Resolve config save error [JENKINS-59149] ([05c758f](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/05c758f))
 * **deps:** Fix enforcer failure due to credentials upgrade ([#55](https://github.com/jenkinsci/rocketchatnotifier-plugin/issues/55)) ([d39d9d1](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/d39d9d1))
 * **Jenkins URL:** use JenkinsLocationConfiguration.get() (JENKINS-59153) ([#54](https://github.com/jenkinsci/rocketchatnotifier-plugin/issues/54)) ([1ec2e45](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/1ec2e45))

diff --git a/pom.xml b/pom.xml
@@ -40,7 +40,7 @@
 
   <name>RocketChat Notifier</name>
   <artifactId>rocketchatnotifier</artifactId>
-  <version>1.4.6</version>
+  <version>1.4.7</version>
   <packaging>hpi</packaging>
 
   <licenses>

diff --git a/src/main/java/jenkins/plugins/rocketchatnotifier/RocketChatNotifier.java b/src/main/java/jenkins/plugins/rocketchatnotifier/RocketChatNotifier.java
@@ -34,7 +34,6 @@
 
 import javax.net.ssl.SSLHandshakeException;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -668,7 +667,7 @@ public static class RocketJobProperty extends hudson.model.JobProperty<AbstractP
     private String password;
     private String channel;
     private boolean trustSSL;
-    private boolean startNotification;
+    private boolean notifyStart;
     private boolean notifySuccess;
     private boolean notifyAborted;
     private boolean notifyNotBuilt;
@@ -688,7 +687,7 @@ public RocketJobProperty(String rocketServerUrl,
                              String username,
                              String password,
                              String channel,
-                             boolean startNotification,
+                             boolean notifyStart,
                              boolean notifyAborted,
                              boolean notifyFailure,
                              boolean notifyNotBuilt,
@@ -706,7 +705,7 @@ public RocketJobProperty(String rocketServerUrl,
       this.username = username;
       this.password = password;
       this.channel = channel;
-      this.startNotification = startNotification;
+      this.notifyStart = notifyStart;
       this.notifyAborted = notifyAborted;
       this.notifyFailure = notifyFailure;
       this.notifyNotBuilt = notifyNotBuilt;
@@ -747,8 +746,8 @@ public String getChannel() {
     }
 
     @Exported
-    public boolean getStartNotification() {
-      return startNotification;
+    public boolean getNotifyStart() {
+      return notifyStart;
     }
 
     @Exported

diff --git a/src/main/resources/jenkins/plugins/rocketchatnotifier/RocketChatNotifier/config.jelly b/src/main/resources/jenkins/plugins/rocketchatnotifier/RocketChatNotifier/config.jelly
@@ -2,36 +2,36 @@
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:c="/lib/credentials">
     <f:entry title="Notify Build Start">
-        <f:checkbox name="rocketStartNotification" value="true" checked="${instance.getStartNotification()}"/>
+        <f:checkbox name="notifyStart" value="true" checked="${instance.getNotifyStart()}"/>
     </f:entry>
 
     <f:entry title="Notify Aborted">
-        <f:checkbox name="rocketNotifyAborted" value="true" checked="${instance.getNotifyAborted()}"/>
+        <f:checkbox name="notifyAborted" value="true" checked="${instance.getNotifyAborted()}"/>
     </f:entry>
 
     <f:entry title="Notify Failure">
-        <f:checkbox name="rocketNotifyFailure" value="true" checked="${instance.getNotifyFailure()}"/>
+        <f:checkbox name="notifyFailure" value="true" checked="${instance.getNotifyFailure()}"/>
     </f:entry>
 
     <f:entry title="Notify Not Built">
-        <f:checkbox name="rocketNotifyNotBuilt" value="true" checked="${instance.getNotifyNotBuilt()}"/>
+        <f:checkbox name="notifyNotBuilt" value="true" checked="${instance.getNotifyNotBuilt()}"/>
     </f:entry>
 
     <f:entry title="Notify Success">
-        <f:checkbox name="rocketNotifySuccess" value="true" checked="${instance.getNotifySuccess()}"/>
+        <f:checkbox name="notifySuccess" value="true" checked="${instance.getNotifySuccess()}"/>
     </f:entry>
 
     <f:entry title="Notify Unstable">
-        <f:checkbox name="rocketNotifyUnstable" value="true" checked="${instance.getNotifyUnstable()}"/>
+        <f:checkbox name="notifyUnstable" value="true" checked="${instance.getNotifyUnstable()}"/>
     </f:entry>
 
     <f:entry title="Notify Back To Normal">
-        <f:checkbox name="rocketNotifyBackToNormal" value="true" checked="${instance.getNotifyBackToNormal()}"/>
+        <f:checkbox name="notifyBackToNormal" value="true" checked="${instance.getNotifyBackToNormal()}"/>
     </f:entry>
 
     <f:advanced>
         <f:entry title="Notify Repeated Failure">
-            <f:checkbox name="rocketNotifyRepeatedFailure" value="true"
+            <f:checkbox name="notifyRepeatedFailure" value="true"
                         checked="${instance.getNotifyRepeatedFailure()}"/>
         </f:entry>
         <f:entry title="Include Test Summary">