You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2009/07/13 13:34:45 UTC
svn commit: r793552 - /servicemix/smx4/features/trunk/camel/camel-features/pom.xml

Author: ffang
Date: Mon Jul 13 11:34:44 2009
New Revision: 793552

URL: http://svn.apache.org/viewvc?rev=793552&view=rev
Log:
[SMX4-317]camel features doen't includes right version of bundles which are shipped with Servicemix

Modified:
    servicemix/smx4/features/trunk/camel/camel-features/pom.xml

Modified: servicemix/smx4/features/trunk/camel/camel-features/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/camel-features/pom.xml?rev=793552&r1=793551&r2=793552&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/camel-features/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/camel-features/pom.xml Mon Jul 13 11:34:44 2009
@@ -122,6 +122,24 @@
        <groupId>org.apache.camel</groupId>
        <artifactId>camel-cxf</artifactId>
        <version>${camel.version}</version>
+       <exclusions>
+          <exclusion>
+              <groupId>org.mortbay.jetty</groupId>
+              <artifactId>jetty</artifactId> 
+          </exclusion>
+          <exclusion>
+              <groupId>org.mortbay.jetty</groupId>
+              <artifactId>jetty-util</artifactId>
+          </exclusion>
+          <exclusion>
+              <groupId>org.apache.ws.commons.schema</groupId>
+              <artifactId>XmlSchema</artifactId>
+          </exclusion>
+          <exclusion>
+              <groupId>org.apache.neethi</groupId>
+              <artifactId>neethi</artifactId>
+          </exclusion>
+        </exclusions>
      </dependency>
      <dependency>
        <groupId>org.apache.camel</groupId>
@@ -133,12 +151,21 @@
        <artifactId>camel-mina</artifactId>
        <version>${camel.version}</version>
      </dependency>
-<!-- is in the assembly's features.xml - generator includes the discovered bundle instead of our fixed one    
      <dependency>
        <groupId>org.apache.camel</groupId>
        <artifactId>camel-jetty</artifactId>
        <version>${camel.version}</version>
-     </dependency> -->
+       <exclusions>
+          <exclusion>
+              <groupId>org.mortbay.jetty</groupId>
+              <artifactId>jetty</artifactId>
+          </exclusion>
+          <exclusion>
+              <groupId>org.mortbay.jetty</groupId>
+              <artifactId>jetty-util</artifactId>
+          </exclusion>
+       </exclusions>
+     </dependency> 
      <dependency>
        <groupId>org.apache.camel</groupId>
        <artifactId>camel-jms</artifactId>