This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit b2e6ed23c33a70115ad97292aa34e490918d7a53 Author: JiriOndrusek <ondrusek.j...@gmail.com> AuthorDate: Tue Nov 21 10:37:08 2023 +0100 Fixed compilation issues with fhir, http + generated stuff --- .../ROOT/pages/reference/extensions/jolt.adoc | 6 --- .../fhir/deployment/r4/FhirR4Processor.java | 2 +- pom.xml | 8 ++-- poms/bom/pom.xml | 6 +++ poms/bom/src/main/generated/flattened-full-pom.xml | 54 ++++++++++++---------- .../src/main/generated/flattened-reduced-pom.xml | 48 ++++++++++--------- .../generated/flattened-reduced-verbose-pom.xml | 48 ++++++++++--------- 7 files changed, 95 insertions(+), 77 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/jolt.adoc b/docs/modules/ROOT/pages/reference/extensions/jolt.adoc index 8d371487fc..eb12bdc6af 100644 --- a/docs/modules/ROOT/pages/reference/extensions/jolt.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/jolt.adoc @@ -45,12 +45,6 @@ ifeval::[{doc-show-user-guide-link} == true] Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications. endif::[] -[id="extensions-jolt-allowcontextmapall-option-in-native-mode"] -== allowContextMapAll option in native mode - -The `allowContextMapAll` option is not supported in native mode as it requires reflective access to security sensitive camel core classes such as -`CamelContext` & `Exchange`. This is considered a security risk and thus access to the feature is not provided by default. - [id="extensions-jolt-additional-camel-quarkus-configuration"] == Additional Camel Quarkus configuration diff --git a/extensions/fhir/deployment/src/main/java/org/apache/camel/quarkus/component/fhir/deployment/r4/FhirR4Processor.java b/extensions/fhir/deployment/src/main/java/org/apache/camel/quarkus/component/fhir/deployment/r4/FhirR4Processor.java index 86581c95f6..8c71a2e1fe 100644 --- a/extensions/fhir/deployment/src/main/java/org/apache/camel/quarkus/component/fhir/deployment/r4/FhirR4Processor.java +++ b/extensions/fhir/deployment/src/main/java/org/apache/camel/quarkus/component/fhir/deployment/r4/FhirR4Processor.java @@ -43,7 +43,7 @@ import static org.apache.camel.quarkus.component.fhir.deployment.FhirUtil.getMod import static org.apache.camel.quarkus.component.fhir.deployment.FhirUtil.getResourceDefinitions; public class FhirR4Processor { - private static final String FHIR_VERSION_PROPERTIES = "org/hl7/fhir/r4/model/fhirversion.properties"; + private static final String FHIR_VERSION_PROPERTIES = "org/hl7/fhir/r4/hapi/model/fhirversion.properties"; @BuildStep(onlyIf = FhirFlags.R4Enabled.class) R4PropertiesBuildItem fhirProperties() { diff --git a/pom.xml b/pom.xml index aef026be6e..8a60f09836 100644 --- a/pom.xml +++ b/pom.xml @@ -98,16 +98,16 @@ <github-api.version>1.313</github-api.version><!-- Used in a Groovy script bellow --> <google-auth-library.version>1.20.0</google-auth-library.version><!-- @sync com.google.cloud:google-cloud-pubsub:${google-cloud-pubsub.version} dep:com.google.auth:google-auth-library-oauth2-http --> <google-oauth-client.version>${google-oauth-client-version}</google-oauth-client.version> - <google-cloud-bom.version>0.207.0</google-cloud-bom.version><!-- @sync com.google.cloud:libraries-bom:${google-cloud-bom-version} dep:com.google.cloud:google-cloud-bom --> - <google-cloud-pubsub-bom.version>1.125.8</google-cloud-pubsub-bom.version><!-- @sync com.google.cloud:google-cloud-bom:${google-cloud-bom.version} dep:com.google.cloud:google-cloud-pubsub-bom --> - <google-cloud-pubsub.version>1.125.8</google-cloud-pubsub.version><!-- @sync com.google.cloud:google-cloud-pubsub-bom:${google-cloud-pubsub-bom.version} dep:com.google.cloud:google-cloud-pubsub --> + <google-cloud-bom.version>0.208.0</google-cloud-bom.version><!-- @sync com.google.cloud:libraries-bom:${google-cloud-bom-version} dep:com.google.cloud:google-cloud-bom --> + <google-cloud-pubsub-bom.version>1.125.11</google-cloud-pubsub-bom.version><!-- @sync com.google.cloud:google-cloud-bom:${google-cloud-bom.version} dep:com.google.cloud:google-cloud-pubsub-bom --> + <google-cloud-pubsub.version>1.125.11</google-cloud-pubsub.version><!-- @sync com.google.cloud:google-cloud-pubsub-bom:${google-cloud-pubsub-bom.version} dep:com.google.cloud:google-cloud-pubsub --> <graalvm.version>23.0.1</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk --> <groovy.version>4.0.15</groovy.version><!-- @sync io.quarkiverse.groovy:quarkus-groovy-parent:${quarkiverse-groovy.version} prop:groovy.version --> <grpc.version>1.59.0</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core --> <hapi.version>${hapi-version}</hapi.version> <hapi-base.version>${hapi-base-version}</hapi-base.version> <hapi-fhir.version>${hapi-fhir-version}</hapi-fhir.version> - <hapi-fhir-core.version>6.0.1</hapi-fhir-core.version><!-- @sync ca.uhn.hapi.fhir:hapi-fhir:${hapi-fhir.version} prop:fhir_core_version --> + <hapi-fhir-core.version>6.0.22.2</hapi-fhir-core.version><!-- @sync ca.uhn.hapi.fhir:hapi-fhir:${hapi-fhir.version} prop:fhir_core_version --> <httpclient5.version>${httpclient-version}</httpclient5.version><!-- Saxon and Wiremock --> <ibm.mq.client.version>9.3.2.1</ibm.mq.client.version> <icu4j.version>${icu4j-version}</icu4j.version> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 1a3277fb9b..9989550645 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6532,6 +6532,12 @@ <groupId>org.apache.httpcomponents.client5</groupId> <artifactId>httpclient5</artifactId> <version>${httpclient5.version}</version> + <exclusions> + <exclusion> + <artifactId>httpcore5-h2</artifactId> + <groupId>org.apache.httpcomponents.core5</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.httpcomponents.core5</groupId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index cff163ac42..e7836a6844 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -5930,7 +5930,7 @@ <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-base</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.6.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.8.5</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} --> @@ -5949,62 +5949,62 @@ <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-client</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.6.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.8.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-structures-dstu2.1</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.6.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.8.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-structures-dstu3</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.6.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.8.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.6.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.8.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-structures-r4</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.6.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.8.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-structures-r5</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.6.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.8.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>org.hl7.fhir.dstu2</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.22.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>org.hl7.fhir.dstu2016may</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.22.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>org.hl7.fhir.dstu3</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.22.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>org.hl7.fhir.r4</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.22.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>org.hl7.fhir.r5</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.22.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>org.hl7.fhir.utilities</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.22.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>com.azure</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6072,7 +6072,7 @@ <dependency> <groupId>com.google.cloud</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>google-cloud-pubsub</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.125.8</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.125.11</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>com.google.android</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6196,12 +6196,12 @@ <dependency> <groupId>io.dropwizard.metrics</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>dropwizard-core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>4.2.21</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>4.2.22</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>metrics-jmx</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>4.2.21</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>4.2.22</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>io.minio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6243,7 +6243,7 @@ <dependency> <groupId>io.projectreactor.netty</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>reactor-netty</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.1.12</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.1.13</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>io.quarkiverse.freemarker</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6455,6 +6455,12 @@ <groupId>org.apache.httpcomponents.client5</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>httpclient5</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>5.2.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <exclusions> + <exclusion> + <groupId>org.apache.httpcomponents.core5</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>httpcore5-h2</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.httpcomponents.core5</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6681,7 +6687,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.13</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.14</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} --> @@ -6696,7 +6702,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.13</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.14</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} --> @@ -6707,7 +6713,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.13</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.14</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} --> @@ -6722,7 +6728,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.13</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.14</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} --> @@ -6737,7 +6743,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.13</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.14</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} --> @@ -6752,7 +6758,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.13</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.14</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} --> @@ -6767,7 +6773,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.13</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.14</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 3787ae7dc6..b4b9a39ca1 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -5930,7 +5930,7 @@ <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-fhir-base</artifactId> - <version>6.6.2</version> + <version>6.8.5</version> <exclusions> <exclusion> <groupId>com.google.code.findbugs</groupId> @@ -5949,62 +5949,62 @@ <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-fhir-client</artifactId> - <version>6.6.2</version> + <version>6.8.5</version> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-fhir-structures-dstu2.1</artifactId> - <version>6.6.2</version> + <version>6.8.5</version> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-fhir-structures-dstu3</artifactId> - <version>6.6.2</version> + <version>6.8.5</version> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId> - <version>6.6.2</version> + <version>6.8.5</version> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-fhir-structures-r4</artifactId> - <version>6.6.2</version> + <version>6.8.5</version> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-fhir-structures-r5</artifactId> - <version>6.6.2</version> + <version>6.8.5</version> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>org.hl7.fhir.dstu2</artifactId> - <version>6.0.1</version> + <version>6.0.22.2</version> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>org.hl7.fhir.dstu2016may</artifactId> - <version>6.0.1</version> + <version>6.0.22.2</version> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>org.hl7.fhir.dstu3</artifactId> - <version>6.0.1</version> + <version>6.0.22.2</version> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>org.hl7.fhir.r4</artifactId> - <version>6.0.1</version> + <version>6.0.22.2</version> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>org.hl7.fhir.r5</artifactId> - <version>6.0.1</version> + <version>6.0.22.2</version> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>org.hl7.fhir.utilities</artifactId> - <version>6.0.1</version> + <version>6.0.22.2</version> </dependency> <dependency> <groupId>com.azure</groupId> @@ -6072,7 +6072,7 @@ <dependency> <groupId>com.google.cloud</groupId> <artifactId>google-cloud-pubsub</artifactId> - <version>1.125.8</version> + <version>1.125.11</version> <exclusions> <exclusion> <groupId>com.google.android</groupId> @@ -6233,7 +6233,7 @@ <dependency> <groupId>io.projectreactor.netty</groupId> <artifactId>reactor-netty</artifactId> - <version>1.1.12</version> + <version>1.1.13</version> </dependency> <dependency> <groupId>io.quarkiverse.freemarker</groupId> @@ -6400,6 +6400,12 @@ <groupId>org.apache.httpcomponents.client5</groupId> <artifactId>httpclient5</artifactId> <version>5.2.1</version> + <exclusions> + <exclusion> + <groupId>org.apache.httpcomponents.core5</groupId> + <artifactId>httpcore5-h2</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.httpcomponents.core5</groupId> @@ -6601,7 +6607,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> - <version>6.0.13</version> + <version>6.0.14</version> <exclusions> <exclusion> <groupId>org.springframework</groupId> @@ -6616,7 +6622,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId> - <version>6.0.13</version> + <version>6.0.14</version> <exclusions> <exclusion> <groupId>org.springframework</groupId> @@ -6627,7 +6633,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-jdbc</artifactId> - <version>6.0.13</version> + <version>6.0.14</version> <exclusions> <exclusion> <groupId>org.springframework</groupId> @@ -6642,7 +6648,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-jms</artifactId> - <version>6.0.13</version> + <version>6.0.14</version> <exclusions> <exclusion> <groupId>org.springframework</groupId> @@ -6657,7 +6663,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-messaging</artifactId> - <version>6.0.13</version> + <version>6.0.14</version> <exclusions> <exclusion> <groupId>org.springframework</groupId> @@ -6672,7 +6678,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>6.0.13</version> + <version>6.0.14</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 8f4007f59c..3df4bbbabe 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -5930,7 +5930,7 @@ <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-base</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.6.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.8.5</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} --> @@ -5949,62 +5949,62 @@ <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-client</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.6.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.8.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-structures-dstu2.1</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.6.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.8.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-structures-dstu3</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.6.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.8.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.6.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.8.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-structures-r4</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.6.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.8.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>hapi-fhir-structures-r5</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.6.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.8.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>org.hl7.fhir.dstu2</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.22.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>org.hl7.fhir.dstu2016may</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.22.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>org.hl7.fhir.dstu3</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.22.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>org.hl7.fhir.r4</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.22.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>org.hl7.fhir.r5</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.22.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>org.hl7.fhir.utilities</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>6.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.22.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>com.azure</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6072,7 +6072,7 @@ <dependency> <groupId>com.google.cloud</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>google-cloud-pubsub</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.125.8</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.125.11</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>com.google.android</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6233,7 +6233,7 @@ <dependency> <groupId>io.projectreactor.netty</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>reactor-netty</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.1.12</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.1.13</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>io.quarkiverse.freemarker</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6400,6 +6400,12 @@ <groupId>org.apache.httpcomponents.client5</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>httpclient5</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>5.2.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <exclusions> + <exclusion> + <groupId>org.apache.httpcomponents.core5</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>httpcore5-h2</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.httpcomponents.core5</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6601,7 +6607,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.13</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.14</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} --> @@ -6616,7 +6622,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.13</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.14</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} --> @@ -6627,7 +6633,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.13</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.14</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} --> @@ -6642,7 +6648,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.13</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.14</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} --> @@ -6657,7 +6663,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.13</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.14</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} --> @@ -6672,7 +6678,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.13</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.0.14</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} -->