This is an automated email from the ASF dual-hosted git repository.
zhfeng pushed a commit to branch 3.8.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit e2745a644788b481c40f01542fd3755949cb546d
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Mon Nov 11 15:22:40 2024 +0000
Upgrade FHIR core to 6.4.0
---
pom.xml | 2 +-
poms/bom/pom.xml | 6 ++++++
poms/bom/src/main/generated/flattened-full-pom.xml | 18 ++++++++++++------
poms/bom/src/main/generated/flattened-reduced-pom.xml | 18 ++++++++++++------
.../main/generated/flattened-reduced-verbose-pom.xml | 18 ++++++++++++------
5 files changed, 43 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index d4dd8ac3ad..8c89eaeb6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,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.1.2.2</hapi-fhir-core.version><!-- @sync
ca.uhn.hapi.fhir:hapi-fhir:${hapi-fhir.version} prop:fhir_core_version -->
+ <hapi-fhir-core.version>6.4.0</hapi-fhir-core.version><!-- TODO:
https://github.com/apache/camel-quarkus/issues/6624.
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 fc12bf9683..6af3fc42d0 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -6202,6 +6202,12 @@
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.r5</artifactId>
<version>${hapi-fhir-core.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.github.stephenc.jcip</groupId>
+ <artifactId>jcip-annotations</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 029a8afb21..85dc57c90d 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6105,32 +6105,38 @@
<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.1.2.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.4.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.dstu2016may</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.1.2.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.4.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.dstu3</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.1.2.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.4.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.r4</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.1.2.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.4.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.r5</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.1.2.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.4.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <exclusions>
+ <exclusion>
+ <groupId>com.github.stephenc.jcip</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jcip-annotations</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>org.hl7.fhir.utilities</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.1.2.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.4.0</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 5bf2ece44b..c378793aaa 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6105,32 +6105,38 @@
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.dstu2</artifactId>
- <version>6.1.2.2</version>
+ <version>6.4.0</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.dstu2016may</artifactId>
- <version>6.1.2.2</version>
+ <version>6.4.0</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.dstu3</artifactId>
- <version>6.1.2.2</version>
+ <version>6.4.0</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.r4</artifactId>
- <version>6.1.2.2</version>
+ <version>6.4.0</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.r5</artifactId>
- <version>6.1.2.2</version>
+ <version>6.4.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.github.stephenc.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.utilities</artifactId>
- <version>6.1.2.2</version>
+ <version>6.4.0</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 4f8b8ba955..8f98378202 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6105,32 +6105,38 @@
<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.1.2.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.4.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.dstu2016may</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.1.2.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.4.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.dstu3</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.1.2.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.4.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.r4</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.1.2.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.4.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.r5</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.1.2.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.4.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <exclusions>
+ <exclusion>
+ <groupId>com.github.stephenc.jcip</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jcip-annotations</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>org.hl7.fhir.utilities</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.1.2.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.4.0</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} -->
