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 2009/12/17 23:20:40 UTC
svn commit: r891955 - in /cxf/branches/2.2.x-fixes: ./
distribution/bundle/all/pom.xml distribution/bundle/jaxrs/pom.xml
distribution/bundle/minimal/pom.xml
Author: dkulp
Date: Thu Dec 17 22:20:40 2009
New Revision: 891955
URL: http://svn.apache.org/viewvc?rev=891955&view=rev
Log:
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.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml
cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml
cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 17 22:20:40 2009
@@ -1 +1 @@
-/cxf/trunk:891375-891393,891452,891817,891827,891859,891945
+/cxf/trunk:891375-891393,891452,891817,891827,891859,891945-891946
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml?rev=891955&r1=891954&r2=891955&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml Thu Dec 17 22:20:40 2009
@@ -290,7 +290,6 @@
com.ibm*;resolution:=optional,
com.sun*;resolution:=optional,
com.ctc.wstx.msv*;resolution:=optional,
- javax.jms*;resolution:=optional,
javax.ws.rs*;resolution:=optional,
repackage;resolution:=optional,
javax.resource*;resolution:=optional,
@@ -311,7 +310,15 @@
org.junit*;resolution:=optional,
org.mortbay*;resolution:=optional,
org.mozilla.javascript*;resolution:=optional,
- org.springframework*;resolution:=optional,
+ org.springframework*;resolution:=optional;version="[2.5,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.2.x-fixes/distribution/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml?rev=891955&r1=891954&r2=891955&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml Thu Dec 17 22:20:40 2009
@@ -149,7 +149,15 @@
org.junit*;resolution:=optional,
org.mortbay*;resolution:=optional,
org.mozilla.javascript*;resolution:=optional,
- org.springframework*;resolution:=optional,
+ org.springframework*;resolution:=optional;version="[2.5,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.2.x-fixes/distribution/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml?rev=891955&r1=891954&r2=891955&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml Thu Dec 17 22:20:40 2009
@@ -173,7 +173,6 @@
antlr*;resolution:=optional,
com.ibm*;resolution:=optional,
com.sun*;resolution:=optional,
- javax.jms*;resolution:=optional,
javax.ws.rs*;resolution:=optional,
com.ctc.wstx.msv*;resolution:=optional,
repackage;resolution:=optional,
@@ -195,7 +194,15 @@
org.junit*;resolution:=optional,
org.mortbay*;resolution:=optional,
org.mozilla.javascript*;resolution:=optional,
- org.springframework*;resolution:=optional,
+ org.springframework*;resolution:=optional;version="[2.5,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>