You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by js...@apache.org on 2006/07/07 11:23:49 UTC

svn commit: r419849 - /incubator/activemq/trunk/pom.xml

Author: jstrachan
Date: Fri Jul  7 02:23:49 2006
New Revision: 419849

URL: http://svn.apache.org/viewvc?rev=419849&view=rev
Log:
updated to spring 2.x and xbean 2.4 for AMQ-531

Modified:
    incubator/activemq/trunk/pom.xml

Modified: incubator/activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/pom.xml?rev=419849&r1=419848&r2=419849&view=diff
==============================================================================
--- incubator/activemq/trunk/pom.xml (original)
+++ incubator/activemq/trunk/pom.xml Fri Jul  7 02:23:49 2006
@@ -302,10 +302,16 @@
             <!-- =============================== -->
             <!--  for custom XML parsing -->
             <dependency>
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-spring</artifactId>
-                <version>${org-apache-xbean-version}</version>
-                <optional>true</optional>
+		        <groupId>org.apache.xbean</groupId>
+		        <artifactId>xbean-spring</artifactId>
+		        <version>2.4</version>
+		                <optional>true</optional>
+		        <exclusions>
+		          <exclusion>
+		            <groupId>qdox</groupId>
+		            <artifactId>qdox</artifactId>
+		          </exclusion>
+		        </exclusions>
                 <!--
                 <exclusions>
                   <exclusion>
@@ -363,8 +369,42 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring</artifactId>
-                <version>${org-springframework-version}</version>
+		        <version>2.0-m5</version>
                 <optional>true</optional>
+		        <exclusions>
+		          <exclusion>
+		            <groupId>javax.mail</groupId>
+		            <artifactId>mail</artifactId>
+		          </exclusion>
+		          <exclusion>
+		            <groupId>javax.resource</groupId>
+		            <artifactId>connector</artifactId>
+		          </exclusion>
+		          <exclusion>
+		            <groupId>javax.transaction</groupId>
+		            <artifactId>jta</artifactId>
+		          </exclusion>
+		          <exclusion>
+		            <groupId>org.springframework</groupId>
+		            <artifactId>spring-support</artifactId>
+		          </exclusion>
+		          <exclusion>
+		            <groupId>org.springframework</groupId>
+		            <artifactId>spring-orm</artifactId>
+		          </exclusion>
+		          <exclusion>
+		            <groupId>org.springframework</groupId>
+		            <artifactId>spring-hibernate</artifactId>
+		          </exclusion>
+		          <exclusion>
+		            <groupId>org.springframework</groupId>
+		            <artifactId>spring-remoting</artifactId>
+		          </exclusion>
+		          <exclusion>
+		            <groupId>org.springframework</groupId>
+		            <artifactId>spring-core</artifactId>
+		          </exclusion>
+		        </exclusions>
             </dependency>
 
             <!-- an optional discovery agent -->
@@ -910,8 +950,6 @@
         <org-apache-derby-version>10.1.1.0</org-apache-derby-version>
         <org-apache-geronimo-specs-version>1.0</org-apache-geronimo-specs-version>
         <org-apache-maven-surefire-plugin-version>2.3-SNAPSHOT</org-apache-maven-surefire-plugin-version>
-        <org-apache-xbean-version>2.2</org-apache-xbean-version>
-        <org-springframework-version>1.2.8</org-springframework-version>
         <p2psockets-version>1.1.2</p2psockets-version>
         <regexp-version>1.3</regexp-version>
         <rome-version>0.8</rome-version>