Upgrade Quarkus 3.5 and test with Java 21

pe-st · Nov 6, 2023 · 2c17fe7 · 2c17fe7
1 parent eb88f65
commit 2c17fe7
Show file tree

Hide file tree

Showing 18 changed files with 409 additions and 468 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -16,16 +16,18 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
+    strategy:
+      matrix:
+        java: [ '17', '21' ]
+    name: Build with Java ${{ matrix.Java }}
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
         distribution: 'temurin'
+        java-version: ${{ matrix.java }}
         cache: maven
     - name: Build with Maven
       run: |

diff --git a/_idea/.idea/misc.xml b/_idea/.idea/misc.xml
diff --git a/code-first-openapi-quarkus/pom.xml b/code-first-openapi-quarkus/pom.xml
@@ -18,15 +18,15 @@
 
         <!-- artifact versions -->
         <lombok.version>1.18.30</lombok.version>
-        <quarkus.version>3.4.3</quarkus.version>
+        <quarkus.version>3.5.0</quarkus.version>
 
         <!-- testing artifact versions -->
         <hamcrest.version>2.2</hamcrest.version>
         <json.unit.version>3.2.2</json.unit.version>
 
         <!-- apache maven plugin versions (in alphabetical order) -->
         <maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
-        <maven.surefire.plugin.version>3.1.2</maven.surefire.plugin.version>
+        <maven.surefire.plugin.version>3.2.1</maven.surefire.plugin.version>
     </properties>
 
     <dependencyManagement>
@@ -60,13 +60,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- for debugging the openapi quarkus extension -->
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-smallrye-openapi-deployment</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <!-- Testing dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -97,6 +90,13 @@
             <version>${json.unit.version}</version>
             <scope>test</scope>
         </dependency>
+
+        <!-- for debugging the openapi quarkus extension -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-openapi-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -120,6 +120,13 @@
                 <configuration>
                     <!-- starting with Java 9 javac should be called with -release N -->
                     <release>${java.release}</release>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/code-first-openapi-quarkus/src/test/resources/openapi-sorted.yaml.txt b/code-first-openapi-quarkus/src/test/resources/openapi-sorted.yaml.txt
@@ -136,8 +136,3 @@ components:
       format: uuid
       pattern: "[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}"
       type: string
-  securitySchemes:
-    SecurityScheme:
-      description: Authentication
-      scheme: basic
-      type: http
diff --git a/code-first-openapi-quarkus/src/test/resources/openapi.json.txt b/code-first-openapi-quarkus/src/test/resources/openapi.json.txt
@@ -176,13 +176,6 @@
         "pattern" : "[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}",
         "type" : "string"
       }
-    },
-    "securitySchemes" : {
-      "SecurityScheme" : {
-        "type" : "http",
-        "description" : "Authentication",
-        "scheme" : "basic"
-      }
     }
   }
 }
diff --git a/code-first-openapi-quarkus/src/test/resources/openapi.yaml.txt b/code-first-openapi-quarkus/src/test/resources/openapi.yaml.txt
@@ -136,8 +136,3 @@ components:
       format: uuid
       pattern: "[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}"
       type: string
-  securitySchemes:
-    SecurityScheme:
-      type: http
-      description: Authentication
-      scheme: basic
diff --git a/code-first-swagger/pom.xml b/code-first-swagger/pom.xml
@@ -18,16 +18,16 @@
 
         <!-- artifact versions -->
         <lombok.version>1.18.30</lombok.version>
-        <quarkus.version>3.4.3</quarkus.version>
-        <swagger.version>2.2.15</swagger.version>
+        <quarkus.version>3.5.0</quarkus.version>
+        <swagger.version>2.2.18</swagger.version>
 
         <!-- testing artifact versions -->
         <hamcrest.version>2.2</hamcrest.version>
         <json.unit.version>3.2.2</json.unit.version>
 
         <!-- apache maven plugin versions (in alphabetical order) -->
         <maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
-        <maven.surefire.plugin.version>3.1.2</maven.surefire.plugin.version>
+        <maven.surefire.plugin.version>3.2.1</maven.surefire.plugin.version>
     </properties>
 
     <dependencyManagement>
@@ -96,6 +96,13 @@
             <version>${json.unit.version}</version>
             <scope>test</scope>
         </dependency>
+
+        <!-- for debugging the openapi quarkus extension -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-openapi-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -142,6 +149,13 @@
                 <configuration>
                     <!-- starting with Java 9 javac should be called with -release N -->
                     <release>${java.release}</release>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/code-first-swagger/src/test/resources/openapi-sorted.yaml.txt b/code-first-swagger/src/test/resources/openapi-sorted.yaml.txt
@@ -118,8 +118,3 @@ components:
           - WRONG
           type: string
       type: object
-  securitySchemes:
-    SecurityScheme:
-      description: Authentication
-      scheme: basic
-      type: http