Author: ningjiang
Date: Thu Aug 11 08:33:56 2011
New Revision: 1156535

URL: http://svn.apache.org/viewvc?rev=1156535&view=rev
Log:
Merged revisions 1156524 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1156524 | ningjiang | 2011-08-11 15:52:25 +0800 (Thu, 11 Aug 2011) | 1 line
  
  CAMEL-4323 clean up the spring dependencies of camel-example-spring-javaconfig
........

Modified:
    camel/branches/camel-2.8.x/   (props changed)
    camel/branches/camel-2.8.x/examples/camel-example-spring-javaconfig/pom.xml

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 11 08:33:56 2011
@@ -1 +1 @@
-/camel/trunk:1155230,1156108,1156260
+/camel/trunk:1155230,1156108,1156260,1156524

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Aug 11 08:33:56 2011
@@ -1 +1 @@
-/camel/trunk:1-1148091,1149488,1153146,1153323,1155229-1155231,1155233-1155276,1155278-1155291,1155293-1155318,1155320-1155327,1156108,1156260
+/camel/trunk:1-1148091,1149488,1153146,1153323,1155229-1155231,1155233-1155276,1155278-1155291,1155293-1155318,1155320-1155327,1156108,1156260,1156524

Modified: 
camel/branches/camel-2.8.x/examples/camel-example-spring-javaconfig/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-spring-javaconfig/pom.xml?rev=1156535&r1=1156534&r2=1156535&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/examples/camel-example-spring-javaconfig/pom.xml 
(original)
+++ camel/branches/camel-2.8.x/examples/camel-example-spring-javaconfig/pom.xml 
Thu Aug 11 08:33:56 2011
@@ -102,6 +102,24 @@
     <dependency>
       <groupId>org.springframework.osgi</groupId>
       <artifactId>spring-osgi-core</artifactId>
+      <exclusions>
+          <exclusion>
+              <groupId>org.springframework</groupId>
+              <artifactId>org.springframework.aop</artifactId>
+          </exclusion>
+          <exclusion>
+              <groupId>org.springframework</groupId>
+              <artifactId>org.springframework.beans</artifactId>
+          </exclusion>
+          <exclusion>
+              <groupId>org.springframework</groupId>
+              <artifactId>org.springframework.context</artifactId>
+          </exclusion>
+          <exclusion>
+              <groupId>org.springframework</groupId>
+              <artifactId>org.springframework.core</artifactId>
+          </exclusion>
+      </exclusions>
     </dependency>
 
     <!-- logging -->


Reply via email to