[camel] branch master updated: Fixed Karaf features verification on JDK11 for camel-solr

[acosentino]

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 79f1711  Fixed Karaf features verification on JDK11 for camel-solr
79f1711 is described below

commit 79f1711cd0c7acfc03cc176add5696ef06142eaa
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Wed Jul 10 11:20:31 2019 +0200

    Fixed Karaf features verification on JDK11 for camel-solr
---
 components/camel-solr/pom.xml                            | 7 +++++++
 platforms/karaf/features/src/main/resources/features.xml | 1 +
 2 files changed, 8 insertions(+)

diff --git a/components/camel-solr/pom.xml b/components/camel-solr/pom.xml
index 01d10e8..cbd585c 100644
--- a/components/camel-solr/pom.xml
+++ b/components/camel-solr/pom.xml
@@ -34,6 +34,9 @@
     <properties>
         <java.awt.headless>true</java.awt.headless>
         
<solr-test-framework-jetty-version>9.4.11.v20180605</solr-test-framework-jetty-version>
+        <camel.osgi.import.before.defaults>
+            javax.activation.*;version="${javax-activation-version-range}"
+        </camel.osgi.import.before.defaults>
         <camel.osgi.import.additional>
             org.apache.solr.*;version="${solr-version-range}"
         </camel.osgi.import.additional>
@@ -45,6 +48,10 @@
             <artifactId>camel-support</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-attachments</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.solr</groupId>
             <artifactId>solr-solrj</artifactId>
             <version>${solr-version}</version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 0046fd4..7b11435 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2285,6 +2285,7 @@
     <bundle 
dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
     <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle>
     <bundle 
dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
+    <bundle>mvn:org.apache.camel/camel-attachments/${project.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-solr/${project.version}</bundle>
   </feature>
   <feature name='camel-soroush' version='${project.version}' start-level='50'>