From 2dff775db2b10f387594db07a7a3fdbf3ad7f492 Mon Sep 17 00:00:00 2001
From: Carles Arnal <carlesarnal92@gmail.com>
Date: Fri, 22 Nov 2024 11:19:10 +0100
Subject: [PATCH] Upgrade to quarkus 3.15 (#5561)

---
 app/pom.xml                                         | 13 ++++++++++---
 .../registry/services/RegistryConfigSource.java     |  4 ++--
 app/src/main/resources/application-dev.properties   |  2 +-
 app/src/main/resources/application-prod.properties  |  2 +-
 pom.xml                                             |  2 +-
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/pom.xml b/app/pom.xml
index 2bf8983d75..a798c9301e 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -136,11 +136,11 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest-client</artifactId>
+            <artifactId>quarkus-resteasy-client</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest-client-jackson</artifactId>
+            <artifactId>quarkus-resteasy-client-jackson</artifactId>
         </dependency>
 
         <dependency>
@@ -266,6 +266,12 @@
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+            <artifactId>jackson-jakarta-rs-json-provider</artifactId>
+            <version>${jackson.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -610,7 +616,8 @@
                 </plugins>
             </build>
             <properties>
-                <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>
 
diff --git a/app/src/main/java/io/apicurio/registry/services/RegistryConfigSource.java b/app/src/main/java/io/apicurio/registry/services/RegistryConfigSource.java
index 4bd63d622e..13da3b5a7a 100644
--- a/app/src/main/java/io/apicurio/registry/services/RegistryConfigSource.java
+++ b/app/src/main/java/io/apicurio/registry/services/RegistryConfigSource.java
@@ -16,7 +16,7 @@
 
 package io.apicurio.registry.services;
 
-import io.quarkus.runtime.configuration.ProfileManager;
+import io.quarkus.runtime.LaunchMode;
 import org.eclipse.microprofile.config.spi.ConfigSource;
 
 import java.util.HashMap;
@@ -39,7 +39,7 @@ public synchronized Map<String, String> getProperties() {
             properties = new HashMap<>();
             String prefix = System.getenv("REGISTRY_PROPERTIES_PREFIX");
             if (prefix != null) {
-                String profile = ProfileManager.getActiveProfile();
+                String profile = LaunchMode.current().getProfileKey();
                 String profilePrefix = "%" + profile + ".";
                 Map<String, String> envMap = System.getenv();
                 for (Map.Entry<String, String> entry : envMap.entrySet()) {
diff --git a/app/src/main/resources/application-dev.properties b/app/src/main/resources/application-dev.properties
index c7f8cd6034..114fa300ac 100644
--- a/app/src/main/resources/application-dev.properties
+++ b/app/src/main/resources/application-dev.properties
@@ -3,7 +3,7 @@
 %dev.quarkus.log.level=${LOG_LEVEL:INFO}
 %dev.quarkus.log.category."io.apicurio".level=${REGISTRY_LOG_LEVEL:DEBUG}
 %dev.quarkus.log.console.enable=true
-%dev.quarkus.package.type=legacy-jar
+%dev.quarkus.package.jar.type=legacy-jar
 
 # Liveness and Readiness
 %dev.registry.liveness.errors.ignored=${LIVENESS_ERRORS_IGNORED:}
diff --git a/app/src/main/resources/application-prod.properties b/app/src/main/resources/application-prod.properties
index eb363d82f5..418bf1ebce 100644
--- a/app/src/main/resources/application-prod.properties
+++ b/app/src/main/resources/application-prod.properties
@@ -46,7 +46,7 @@
 # === Prod profile - see README
 # HTTP Port
 %prod.quarkus.http.port=${HTTP_PORT:8080}
-%prod.quarkus.package.type=legacy-jar
+%prod.quarkus.package.jar.type=legacy-jar
 
 # Metrics
 %prod.quarkus.micrometer.enabled=true
diff --git a/pom.xml b/pom.xml
index 64cf05f444..6895226d77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
         <node.version>16.17.0</node.version>
 
         <!-- Quarkus Version -->
-        <quarkus.version>3.8.5</quarkus.version>
+        <quarkus.version>3.15.2</quarkus.version>
 
         <!-- Jandex -->
         <jandex.version>3.1.8</jandex.version>