You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by jp...@apache.org on 2018/07/18 09:59:32 UTC
[camel] 01/02: Fix camel-fhir Karaf feature
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 cfbd61587a37cb66523b79e5ad04bed3620d4cb5
Author: jpoth <po...@gmail.com>
AuthorDate: Tue Jul 17 17:35:56 2018 +0200
Fix camel-fhir Karaf feature
---
components/camel-fhir/camel-fhir-component/pom.xml | 4 +---
platforms/karaf/features/src/main/resources/features.xml | 2 ++
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/camel-fhir/camel-fhir-component/pom.xml b/components/camel-fhir/camel-fhir-component/pom.xml
index eff51ad..506d117 100644
--- a/components/camel-fhir/camel-fhir-component/pom.xml
+++ b/components/camel-fhir/camel-fhir-component/pom.xml
@@ -37,9 +37,7 @@
<schemeName>fhir</schemeName>
<componentPackage>org.apache.camel.component.fhir</componentPackage>
<outPackage>org.apache.camel.component.fhir.internal</outPackage>
- <camel.osgi.export.pkg>
- org.apache.camel.component.fhir.*
- </camel.osgi.export.pkg>
+ <camel.osgi.export.pkg>${componentPackage}</camel.osgi.export.pkg>
<camel.osgi.dynamic>
org.hl7.fhir.*
</camel.osgi.dynamic>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 2d4a437..ea6be25 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -675,8 +675,10 @@
<feature name='camel-fhir' version='${project.version}' resolver='(obr)' 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:org.apache.camel/camel-fhir-api/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-fhir/${project.version}</bundle>
</feature>
<feature name='camel-flatpack' version='${project.version}' resolver='(obr)' start-level='50'>