You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2014/10/16 08:53:16 UTC

git commit: CAMEL-7918: Getting namespace error in camel-spring-ws from time to time

Repository: camel
Updated Branches:
  refs/heads/camel-2.12.x 7949af8ad -> ff1de4d99


CAMEL-7918: Getting namespace error in camel-spring-ws from time to time


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

Branch: refs/heads/camel-2.12.x
Commit: ff1de4d9955744c89b295c1098cd497a1920cf65
Parents: 7949af8
Author: cmueller <cm...@apache.org>
Authored: Thu Oct 16 08:53:03 2014 +0200
Committer: cmueller <cm...@apache.org>
Committed: Thu Oct 16 08:53:03 2014 +0200

----------------------------------------------------------------------
 components/camel-spring-ws/pom.xml                       | 6 ++++--
 platforms/karaf/features/src/main/resources/features.xml | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/ff1de4d9/components/camel-spring-ws/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml
index 56c5548..0eeb26b 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -68,11 +68,13 @@
             <artifactId>spring-ws-support</artifactId>
             <version>${spring-ws-version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <version>${geronimo-servlet-spec-version}</version>
             <scope>provided</scope>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/ff1de4d9/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 667f1fb..e04ad6d 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -987,6 +987,7 @@
     <bundle dependency='true'>mvn:org.springframework.ws/spring-xml/${spring-ws-version}</bundle>
     <bundle dependency='true'>mvn:org.springframework.ws/spring-ws-core/${spring-ws-version}</bundle>
     <bundle dependency='true'>mvn:org.springframework.ws/spring-ws-support/${spring-ws-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-spring-ws/${project.version}</bundle>
   </feature>
   <feature name='camel-sql' version='${project.version}' resolver='(obr)' start-level='50'>