Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion schema/schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ type Target {
}

type ThreadMetrics {
allThreadIds: [BigInteger]
allThreadIds: [BigInteger!]
currentThreadCpuTime: BigInteger!
currentThreadCpuTimeSupported: Boolean!
currentThreadUserTime: BigInteger!
Expand Down
13 changes: 0 additions & 13 deletions src/main/java/io/cryostat/graphql/RecordingLinks.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
}
}
8 changes: 6 additions & 2 deletions src/main/java/io/cryostat/graphql/TargetNodes.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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")
Expand Down
11 changes: 9 additions & 2 deletions src/main/java/io/cryostat/recordings/Recordings.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down
Loading