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 aa14d353d2871fc87edd6e49fb17bfcf7de6b1cf Author: Jiri Ondrusek <ondrusek.j...@gmail.com> AuthorDate: Mon May 26 08:45:53 2025 +0200 Generated files --- pom.xml | 2 +- poms/bom/pom.xml | 10 ++++++ poms/bom/src/main/generated/flattened-full-pom.xml | 36 ++++++++++++++-------- .../src/main/generated/flattened-reduced-pom.xml | 36 ++++++++++++++-------- .../generated/flattened-reduced-verbose-pom.xml | 36 ++++++++++++++-------- 5 files changed, 80 insertions(+), 40 deletions(-) diff --git a/pom.xml b/pom.xml index 7d3036ca0a..d2c458fbc5 100644 --- a/pom.xml +++ b/pom.xml @@ -116,7 +116,7 @@ <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.4.0</hapi-fhir-core.version><!-- @sync ca.uhn.hapi.fhir:hapi-fhir:${hapi-fhir.version} prop:fhir_core_version --> + <hapi-fhir-core.version>6.5.18</hapi-fhir-core.version><!-- @sync ca.uhn.hapi.fhir:hapi-fhir:${hapi-fhir.version} prop:fhir_core_version --> <ibm.java-sdk-core.version>9.23.1</ibm.java-sdk-core.version><!-- Required because of https://github.com/apache/camel-quarkus/issues/7269 --> <ibm.mq.client.version>9.4.2.0</ibm.mq.client.version> <icu4j.version>${icu4j-version}</icu4j.version> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 545cb91ce0..7b5b68be68 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6697,6 +6697,16 @@ <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-fhir-structures-r4</artifactId> <version>${hapi-fhir.version}</version> + <exclusions> + <exclusion> + <groupId>org.glassfish</groupId> + <artifactId>jakarta.json</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index c1e5ed43e7..eb0bdac16a 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6554,7 +6554,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>8.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>8.2.0</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} --> @@ -6573,12 +6573,12 @@ <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>8.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>8.2.0</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>8.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>8.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>junit</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6593,52 +6593,62 @@ <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>8.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>8.2.0</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>8.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>8.2.0</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>8.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>8.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <exclusions> + <exclusion> + <groupId>org.glassfish</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>jakarta.json</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>jcl-over-slf4j</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + </exclusions> </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>8.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>8.2.0</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.4.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.5.18</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.4.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.5.18</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.4.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.5.18</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.4.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.5.18</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.4.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.5.18</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.4.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.5.18</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} --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index a79d16a031..e99318f7f8 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6544,7 +6544,7 @@ <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-fhir-base</artifactId> - <version>8.0.0</version> + <version>8.2.0</version> <exclusions> <exclusion> <groupId>com.google.code.findbugs</groupId> @@ -6563,12 +6563,12 @@ <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-fhir-client</artifactId> - <version>8.0.0</version> + <version>8.2.0</version> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-fhir-structures-dstu2.1</artifactId> - <version>8.0.0</version> + <version>8.2.0</version> <exclusions> <exclusion> <groupId>junit</groupId> @@ -6583,52 +6583,62 @@ <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-fhir-structures-dstu3</artifactId> - <version>8.0.0</version> + <version>8.2.0</version> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId> - <version>8.0.0</version> + <version>8.2.0</version> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-fhir-structures-r4</artifactId> - <version>8.0.0</version> + <version>8.2.0</version> + <exclusions> + <exclusion> + <groupId>org.glassfish</groupId> + <artifactId>jakarta.json</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-fhir-structures-r5</artifactId> - <version>8.0.0</version> + <version>8.2.0</version> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>org.hl7.fhir.dstu2</artifactId> - <version>6.4.0</version> + <version>6.5.18</version> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>org.hl7.fhir.dstu2016may</artifactId> - <version>6.4.0</version> + <version>6.5.18</version> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>org.hl7.fhir.dstu3</artifactId> - <version>6.4.0</version> + <version>6.5.18</version> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>org.hl7.fhir.r4</artifactId> - <version>6.4.0</version> + <version>6.5.18</version> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>org.hl7.fhir.r5</artifactId> - <version>6.4.0</version> + <version>6.5.18</version> </dependency> <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>org.hl7.fhir.utilities</artifactId> - <version>6.4.0</version> + <version>6.5.18</version> </dependency> <dependency> <groupId>com.azure</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 1de764d633..13a2048c4e 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6544,7 +6544,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>8.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>8.2.0</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} --> @@ -6563,12 +6563,12 @@ <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>8.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>8.2.0</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>8.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>8.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>junit</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6583,52 +6583,62 @@ <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>8.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>8.2.0</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>8.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>8.2.0</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>8.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>8.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <exclusions> + <exclusion> + <groupId>org.glassfish</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>jakarta.json</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>jcl-over-slf4j</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + </exclusions> </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>8.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>8.2.0</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.4.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.5.18</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.4.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.5.18</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.4.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.5.18</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.4.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.5.18</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.4.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.5.18</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.4.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>6.5.18</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} -->