Bump supported Spring Boot baseline to version 3.2.x (#1050)

* Drop support for Spring Boot 2.x * Bump dependencies in sdk-springboot module from Spring Boot 2.x to 3.2.6 * Update examples module to use new Spring Boot support with Java 17 baseline * Fix wrong sdkman and mavne wrapper setup that failed the local setup * Update GHA workflow to stop testing for Spring Boot versions < 3.2.x Fixes gh-1039 Signed-off-by: Thomas Vitale <[email protected]> * Update pom.xml Signed-off-by: Artur Souza <[email protected]> --------- Signed-off-by: Thomas Vitale <[email protected]> Signed-off-by: Artur Souza <[email protected]> Co-authored-by: Artur Souza <[email protected]> Co-authored-by: Artur Souza <[email protected]>
dapr · Jul 16, 2024 · 6e0f267 · 6e0f267
1 parent 5bf8769
commit 6e0f267
Show file tree

Hide file tree

Showing 12 changed files with 200 additions and 382 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,21 +24,13 @@ jobs:
       fail-fast: false
       matrix:
         java: [ 17 ]
-        spring-boot-version: [ 3.0.13 ]
-        spring-boot-display-version: [ 3.0.x ]
+        spring-boot-version: [ 3.2.6 ]
+        spring-boot-display-version: [ 3.2.x ]
         experimental: [ false ]
         include:
           - java: 17
-            spring-boot-version: 2.7.18
-            spring-boot-display-version: 2.7.x
-            experimental: false
-          - java: 17
-            spring-boot-version: 2.6.14
-            spring-boot-display-version: 2.6.x
-            experimental: false
-          - java: 17
-            spring-boot-version: 2.5.7
-            spring-boot-display-version: 2.5.x
+            spring-boot-version: 3.3.0
+            spring-boot-display-version: 3.3.x
             experimental: false
     env:
       GOVER: "1.20"

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+wrapperVersion=3.3.2
+distributionType=script
 distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.5/apache-maven-3.8.5-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar
diff --git a/.sdkmanrc b/.sdkmanrc
@@ -1,4 +1,4 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=11.0.19-tem
+java=17.0.11-tem
 maven=3.8.5
diff --git a/docs/project-reports.html b/docs/project-reports.html
@@ -42,7 +42,6 @@ <h5>Modules</h5>
      <li class="none"><a href="dapr-sdk-actors/index.html" title="dapr-sdk-actors">dapr-sdk-actors</a></li>
      <li class="none"><a href="dapr-sdk-workflows/index.html" title="dapr-sdk-workflows">dapr-sdk-workflows</a></li>
      <li class="none"><a href="dapr-sdk-springboot/index.html" title="dapr-sdk-springboot">dapr-sdk-springboot</a></li>
-     <li class="none"><a href="dapr-sdk-springboot3/index.html" title="dapr-sdk-springboot3">dapr-sdk-springboot3</a></li>
      <li class="none"><a href="dapr-sdk-examples/index.html" title="dapr-sdk-examples">dapr-sdk-examples</a></li>
     </ul>
        <h5>Project Documentation</h5>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -24,14 +24,14 @@
     <maven.deploy.skip>true</maven.deploy.skip>
     <spotbugs.fail>false</spotbugs.fail>
     <opentelemetry.version>0.14.0</opentelemetry.version>
-    <springboot.version>3.2.0</springboot.version>
+    <springboot.version>3.2.6</springboot.version>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
-      <version>1.4</version>
+      <version>1.8.0</version>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
@@ -59,21 +59,11 @@
       <artifactId>protobuf-java-util</artifactId>
       <version>${protobuf.version}</version>
     </dependency>
-    <dependency>
-      <groupId>com.github.os72</groupId>
-      <artifactId>protoc-jar-maven-plugin</artifactId>
-      <version>3.11.4</version>
-    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
       <version>${springboot.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-autoconfigure</artifactId>
-      <version>${springboot.version}</version>
-    </dependency>
     <dependency>
       <groupId>com.jayway.jsonpath</groupId>
       <artifactId>json-path</artifactId>
@@ -112,7 +102,7 @@
     </dependency>
     <dependency>
       <groupId>io.dapr</groupId>
-      <artifactId>dapr-sdk-springboot3</artifactId>
+      <artifactId>dapr-sdk-springboot</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
@@ -140,16 +130,6 @@
       <artifactId>javax.annotation-api</artifactId>
       <version>1.3.2</version>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>6.1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-      <version>6.1.1</version>
-    </dependency>
   </dependencies>
 
   <build>
@@ -190,7 +170,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
+        <version>3.13.0</version>
         <configuration>
           <release>${java.version}</release>
         </configuration>
@@ -206,7 +186,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.9.1</version>
+        <version>3.12.1</version>
         <configuration>
           <skip>true</skip>
         </configuration>
@@ -236,6 +216,14 @@
           <skip>true</skip>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>animal-sniffer-maven-plugin</artifactId>
+        <configuration>
+          <!-- Spring Boot 3 has a Java 17 baseline, no Java 8 support -->
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>