From 71e53321dcdb6a272522cb0e684331d671c8af37 Mon Sep 17 00:00:00 2001
From: Ilayaperumal Gopinathan <igopinathan@pivotal.io>
Date: Wed, 17 Jun 2015 12:16:43 -0700
Subject: [PATCH] DefaultOptions resolver does not create a new CL

  - This will make sure the options metadata classes are loaded from the jars provided in the current classloader instead of a new ParentLastURLClassLoader created in XD.
---
 pom.xml                                                       | 4 ++--
 .../xd/bootstrap/ModuleOptionsPropertySourceInitializer.java  | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index ae662e34c..40b3907b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,9 +12,9 @@
 	</organization>
     <properties>
       <java.version>1.7</java.version>
-      <spring-boot.version>1.3.0.BUILD-SNAPSHOT</spring-boot.version>
+      <spring-boot.version>1.3.0.M1</spring-boot.version>
       <spring-cloud.version>1.0.3.BUILD-SNAPSHOT</spring-cloud.version>
-      <spring-xd.version>1.2.0.BUILD-SNAPSHOT</spring-xd.version>
+      <spring-xd.version>2.0.0.BUILD-SNAPSHOT</spring-xd.version>
     </properties>
 	<modules>
 		<module>spring-bus-core</module>
diff --git a/spring-xd-runner/src/main/java/org/springframework/bus/xd/bootstrap/ModuleOptionsPropertySourceInitializer.java b/spring-xd-runner/src/main/java/org/springframework/bus/xd/bootstrap/ModuleOptionsPropertySourceInitializer.java
index 5e304f190..f918276c4 100644
--- a/spring-xd-runner/src/main/java/org/springframework/bus/xd/bootstrap/ModuleOptionsPropertySourceInitializer.java
+++ b/spring-xd-runner/src/main/java/org/springframework/bus/xd/bootstrap/ModuleOptionsPropertySourceInitializer.java
@@ -105,7 +105,9 @@ public class ModuleOptionsPropertySourceInitializer implements
 	@Bean
 	// TODO: allow override of this
 	public DefaultModuleOptionsMetadataResolver defaultResolver() {
-		return new DefaultModuleOptionsMetadataResolver();
+		DefaultModuleOptionsMetadataResolver defaultResolver = new DefaultModuleOptionsMetadataResolver();
+		defaultResolver.setShouldCreateModuleClassLoader(false);
+		return defaultResolver;
 	}
 
 	@ConditionalOnExpression("'${xd.module.config.location:${xd.config.home:}}'!=''")