-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore(quarkus): upgrade to 3.8 LTS (#687)
* build(deps): update Quarkus to 3.8 LTS (#609) * build(deps): update Quarkus to 3.8 LTS * add hibernate format mapper override * remove no longer necessary lazy init * disable openapi management / swagger UI unless in dev mode * remove duplicate healthcheck override * reduce healthcheck start periods * correct healthcheck URL * use authproxy image which contains wget for healthcheck * correct healthchecks for vertx agent test applications * build(deps): replace direct fabric8 kubernetes-client with quarkus kubernetes-client (#606) * compose fixup * graphql test fixup * auth proxy fixup * startup discovery transactions * chore(schema): automatic update --------- Co-authored-by: Cryostat CI <[email protected]>
- Loading branch information
1 parent
ada4220
commit f537021
Showing
29 changed files
with
273 additions
and
262 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -85,6 +85,7 @@ components: | |
| DiscoveryPlugin: | ||
| properties: | ||
| builtin: | ||
| readOnly: true | ||
| type: boolean | ||
| callback: | ||
| format: uri | ||
|
|
@@ -296,6 +297,7 @@ components: | |
| Target: | ||
| properties: | ||
| agent: | ||
| readOnly: true | ||
| type: boolean | ||
| alias: | ||
| pattern: \S | ||
|
|
@@ -347,11 +349,6 @@ components: | |
| meta: | ||
| $ref: '#/components/schemas/Meta' | ||
| type: object | ||
| securitySchemes: | ||
| SecurityScheme: | ||
| description: Authentication | ||
| scheme: basic | ||
| type: http | ||
| info: | ||
| contact: | ||
| email: [email protected] | ||
|
|
@@ -362,7 +359,7 @@ info: | |
| name: Apache 2.0 | ||
| url: https://github.com/cryostatio/cryostat3/blob/main/LICENSE | ||
| title: Cryostat API | ||
| version: 3.0.1-snapshot | ||
| version: 3.0.2-snapshot | ||
| openapi: 3.0.3 | ||
| paths: | ||
| /api/beta/credentials/{connectUrl}: | ||
|
|
@@ -913,7 +910,7 @@ paths: | |
| type: string | ||
| requestBody: | ||
| content: | ||
| application/json: | ||
| text/plain: | ||
| schema: | ||
| type: string | ||
| responses: | ||
|
|
@@ -1906,7 +1903,7 @@ paths: | |
| responses: | ||
| "200": | ||
| content: | ||
| application/json: | ||
| text/plain: | ||
| schema: | ||
| type: string | ||
| description: OK | ||
|
|
@@ -2393,13 +2390,13 @@ paths: | |
| type: integer | ||
| requestBody: | ||
| content: | ||
| application/json: | ||
| text/plain: | ||
| schema: | ||
| type: string | ||
| responses: | ||
| "200": | ||
| content: | ||
| application/json: | ||
| text/plain: | ||
| schema: | ||
| type: string | ||
| description: OK | ||
|
|
@@ -2429,7 +2426,7 @@ paths: | |
| responses: | ||
| "200": | ||
| content: | ||
| application/json: | ||
| text/plain: | ||
| schema: | ||
| type: string | ||
| description: OK | ||
|
|
||
46 changes: 46 additions & 0 deletions
46
src/main/java/io/cryostat/HibernateFormatMapperCustomization.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /* | ||
| * Copyright The Cryostat Authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.cryostat; | ||
|
|
||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import io.quarkus.hibernate.orm.JsonFormat; | ||
| import io.quarkus.hibernate.orm.PersistenceUnitExtension; | ||
| import org.hibernate.type.descriptor.WrapperOptions; | ||
| import org.hibernate.type.descriptor.java.JavaType; | ||
| import org.hibernate.type.format.FormatMapper; | ||
| import org.hibernate.type.format.jackson.JacksonJsonFormatMapper; | ||
|
|
||
| @JsonFormat | ||
| @PersistenceUnitExtension | ||
| /** | ||
| * @see https://github.com/quarkusio/quarkus/issues/42596 | ||
| */ | ||
| public class HibernateFormatMapperCustomization implements FormatMapper { | ||
|
|
||
| private final JacksonJsonFormatMapper delegate = | ||
| new JacksonJsonFormatMapper(new ObjectMapper().findAndRegisterModules()); | ||
|
|
||
| @Override | ||
| public <T> T fromString( | ||
| CharSequence charSequence, JavaType<T> javaType, WrapperOptions wrapperOptions) { | ||
| return delegate.fromString(charSequence, javaType, wrapperOptions); | ||
| } | ||
|
|
||
| @Override | ||
| public <T> String toString(T value, JavaType<T> javaType, WrapperOptions wrapperOptions) { | ||
| return delegate.toString(value, javaType, wrapperOptions); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.