From 49170f6ff7fb567d581a237dc825343c44e05f78 Mon Sep 17 00:00:00 2001
From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
Date: Fri, 30 Jun 2023 12:30:06 -0400
Subject: [PATCH 1/5] Try 1.0.12 release of spring-security-rsa

---
 spring-cloud-commons-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml
index b86e33f2..83de3e98 100644
--- a/spring-cloud-commons-dependencies/pom.xml
+++ b/spring-cloud-commons-dependencies/pom.xml
@@ -15,7 +15,7 @@
 	<name>spring-cloud-commons-dependencies</name>
 	<description>Spring Cloud Commons Dependencies</description>
 	<properties>
-		<spring-security-rsa.version>1.0.11.RELEASE</spring-security-rsa.version>
+		<spring-security-rsa.version>1.0.12.RELEASE</spring-security-rsa.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>

From a0b8a51742c3bbaeb8bd65a9511d5a55dc7ca9e8 Mon Sep 17 00:00:00 2001
From: Olga MaciaszekSharma <omaciaszeksh@vmware.com>
Date: Mon, 3 Jul 2023 14:16:36 +0200
Subject: [PATCH 2/5] Temporarily downgrade version.

---
 docs/pom.xml                                           | 2 +-
 pom.xml                                                | 4 ++--
 spring-cloud-commons-dependencies/pom.xml              | 4 ++--
 spring-cloud-commons/pom.xml                           | 2 +-
 spring-cloud-context-integration-tests/pom.xml         | 2 +-
 spring-cloud-context-webflux-integration-tests/pom.xml | 2 +-
 spring-cloud-context/pom.xml                           | 2 +-
 spring-cloud-loadbalancer/pom.xml                      | 2 +-
 spring-cloud-starter-bootstrap/pom.xml                 | 2 +-
 spring-cloud-starter-loadbalancer/pom.xml              | 2 +-
 spring-cloud-starter/pom.xml                           | 2 +-
 spring-cloud-test-support/pom.xml                      | 2 +-
 12 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index 96b1171f..409915ff 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>3.1.8-SNAPSHOT</version>
+		<version>3.1.7</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Spring Cloud Commons Docs</name>
diff --git a/pom.xml b/pom.xml
index a93d983c..ea9df671 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-commons-parent</artifactId>
-	<version>3.1.8-SNAPSHOT</version>
+	<version>3.1.7</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Commons Parent</name>
 	<description>Spring Cloud Commons Parent</description>
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.1.9-SNAPSHOT</version>
+		<version>3.1.8</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<scm>
diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml
index a4a97651..2aa66ef1 100644
--- a/spring-cloud-commons-dependencies/pom.xml
+++ b/spring-cloud-commons-dependencies/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.9-SNAPSHOT</version>
+		<version>3.1.8</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-commons-dependencies</artifactId>
-	<version>3.1.8-SNAPSHOT</version>
+	<version>3.1.7</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-commons-dependencies</name>
 	<description>Spring Cloud Commons Dependencies</description>
diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml
index fd136d5b..4de99bfb 100644
--- a/spring-cloud-commons/pom.xml
+++ b/spring-cloud-commons/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>3.1.8-SNAPSHOT</version>
+		<version>3.1.7</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-commons</artifactId>
diff --git a/spring-cloud-context-integration-tests/pom.xml b/spring-cloud-context-integration-tests/pom.xml
index 6eea481a..4de23aaf 100644
--- a/spring-cloud-context-integration-tests/pom.xml
+++ b/spring-cloud-context-integration-tests/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>3.1.8-SNAPSHOT</version>
+		<version>3.1.7</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-context-integration-tests</artifactId>
diff --git a/spring-cloud-context-webflux-integration-tests/pom.xml b/spring-cloud-context-webflux-integration-tests/pom.xml
index 00de6588..e341ae17 100644
--- a/spring-cloud-context-webflux-integration-tests/pom.xml
+++ b/spring-cloud-context-webflux-integration-tests/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>3.1.8-SNAPSHOT</version>
+		<version>3.1.7</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-context-webflux-integration-tests</artifactId>
diff --git a/spring-cloud-context/pom.xml b/spring-cloud-context/pom.xml
index 6970f45d..7a9a5a03 100644
--- a/spring-cloud-context/pom.xml
+++ b/spring-cloud-context/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>3.1.8-SNAPSHOT</version>
+		<version>3.1.7</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-context</artifactId>
diff --git a/spring-cloud-loadbalancer/pom.xml b/spring-cloud-loadbalancer/pom.xml
index ee1f833f..b238c4ae 100644
--- a/spring-cloud-loadbalancer/pom.xml
+++ b/spring-cloud-loadbalancer/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>3.1.8-SNAPSHOT</version>
+		<version>3.1.7</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-loadbalancer</artifactId>
diff --git a/spring-cloud-starter-bootstrap/pom.xml b/spring-cloud-starter-bootstrap/pom.xml
index ad8ad701..d3d825c0 100644
--- a/spring-cloud-starter-bootstrap/pom.xml
+++ b/spring-cloud-starter-bootstrap/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>3.1.8-SNAPSHOT</version>
+		<version>3.1.7</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-starter-loadbalancer/pom.xml b/spring-cloud-starter-loadbalancer/pom.xml
index a7a5dd16..cc4c9e66 100644
--- a/spring-cloud-starter-loadbalancer/pom.xml
+++ b/spring-cloud-starter-loadbalancer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>3.1.8-SNAPSHOT</version>
+		<version>3.1.7</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml
index e244fc64..ba2ee7d9 100644
--- a/spring-cloud-starter/pom.xml
+++ b/spring-cloud-starter/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>3.1.8-SNAPSHOT</version>
+		<version>3.1.7</version>
 	</parent>
 	<artifactId>spring-cloud-starter</artifactId>
 	<name>spring-cloud-starter</name>
