From ee0993115212639d1dac15bb0dd1d52ee5f19dc6 Mon Sep 17 00:00:00 2001
From: Elena Felder <41136058+elefeint@users.noreply.github.com>
Date: Wed, 15 Dec 2021 17:07:44 -0500
Subject: [PATCH 1/3] Remove spring-cloud-build dependency; add spring-boot BOM
 explicitly

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index ecce4de425..066e9747a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,7 @@
 		<skipTests>false</skipTests>
 		<spring-cloud-build.version>3.0.4</spring-cloud-build.version>
 		<spring-cloud-dependencies.version>2020.0.4</spring-cloud-dependencies.version>
+		<spring-boot-dependencies.version>2.5.7</spring-boot-dependencies.version>
 		<spring-javaformat-checkstyle.version>0.0.29</spring-javaformat-checkstyle.version>
 		<zipkin-gcp.version>1.0.2</zipkin-gcp.version>
 		<spring-native.version>0.10.5</spring-native.version>
@@ -80,9 +81,9 @@
 			</dependency>
 
 			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-build-dependencies</artifactId>
-				<version>${spring-cloud-build.version}</version>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-dependencies</artifactId>
+				<version>${spring-boot-dependencies.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -171,7 +172,6 @@
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<!-- Needed to run JUnit4 tests while inheriting from spring-cloud-build parent pom -->
 		<dependency>
 			<groupId>org.junit.vintage</groupId>
 			<artifactId>junit-vintage-engine</artifactId>

From 2a3c599cd26ad6a7567e355a153d9003a6ad3b04 Mon Sep 17 00:00:00 2001
From: Elena Felder <41136058+elefeint@users.noreply.github.com>
Date: Wed, 15 Dec 2021 17:49:17 -0500
Subject: [PATCH 2/3] fix Secret Manager integration test

---
 pom.xml                                                         | 2 +-
 .../it/SecretManagerPropertySourceIntegrationTests.java         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 066e9747a4..8f7b30015a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
 		<skipTests>false</skipTests>
 		<spring-cloud-build.version>3.0.4</spring-cloud-build.version>
 		<spring-cloud-dependencies.version>2020.0.4</spring-cloud-dependencies.version>
-		<spring-boot-dependencies.version>2.5.7</spring-boot-dependencies.version>
+		<spring-boot-dependencies.version>2.5.1</spring-boot-dependencies.version>
 		<spring-javaformat-checkstyle.version>0.0.29</spring-javaformat-checkstyle.version>
 		<zipkin-gcp.version>1.0.2</zipkin-gcp.version>
 		<spring-native.version>0.10.5</spring-native.version>
diff --git a/spring-cloud-gcp-secretmanager/src/test/java/com/google/cloud/spring/secretmanager/it/SecretManagerPropertySourceIntegrationTests.java b/spring-cloud-gcp-secretmanager/src/test/java/com/google/cloud/spring/secretmanager/it/SecretManagerPropertySourceIntegrationTests.java
index 7d959f066c..2c85315414 100644
--- a/spring-cloud-gcp-secretmanager/src/test/java/com/google/cloud/spring/secretmanager/it/SecretManagerPropertySourceIntegrationTests.java
+++ b/spring-cloud-gcp-secretmanager/src/test/java/com/google/cloud/spring/secretmanager/it/SecretManagerPropertySourceIntegrationTests.java
@@ -35,7 +35,7 @@
 public class SecretManagerPropertySourceIntegrationTests {
 
 	private ConfigurableApplicationContext context =
-			new SpringApplicationBuilder(TestConfiguration.class)
+			new SpringApplicationBuilder(SecretManagerTestConfiguration.class, TestConfiguration.class)
 					.web(WebApplicationType.NONE)
 					.properties("spring.cloud.bootstrap.enabled=true")
 					.run();

From b167458b2e222af76a86e09356babab26bb3a279 Mon Sep 17 00:00:00 2001
From: Elena Felder <41136058+elefeint@users.noreply.github.com>
Date: Wed, 15 Dec 2021 17:50:47 -0500
Subject: [PATCH 3/3] put correct version back

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8f7b30015a..066e9747a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
 		<skipTests>false</skipTests>
 		<spring-cloud-build.version>3.0.4</spring-cloud-build.version>
 		<spring-cloud-dependencies.version>2020.0.4</spring-cloud-dependencies.version>
-		<spring-boot-dependencies.version>2.5.1</spring-boot-dependencies.version>
+		<spring-boot-dependencies.version>2.5.7</spring-boot-dependencies.version>
 		<spring-javaformat-checkstyle.version>0.0.29</spring-javaformat-checkstyle.version>
 		<zipkin-gcp.version>1.0.2</zipkin-gcp.version>
 		<spring-native.version>0.10.5</spring-native.version>