You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/03/24 13:42:00 UTC
[camel-karaf] branch master updated: CAMEL-14629: Fix installing
camel on karaf due to JAXB import range. Lower it to 2.2 so it works on
older Karaf.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/master by this push:
new bc77428 CAMEL-14629: Fix installing camel on karaf due to JAXB import range. Lower it to 2.2 so it works on older Karaf.
bc77428 is described below
commit bc77428fc110a934bf9cc85b4062002bca3f9652
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Mar 24 14:41:48 2020 +0100
CAMEL-14629: Fix installing camel on karaf due to JAXB import range. Lower it to 2.2 so it works on older Karaf.
---
components/camel-blueprint/pom.xml | 4 ++++
components/camel-cxf-blueprint/pom.xml | 4 ++++
components/camel-cxf-transport-blueprint/pom.xml | 4 ++++
components/camel-test-blueprint/pom.xml | 4 ++++
platforms/karaf/features/src/main/resources/features.xml | 1 -
5 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml
index a236711..295fafd 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -36,6 +36,10 @@
<properties>
<firstVersion>2.4.0</firstVersion>
<label>java,osgi</label>
+ <camel.osgi.import>
+ javax.xml.bind*;version="[2.2,3.0)",
+ *
+ </camel.osgi.import>
</properties>
<dependencies>
diff --git a/components/camel-cxf-blueprint/pom.xml b/components/camel-cxf-blueprint/pom.xml
index 6231554..ecd2499 100644
--- a/components/camel-cxf-blueprint/pom.xml
+++ b/components/camel-cxf-blueprint/pom.xml
@@ -32,6 +32,10 @@
<description>Camel CXF for OSGi Blueprint</description>
<properties>
+ <camel.osgi.import>
+ javax.xml.bind*;version="[2.2,3.0)",
+ *
+ </camel.osgi.import>
</properties>
<dependencies>
diff --git a/components/camel-cxf-transport-blueprint/pom.xml b/components/camel-cxf-transport-blueprint/pom.xml
index 8dacbf3..7395b2a 100644
--- a/components/camel-cxf-transport-blueprint/pom.xml
+++ b/components/camel-cxf-transport-blueprint/pom.xml
@@ -32,6 +32,10 @@
<description>Camel CXF Transport for OSGi Blueprint</description>
<properties>
+ <camel.osgi.import>
+ javax.xml.bind*;version="[2.2,3.0)",
+ *
+ </camel.osgi.import>
</properties>
<dependencies>
diff --git a/components/camel-test-blueprint/pom.xml b/components/camel-test-blueprint/pom.xml
index aad0690..38c35e2 100644
--- a/components/camel-test-blueprint/pom.xml
+++ b/components/camel-test-blueprint/pom.xml
@@ -36,6 +36,10 @@
<firstVersion>2.10.0</firstVersion>
<label>testing,java,osgi</label>
+ <camel.osgi.import>
+ javax.xml.bind*;version="[2.2,3.0)",
+ *
+ </camel.osgi.import>
</properties>
<dependencies>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index b8598ce..9f5edbb 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -61,7 +61,6 @@
<bundle>mvn:org.apache.camel/camel-cluster/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-xml-jaxp/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-xml-jaxb/${project.version}</bundle>
- <bundle>mvn:org.apache.camel/camel-main/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-caffeine-lrucache/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-tooling-model/${project.version}</bundle>
<!-- core components -->