diff --git a/spring-cloud-test-support/pom.xml b/spring-cloud-test-support/pom.xml
index f6bb1e45..aba01b19 100644
--- a/spring-cloud-test-support/pom.xml
+++ b/spring-cloud-test-support/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>3.1.8-SNAPSHOT</version>
+		<version>3.1.7</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-test-support</artifactId>

From e52bae7773f26dcdb5fcb42ff3ecf8d030469b02 Mon Sep 17 00:00:00 2001
From: Olga MaciaszekSharma <omaciaszeksh@vmware.com>
Date: Mon, 3 Jul 2023 15:30:26 +0200
Subject: [PATCH 3/5] Revert "Temporarily downgrade version."

This reverts commit bd99eeee26c420877a82e0f89e06d876da0ff8e1.
---
 docs/pom.xml                                           | 2 +-
 pom.xml                                                | 4 ++--
 spring-cloud-commons-dependencies/pom.xml              | 4 ++--
 spring-cloud-commons/pom.xml                           | 2 +-
 spring-cloud-context-integration-tests/pom.xml         | 2 +-
 spring-cloud-context-webflux-integration-tests/pom.xml | 2 +-
 spring-cloud-context/pom.xml                           | 2 +-
 spring-cloud-loadbalancer/pom.xml                      | 2 +-
 spring-cloud-starter-bootstrap/pom.xml                 | 2 +-
 spring-cloud-starter-loadbalancer/pom.xml              | 2 +-
 spring-cloud-starter/pom.xml                           | 2 +-
 spring-cloud-test-support/pom.xml                      | 2 +-
 12 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index 409915ff..96b1171f 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.8-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Spring Cloud Commons Docs</name>
diff --git a/pom.xml b/pom.xml
index ea9df671..a93d983c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-commons-parent</artifactId>
-	<version>3.1.7</version>
+	<version>3.1.8-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Commons Parent</name>
 	<description>Spring Cloud Commons Parent</description>
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.1.8</version>
+		<version>3.1.9-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<scm>
diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml
index 2aa66ef1..a4a97651 100644
--- a/spring-cloud-commons-dependencies/pom.xml
+++ b/spring-cloud-commons-dependencies/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.8</version>
+		<version>3.1.9-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-commons-dependencies</artifactId>
-	<version>3.1.7</version>
+	<version>3.1.8-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-commons-dependencies</name>
 	<description>Spring Cloud Commons Dependencies</description>
diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml
index 4de99bfb..fd136d5b 100644
--- a/spring-cloud-commons/pom.xml
+++ b/spring-cloud-commons/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.8-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-commons</artifactId>
diff --git a/spring-cloud-context-integration-tests/pom.xml b/spring-cloud-context-integration-tests/pom.xml
index 4de23aaf..6eea481a 100644
--- a/spring-cloud-context-integration-tests/pom.xml
+++ b/spring-cloud-context-integration-tests/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.8-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-context-integration-tests</artifactId>
diff --git a/spring-cloud-context-webflux-integration-tests/pom.xml b/spring-cloud-context-webflux-integration-tests/pom.xml
index e341ae17..00de6588 100644
--- a/spring-cloud-context-webflux-integration-tests/pom.xml
+++ b/spring-cloud-context-webflux-integration-tests/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.8-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-context-webflux-integration-tests</artifactId>
diff --git a/spring-cloud-context/pom.xml b/spring-cloud-context/pom.xml
index 7a9a5a03..6970f45d 100644
--- a/spring-cloud-context/pom.xml
+++ b/spring-cloud-context/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.8-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-context</artifactId>
diff --git a/spring-cloud-loadbalancer/pom.xml b/spring-cloud-loadbalancer/pom.xml
index b238c4ae..ee1f833f 100644
--- a/spring-cloud-loadbalancer/pom.xml
+++ b/spring-cloud-loadbalancer/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.8-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-loadbalancer</artifactId>
diff --git a/spring-cloud-starter-bootstrap/pom.xml b/spring-cloud-starter-bootstrap/pom.xml
index d3d825c0..ad8ad701 100644
--- a/spring-cloud-starter-bootstrap/pom.xml
+++ b/spring-cloud-starter-bootstrap/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.8-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<packaging>jar</packaging>
diff --git a/spring-cloud-starter-loadbalancer/pom.xml b/spring-cloud-starter-loadbalancer/pom.xml
index cc4c9e66..a7a5dd16 100644
--- a/spring-cloud-starter-loadbalancer/pom.xml
+++ b/spring-cloud-starter-loadbalancer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.8-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml
index ba2ee7d9..e244fc64 100644
--- a/spring-cloud-starter/pom.xml
+++ b/spring-cloud-starter/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.8-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-starter</artifactId>
 	<name>spring-cloud-starter</name>
