geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r725319 - in /geronimo/server/trunk: plugins/activemq/activemq-broker/src/main/history/dependencies.xml plugins/activemq/geronimo-activemq/pom.xml plugins/activemq/pom.xml pom.xml
Date Wed, 10 Dec 2008 16:11:30 GMT
Author: dwoods
Date: Wed Dec 10 08:11:30 2008
New Revision: 725319

URL: http://svn.apache.org/viewvc?rev=725319&view=rev
Log:
GERONIMO-4460 Upgrade Spring plugin to 2.5.6 artifacts for usage by ActiveMQ and Pluto.

Modified:
    geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml
    geronimo/server/trunk/plugins/activemq/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/history/dependencies.xml?rev=725319&r1=725318&r2=725319&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/history/dependencies.xml
Wed Dec 10 08:11:30 2008
@@ -32,6 +32,12 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>spring</artifactId>
+        <type>car</type>
+    </dependency>
+    <!--
+    <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-core</artifactId>
         <type>jar</type>
@@ -46,17 +52,13 @@
         <artifactId>spring-context</artifactId>
         <type>jar</type>
     </dependency>
+    -->
     <dependency>
         <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-spring</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-core</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml?rev=725319&r1=725318&r2=725319&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml Wed Dec 10 08:11:30 2008
@@ -71,6 +71,8 @@
             <groupId>org.apache.activemq</groupId>
             <artifactId>activeio-core</artifactId>
         </dependency>
+
+        <!-- Use our Spring plugin instead
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
@@ -86,15 +88,23 @@
             <artifactId>spring-context</artifactId>
             <version>2.5.5</version>
         </dependency>
+        -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>spring</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-spring</artifactId>
-            <version>3.4.1</version>
+            <!-- <version>3.4.1</version> -->
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-naming</artifactId>
-            <version>2.2-SNAPSHOT</version>
+            <version>${version}</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/plugins/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/pom.xml?rev=725319&r1=725318&r2=725319&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/pom.xml Wed Dec 10 08:11:30 2008
@@ -57,6 +57,10 @@
                 <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
                         <artifactId>commons-logging-api</artifactId>
                     </exclusion>
                     <exclusion>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=725319&r1=725318&r2=725319&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Dec 10 08:11:30 2008
@@ -79,7 +79,8 @@
         <cxfVersion>2.1.4-SNAPSHOT</cxfVersion>
         <axis2Version>SNAPSHOT</axis2Version>
         <axiomVersion>SNAPSHOT</axiomVersion>
-        <springVersion>2.0.5</springVersion>
+        <!-- <springVersion>2.0.5</springVersion> -->
+        <springVersion>2.5.6</springVersion>
         <plutoVersion>1.1.6-G643117</plutoVersion>
         <openjpaVersion>1.2.0</openjpaVersion>
         <xbeanVersion>3.5-SNAPSHOT</xbeanVersion>
@@ -419,6 +420,18 @@
             </dependency>
 
             <dependency>
+                <groupId>org.apache.xbean</groupId>
+                <artifactId>xbean-spring</artifactId>
+                <version>${xbeanVersion}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
                 <groupId>commons-vfs</groupId>
                 <artifactId>commons-vfs</artifactId>
                 <version>1.0</version>



Mime
View raw message