cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1066882 - in /cxf/branches/2.3.x-fixes: ./ rt/transports/http-osgi/pom.xml
Date Thu, 03 Feb 2011 17:30:36 GMT
Author: dkulp
Date: Thu Feb  3 17:30:36 2011
New Revision: 1066882

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

........
  r1065592 | cschneider | 2011-01-31 08:11:40 -0500 (Mon, 31 Jan 2011) | 1 line
  
  Added reference to spring osgi as it is used in the spring context
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/transports/http-osgi/pom.xml

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

Modified: cxf/branches/2.3.x-fixes/rt/transports/http-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http-osgi/pom.xml?rev=1066882&r1=1066881&r2=1066882&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/http-osgi/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/transports/http-osgi/pom.xml Thu Feb  3 17:30:36 2011
@@ -32,7 +32,6 @@
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
-
     <dependencies>
         <dependency>
             <groupId>org.apache.felix</groupId>
@@ -60,6 +59,14 @@
             <artifactId>${cxf.servlet-api.artifact}</artifactId>
             <scope>provided</scope>
         </dependency>
+        
+        <!-- Optional as http osgi could also be used without spring  -->
+		<dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>spring-osgi-core</artifactId>
+			<version>1.2.1</version>
+			<optional>true</optional>
+		</dependency>
 
         <dependency>
             <groupId>junit</groupId>



Mime
View raw message