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

[jp...@apache.org]

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 <po...@gmail.com>
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");
-    }
-
-}