Upgrade to latest Spring and include needed classes

sfdads
quarkusio · Apr 25, 2024 · 163b8f3 · 163b8f3
1 parent b12c345
commit 163b8f3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/mvn-build.yml b/.github/workflows/mvn-build.yml
@@ -1,24 +1,24 @@
-name: "CI - JDK 11 Build"
+name: "CI - JDK 17 Build"
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 
 jobs:
-  build-jdk11:
-    name: "JDK 11 Build"
+  build-jdk17:
+    name: "JDK 17 Build"
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
       - name: Build
         run: mvn clean install
 
diff --git a/pom.xml b/pom.xml
@@ -41,7 +41,7 @@
     <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <spring-framework.version>5.2.20.RELEASE</spring-framework.version>
+    <spring-framework.version>6.1.6</spring-framework.version>
   </properties>
 
   <packaging>pom</packaging>

diff --git a/quarkus-spring-web-api/pom.xml b/quarkus-spring-web-api/pom.xml
@@ -48,7 +48,10 @@
                                         <include>org/springframework/http/HttpStatus**</include>
                                         <include>org/springframework/http/HttpMethod**</include>
                                         <include>org/springframework/http/ResponseEntity**</include>
+                                        <include>org/springframework/http/ProblemDetail**</include>
                                         <include>org/springframework/web/SpringServletContainerInitializer**</include>
+                                        <include>org/springframework/web/ErrorResponseException**</include>
+                                        <include>org/springframework/web/ErrorResponse**</include>
                                         <include>org/springframework/web/context/annotation/RequestScope**</include>
                                         <include>org/springframework/web/bind/annotation/CookieValue**</include>
                                         <include>org/springframework/web/bind/annotation/DeleteMapping**</include>