Merge pull request #19 from alexouzounis/JENKINS-24735

JENKINS-24735 - Add support for build parameters in Subversion URLs
jenkinsci · Nov 5, 2014 · d4f3658 · d4f3658
2 parents 344a848 + 14eeb00
commit d4f3658
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/jenkins/plugins/svnmerge/IntegrateAction.java b/src/main/java/jenkins/plugins/svnmerge/IntegrateAction.java
@@ -18,11 +18,13 @@
 import hudson.security.ACL;
 import jenkins.model.Jenkins;
 import jenkins.plugins.svnmerge.FeatureBranchProperty.IntegrationResult;
+
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 import org.tmatesoft.svn.core.SVNException;
 
 import javax.servlet.ServletException;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.Hashtable;
@@ -144,7 +146,8 @@ public SvnInfo getSvnInfo() {
 
             if (locations.length == 1) {
                 ModuleLocation firstLocation = svn.getLocations()[0];
-
+                // expand system and node environment variables as well as the project parameters
+                firstLocation = Utility.getExpandedLocation(firstLocation, getProject());
                 if (!firstLocation.isIgnoreExternalsOption()) {
                     for (SvnInfo svnInfo : svnInfos) {
                         try {