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 2013/07/23 15:35:53 UTC

[1/2] git commit: CAMEL-6569: Fixed xslt component with saxon=true not working in OSGi

Updated Branches:
  refs/heads/camel-2.11.x c85eae204 -> 053ac2f37
  refs/heads/master 1b3a28a6e -> dad558cc8


CAMEL-6569: Fixed xslt component with saxon=true not working in OSGi


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

Branch: refs/heads/master
Commit: dad558cc81e5c105da4c2573daef4d906aa92a9e
Parents: 1b3a28a
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jul 23 15:35:18 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jul 23 15:35:18 2013 +0200

----------------------------------------------------------------------
 camel-core/pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/dad558cc/camel-core/pom.xml
----------------------------------------------------------------------
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index 9e09f08..fff7db5 100755
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -42,7 +42,6 @@
         !com.googlecode.concurrentlinkedhashmap,
         ${camel.osgi.import.defaults},
         org.apache.xalan.xsltc.trax;resolution:=optional,
-        net.sf.saxon;resolution:=optional,
         javax.activation;resolution:=optional,
         javax.xml.bind;resolution:=optional,
         javax.xml.bind.annotation;resolution:=optional,
@@ -84,7 +83,9 @@
       org.apache.camel.spi.LanguageResolver;language=tokenize
     </camel.osgi.export.service>
     <camel.osgi.dynamic>
-        org.apache.camel.spring.util;${camel.osgi.import.strict.version},org.apache.camel.processor.interceptor.jpa;${camel.osgi.import.strict.version}
+        org.apache.camel.spring.util;${camel.osgi.import.strict.version},
+        org.apache.camel.processor.interceptor.jpa;${camel.osgi.import.strict.version},
+        net.sf.saxon
     </camel.osgi.dynamic>
     <camel.osgi.activator>
         org.apache.camel.impl.osgi.Activator


[2/2] git commit: CAMEL-6569: Fixed xslt component with saxon=true not working in OSGi

Posted by da...@apache.org.
CAMEL-6569: Fixed xslt component with saxon=true not working in OSGi


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

Branch: refs/heads/camel-2.11.x
Commit: 053ac2f3759ccde8fcce441ae01beaab229de6f6
Parents: c85eae2
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jul 23 15:35:18 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jul 23 15:35:37 2013 +0200

----------------------------------------------------------------------
 camel-core/pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/053ac2f3/camel-core/pom.xml
----------------------------------------------------------------------
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index 61d5dcb..9070d05 100755
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -40,7 +40,6 @@
         !com.googlecode.concurrentlinkedhashmap,
         ${camel.osgi.import.defaults},
         org.apache.xalan.xsltc.trax;resolution:=optional,
-        net.sf.saxon;resolution:=optional,
         javax.activation;resolution:=optional,
         javax.xml.bind;resolution:=optional,
         javax.xml.bind.annotation;resolution:=optional,
@@ -82,7 +81,9 @@
       org.apache.camel.spi.LanguageResolver;language=tokenize
     </camel.osgi.export.service>
     <camel.osgi.dynamic>
-        org.apache.camel.spring.util;${camel.osgi.import.strict.version},org.apache.camel.processor.interceptor.jpa;${camel.osgi.import.strict.version}
+        org.apache.camel.spring.util;${camel.osgi.import.strict.version},
+        org.apache.camel.processor.interceptor.jpa;${camel.osgi.import.strict.version},
+        net.sf.saxon
     </camel.osgi.dynamic>
     <camel.osgi.activator>
         org.apache.camel.impl.osgi.Activator