cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asold...@apache.org
Subject svn commit: r1076157 - in /cxf/branches/2.3.x-fixes: ./ rt/transports/http-osgi/pom.xml systests/container-integration/grizzly/pom.xml
Date Wed, 02 Mar 2011 09:36:06 GMT
Author: asoldano
Date: Wed Mar  2 09:36:05 2011
New Revision: 1076157

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

........
  r1076141 | asoldano | 2011-03-02 09:45:09 +0100 (Wed, 02 Mar 2011) | 2 lines
  
  Fixing container-integration/grizzly failures when running testsuite with -Pjaxws22 profile
........
  r1076156 | asoldano | 2011-03-02 10:31:29 +0100 (Wed, 02 Mar 2011) | 2 lines
  
  Fixing rt/transports/http-osgi/pom.xml to avoid trying pulling in spring artifacts of wrong
version and not available on maven central
........

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

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar  2 09:36:05 2011
@@ -1 +1 @@
-/cxf/trunk:1076052
+/cxf/trunk:1076052,1076141-1076156

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=1076157&r1=1076156&r2=1076157&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 Wed Mar  2 09:36:05 2011
@@ -60,13 +60,55 @@
             <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>
+        <!-- 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>
+            <exclusions> <!-- Excluding bad artifacts (not available at this location
on Maven central -->
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>org.springframework.aop</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>org.springframework.beans</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>org.springframework.context</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>org.springframework.core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <version>${cxf.spring.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>${cxf.spring.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${cxf.spring.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${cxf.spring.version}</version>
+            <optional>true</optional>
+        </dependency>
 
         <dependency>
             <groupId>junit</groupId>

Modified: cxf/branches/2.3.x-fixes/systests/container-integration/grizzly/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/container-integration/grizzly/pom.xml?rev=1076157&r1=1076156&r2=1076157&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/container-integration/grizzly/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/systests/container-integration/grizzly/pom.xml Wed Mar  2 09:36:05
2011
@@ -29,6 +29,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-testutils</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>



Mime
View raw message