This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 6ed659a Update camel-fhir Karaf feature
6ed659a is described below
commit 6ed659a76e7f4133dd9105fdcc46b63aa2719648
Author: jpoth <poth.j...@gmail.com>
AuthorDate: Tue Apr 17 15:30:20 2018 +0200
Update camel-fhir Karaf feature
---
parent/pom.xml | 1 -
.../karaf/features/src/main/resources/features.xml | 17 ++++-------------
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index ead9649..638bc72 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -288,7 +288,6 @@
<hamcrest-version>2.0.0.0</hamcrest-version>
<hapi-version>2.3</hapi-version>
<hapi-fhir-version>3.3.0</hapi-fhir-version>
- <guava-fhir-version>23.0</guava-fhir-version>
<hawtbuf-version>1.11</hawtbuf-version>
<hawtdb-version>1.6</hawtdb-version>
<hawtdispatch-version>1.22</hawtdispatch-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 2299c97..416997c 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -22,6 +22,7 @@
<repository>mvn:org.apache.jclouds.karaf/jclouds-karaf/${jclouds-version}/xml/features</repository>
<repository>mvn:org.ops4j.pax.cdi/pax-cdi-features/${pax-cdi-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>
<feature name='xml-specs-api' version='${servicemix-specs-version}'
resolver='(obr)' start-level='10'>
<bundle
dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}</bundle>
@@ -671,19 +672,9 @@
</feature>
<feature name='camel-fhir' version='${project.version}' resolver='(obr)'
start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle
dependency='true'>mvn:com.google.code.gson/gson/${gson-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
- <bundle
dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
- <bundle
dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
- <bundle
dependency='true'>mvn:com.google.guava/guava/${guava-fhir-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
- <bundle
dependency='true'>mvn:ca.uhn.hapi/hapi-osgi-base/${hapi-version}</bundle>
-
<bundle>wrap:mvn:ca.uhn.hapi.fhir/hapi-fhir-client/${hapi-fhir-version}</bundle>
-
<bundle>wrap:mvn:ca.uhn.hapi.fhir/hapi-fhir-base/${hapi-fhir-version}$DynamicImport-Package=*</bundle>
-
<bundle>wrap:mvn:ca.uhn.hapi.fhir/hapi-fhir-structures-dstu3/${hapi-fhir-version}</bundle>
-
<bundle>wrap:mvn:ca.uhn.hapi.fhir/hapi-fhir-utilities/${hapi-fhir-version}</bundle>
-
<bundle>wrap:mvn:ca.uhn.hapi.fhir/hapi-fhir-structures-dstu2/${hapi-fhir-version}</bundle>
+ <feature version='${hapi-fhir-version}'>hapi-fhir</feature>
+ <feature version='${hapi-fhir-version}'>hapi-fhir-dstu2</feature>
+ <feature version='${hapi-fhir-version}'>hapi-fhir-dstu3</feature>
<bundle>mvn:org.apache.camel/camel-fhir/${project.version}</bundle>
</feature>
<feature name='camel-flatpack' version='${project.version}' resolver='(obr)'
start-level='50'>
--
To stop receiving notification emails like this one, please contact
acosent...@apache.org.