diff --git a/spring-cloud-test-support/pom.xml b/spring-cloud-test-support/pom.xml
index aba01b19..f6bb1e45 100644
--- a/spring-cloud-test-support/pom.xml
+++ b/spring-cloud-test-support/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.8-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-test-support</artifactId>

From 464a9820fd46d5023054682cd66bcfedc116218d Mon Sep 17 00:00:00 2001
From: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
Date: Thu, 20 Jul 2023 10:24:29 +0200
Subject: [PATCH 4/5] Use classloader from class. (#1256)

---
 .../cloud/context/named/NamedContextFactory.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java
index 6e8c8090..ef42e9c8 100644
--- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java
+++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,8 +48,8 @@ import org.springframework.core.env.MapPropertySource;
  * @author Spencer Gibb
  * @author Dave Syer
  * @author Tommy Karlsson
+ * @author Olga Maciaszek-Sharma
  */
-// TODO: add javadoc
 public abstract class NamedContextFactory<C extends NamedContextFactory.Specification>
 		implements DisposableBean, ApplicationContextAware {
 
@@ -113,25 +113,25 @@ public abstract class NamedContextFactory<C extends NamedContextFactory.Specific
 	}
 
 	protected AnnotationConfigApplicationContext createContext(String name) {
+		// https://github.com/spring-cloud/spring-cloud-netflix/issues/3101
+		// https://github.com/spring-cloud/spring-cloud-openfeign/issues/475
+		ClassLoader classLoader = getClass().getClassLoader();
 		AnnotationConfigApplicationContext context;
 		if (this.parent != null) {
-			// jdk11 issue
-			// https://github.com/spring-cloud/spring-cloud-netflix/issues/3101
-			// https://github.com/spring-cloud/spring-cloud-openfeign/issues/475
 			DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
 			if (parent instanceof ConfigurableApplicationContext) {
 				beanFactory.setBeanClassLoader(
 						((ConfigurableApplicationContext) parent).getBeanFactory().getBeanClassLoader());
 			}
 			else {
-				beanFactory.setBeanClassLoader(parent.getClassLoader());
+				beanFactory.setBeanClassLoader(classLoader);
 			}
 			context = new AnnotationConfigApplicationContext(beanFactory);
-			context.setClassLoader(this.parent.getClassLoader());
 		}
 		else {
 			context = new AnnotationConfigApplicationContext();
 		}
+		context.setClassLoader(classLoader);
 		if (this.configurations.containsKey(name)) {
 			for (Class<?> configuration : this.configurations.get(name).getConfiguration()) {
 				context.register(configuration);

From 989ed7dc1594889b18dd8d871d06a6f42b024359 Mon Sep 17 00:00:00 2001
From: Olga MaciaszekSharma <omaciaszeksh@vmware.com>
Date: Tue, 18 Jul 2023 17:17:49 +0200
Subject: [PATCH 5/5] Use classloader from class.

---
 .../cloud/context/named/NamedContextFactory.java       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java
index ea6b3981..9aedb026 100644
--- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java
+++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java
@@ -158,27 +158,27 @@ public abstract class NamedContextFactory<C extends NamedContextFactory.Specific
 	}
 
 	public GenericApplicationContext buildContext(String name) {
+		// https://github.com/spring-cloud/spring-cloud-netflix/issues/3101
+		// https://github.com/spring-cloud/spring-cloud-openfeign/issues/475
+		ClassLoader classLoader = getClass().getClassLoader();
 		GenericApplicationContext context;
 		if (this.parent != null) {
-			// jdk11 issue
-			// https://github.com/spring-cloud/spring-cloud-netflix/issues/3101
-			// https://github.com/spring-cloud/spring-cloud-openfeign/issues/475
 			DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
 			if (parent instanceof ConfigurableApplicationContext) {
 				beanFactory.setBeanClassLoader(
 						((ConfigurableApplicationContext) parent).getBeanFactory().getBeanClassLoader());
 			}
 			else {
-				beanFactory.setBeanClassLoader(parent.getClassLoader());
+				beanFactory.setBeanClassLoader(classLoader);
 			}
 			context = AotDetector.useGeneratedArtifacts() ? new GenericApplicationContext(beanFactory)
 					: new AnnotationConfigApplicationContext(beanFactory);
-			context.setClassLoader(parent.getClassLoader());
 		}
 		else {
 			context = AotDetector.useGeneratedArtifacts() ? new GenericApplicationContext()
 					: new AnnotationConfigApplicationContext();
 		}
+		context.setClassLoader(classLoader);
 		context.getEnvironment().getPropertySources().addFirst(
 				new MapPropertySource(this.propertySourceName, Collections.singletonMap(this.propertyName, name)));
 		if (this.parent != null) {