camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject camel git commit: CAMEL-11822: camel-jaxb should osgi import from JAXB 2.2 so it can use older version that are arlready installed in Karaf etc.
Date Wed, 18 Oct 2017 08:53:50 GMT
Repository: camel
Updated Branches:
  refs/heads/master e2132b787 -> 06d271b25


CAMEL-11822: camel-jaxb should osgi import from JAXB 2.2 so it can use older version that
are arlready installed in Karaf etc.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/06d271b2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/06d271b2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/06d271b2

Branch: refs/heads/master
Commit: 06d271b259ec3500dbe1a6d1adff6cdcc051ad80
Parents: e2132b7
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Wed Oct 18 10:53:43 2017 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Wed Oct 18 10:53:43 2017 +0200

----------------------------------------------------------------------
 components/camel-jaxb/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/06d271b2/components/camel-jaxb/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jaxb/pom.xml b/components/camel-jaxb/pom.xml
index 9fed93e..f8d5588 100644
--- a/components/camel-jaxb/pom.xml
+++ b/components/camel-jaxb/pom.xml
@@ -33,7 +33,7 @@
 
     <properties>
 		<camel.osgi.import.before.defaults>
-			com.sun.xml.bind.marshaller;resolution:=optional
+			com.sun.xml.bind.marshaller;resolution:=optional;version="[2.2,3)"
 		</camel.osgi.import.before.defaults>
 		<camel.osgi.export.pkg>org.apache.camel.converter.jaxb.*</camel.osgi.export.pkg>
 		<camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=jaxb</camel.osgi.export.service>


Mime
View raw message