Updated labeling to expand tokens

(cherry picked from commit bcba826) Signed-off-by: Joe Hansche <jhansche@meetme.com>
jenkinsci · Dec 4, 2013 · 663b62c · 663b62c
1 parent 4ba54b0
commit 663b62c
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/java/com/myyearbook/hudson/plugins/confluence/ConfluencePublisher.java b/src/main/java/com/myyearbook/hudson/plugins/confluence/ConfluencePublisher.java
@@ -355,10 +355,15 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
         String labels = this.labels;
         if (StringUtils.isNotBlank(labels)) {
             try {
-                result &= confluence.addLabels(pageData.getId(), labels);
+                String expandedLabels = build.getEnvironment(listener).expand(labels);
+                result &= confluence.addLabels(pageData.getId(), expandedLabels);
 
             } catch (OperationNotSupportedException e) {
                 e.printStackTrace(listener.getLogger());
+            } catch (IOException e) {
+                e.printStackTrace(listener.getLogger());
+            } catch (InterruptedException e) {
+                e.printStackTrace(listener.getLogger());
             }
         }