From bbb879039186f612a7bdf826b5ddacebb8616ddc Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sun, 2 Jan 2011 22:33:17 +0100 Subject: [PATCH] MavenEmbedderRequest must be able to pass a ClassLoader for building embedder --- .../java/hudson/maven/MavenEmbedderRequest.java | 16 ++++++++++++++++ .../java/hudson/maven/MavenModuleSetBuild.java | 3 +++ .../src/main/java/hudson/maven/MavenUtil.java | 6 +++++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenEmbedderRequest.java b/maven-plugin/src/main/java/hudson/maven/MavenEmbedderRequest.java index 831ced3a59..5cd50c382d 100755 --- a/maven-plugin/src/main/java/hudson/maven/MavenEmbedderRequest.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenEmbedderRequest.java @@ -47,6 +47,11 @@ public class MavenEmbedderRequest private File alternateSettings; private TransferListener transferListener; + + /** + * @since 1.393 + */ + private ClassLoader classLoader; /** * @param listener @@ -150,4 +155,15 @@ public class MavenEmbedderRequest this.transferListener = transferListener; return this; } + + public ClassLoader getClassLoader() + { + return classLoader; + } + + public MavenEmbedderRequest setClassLoader( ClassLoader classLoader ) + { + this.classLoader = classLoader; + return this; + } } diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index d3c06d0ff5..3ac33b49ba 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -1078,6 +1078,9 @@ public class MavenModuleSetBuild extends AbstractMavenBuild mps = embedder.readProjects( pom,true); diff --git a/maven-plugin/src/main/java/hudson/maven/MavenUtil.java b/maven-plugin/src/main/java/hudson/maven/MavenUtil.java index fc0b3fa37f..cc444edc41 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenUtil.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenUtil.java @@ -184,8 +184,12 @@ public class MavenUtil { ClassLoader cl = MavenUtil.class.getClassLoader(); + ClassLoader mavenEmbedderClassLoader = + mavenEmbedderRequest.getClassLoader() == null ? new MaskingClassLoader( cl ) + : mavenEmbedderRequest.getClassLoader(); + // TODO check this MaskingClassLoader with maven 3 artifacts - MavenEmbedder maven = new MavenEmbedder( new MaskingClassLoader(cl), mavenRequest ); + MavenEmbedder maven = new MavenEmbedder( mavenEmbedderClassLoader, mavenRequest ); { Enumeration e = cl.getResources("META-INF/plexus/components.xml"); while (e.hasMoreElements()) {