build(deps): update to Quarkus 3.15 LTS (#671)

cryostatio · Sep 30, 2024 · c59211f · c59211f
1 parent bcbdf92
commit c59211f
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 29 deletions.
diff --git a/pom.xml b/pom.xml
@@ -44,8 +44,8 @@
     <org.testcontainers.bom.version>1.20.1</org.testcontainers.bom.version>
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
     <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-    <quarkus.platform.version>3.8.6</quarkus.platform.version>
-    <quarkus-quinoa.version>2.3.10</quarkus-quinoa.version>
+    <quarkus.platform.version>3.15.1</quarkus.platform.version>
+    <quarkus-quinoa.version>2.4.9</quarkus-quinoa.version>
     <org.codehaus.mojo.build.helper.plugin.version>3.6.0</org.codehaus.mojo.build.helper.plugin.version>
     <org.codehaus.mojo.exec.plugin.version>3.4.1</org.codehaus.mojo.exec.plugin.version>
     <assembly-plugin.version>3.7.1</assembly-plugin.version>
@@ -144,7 +144,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-resteasy-reactive-jackson</artifactId>
+      <artifactId>quarkus-rest-jackson</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
@@ -181,7 +181,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-rest-client-reactive-jackson</artifactId>
+      <artifactId>quarkus-rest-client-jackson</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
@@ -219,14 +219,17 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.flywaydb</groupId>
+      <artifactId>flyway-database-postgresql</artifactId>
+    </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>${org.apache.commons.io.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -329,11 +332,6 @@
             <arg>-parameters</arg>
           </compilerArgs>
           <annotationProcessorPaths>
-            <path>
-              <groupId>io.quarkus</groupId>
-              <artifactId>quarkus-panache-common</artifactId>
-              <version>${quarkus.platform.version}</version>
-            </path>
           </annotationProcessorPaths>
         </configuration>
       </plugin>
@@ -501,7 +499,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>
 

diff --git a/schema/schema.graphql b/schema/schema.graphql
@@ -212,7 +212,7 @@ type Target {
 }
 
 type ThreadMetrics {
-  allThreadIds: [BigInteger]
+  allThreadIds: [BigInteger!]
   currentThreadCpuTime: BigInteger!
   currentThreadCpuTimeSupported: Boolean!
   currentThreadUserTime: BigInteger!

diff --git a/src/main/java/io/cryostat/graphql/RecordingLinks.java b/src/main/java/io/cryostat/graphql/RecordingLinks.java
@@ -17,7 +17,6 @@
 
 import io.cryostat.recordings.ActiveRecording;
 import io.cryostat.recordings.RecordingHelper;
-import io.cryostat.recordings.Recordings.ArchivedRecording;
 
 import jakarta.inject.Inject;
 import org.eclipse.microprofile.graphql.Description;
@@ -40,16 +39,4 @@ public String downloadUrl(@Source ActiveRecording recording) {
     public String reportUrl(@Source ActiveRecording recording) {
         return recordingHelper.reportUrl(recording);
     }
-
-    @Description("URL for GET request to retrieve the JFR binary file content of this recording")
-    public String downloadUrl(@Source ArchivedRecording recording) {
-        return recording.downloadUrl();
-    }
-
-    @Description(
-            "URL for GET request to retrieve a JSON formatted Automated Analysis Report of this"
-                    + " recording")
-    public String reportUrl(@Source ArchivedRecording recording) {
-        return recording.reportUrl();
-    }
 }
diff --git a/src/main/java/io/cryostat/graphql/TargetNodes.java b/src/main/java/io/cryostat/graphql/TargetNodes.java
@@ -40,6 +40,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.microprofile.graphql.Description;
 import org.eclipse.microprofile.graphql.GraphQLApi;
+import org.eclipse.microprofile.graphql.Ignore;
 import org.eclipse.microprofile.graphql.NonNull;
 import org.eclipse.microprofile.graphql.Query;
 import org.eclipse.microprofile.graphql.Source;
@@ -131,8 +132,11 @@ public MBeanMetrics mbeanMetrics(@Source Target target) {
 
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public static class Recordings {
-        public @NonNull ActiveRecordings active = new ActiveRecordings();
-        public @NonNull ArchivedRecordings archived = new ArchivedRecordings();
+        // @Ignore these two from the GraphQL schema generation because we override the definition
+        // in the ArchivedRecordings and ActiveRecordings classes so that we can apply input
+        // filtering, and those accessor overrides conflict with the schema generator
+        public @NonNull @Ignore ActiveRecordings active = new ActiveRecordings();
+        public @NonNull @Ignore ArchivedRecordings archived = new ArchivedRecordings();
     }
 
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")

diff --git a/src/main/java/io/cryostat/recordings/Recordings.java b/src/main/java/io/cryostat/recordings/Recordings.java
@@ -85,6 +85,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.eclipse.microprofile.graphql.Description;
 import org.jboss.logging.Logger;
 import org.jboss.resteasy.reactive.RestForm;
 import org.jboss.resteasy.reactive.RestPath;
@@ -1119,8 +1120,14 @@ public record LinkedRecordingDescriptor(
     public record ArchivedRecording(
             String jvmId,
             String name,
-            String downloadUrl,
-            String reportUrl,
+            @Description(
+                            "URL for GET request to retrieve the JFR binary file content of this"
+                                    + " recording")
+                    String downloadUrl,
+            @Description(
+                            "URL for GET request to retrieve a JSON formatted Automated Analysis"
+                                    + " Report of this recording")
+                    String reportUrl,
             Metadata metadata,
             long size,
             long archivedTime) {