You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2010/11/29 23:20:25 UTC

svn commit: r1040318 - in /cxf/branches/2.2.x-fixes: ./ rt/transports/jms/pom.xml

Author: dkulp
Date: Mon Nov 29 22:20:25 2010
New Revision: 1040318

URL: http://svn.apache.org/viewvc?rev=1040318&view=rev
Log:
Merged revisions 1038207 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes

................
  r1038207 | dkulp | 2010-11-23 12:07:39 -0500 (Tue, 23 Nov 2010) | 10 lines
  
  Merged revisions 1038206 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1038206 | dkulp | 2010-11-23 12:06:40 -0500 (Tue, 23 Nov 2010) | 2 lines
    
    Make a hard dependency on spring-context to make sure the proper version
    gets picked up
  ........
................

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/transports/jms/pom.xml

Propchange: cxf/branches/2.2.x-fixes/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/rt/transports/jms/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/jms/pom.xml?rev=1040318&r1=1040317&r2=1040318&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/transports/jms/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/rt/transports/jms/pom.xml Mon Nov 29 22:20:25 2010
@@ -103,6 +103,10 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
             <artifactId>spring-tx</artifactId>
             <version>${spring.version}</version>
         </dependency>