[FIXED JENKINS-39998] replace tokens in pipeline jobs too

jenkinsci · Dec 27, 2016 · 222e2df · 222e2df
1 parent e6e7d2e
commit 222e2df
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>token-macro</artifactId>
-            <version>1.12.1</version>
+            <version>2.0</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>

diff --git a/src/main/java/org/jenkinsci/plugins/configfiles/buildwrapper/ManagedFileUtil.java b/src/main/java/org/jenkinsci/plugins/configfiles/buildwrapper/ManagedFileUtil.java
@@ -98,7 +98,7 @@ public static Map<ManagedFile, FilePath> provisionConfigFiles(List<ManagedFile>
 
                 String expandedTargetLocation = managedFile.targetLocation;
                 try {
-                    expandedTargetLocation = build instanceof AbstractBuild ? TokenMacro.expandAll((AbstractBuild<?, ?>) build, listener, managedFile.targetLocation) : managedFile.targetLocation;
+                    expandedTargetLocation = TokenMacro.expandAll(build, workspace, listener, managedFile.targetLocation);
                 } catch (MacroEvaluationException e) {
                     listener.getLogger().println("[ERROR] failed to expand variables in target location '" + managedFile.targetLocation + "' : " + e.getMessage());
                     expandedTargetLocation = managedFile.targetLocation;
@@ -119,7 +119,7 @@ public static Map<ManagedFile, FilePath> provisionConfigFiles(List<ManagedFile>
 
             if (managedFile.getReplaceTokens()) {
                 try {
-                    fileContent = build instanceof AbstractBuild ? TokenMacro.expandAll((AbstractBuild<?, ?>) build, listener, fileContent) : fileContent;
+                    fileContent = TokenMacro.expandAll(build, workspace, listener, fileContent);
                 } catch (MacroEvaluationException e) {
                     listener.getLogger().println("[ERROR] failed to expand variables in content of " + configFile.name + " - " + e.getMessage());
                 }