camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1460678 - /camel/trunk/tests/camel-blueprint-cxf-test/pom.xml
Date Mon, 25 Mar 2013 14:25:51 GMT
Author: davsclaus
Date: Mon Mar 25 14:25:51 2013
New Revision: 1460678

URL: http://svn.apache.org/r1460678
Log:
Fixed problem with duplicate blueprint JARs on classpath

Modified:
    camel/trunk/tests/camel-blueprint-cxf-test/pom.xml

Modified: camel/trunk/tests/camel-blueprint-cxf-test/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-blueprint-cxf-test/pom.xml?rev=1460678&r1=1460677&r2=1460678&view=diff
==============================================================================
--- camel/trunk/tests/camel-blueprint-cxf-test/pom.xml (original)
+++ camel/trunk/tests/camel-blueprint-cxf-test/pom.xml Mon Mar 25 14:25:51 2013
@@ -43,11 +43,6 @@
       <artifactId>camel-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-blueprint</artifactId>
-      <scope>test</scope>
-    </dependency>
      <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-test</artifactId>
@@ -63,9 +58,25 @@
       <artifactId>camel-http</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- exclude bluerprint from camel-cxf as we have them already from camel-blueprint
+         and we need to avoid duplicate JARs in the classpath as then blueprint start up
twice -->
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-cxf</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.aries.blueprint</groupId>
+          <artifactId>org.apache.aries.blueprint.core</artifactId>         
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.aries.blueprint</groupId>
+          <artifactId>org.apache.aries.blueprint.api</artifactId>         
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.aries.quiesce</groupId>
+          <artifactId>org.apache.aries.quiesce.api</artifactId>         
+        </exclusion>
+      </exclusions>
       <scope>test</scope>
     </dependency>
     
@@ -102,11 +113,6 @@
 
     <!--  test -->
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>



Mime
View raw message