cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r895872 - in /cxf/branches/2.1.x-fixes: ./ distribution/bundle/all/pom.xml distribution/bundle/jaxrs/pom.xml distribution/bundle/minimal/pom.xml
Date Tue, 05 Jan 2010 03:13:27 GMT
Author: dkulp
Date: Tue Jan  5 03:13:16 2010
New Revision: 895872

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

................
  r891955 | dkulp | 2009-12-17 17:20:40 -0500 (Thu, 17 Dec 2009) | 12 lines
  
  Merged revisions 891946 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r891946 | dkulp | 2009-12-17 17:12:06 -0500 (Thu, 17 Dec 2009) | 4 lines
    
    [CXF-2216,CXF-2091] Updat spring version range to [2.5,4] so spring 3
    can be used.
    Update all the javax.* things to be [0.0,...) to allow equinox to grab
    the in JDK versions.
  ........
................

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/distribution/bundle/all/pom.xml
    cxf/branches/2.1.x-fixes/distribution/bundle/jaxrs/pom.xml
    cxf/branches/2.1.x-fixes/distribution/bundle/minimal/pom.xml

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan  5 03:13:16 2010
@@ -1,2 +1,2 @@
-/cxf/branches/2.2.x-fixes:891302,891453,892955
-/cxf/trunk:891301,891452,892953
+/cxf/branches/2.2.x-fixes:891302,891453,891955,892955
+/cxf/trunk:891301,891452,891946,892953

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

Modified: cxf/branches/2.1.x-fixes/distribution/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/bundle/all/pom.xml?rev=895872&r1=895871&r2=895872&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/bundle/all/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/bundle/all/pom.xml Tue Jan  5 03:13:16 2010
@@ -277,7 +277,6 @@
                             antlr*;resolution:=optional,
                             com.ibm*;resolution:=optional,
                             com.sun*;resolution:=optional,
-                            javax.jms*;resolution:=optional,
                             javax.ws.rs*;resolution:=optional,
                             repackage;resolution:=optional,
                             javax.resource*;resolution:=optional,
@@ -298,7 +297,15 @@
                             org.junit*;resolution:=optional,
                             org.mortbay*;resolution:=optional,
                             org.mozilla.javascript*;resolution:=optional,
-                            org.springframework*;resolution:=optional,
+                            org.springframework*;resolution:=optional;version="[2.0,4)",
+                            javax.activation;version="[0.0,2)",
+                            javax.annotation;version="[0.0,2)",
+                            javax.jms;resolution:=optional;version="[0.0,2)",
+                            javax.jws*;version="[0.0,3)",
+                            javax.mail*;version="[0.0,2)",
+                            javax.servlet.*;version="[0.0,3)",
+                            javax.xml.stream*;version="[0.0,2)",
+                            javax.xml.ws*;version="[0.0,3)",
                             *
                         </Import-Package>
                         <Export-Package>

Modified: cxf/branches/2.1.x-fixes/distribution/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/bundle/jaxrs/pom.xml?rev=895872&r1=895871&r2=895872&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/bundle/jaxrs/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/bundle/jaxrs/pom.xml Tue Jan  5 03:13:16 2010
@@ -141,7 +141,15 @@
                             org.junit*;resolution:=optional,
                             org.mortbay*;resolution:=optional,
                             org.mozilla.javascript*;resolution:=optional,
-                            org.springframework*;resolution:=optional,
+                            org.springframework*;resolution:=optional;version="[2.0,4)",
+                            javax.activation;version="[0.0,2)",
+                            javax.annotation;version="[0.0,2)",
+                            javax.jms;resolution:=optional;version="[0.0,2)",
+                            javax.jws*;version="[0.0,3)",
+                            javax.mail*;version="[0.0,2)",
+                            javax.servlet.*;version="[0.0,3)",
+                            javax.xml.stream*;version="[0.0,2)",
+                            javax.xml.ws*;version="[0.0,3)",
                             *
                         </Import-Package>
                         <Export-Package>

Modified: cxf/branches/2.1.x-fixes/distribution/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/bundle/minimal/pom.xml?rev=895872&r1=895871&r2=895872&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/bundle/minimal/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/bundle/minimal/pom.xml Tue Jan  5 03:13:16 2010
@@ -161,7 +161,6 @@
                             antlr*;resolution:=optional,
                             com.ibm*;resolution:=optional,
                             com.sun*;resolution:=optional,
-                            javax.jms*;resolution:=optional,
                             javax.ws.rs*;resolution:=optional,
                             repackage;resolution:=optional,
                             javax.resource*;resolution:=optional,
@@ -182,7 +181,15 @@
                             org.junit*;resolution:=optional,
                             org.mortbay*;resolution:=optional,
                             org.mozilla.javascript*;resolution:=optional,
-                            org.springframework*;resolution:=optional,
+                            org.springframework*;resolution:=optional;version="[2.0,4)",
+                            javax.activation;version="[0.0,2)",
+                            javax.annotation;version="[0.0,2)",
+                            javax.jms;resolution:=optional;version="[0.0,2)",
+                            javax.jws*;version="[0.0,3)",
+                            javax.mail*;version="[0.0,2)",
+                            javax.servlet.*;version="[0.0,3)",
+                            javax.xml.stream*;version="[0.0,2)",
+                            javax.xml.ws*;version="[0.0,3)",
                             *
                         </Import-Package>
                         <Export-Package>



Mime
View raw message