mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 05:22:22 +00:00
[FIXED HUDSON-4693] Fixed handling of relative paths in alternate settings.xml in Maven 2 projects
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@28278 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
1 parent
6bd56e9a9c
commit
86b2bcb094
1 file changed
+2
-2
@@ -736,7 +736,7 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
|
||||
public FormValidation doCheckFileInWorkspace(@QueryParameter String value) throws IOException, ServletException {
|
||||
MavenModuleSetBuild lb = getLastBuild();
|
||||
if (lb!=null) {
|
||||
FilePath ws = lb.getModuleRoot();
|
||||
FilePath ws = lb.getWorkspace();
|
||||
if(ws!=null)
|
||||
return ws.validateRelativePath(value,true,true);
|
||||
}
|
||||
@@ -758,7 +758,7 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
|
||||
|
||||
MavenModuleSetBuild lb = getLastBuild();
|
||||
if (lb!=null) {
|
||||
FilePath ws = lb.getModuleRoot();
|
||||
FilePath ws = lb.getWorkspace();
|
||||
if(ws!=null)
|
||||
return ws.validateRelativePath(value,true,true);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user