Skip to content
Permalink
Browse files
JENKINS-24735 - Add support for build parameters in Subversion URLs
 
 * Update IntegrateAction to expand SVN URLs
  • Loading branch information
alexouzounis committed Nov 5, 2014
1 parent 8e1a3b7 commit c1c54c962b9dc39b2d865119ca343343779c1c96
Showing with 4 additions and 1 deletion.
  1. +4 −1 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, project);
if (!firstLocation.isIgnoreExternalsOption()) {
for (SvnInfo svnInfo : svnInfos) {
try {

0 comments on commit c1c54c9

Please sign in to comment.