From 9152c91bc1f08ecf2dd3bccf8159fd5d0500e351 Mon Sep 17 00:00:00 2001
From: Sergio <champel@gmail.com>
Date: Fri, 3 Feb 2023 19:48:08 +0100
Subject: [PATCH] Bump from spring boot 2.3.5.RELEASE to 2.7.8

Signed-off-by: Sergio <champel@gmail.com>
---
 examples/pom.xml                                              | 4 ++--
 pom.xml                                                       | 2 +-
 sdk-actors/pom.xml                                            | 2 +-
 sdk-springboot/pom.xml                                        | 4 +---
 sdk-springboot/src/main/resources/META-INF/spring.factories   | 2 --
 ...ringframework.boot.autoconfigure.AutoConfiguration.imports | 1 +
 sdk-tests/pom.xml                                             | 2 +-
 sdk/pom.xml                                                   | 4 ++--
 8 files changed, 9 insertions(+), 12 deletions(-)
 delete mode 100644 sdk-springboot/src/main/resources/META-INF/spring.factories
 create mode 100644 sdk-springboot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

diff --git a/examples/pom.xml b/examples/pom.xml
index 5238d66dd6..a83f118516 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -66,12 +66,12 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
-      <version>2.3.5.RELEASE</version>
+      <version>2.7.8</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-autoconfigure</artifactId>
-      <version>2.3.5.RELEASE</version>
+      <version>2.7.8</version>
     </dependency>
     <dependency>
       <groupId>com.jayway.jsonpath</groupId>
diff --git a/pom.xml b/pom.xml
index fe0c7f6eed..4af82cf572 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
     <gpg.skip>true</gpg.skip>
     <spotbugs.version>4.0.0-RC1</spotbugs.version>
     <spotbugs.fail>true</spotbugs.fail>
-    <springboot.version>2.3.5.RELEASE</springboot.version>
+    <springboot.version>2.7.8</springboot.version>
     <argLine>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED</argLine>
   </properties>
 
diff --git a/sdk-actors/pom.xml b/sdk-actors/pom.xml
index def8e3d10f..503f8651ee 100644
--- a/sdk-actors/pom.xml
+++ b/sdk-actors/pom.xml
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
-      <version>2.3.5.RELEASE</version>
+      <version>2.7.8</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk-springboot/pom.xml b/sdk-springboot/pom.xml
index fd8d053031..a0b38714c6 100644
--- a/sdk-springboot/pom.xml
+++ b/sdk-springboot/pom.xml
@@ -18,7 +18,7 @@
 
   <properties>
     <maven.deploy.skip>false</maven.deploy.skip>
-    <springboot.version>2.3.5.RELEASE</springboot.version>
+    <springboot.version>2.7.8</springboot.version>
   </properties>
 
   <dependencyManagement>
@@ -68,13 +68,11 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>5.2.10.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>5.2.10.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/sdk-springboot/src/main/resources/META-INF/spring.factories b/sdk-springboot/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 58ff4b58d6..0000000000
--- a/sdk-springboot/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,2 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-io.dapr.springboot.DaprAutoConfiguration
diff --git a/sdk-springboot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sdk-springboot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000000..7c43d84827
--- /dev/null
+++ b/sdk-springboot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+io.dapr.springboot.DaprAutoConfiguration
\ No newline at end of file
diff --git a/sdk-tests/pom.xml b/sdk-tests/pom.xml
index 55e532f104..3d10de6461 100644
--- a/sdk-tests/pom.xml
+++ b/sdk-tests/pom.xml
@@ -20,7 +20,7 @@
     <grpc.version>1.42.1</grpc.version>
     <protobuf.version>3.17.3</protobuf.version>
     <opentelemetry.version>0.14.0</opentelemetry.version>
-    <spring-boot.version>2.3.5.RELEASE</spring-boot.version>
+    <spring-boot.version>2.7.8</spring-boot.version>
   </properties>
 
   <dependencies>
diff --git a/sdk/pom.xml b/sdk/pom.xml
index 09efa68bf8..01a354fa5e 100644
--- a/sdk/pom.xml
+++ b/sdk/pom.xml
@@ -94,13 +94,13 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
-      <version>2.3.5.RELEASE</version>
+      <version>2.7.8</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-autoconfigure</artifactId>
-      <version>2.3.5.RELEASE</version>
+      <version>2.7.8</version>
       <scope>test</scope>
     </dependency>
     <dependency>