geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r735754 - in /geronimo/server/branches/2.1: plugins/activemq/geronimo-activemq/pom.xml pom.xml
Date Mon, 19 Jan 2009 17:41:05 GMT
Author: dwoods
Date: Mon Jan 19 09:41:05 2009
New Revision: 735754

URL: http://svn.apache.org/viewvc?rev=735754&view=rev
Log:
GERONIMO-4460 Upgrade Spring plugin to 2.5.6 artifacts

Modified:
    geronimo/server/branches/2.1/plugins/activemq/geronimo-activemq/pom.xml
    geronimo/server/branches/2.1/pom.xml

Modified: geronimo/server/branches/2.1/plugins/activemq/geronimo-activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/geronimo-activemq/pom.xml?rev=735754&r1=735753&r2=735754&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/geronimo-activemq/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/activemq/geronimo-activemq/pom.xml Mon Jan 19 09:41:05
2009
@@ -60,6 +60,14 @@
             <groupId>org.apache.activemq</groupId>
             <artifactId>activeio-core</artifactId>
         </dependency>
+
+        <!-- Use our Spring plugin to enable using activemq.xml -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>spring</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
     </dependencies>
     
 </project>

Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=735754&r1=735753&r2=735754&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Mon Jan 19 09:41:05 2009
@@ -79,7 +79,7 @@
         <cxfVersion>2.0.8</cxfVersion>
         <axis2Version>1.3</axis2Version>
         <axiomVersion>1.2.5</axiomVersion>
-        <springVersion>2.0.5</springVersion>
+        <springVersion>2.5.6</springVersion>
         <plutoVersion>1.1.6-G643117</plutoVersion>
         <openjpaVersion>1.2.0</openjpaVersion>
         <xbeanVersion>3.3</xbeanVersion>
@@ -1669,12 +1669,24 @@
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-context</artifactId>
                 <version>${springVersion}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>aopalliance</groupId>
+                        <artifactId>aopalliance</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-web</artifactId>
                 <version>${springVersion}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.servlet</groupId>
+                        <artifactId>servlet-api</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <!-- CXF Plugin -->



Mime
View raw message