You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/08/21 07:58:11 UTC
[camel] 16/20: fix karaf support
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
commit f158bd5680c8c2d9bcb430ddcc27d5f1b61f1e19
Author: Roberto Flores <be...@gmail.com>
AuthorDate: Fri Aug 9 23:00:09 2019 -0500
fix karaf support
---
components/camel-any23/pom.xml | 6 +++++-
parent/pom.xml | 14 +++++++++++---
.../karaf/features/src/main/resources/bundles.properties | 1 +
platforms/karaf/features/src/main/resources/features.xml | 4 ++++
4 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/components/camel-any23/pom.xml b/components/camel-any23/pom.xml
index 9e10141..0788dfb 100644
--- a/components/camel-any23/pom.xml
+++ b/components/camel-any23/pom.xml
@@ -75,7 +75,11 @@
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
- <artifactId>rdf4j-runtime</artifactId>
+ <artifactId>rdf4j-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.rdf4j</groupId>
+ <artifactId>rdf4j-rio-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index a91078f..e54f126 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -49,6 +49,7 @@
<ant-bundle-version>1.7.0_6</ant-bundle-version>
<antlr-bundle-version>3.5.2_1</antlr-bundle-version>
<antlr-runtime-bundle-version>3.5.2_1</antlr-runtime-bundle-version>
+ <any23-bundle-version>2.3_1-SNAPSHOT</any23-bundle-version>
<apacheds-version>2.0.0-M24</apacheds-version>
<apache-any23-version>2.3</apache-any23-version>
<apache-drill-version>1.16.0</apache-drill-version>
@@ -529,7 +530,8 @@
<quartz-version>2.3.1</quartz-version>
<quickfixj-version>2.1.1</quickfixj-version>
<rabbitmq-amqp-client-version>5.7.3</rabbitmq-amqp-client-version>
- <rdf4j-version>3.0.0-M1</rdf4j-version>
+ <rdf4j-rio-version>2.4.4</rdf4j-rio-version>
+ <rdf4j-model-version>2.4.4</rdf4j-model-version>
<reactive-streams-version>1.0.2</reactive-streams-version>
<reactor-version>3.2.11.RELEASE</reactor-version>
<reflections-bundle-version>0.9.11_1</reflections-bundle-version>
@@ -4905,8 +4907,14 @@
<!-- optional RDF4J -->
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
- <artifactId>rdf4j-runtime</artifactId>
- <version>${rdf4j-version}</version>
+ <artifactId>rdf4j-model</artifactId>
+ <version>${rdf4j-model-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.rdf4j</groupId>
+ <artifactId>rdf4j-rio-api</artifactId>
+ <version>${rdf4j-rio-version}</version>
</dependency>
<!-- optional Axiom -->
diff --git a/platforms/karaf/features/src/main/resources/bundles.properties b/platforms/karaf/features/src/main/resources/bundles.properties
index 69de20d..aaca147 100644
--- a/platforms/karaf/features/src/main/resources/bundles.properties
+++ b/platforms/karaf/features/src/main/resources/bundles.properties
@@ -30,6 +30,7 @@ org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${ser
org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera-bundle-version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.any23/${any23-bundle-version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm-bundle-version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}/jar
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index adcebd3..04ae6c2 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -172,6 +172,10 @@
</feature>
<feature name='camel-any23' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.any23/${any23-bundle-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:commons.io/commons.io/${commons-io-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.eclipse.rdf4j/rdf4j-model/${rdf4j-model-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.eclipse.rdf4j/rdf4j-rio-api/${rdf4j-rio-version}</bundle>
<bundle>mvn:org.apache.camel/camel-any23/${project.version}</bundle>
</feature>
<feature name='camel-apns' version='${project.version}' start-level='50'>