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:41:36 UTC
[camel] 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.git
The following commit(s) were added to refs/heads/master by this push:
new be7e399 CAMEL-14629: Fix installing camel on karaf due to JAXB import range. Lower it to 2.2 so it works on older Karaf.
be7e399 is described below
commit be7e399e7dc782d8f80113d1dedf1c812fa011f4
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Mar 24 14:28:45 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-cdi/pom.xml | 1 +
components/camel-hbase/pom.xml | 1 +
components/camel-jaxb/pom.xml | 1 +
components/camel-jmx/pom.xml | 4 ++++
components/camel-milo/pom.xml | 1 +
components/camel-rest/pom.xml | 10 +++++++++-
components/camel-salesforce/camel-salesforce-component/pom.xml | 1 +
components/camel-soap/pom.xml | 1 +
components/camel-spring/pom.xml | 7 +++++++
components/camel-stax/pom.xml | 4 ++++
components/camel-syslog/pom.xml | 4 ++++
core/camel-api/pom.xml | 4 ++++
core/camel-base/pom.xml | 7 +++++++
core/camel-core-engine/pom.xml | 4 ++++
core/camel-core-xml/pom.xml | 8 +++++++-
core/camel-endpointdsl/pom.xml | 4 ++++
core/camel-util/pom.xml | 7 +++++++
17 files changed, 67 insertions(+), 2 deletions(-)
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index d0b91a9..01856e6 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -40,6 +40,7 @@
<camel.osgi.import>
!org.apache.camel.cdi.*,
!org.apache.deltaspike.cdise.api.*,
+ javax.xml.bind*;version="[2.2,3.0)",
${camel.osgi.import.defaults},
*
</camel.osgi.import>
diff --git a/components/camel-hbase/pom.xml b/components/camel-hbase/pom.xml
index 4530a02..f7b33cd 100644
--- a/components/camel-hbase/pom.xml
+++ b/components/camel-hbase/pom.xml
@@ -32,6 +32,7 @@
<description>Camel HBase component</description>
<properties>
<camel.osgi.import.before.defaults>
+ javax.xml.bind*;version="[2.2,3.0)",
org.apache.hadoop.conf;version="[2,3)",
org.apache.hadoop.hbase.*;version="[1,2)"
</camel.osgi.import.before.defaults>
diff --git a/components/camel-jaxb/pom.xml b/components/camel-jaxb/pom.xml
index 58997e6..3662d4b 100644
--- a/components/camel-jaxb/pom.xml
+++ b/components/camel-jaxb/pom.xml
@@ -35,6 +35,7 @@
<properties>
<camel.osgi.import>
com.sun.xml.bind.marshaller;resolution:=optional;version="[2.2,3)",
+ javax.xml.bind*;version="[2.2,3.0)",
*
</camel.osgi.import>
</properties>
diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml
index 9775a70..340929f 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -32,6 +32,10 @@
<description>Camel JMX support</description>
<properties>
+ <camel.osgi.import>
+ javax.xml.bind*;version="[2.2,3.0)",
+ *
+ </camel.osgi.import>
</properties>
<dependencies>
diff --git a/components/camel-milo/pom.xml b/components/camel-milo/pom.xml
index 8d489c7..1873765 100644
--- a/components/camel-milo/pom.xml
+++ b/components/camel-milo/pom.xml
@@ -33,6 +33,7 @@
<properties>
<camel.osgi.import.before.defaults>
+ javax.xml.bind*;version="[2.2,3.0)",
com.google.common.*;version="19.0.0"
</camel.osgi.import.before.defaults>
</properties>
diff --git a/components/camel-rest/pom.xml b/components/camel-rest/pom.xml
index 4f226e7..286c6aa 100644
--- a/components/camel-rest/pom.xml
+++ b/components/camel-rest/pom.xml
@@ -17,7 +17,8 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -32,6 +33,13 @@
<name>Camel :: REST</name>
<description>Camel REST component</description>
+ <properties>
+ <camel.osgi.import>
+ javax.xml.bind*;version="[2.2,3.0)",
+ *
+ </camel.osgi.import>
+ </properties>
+
<dependencies>
<dependency>
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml
index 1b13cf7..5acc8e4 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -34,6 +34,7 @@
<properties>
<camel.osgi.import.additional>
+ javax.xml.bind*;version="[2.2,3.0)",
com.thoughtworks.xstream.*;version="[1.4.7,2)",
org.eclipse.jetty.*;version="[9.4,10)",
org.mortbay.cometd.*;version="[6.1,7)"
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index 84f98eb..e33c17f 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -33,6 +33,7 @@
<properties>
<camel.osgi.import.before.defaults>
+ javax.xml.bind*;version="[2.2,3.0)",
javax.xml.ws*;version="[0.0,3)",
javax.xml.soap*;version="[1.3,2)"
</camel.osgi.import.before.defaults>
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index e503040..c63bacf 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -32,6 +32,13 @@
<name>Camel :: Spring</name>
<description>Camel Spring with XML DSL</description>
+ <properties>
+ <camel.osgi.import>
+ javax.xml.bind*;version="[2.2,3.0)",
+ *
+ </camel.osgi.import>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/components/camel-stax/pom.xml b/components/camel-stax/pom.xml
index 0a7119b..926bd3f 100644
--- a/components/camel-stax/pom.xml
+++ b/components/camel-stax/pom.xml
@@ -32,6 +32,10 @@
<description>Camel StAX support</description>
<properties>
+ <camel.osgi.import>
+ javax.xml.bind*;version="[2.2,3.0)",
+ *
+ </camel.osgi.import>
</properties>
<dependencies>
diff --git a/components/camel-syslog/pom.xml b/components/camel-syslog/pom.xml
index 702e0e1..40e28d8 100644
--- a/components/camel-syslog/pom.xml
+++ b/components/camel-syslog/pom.xml
@@ -31,6 +31,10 @@
<description>Camel Syslog support</description>
<properties>
+ <camel.osgi.import>
+ javax.xml.bind*;version="[2.2,3.0)",
+ *
+ </camel.osgi.import>
</properties>
<dependencies>
diff --git a/core/camel-api/pom.xml b/core/camel-api/pom.xml
index 20e79ed..cfca819 100644
--- a/core/camel-api/pom.xml
+++ b/core/camel-api/pom.xml
@@ -37,6 +37,10 @@
<properties>
<camel.osgi.export.pkg>$${replace;{local-packages};;;\;},org.apache.camel.spi.annotations
</camel.osgi.export.pkg>
+ <camel.osgi.import>
+ javax.xml.bind*;version="[2.2,3.0)",
+ *
+ </camel.osgi.import>
</properties>
<dependencies>
diff --git a/core/camel-base/pom.xml b/core/camel-base/pom.xml
index d2db70b..7dda4fe 100644
--- a/core/camel-base/pom.xml
+++ b/core/camel-base/pom.xml
@@ -33,6 +33,13 @@
<name>Camel :: Base</name>
<description>The Base Camel Framework</description>
+ <properties>
+ <camel.osgi.import>
+ javax.xml.bind*;version="[2.2,3.0)",
+ *
+ </camel.osgi.import>
+ </properties>
+
<dependencies>
<!-- required dependencies by camel-base -->
diff --git a/core/camel-core-engine/pom.xml b/core/camel-core-engine/pom.xml
index e0bf3cb..9a9aa39 100644
--- a/core/camel-core-engine/pom.xml
+++ b/core/camel-core-engine/pom.xml
@@ -44,6 +44,10 @@
org.apache.camel.component.caffeine;${camel.osgi.import.strict.version},
net.sf.saxon
</camel.osgi.dynamic>
+ <camel.osgi.import>
+ javax.xml.bind*;version="[2.2,3.0)",
+ *
+ </camel.osgi.import>
</properties>
<dependencies>
diff --git a/core/camel-core-xml/pom.xml b/core/camel-core-xml/pom.xml
index 98f8b2f..1c4bc95 100644
--- a/core/camel-core-xml/pom.xml
+++ b/core/camel-core-xml/pom.xml
@@ -31,8 +31,14 @@
<name>Camel :: Core XML</name>
<description>Camel Core XML support</description>
- <dependencies>
+ <properties>
+ <camel.osgi.import>
+ javax.xml.bind*;version="[2.2,3.0)",
+ *
+ </camel.osgi.import>
+ </properties>
+ <dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-engine</artifactId>
diff --git a/core/camel-endpointdsl/pom.xml b/core/camel-endpointdsl/pom.xml
index 72cc92e..6e8767f 100644
--- a/core/camel-endpointdsl/pom.xml
+++ b/core/camel-endpointdsl/pom.xml
@@ -35,6 +35,10 @@
<properties>
<camel-generate-endpoint-dsl>true</camel-generate-endpoint-dsl>
+ <camel.osgi.import>
+ javax.xml.bind*;version="[2.2,3.0)",
+ *
+ </camel.osgi.import>
</properties>
<dependencies>
diff --git a/core/camel-util/pom.xml b/core/camel-util/pom.xml
index 5659982..ac3ed20 100644
--- a/core/camel-util/pom.xml
+++ b/core/camel-util/pom.xml
@@ -33,6 +33,13 @@
<name>Camel :: Util</name>
<description>The Camel Utilities</description>
+ <properties>
+ <camel.osgi.import>
+ javax.xml.bind*;version="[2.2,3.0)",
+ *
+ </camel.osgi.import>
+ </properties>
+
<dependencies>
<!-- required dependencies by camel-util -->