Merge branch 'release/1.4.6'

jenkinsci · Oct 11, 2019 · 4d1b203 · 4d1b203
2 parents db831d9 + f94d9a9
commit 4d1b203
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,17 +1,19 @@
-# [](https://github.com/jenkinsci/rocketchatnotifier-plugin/compare/v1.4.0...v) (2019-09-17)
+# [](https://github.com/jenkinsci/rocketchatnotifier-plugin/compare/v1.4.0...v) (2019-10-11)
 
 
 ### Bug Fixes
 
-* pom.xml to reduce vulnerabilities ([42593b6](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/42593b6))
-* pom.xml to reduce vulnerabilities ([3a410e6](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/3a410e6))
 * **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 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))
+* pom.xml to reduce vulnerabilities ([42593b6](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/42593b6))
+* pom.xml to reduce vulnerabilities ([3a410e6](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/3a410e6))
 * **Logging:** Improve logging for JENKINS-59149 ([c74509b](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/c74509b))
 * **Message sent:** Improve error handling ([ec36a79](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/ec36a79))
 * **RocketChatClientCallBuilder:** fix proxy access without credentials (JENKINS-55890) ([4d27927](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/4d27927))
+* **Security:** pom.xml to reduce vulnerabilities ([#73](https://github.com/jenkinsci/rocketchatnotifier-plugin/issues/73)) ([3d886e6](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/3d886e6))
 
 
 ### Features

diff --git a/pom.xml b/pom.xml
@@ -19,9 +19,9 @@
     <!-- Project Libs-->
     <httpclient.version>4.5.5</httpclient.version>
     <unirest.version>1.4.9</unirest.version>
-    <jackson.version>2.9.9.1</jackson.version>
+    <jackson.version>2.10.0.pr3</jackson.version>
     <hamcrest.version>2.1</hamcrest.version>
-    <jackson.version>2.9.8</jackson.version>
+    <jackson.version>2.10.0.pr3</jackson.version>
     <hamcrest.version>1.3</hamcrest.version>
     <workflow-api.version>2.22</workflow-api.version>
     <workflow-support.version>2.14</workflow-support.version>
@@ -40,7 +40,7 @@
 
   <name>RocketChat Notifier</name>
   <artifactId>rocketchatnotifier</artifactId>
-  <version>1.4.5</version>
+  <version>1.4.6</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
@@ -507,6 +507,52 @@ public String getBuildServerUrl() {
       }
     }
 
+    @DataBoundSetter
+    public void setRocketServerUrl(String rocketServerUrl) {
+      this.rocketServerUrl = rocketServerUrl;
+    }
+
+    @DataBoundSetter
+    public void setUsername(String username) {
+      this.username = username;
+    }
+
+    @DataBoundSetter
+    public void setPassword(String password) {
+      this.password = password;
+    }
+
+    @DataBoundSetter
+    public void setChannel(String channel) {
+      this.channel = channel;
+    }
+
+    @DataBoundSetter
+    public void setBuildServerUrl(String buildServerUrl) {
+      this.buildServerUrl = buildServerUrl;
+      if (buildServerUrl == null || buildServerUrl.equalsIgnoreCase("")) {
+        JenkinsLocationConfiguration jenkinsConfig = new JenkinsLocationConfiguration();
+        this.buildServerUrl = jenkinsConfig.getUrl();
+      }
+      if (buildServerUrl != null && !buildServerUrl.endsWith("/")) {
+        this.buildServerUrl = buildServerUrl + "/";
+      }
+    }
+
+    @DataBoundSetter
+    public void setTrustSSL(boolean trustSSL) {
+      this.trustSSL = trustSSL;
+    }
+    @DataBoundSetter
+    public void setWebhookToken(String webhookToken) {
+      this.webhookToken = webhookToken;
+    }
+
+    @DataBoundSetter
+    public void setWebhookTokenCredentialId(String webhookTokenCredentialId) {
+      this.webhookTokenCredentialId = webhookTokenCredentialId;
+    }
+
     public boolean isApplicable(Class<? extends AbstractProject> aClass) {
       return true;
     }

diff --git a/src/main/resources/jenkins/plugins/rocketchatnotifier/RocketChatNotifier/global.jelly b/src/main/resources/jenkins/plugins/rocketchatnotifier/RocketChatNotifier/global.jelly
@@ -13,32 +13,34 @@
     tags they use. Views are always organized according to its owner class,
     so it should be straightforward to find them.
   -->
-  <f:section title="Global RocketChat Notifier Settings" name="rocket">
+  <f:section title="Global RocketChat Notifier Settings">
     <f:entry title="Rocket Server URL">
       <f:textbox field="rocketServerUrl" clazz="required" name="rocketServerUrl"/>
     </f:entry>
-    <f:entry title="Trust Server Certificate?"
-             description="If checked, the SSL certificate of the Rocket Server will not be checked">
-      <f:checkbox field="trustSSL" name="trustSSL"/>
-    </f:entry>
     <f:entry title="Login Username">
       <f:textbox field="username" name="username" help="Login of the user. Can also be the user id for token based login"/>
     </f:entry>
     <f:entry title="Login password">
       <f:password field="password" name="password" help="Password of the rocketchat user. Can be also the personal access token"/>
     </f:entry>
-    <f:entry title="Webhook Token Credential ID">
-      <f:textbox field="webhookTokenCredentialId" name="webhookTokenCredentialId" help="Webhook token as Secret Text credential for posting messages. Overrides webhook token text."/>
-    </f:entry>
-    <f:entry title="Webhook Token">
-      <f:password field="webhookToken" name="webhookToken" help="As alternative for login/password you can use the webhook token here"/>
-    </f:entry>
     <f:entry title="Channel" description="Comma separated list of rooms (e.g. #project) and / or persons (e.g. @john)">
-      <f:textbox field="channel" name="channel" />
-    </f:entry>
-    <f:entry title="Build Server URL">
-      <f:textbox field="buildServerUrl" name="buildServerUrl"/>
-    </f:entry>
+      <f:textbox field="channel" clazz="required" name="channel" />
+    </f:entry>
+    <f:advanced>
+      <f:entry title="Trust Server Certificate?"
+               description="If checked, the SSL certificate of the Rocket Server will not be checked">
+        <f:checkbox field="trustSSL" name="trustSSL"/>
+      </f:entry>
+      <f:entry title="Webhook Token Credential ID">
+        <f:textbox field="webhookTokenCredentialId" name="webhookTokenCredentialId" help="Webhook token as Secret Text credential for posting messages. Overrides webhook token text."/>
+      </f:entry>
+      <f:entry title="Webhook Token">
+        <f:password field="webhookToken" name="webhookToken" help="As alternative for login/password you can use the webhook token here"/>
+      </f:entry>
+      <f:entry title="Build Server URL">
+        <f:textbox field="buildServerUrl" name="buildServerUrl"/>
+      </f:entry>
+    </f:advanced>
     <f:validateButton
       title="${%Test Connection}" progress="${%Testing...}"
       method="testConnection"