mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 05:22:22 +00:00
[HUDSON-8445] Parsing poms fails if a module is a path to a pom (and not to a directory)
This commit is contained in:
1 parent
8325b4eb1d
commit
f2191d6162
3 files changed
+33
-3
No files matched your search
@@ -1181,8 +1181,13 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
|
||||
}
|
||||
for (String module : mp.getModules()) {
|
||||
if ( Util.fixEmptyAndTrim( module ) != null ) {
|
||||
MavenProject mavenProject2 =
|
||||
mavenEmbedder.readProject( new File(mp.getFile().getParent(), module + "/pom.xml") );
|
||||
File pomFile = new File(mp.getFile().getParent(), module);
|
||||
MavenProject mavenProject2 = null;
|
||||
// take care of HUDSON-8445
|
||||
if (pomFile.isFile() && pomFile.exists())
|
||||
mavenProject2 = mavenEmbedder.readProject( pomFile );
|
||||
else
|
||||
mavenProject2 = mavenEmbedder.readProject( new File(mp.getFile().getParent(), module + "/pom.xml") );
|
||||
mavenProjects.add( mavenProject2 );
|
||||
reactorReader.addProject( mavenProject2 );
|
||||
readChilds( mavenProject2, mavenEmbedder, mavenProjects, reactorReader );
|
||||
|
||||
Reference in new issue
Block a user