Migrate to Quarkus 3.30

Author: marcelstoer

.editorconfig

@@ -12,7 +12,7 @@ indent_style = space
 indent_size = 4
 max_line_length = 120
 
-[*.{scss,json,yml,conf,toml}]
+[*.{scss,json,yml,yaml,conf,toml}]
 indent_size = 2
 
 [*.html]

.github/workflows/maven.yml

@@ -12,10 +12,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: 'maven'
     - name: Maven build

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.frightanic</groupId>
     <artifactId>open-data-smn</artifactId>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.0.3-SNAPSHOT</version>
 
     <name>OpenData SMN</name>
     <description>An API to serve publicly available data from the SwissMetNet.</description>
@@ -52,25 +52,25 @@
 
     <properties>
         <!-- dependencies -->
-        <dokka.version>1.7.10</dokka.version>
-        <jacoco.version>0.8.8</jacoco.version>
-        <kotlin.version>1.7.10</kotlin.version>
-        <microprofile-openapi-api.version>3.0</microprofile-openapi-api.version>
-        <quarkus.version>2.12.1.Final</quarkus.version>
+        <dokka.version>2.1.0</dokka.version>
+        <jacoco.version>0.8.14</jacoco.version>
+        <kotlin.version>2.2.21</kotlin.version>
+        <quarkus.version>3.30.5</quarkus.version>
 
         <!-- plugins -->
-        <compiler-plugin.version>3.10.1</compiler-plugin.version>
+        <compiler-plugin.version>3.12.1</compiler-plugin.version>
         <exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
         <gpg-plugin.version>3.0.1</gpg-plugin.version>
-        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
+        <surefire-plugin.version>3.2.3</surefire-plugin.version>
 
         <!-- Docker/Buildx -->
         <buildx.builder.name>maven</buildx.builder.name>
         <buildx.platforms>linux/amd64,linux/arm64</buildx.platforms>
         <docker.file>src/main/docker/Dockerfile.jvm</docker.file>
         <docker.image-name>marcelstoer/open-data-smn</docker.image-name>
 
-        <java.version>11</java.version>
+        <java.version>17</java.version>
+        <maven.compiler.release>${java.version}</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <skipITs>true</skipITs>
@@ -116,11 +116,11 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-reactive-jackson</artifactId>
+            <artifactId>quarkus-rest-jackson</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-reactive</artifactId>
+            <artifactId>quarkus-rest</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -129,7 +129,6 @@
         <dependency>
             <groupId>org.eclipse.microprofile.openapi</groupId>
             <artifactId>microprofile-openapi-api</artifactId>
-            <version>${microprofile-openapi-api.version}</version>
         </dependency>
 
         <!-- test -->
@@ -336,13 +335,13 @@
                         </executions>
                     </plugin>
                     <plugin>
-                        <groupId>org.sonatype.plugins</groupId>
-                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <groupId>org.sonatype.central</groupId>
+                        <artifactId>central-publishing-maven-plugin</artifactId>
                         <extensions>true</extensions>
                         <configuration>
-                            <serverId>ossrh</serverId>
-                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                            <publishingServerId>central</publishingServerId>
+                            <autoPublish>true</autoPublish>
+                            <waitUntil>published</waitUntil>
                         </configuration>
                     </plugin>
                     <plugin>
@@ -410,7 +409,8 @@
             </activation>
             <properties>
                 <skipITs>false</skipITs>
-                <quarkus.package.type>native</quarkus.package.type>
+                <quarkus.native.enabled>true</quarkus.native.enabled>
+                <quarkus.package.jar.enabled>false</quarkus.package.jar.enabled>
             </properties>
         </profile>
     </profiles>

src/main/kotlin/com/frightanic/smn/SmnResource.kt

@@ -10,12 +10,12 @@ import org.eclipse.microprofile.openapi.annotations.enums.SchemaType.STRING
 import org.eclipse.microprofile.openapi.annotations.media.Schema
 import org.eclipse.microprofile.openapi.annotations.parameters.Parameter
 import org.eclipse.microprofile.openapi.annotations.tags.Tag
-import javax.enterprise.context.ApplicationScoped
-import javax.ws.rs.GET
-import javax.ws.rs.Path
-import javax.ws.rs.PathParam
-import javax.ws.rs.Produces
-import javax.ws.rs.QueryParam
+import jakarta.enterprise.context.ApplicationScoped
+import jakarta.ws.rs.GET
+import jakarta.ws.rs.Path
+import jakarta.ws.rs.PathParam
+import jakarta.ws.rs.Produces
+import jakarta.ws.rs.QueryParam
 
 private const val cacheName = "http"
 

src/main/kotlin/com/frightanic/smn/StationMap.kt

@@ -172,6 +172,7 @@ object StationMap {
         MAP["REH"] = Station("REH", "Zürich / Affoltern", 681432, 253548, 47.433333, 8.516667, 443)
         MAP["SMA"] = Station("SMA", "Zürich / Fluntern", 685116, 248065, 47.383333, 8.566667, 555)
         MAP["KLO"] = Station("KLO", "Zürich / Kloten", 682710, 259338, 47.483333, 8.533333, 426)
+        MAP["PFA"] = Station("PFA", "Pfäffikon, ZH", 1248165, 2699401, 47.376817, 8.754864, 537)
     }
 
     /**

src/main/kotlin/com/frightanic/smn/core/GeoAdmin.kt

@@ -8,7 +8,7 @@ import org.slf4j.LoggerFactory
 import java.net.http.HttpClient
 import java.net.http.HttpRequest
 import java.net.http.HttpResponse
-import javax.enterprise.context.ApplicationScoped
+import jakarta.enterprise.context.ApplicationScoped
 
 
 @ApplicationScoped

src/main/kotlin/com/frightanic/smn/util/ObjectMapperCustomizer.kt

@@ -9,7 +9,7 @@ import io.quarkus.jackson.ObjectMapperCustomizer
 import io.quarkus.jackson.ObjectMapperCustomizer.MINIMUM_PRIORITY
 import java.time.OffsetDateTime
 import java.time.format.DateTimeFormatter
-import javax.inject.Singleton
+import jakarta.inject.Singleton
 
 @Singleton
 class ObjectMapperCustomizer : ObjectMapperCustomizer {

src/main/resources/application.yaml

@@ -3,17 +3,18 @@ quarkus:
     name: open-data-smn
   cache:
     caffeine:
-      '"smn"':
+      smn:
         expire-after-write: 5M
-      '"http"':
+      http:
         expire-after-write: 1M
   http:
     port: 8080
-    cors: true
-    cors.origins: "*"
-    cors.methods: "GET"
+    cors:
+      origins: "*"
+      methods: "GET"
+      enabled: true
     header:
-      '"Cache-Control"':
+      Cache-Control:
         value: "max-age=300"
   swagger-ui:
     always-include: true

src/test/kotlin/com/frightanic/smn/SmnResourceTest.kt

@@ -5,7 +5,7 @@ import io.restassured.RestAssured.given
 import org.hamcrest.CoreMatchers.containsString
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
-import javax.ws.rs.core.HttpHeaders.CACHE_CONTROL
+import jakarta.ws.rs.core.HttpHeaders.CACHE_CONTROL
 
 @QuarkusTest
 internal class SmnResourceTest {