[camel] branch master updated (375e127 -> 46cc6d3)

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch master updated (375e127 -> 46cc6d3)

jpoth
This is an automated email from the ASF dual-hosted git repository.

jpoth pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from 375e127  CAMEL-14176: camel-xslt - Split up into camel-saxon-xslt (#3339)
     new 267f4e5  Fix ServicePool documentation
     new f0491a1  CAMEL-14104: Update to FHIR 4.1.0
     new 225503e  CAMEL-14104: camel-fhir set default FHIR version to R4
     new 46cc6d3  CAMEL-14104: camel-fhir drop Karaf support

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 components/camel-fhir/camel-fhir-component/pom.xml | 12 +++++++
 .../src/main/docs/fhir-component.adoc              |  6 ++--
 .../camel/component/fhir/FhirConfiguration.java    |  6 ++--
 .../camel/component/fhir/FhirConfigurationIT.java  |  2 +-
 .../fhir/FhirCustomClientConfigurationIT.java      | 27 +++++++--------
 .../camel/component/fhir/FhirOperationIT.java      |  6 +---
 .../src/test/resources/test-options.properties     |  2 +-
 .../org/apache/camel/impl/engine/ServicePool.java  |  3 +-
 .../endpoint/dsl/FhirEndpointBuilderFactory.java   |  6 ++--
 .../ROOT/pages/camel-3-migration-guide.adoc        |  5 +++
 parent/pom.xml                                     |  2 +-
 .../karaf/features/src/main/resources/features.xml | 11 -------
 .../springboot/FhirComponentConfiguration.java     | 38 +---------------------
 .../apache/camel/itest/karaf/CamelFhirTest.java    | 35 --------------------
 14 files changed, 44 insertions(+), 117 deletions(-)
 delete mode 100644 tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFhirTest.java

Reply | Threaded
Open this post in threaded view
|

[camel] 01/04: Fix ServicePool documentation

jpoth
This is an automated email from the ASF dual-hosted git repository.

jpoth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 267f4e5bff9a1db243fda8b67b1079ec673cbcc2
Author: John Poth <[hidden email]>
AuthorDate: Mon Sep 30 16:57:48 2019 +0200

    Fix ServicePool documentation
---
 .../src/main/java/org/apache/camel/impl/engine/ServicePool.java        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/ServicePool.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/ServicePool.java
index 8afe7ef..a75cdd6 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/ServicePool.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/ServicePool.java
@@ -36,8 +36,7 @@ import org.slf4j.LoggerFactory;
 /**
  * A service pool is like a connection pool but can pool any kind of objects.
  * <p/>
- * Notice the capacity is <b>per key</b> which means that each key can contain at most
- * (the capacity) services. The pool will contain at most (the capacity) number of keys.
+ *  The pool will contain at most (the capacity) number of services.
  * <p/>
  * By default the capacity is set to 100.
  */

Reply | Threaded
Open this post in threaded view
|

[camel] 02/04: CAMEL-14104: Update to FHIR 4.1.0

jpoth
In reply to this post by jpoth
This is an automated email from the ASF dual-hosted git repository.

jpoth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit f0491a1aa922d75a6e7926636736c2a8ae5eaee0
Author: John Poth <[hidden email]>
AuthorDate: Wed Oct 23 17:04:30 2019 +0200

    CAMEL-14104: Update to FHIR 4.1.0
---
 components/camel-fhir/camel-fhir-component/pom.xml | 12 ++++++++++
 .../camel/component/fhir/FhirConfiguration.java    |  2 ++
 .../camel/component/fhir/FhirConfigurationIT.java  |  2 +-
 .../fhir/FhirCustomClientConfigurationIT.java      | 27 +++++++++-------------
 .../camel/component/fhir/FhirOperationIT.java      |  6 +----
 .../src/test/resources/test-options.properties     |  2 +-
 .../endpoint/dsl/FhirEndpointBuilderFactory.java   |  6 +++--
 parent/pom.xml                                     |  2 +-
 8 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/components/camel-fhir/camel-fhir-component/pom.xml b/components/camel-fhir/camel-fhir-component/pom.xml
index 73f78c2..aa8285b 100644
--- a/components/camel-fhir/camel-fhir-component/pom.xml
+++ b/components/camel-fhir/camel-fhir-component/pom.xml
@@ -80,6 +80,18 @@
         <!-- These aren't needed for compilation but makes camel-fhir easier to use for third party projects/users e.g wildfly-camel -->
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
+            <artifactId>hapi-fhir-structures-r5</artifactId>
+            <version>${hapi-fhir-version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>ca.uhn.hapi.fhir</groupId>
+            <artifactId>hapi-fhir-structures-r4</artifactId>
+            <version>${hapi-fhir-version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>ca.uhn.hapi.fhir</groupId>
             <artifactId>hapi-fhir-structures-dstu3</artifactId>
             <version>${hapi-fhir-version}</version>
         </dependency>
diff --git a/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java b/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java
index 33910e0..f0dcd1a 100644
--- a/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java
+++ b/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java
@@ -346,6 +346,8 @@ public class FhirConfiguration {
                     && ObjectHelper.equal(proxyPort, otherFhirConfiguration.getProxyPort())
                     && ObjectHelper.equal(proxyUser, otherFhirConfiguration.getProxyUser())
                     && ObjectHelper.equal(proxyPassword, otherFhirConfiguration.getProxyPassword())
+                    && ObjectHelper.equal(client, otherFhirConfiguration.getClient())
+                    && ObjectHelper.equal(clientFactory, otherFhirConfiguration.getClientFactory())
                     && ObjectHelper.equal(serverUrl, otherFhirConfiguration.getServerUrl());
         }
         return false;
diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
index e8ee1c6..d89aa1f 100644
--- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
+++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
@@ -73,7 +73,7 @@ public class FhirConfigurationIT extends AbstractFhirTestSupport {
         assertEquals("http://localhost:8080/hapi-fhir-jpaserver-example/baseDstu3", client.getUrlBase());
         assertEquals(EncodingEnum.JSON, client.getEncoding());
         assertEquals(SummaryEnum.TEXT, client.getSummary());
-        List<IClientInterceptor> interceptors = client.getInterceptors();
+        List<Object> interceptors = client.getInterceptorService().getAllRegisteredInterceptors();
         assertEquals(5, interceptors.size());
     }
 
diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java
index 8fef25a..20f3d26 100644
--- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java
+++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.fhir;
 import java.util.List;
 import java.util.Map;
 import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.interceptor.api.IInterceptorService;
 import ca.uhn.fhir.model.primitive.IdDt;
 import ca.uhn.fhir.model.primitive.UriDt;
 import ca.uhn.fhir.rest.api.EncodingEnum;
@@ -74,17 +75,6 @@ public class FhirCustomClientConfigurationIT extends AbstractFhirTestSupport {
     
     @BindToRegistry("customClientFactory")
     private CustomClientFactory clientFactory = new CustomClientFactory();
-    
-    @Override
-    protected CamelContext createCamelContext() throws Exception {
-        final CamelContext context = new DefaultCamelContext(createRegistry());
-
-        // add FhirComponent to Camel context but don't set up componentConfiguration
-        final FhirComponent component = new FhirComponent(context);
-        context.addComponent("fhir", component);
-
-        return context;
-    }
 
     @Test
     public void testConfigurationWithCustomClient() throws Exception {
@@ -302,27 +292,32 @@ public class FhirCustomClientConfigurationIT extends AbstractFhirTestSupport {
         }
 
         @Override
-        public <T extends IBaseResource> T fetchResourceFromUrl(Class<T> theResourceType, String theUrl) {
+        public IInterceptorService getInterceptorService() {
             return null;
         }
 
         @Override
-        public EncodingEnum getEncoding() {
+        public void setInterceptorService(IInterceptorService theInterceptorService) {
+
+        }
+
+        @Override
+        public <T extends IBaseResource> T fetchResourceFromUrl(Class<T> theResourceType, String theUrl) {
             return null;
         }
 
         @Override
-        public FhirContext getFhirContext() {
+        public EncodingEnum getEncoding() {
             return null;
         }
 
         @Override
-        public IHttpClient getHttpClient() {
+        public FhirContext getFhirContext() {
             return null;
         }
 
         @Override
-        public List<IClientInterceptor> getInterceptors() {
+        public IHttpClient getHttpClient() {
             return null;
         }
 
diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java
index f043b5c..635bae1 100644
--- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java
+++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java
@@ -99,7 +99,7 @@ public class FhirOperationIT extends AbstractFhirTestSupport {
     public void testOnServer() throws Exception {
         final Map<String, Object> headers = new HashMap<>();
         // parameter type is String
-        headers.put("CamelFhir.name", "get-resource-counts");
+        headers.put("CamelFhir.name", "$get-resource-counts");
         // parameter type is org.hl7.fhir.instance.model.api.IBaseParameters
         headers.put("CamelFhir.parameters", null);
         // parameter type is Class
@@ -111,11 +111,7 @@ public class FhirOperationIT extends AbstractFhirTestSupport {
         headers.put("CamelFhir.extraParameters", null);
 
         final Parameters result = requestBodyAndHeaders("direct://ON_SERVER", null, headers);
-
         assertNotNull("onServer result", result);
-        LOG.debug("onServer: " + result);
-        int resourceCount = Integer.valueOf(((IntegerType)result.getParameter().get(0).getValue()).asStringValue());
-        assertTrue(resourceCount > 0);
     }
 
     @Test
diff --git a/components/camel-fhir/camel-fhir-component/src/test/resources/test-options.properties b/components/camel-fhir/camel-fhir-component/src/test/resources/test-options.properties
index db11449..4ce7ca1 100644
--- a/components/camel-fhir/camel-fhir-component/src/test/resources/test-options.properties
+++ b/components/camel-fhir/camel-fhir-component/src/test/resources/test-options.properties
@@ -16,5 +16,5 @@
 ## ---------------------------------------------------------------------------
 
 #serverUrl=http://Fhirtest.uhn.ca/baseDstu3
-serverUrl=http://localhost:8080/hapi-fhir-jpaserver-example/baseDstu3
+serverUrl=http://localhost:8080/hapi-fhir-jpaserver/fhir/
 fhirVersion=DSTU3
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FhirEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FhirEndpointBuilderFactory.java
index 5c91fae..36403ac 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FhirEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FhirEndpointBuilderFactory.java
@@ -2201,7 +2201,8 @@ public interface FhirEndpointBuilderFactory {
      */
     enum EncodingEnum {
         JSON,
-        XML;
+        XML,
+        RDF;
     }
 
     /**
@@ -2212,7 +2213,8 @@ public interface FhirEndpointBuilderFactory {
         DSTU2_HL7ORG,
         DSTU2_1,
         DSTU3,
-        R4;
+        R4,
+        R5;
     }
 
     /**
diff --git a/parent/pom.xml b/parent/pom.xml
index 341416c..27f1ed9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -257,7 +257,7 @@
         <hadoop2-protobuf-version>2.5.0</hadoop2-protobuf-version>
         <hamcrest-version>2.2</hamcrest-version>
         <hapi-version>2.3</hapi-version>
-        <hapi-fhir-version>3.7.0</hapi-fhir-version>
+        <hapi-fhir-version>4.1.0</hapi-fhir-version>
         <hawtbuf-version>1.11</hawtbuf-version>
         <hawtdispatch-version>1.22</hawtdispatch-version>
         <hazelcast-version>3.12.4</hazelcast-version>

Reply | Threaded
Open this post in threaded view
|

[camel] 03/04: CAMEL-14104: camel-fhir set default FHIR version to R4

jpoth
In reply to this post by jpoth
This is an automated email from the ASF dual-hosted git repository.

jpoth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 225503e2de5ba3824f26f05a08b3aef0d74c2f8b
Author: John Poth <[hidden email]>
AuthorDate: Thu Nov 14 15:38:01 2019 +0100

    CAMEL-14104: camel-fhir set default FHIR version to R4
---
 .../src/main/docs/fhir-component.adoc              |  6 ++--
 .../camel/component/fhir/FhirConfiguration.java    |  4 +--
 .../springboot/FhirComponentConfiguration.java     | 38 +---------------------
 3 files changed, 5 insertions(+), 43 deletions(-)

diff --git a/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc b/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc
index 8425aa6..5467775 100644
--- a/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc
+++ b/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc
@@ -51,7 +51,7 @@ Endpoint prefix can be one of:
 
 
 // component options: START
-The FHIR component supports 4 options, which are listed below.
+The FHIR component supports 2 options, which are listed below.
 
 
 
@@ -60,8 +60,6 @@ The FHIR component supports 4 options, which are listed below.
 | Name | Description | Default | Type
 | *configuration* (common) | To use the shared configuration |  | FhirConfiguration
 | *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
-| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
-| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 |===
 // component options: END
 
@@ -93,7 +91,7 @@ with the following path and query parameters:
 |===
 | Name | Description | Default | Type
 | *encoding* (common) | Encoding to use for all request |  | String
-| *fhirVersion* (common) | The FHIR Version to use | DSTU3 | String
+| *fhirVersion* (common) | The FHIR Version to use | R4 | String
 | *inBody* (common) | Sets the name of a parameter to be passed in the exchange In Body |  | String
 | *log* (common) | Will log every requests and responses | false | boolean
 | *prettyPrint* (common) | Pretty print all request | false | boolean
diff --git a/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java b/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java
index f0dcd1a..ebf0c7b 100644
--- a/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java
+++ b/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java
@@ -46,8 +46,8 @@ public class FhirConfiguration {
     @UriParam(description = "The FHIR server base URL")
     private String serverUrl;
 
-    @UriParam(description = "The FHIR Version to use", defaultValue = "DSTU3", javaType = "java.lang.String")
-    private FhirVersionEnum fhirVersion = FhirVersionEnum.DSTU3;
+    @UriParam(description = "The FHIR Version to use", defaultValue = "R4", javaType = "java.lang.String")
+    private FhirVersionEnum fhirVersion = FhirVersionEnum.R4;
 
     @UriParam(description = "Pretty print all request")
     private boolean prettyPrint;
diff --git a/platforms/spring-boot/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirComponentConfiguration.java
index cba6662..fc9a6ef 100644
--- a/platforms/spring-boot/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirComponentConfiguration.java
@@ -49,26 +49,6 @@ public class FhirComponentConfiguration
      * the newer property binding with additional capabilities
      */
     private Boolean basicPropertyBinding = false;
-    /**
-     * Whether the producer should be started lazy (on the first message). By
-     * starting lazy you can use this to allow CamelContext and routes to
-     * startup in situations where a producer may otherwise fail during starting
-     * and cause the route to fail being started. By deferring this startup to
-     * be lazy then the startup failure can be handled during routing messages
-     * via Camel's routing error handlers. Beware that when the first message is
-     * processed then creating and starting the producer may take a little time
-     * and prolong the total processing time of the processing.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
-     * Allows for bridging the consumer to the Camel routing Error Handler,
-     * which mean any exceptions occurred while the consumer is trying to pickup
-     * incoming messages, or the likes, will now be processed as a message and
-     * handled by the routing Error Handler. By default the consumer will use
-     * the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that
-     * will be logged at WARN or ERROR level and ignored.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public FhirConfigurationNestedConfiguration getConfiguration() {
         return configuration;
@@ -87,22 +67,6 @@ public class FhirComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class FhirConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.fhir.FhirConfiguration.class;
         /**
@@ -112,7 +76,7 @@ public class FhirComponentConfiguration
         /**
          * Component configuration for FHIR component.
          */
-        private String fhirVersion = "DSTU3";
+        private String fhirVersion = "R4";
         /**
          * Component configuration for FHIR component.
          */

Reply | Threaded
Open this post in threaded view
|

[camel] 04/04: CAMEL-14104: camel-fhir drop Karaf support

jpoth
In reply to this post by jpoth
This is an automated email from the ASF dual-hosted git repository.

jpoth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 46cc6d367f7a44bfd5f92d08af7b52bde8f7c876
Author: John Poth <[hidden email]>
AuthorDate: Thu Nov 14 15:51:59 2019 +0100

    CAMEL-14104: camel-fhir drop Karaf support
---
 .../ROOT/pages/camel-3-migration-guide.adoc        |  5 ++++
 .../karaf/features/src/main/resources/features.xml | 11 -------
 .../apache/camel/itest/karaf/CamelFhirTest.java    | 35 ----------------------
 3 files changed, 5 insertions(+), 46 deletions(-)

diff --git a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc
index 23eaa91..257bd91 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc
@@ -267,6 +267,11 @@ The component `camel-aws` has been split into multiple components:
 
 So you'll have to add explicitly the dependencies for these components. From the OSGi perspective, there is still a `camel-aws` Karaf feature, which includes all the components features.
 
+=== FHIR
+
+The camel-fhir component has upgraded it's hapi-fhir dependency to 4.1.0; Karaf support has been dropped until the hapi-fhir Karaf features are fixed and released.
+The default FHIR version has been changed to R4. Therefore if DSTU3 is desired it has to be explicitly set.
+
 === Kafka
 
 The `camel-kafka` component has removed the options `bridgeEndpoint` and `circularEndpointDetection` as this is no longer needed as the component is acting as briding would work on Camel 2.x. In other words `camel-kafka` will send messages to the topic from the endpoint uri. To override this use the `KafkaConstants.OVERRIDE_TOPIC` header with the new topic. See more details in the `camel-kafka` component documentation.
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 0ae46a0..722fd96 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -23,7 +23,6 @@
   <repository>mvn:org.ops4j.pax.cdi/pax-cdi-features/${pax-cdi-version}/xml/features</repository>
   <repository>mvn:org.apache.karaf.features/spring-legacy/${karaf4-version}/xml/features</repository>
   <repository>mvn:org.hibernate.validator/hibernate-validator-osgi-karaf-features/${hibernate-validator-version}/xml/features</repository>
-  <repository>mvn:ca.uhn.hapi.fhir.karaf/hapi-fhir/${hapi-fhir-version}/xml/features</repository>
   <repository>mvn:org.infinispan/infinispan-commons/${infinispan-version}/xml/features</repository>
   <repository>mvn:org.infinispan/infinispan-core/${infinispan-version}/xml/features</repository>
   <repository>mvn:org.infinispan/infinispan-jboss-marshalling/${infinispan-version}/xml/features</repository>
@@ -974,16 +973,6 @@
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastjson/${fastjson-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-fastjson/${project.version}</bundle>
   </feature>
-  <feature name='camel-fhir' version='${project.version}' start-level='50'>
-    <feature version='${project.version}'>camel-core</feature>
-    <feature version='${hapi-fhir-version}'>hapi-fhir</feature>
-    <feature version='${hapi-fhir-version}'>hapi-fhir-client</feature>
-    <feature version='${hapi-fhir-version}'>hapi-fhir-dstu2</feature>
-    <feature version='${hapi-fhir-version}'>hapi-fhir-dstu3</feature>
-    <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.camel/camel-fhir-api/${project.version}</bundle>
-    <bundle>mvn:org.apache.camel/camel-fhir/${project.version}</bundle>
-  </feature>
   <feature name='camel-file-watch' version='${project.version}' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <bundle dependency='true'>wrap:mvn:io.methvin/directory-watcher/${directory-watcher-version}</bundle>
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFhirTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFhirTest.java
deleted file mode 100644
index 46d236c..0000000
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFhirTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.itest.karaf;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.PaxExam;
-
-@RunWith(PaxExam.class)
-public class CamelFhirTest extends BaseKarafTest {
-
-    public static final String COMPONENT = extractName(CamelFhirTest.class);
-
-    @Test
-    public void test() throws Exception {
-        testDataFormat(COMPONENT, "fhirJson");
-        testDataFormat(COMPONENT, "fhirXml");
-        testComponent(COMPONENT, "fhir");
-    }
-
-}