This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 653f79788cecbbbc433f948cbc928eb826a18c16 Author: JiriOndrusek <[email protected]> AuthorDate: Mon May 15 15:29:52 2023 +0200 Fix of Openapi-java because of CAMEL-18963 (compile and jvm works, native fails) --- .../java/deployment/OpenApiJavaProcessor.java | 16 ++++------ .../java/graal/RestOpenApiReaderSubstitutions.java | 4 +-- .../openapijava/it/common/OpenApiTest.java | 6 +--- .../component/openapijava/it/v2/OpenApiV2Test.java | 7 ++--- .../component/openapijava/it/v3/OpenApiV3Test.java | 2 +- poms/bom/pom.xml | 20 +++++++++++++ poms/bom/src/main/generated/flattened-full-pom.xml | 34 +++++++++++++++++----- .../src/main/generated/flattened-reduced-pom.xml | 34 +++++++++++++++++----- .../generated/flattened-reduced-verbose-pom.xml | 34 +++++++++++++++++----- 9 files changed, 113 insertions(+), 44 deletions(-) diff --git a/extensions/openapi-java/deployment/src/main/java/org/apache/camel/quarkus/component/openapi/java/deployment/OpenApiJavaProcessor.java b/extensions/openapi-java/deployment/src/main/java/org/apache/camel/quarkus/component/openapi/java/deployment/OpenApiJavaProcessor.java index c4d93f3cc3..3e6e13032a 100644 --- a/extensions/openapi-java/deployment/src/main/java/org/apache/camel/quarkus/component/openapi/java/deployment/OpenApiJavaProcessor.java +++ b/extensions/openapi-java/deployment/src/main/java/org/apache/camel/quarkus/component/openapi/java/deployment/OpenApiJavaProcessor.java @@ -30,7 +30,6 @@ import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import io.apicurio.datamodels.openapi.models.OasDocument; import io.quarkus.bootstrap.classloading.QuarkusClassLoader; import io.quarkus.deployment.Capabilities; import io.quarkus.deployment.Capability; @@ -38,7 +37,6 @@ import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.CombinedIndexBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; -import io.quarkus.deployment.builditem.IndexDependencyBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.smallrye.openapi.deployment.spi.AddToOpenAPIDefinitionBuildItem; import io.smallrye.openapi.api.models.OpenAPIImpl; @@ -59,6 +57,7 @@ import org.apache.camel.openapi.BeanConfig; import org.apache.camel.openapi.DefaultRestDefinitionsResolver; import org.apache.camel.openapi.RestDefinitionsResolver; import org.apache.camel.openapi.RestOpenApiReader; +import org.apache.camel.openapi.RestOpenApiSupport; import org.apache.camel.quarkus.core.deployment.spi.CamelRoutesBuilderClassBuildItem; import org.apache.camel.quarkus.core.deployment.util.CamelSupport; import org.apache.camel.spi.RestConfiguration; @@ -86,11 +85,6 @@ class OpenApiJavaProcessor { return new FeatureBuildItem(FEATURE); } - @BuildStep - void addDependencies(BuildProducer<IndexDependencyBuildItem> indexDependency) { - indexDependency.produce(new IndexDependencyBuildItem("io.swagger.core.v3", "swagger-models-jakarta")); - } - @BuildStep void reflectiveClasses(BuildProducer<ReflectiveClassBuildItem> reflectiveClasses, CombinedIndexBuildItem combinedIndex) { reflectiveClasses.produce(ReflectiveClassBuildItem.builder(SCHEMA.toString()).methods().fields().build()); @@ -186,7 +180,7 @@ class CamelRestOASFilter implements OASFilter { initOpenApi(bc, info, rc, Optional.ofNullable(rc.getApiProperties()).orElseGet(HashMap::new)); - final OasDocument openApi = reader.read(context, rests, bc, null, context.getClassResolver()); + final io.swagger.v3.oas.models.OpenAPI openApi = reader.read(context, rests, bc, null, context.getClassResolver()); if (!rc.isApiVendorExtension()) { clearVendorExtensions(openApi); } @@ -195,9 +189,9 @@ class CamelRestOASFilter implements OASFilter { final ObjectMapper mapper = new ObjectMapper(new JsonFactory()); mapper.enable(SerializationFeature.INDENT_OUTPUT); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - final Object dump = io.apicurio.datamodels.Library.writeNode(openApi); - final byte[] jsonData = mapper.writeValueAsBytes(dump); - final JsonNode node = mapper.readTree(jsonData); + + String jsonContent = RestOpenApiSupport.getJsonFromOpenAPI(openApi, bc); + final JsonNode node = mapper.readTree(jsonContent); OpenAPI oai = new OpenAPIImpl(); DefinitionReader.processDefinition(oai, node); diff --git a/extensions/openapi-java/runtime/src/main/java/org/apache/camel/quarkus/component/openapi/java/graal/RestOpenApiReaderSubstitutions.java b/extensions/openapi-java/runtime/src/main/java/org/apache/camel/quarkus/component/openapi/java/graal/RestOpenApiReaderSubstitutions.java index 950cd24434..820fd66fc7 100644 --- a/extensions/openapi-java/runtime/src/main/java/org/apache/camel/quarkus/component/openapi/java/graal/RestOpenApiReaderSubstitutions.java +++ b/extensions/openapi-java/runtime/src/main/java/org/apache/camel/quarkus/component/openapi/java/graal/RestOpenApiReaderSubstitutions.java @@ -20,13 +20,13 @@ import java.util.List; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; -import io.apicurio.datamodels.core.models.ExtensibleNode; +import io.swagger.v3.oas.models.media.Schema; import org.apache.camel.openapi.RestOpenApiReader; @TargetClass(RestOpenApiReader.class) public final class RestOpenApiReaderSubstitutions { @Substitute - private static void convertAndSetItemsEnum(ExtensibleNode items, List<String> allowableValues, Class<?> type) { + private static void convertAndSetItemsEnum(final Schema items, final List<String> allowableValues, final Class<?> type) { throw new UnsupportedOperationException("RestOpenApiReader::convertAndSetItemsEnum should not be invoked"); } } diff --git a/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/common/OpenApiTest.java b/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/common/OpenApiTest.java index 352851e43e..e759eedc8b 100644 --- a/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/common/OpenApiTest.java +++ b/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/common/OpenApiTest.java @@ -114,7 +114,7 @@ public abstract class OpenApiTest { .statusCode(200) .body( "components.securitySchemes", hasKey("basicAuth"), - "components.securitySchemes.basicAuth.scheme", is("basic"), + "components.securitySchemes.basicAuth.name", is("basic"), "components.securitySchemes.basicAuth.type", is("http"), "components.securitySchemes.basicAuth.description", is("Basic Authentication")); @@ -153,18 +153,14 @@ public abstract class OpenApiTest { "paths.'/api/operation/spec'.get.parameters[0].description", is("Header Param Number"), "paths.'/api/operation/spec'.get.parameters[0].schema.default", is("1"), "paths.'/api/operation/spec'.get.parameters[0].schema.enum", contains("1", "2", "3"), - "paths.'/api/operation/spec'.get.parameters[0].schema.type", is("integer"), "paths.'/api/operation/spec'.get.parameters[0].in", is("header"), "paths.'/api/operation/spec'.get.parameters[0].required", is(true), - "paths.'/api/operation/spec'.get.parameters[1].style", is("multi"), "paths.'/api/operation/spec'.get.parameters[1].name", is("query_letter"), "paths.'/api/operation/spec'.get.parameters[1].description", is("Query Param Letter"), "paths.'/api/operation/spec'.get.parameters[1].schema.default", is("B"), "paths.'/api/operation/spec'.get.parameters[1].schema.enum", contains("A", "B", "C"), - "paths.'/api/operation/spec'.get.parameters[1].schema.type", is("string"), "paths.'/api/operation/spec'.get.parameters[1].in", is("query"), "paths.'/api/operation/spec'.get.parameters[1].required", is(false), - "paths.'/api/operation/spec'.get.responses.418.headers.rate.schema.type", is("integer"), "paths.'/api/operation/spec'.get.responses.418.headers.rate.description", is("API Rate Limit"), "paths.'/api/operation/spec'.get.responses.418.description", is("I am a teapot"), "paths.'/api/operation/spec'.get.responses.error.description", is("Response Error")); diff --git a/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v2/OpenApiV2Test.java b/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v2/OpenApiV2Test.java index 69fdfe24ac..31d73ce417 100644 --- a/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v2/OpenApiV2Test.java +++ b/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v2/OpenApiV2Test.java @@ -50,12 +50,11 @@ public class OpenApiV2Test extends OpenApiTest { "paths.'/api/operation/spec'", hasKey("get"), "paths.'/api/operation/spec'.get.parameters[0].name", is("header_number"), "paths.'/api/operation/spec'.get.parameters[0].description", is("Header Param Number"), - "paths.'/api/operation/spec'.get.parameters[0].default", is("1"), - "paths.'/api/operation/spec'.get.parameters[0].enum", contains("1", "2", "3"), + "paths.'/api/operation/spec'.get.parameters[0].default", is(1), + "paths.'/api/operation/spec'.get.parameters[0].enum", contains(1, 2, 3), "paths.'/api/operation/spec'.get.parameters[0].type", is("integer"), "paths.'/api/operation/spec'.get.parameters[0].in", is("header"), "paths.'/api/operation/spec'.get.parameters[0].required", is(true), - "paths.'/api/operation/spec'.get.parameters[1].collectionFormat", is("multi"), "paths.'/api/operation/spec'.get.parameters[1].name", is("query_letter"), "paths.'/api/operation/spec'.get.parameters[1].description", is("Query Param Letter"), "paths.'/api/operation/spec'.get.parameters[1].default", is("B"), @@ -81,7 +80,7 @@ public class OpenApiV2Test extends OpenApiTest { .statusCode(200) .body( "securityDefinitions", hasKey("basicAuth"), - "securityDefinitions.basicAuth.type", is("basicAuth"), + "securityDefinitions.basicAuth.type", is("basic"), "securityDefinitions.basicAuth.description", is("Basic Authentication")); } diff --git a/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v3/OpenApiV3Test.java b/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v3/OpenApiV3Test.java index 552d57981f..2f7bd3d669 100644 --- a/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v3/OpenApiV3Test.java +++ b/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v3/OpenApiV3Test.java @@ -46,7 +46,7 @@ public class OpenApiV3Test extends OpenApiTest { .statusCode(200) .body( "components.securitySchemes", hasKey("bearerAuth"), - "components.securitySchemes.bearerAuth.scheme", is("bearer"), + "components.securitySchemes.bearerAuth.name", is("bearer"), "components.securitySchemes.bearerAuth.type", is("http"), "components.securitySchemes.bearerAuth.bearerFormat", is("Bearer Token Authentication")); } diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index ad928182b8..e4b5119790 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -1935,6 +1935,16 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-openapi-java</artifactId> <version>${camel.version}</version> + <exclusions> + <exclusion> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + </exclusion> + <exclusion> + <groupId>org.checkerframework</groupId> + <artifactId>checker-qual</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId> @@ -2109,6 +2119,16 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-rest-openapi</artifactId> <version>${camel.version}</version> + <exclusions> + <exclusion> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + </exclusion> + <exclusion> + <groupId>org.checkerframework</groupId> + <artifactId>checker-qual</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 3022e80641..a25a49d090 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -1873,6 +1873,16 @@ <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-openapi-java</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>4.0.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <exclusions> + <exclusion> + <groupId>com.google.code.findbugs</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>jsr305</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + <exclusion> + <groupId>org.checkerframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>checker-qual</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -2042,6 +2052,16 @@ <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-rest-openapi</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>4.0.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <exclusions> + <exclusion> + <groupId>com.google.code.findbugs</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>jsr305</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + <exclusion> + <groupId>org.checkerframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>checker-qual</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6433,7 +6453,7 @@ <dependency> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>spring-aop</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.8</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.9</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6448,7 +6468,7 @@ <dependency> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>spring-expression</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.8</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.9</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6459,7 +6479,7 @@ <dependency> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>spring-jdbc</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.8</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.9</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6474,7 +6494,7 @@ <dependency> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>spring-jms</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.8</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.9</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6489,7 +6509,7 @@ <dependency> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>spring-messaging</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.8</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.9</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6504,7 +6524,7 @@ <dependency> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>spring-orm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.8</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.9</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6519,7 +6539,7 @@ <dependency> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>spring-tx</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.8</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.9</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 3a364d53e2..1d2589c366 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -1873,6 +1873,16 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-openapi-java</artifactId> <version>4.0.0-SNAPSHOT</version> + <exclusions> + <exclusion> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + </exclusion> + <exclusion> + <groupId>org.checkerframework</groupId> + <artifactId>checker-qual</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId> @@ -2042,6 +2052,16 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-rest-openapi</artifactId> <version>4.0.0-SNAPSHOT</version> + <exclusions> + <exclusion> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + </exclusion> + <exclusion> + <groupId>org.checkerframework</groupId> + <artifactId>checker-qual</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId> @@ -6388,7 +6408,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> - <version>6.0.8</version> + <version>6.0.9</version> <exclusions> <exclusion> <groupId>org.springframework</groupId> @@ -6403,7 +6423,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId> - <version>6.0.8</version> + <version>6.0.9</version> <exclusions> <exclusion> <groupId>org.springframework</groupId> @@ -6414,7 +6434,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-jdbc</artifactId> - <version>6.0.8</version> + <version>6.0.9</version> <exclusions> <exclusion> <groupId>org.springframework</groupId> @@ -6429,7 +6449,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-jms</artifactId> - <version>6.0.8</version> + <version>6.0.9</version> <exclusions> <exclusion> <groupId>org.springframework</groupId> @@ -6444,7 +6464,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-messaging</artifactId> - <version>6.0.8</version> + <version>6.0.9</version> <exclusions> <exclusion> <groupId>org.springframework</groupId> @@ -6459,7 +6479,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-orm</artifactId> - <version>6.0.8</version> + <version>6.0.9</version> <exclusions> <exclusion> <groupId>org.springframework</groupId> @@ -6474,7 +6494,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>6.0.8</version> + <version>6.0.9</version> <exclusions> <exclusion> <groupId>org.springframework</groupId> diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 8f32dfb962..47ff5b074c 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -1873,6 +1873,16 @@ <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-openapi-java</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>4.0.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <exclusions> + <exclusion> + <groupId>com.google.code.findbugs</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>jsr305</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + <exclusion> + <groupId>org.checkerframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>checker-qual</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -2042,6 +2052,16 @@ <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-rest-openapi</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>4.0.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <exclusions> + <exclusion> + <groupId>com.google.code.findbugs</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>jsr305</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + <exclusion> + <groupId>org.checkerframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>checker-qual</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6388,7 +6408,7 @@ <dependency> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>spring-aop</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.8</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.9</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6403,7 +6423,7 @@ <dependency> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>spring-expression</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.8</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.9</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6414,7 +6434,7 @@ <dependency> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>spring-jdbc</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.8</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.9</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6429,7 +6449,7 @@ <dependency> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>spring-jms</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.8</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.9</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6444,7 +6464,7 @@ <dependency> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>spring-messaging</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.8</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.9</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6459,7 +6479,7 @@ <dependency> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>spring-orm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.8</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.9</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6474,7 +6494,7 @@ <dependency> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>spring-tx</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.8</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.9</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
