cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r891946 - in /cxf/trunk/distribution/bundle: all/pom.xml jaxrs/pom.xml minimal/pom.xml
Date Thu, 17 Dec 2009 22:12:07 GMT
Author: dkulp
Date: Thu Dec 17 22:12:06 2009
New Revision: 891946

URL: http://svn.apache.org/viewvc?rev=891946&view=rev
Log:
[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/trunk/distribution/bundle/all/pom.xml
    cxf/trunk/distribution/bundle/jaxrs/pom.xml
    cxf/trunk/distribution/bundle/minimal/pom.xml

Modified: cxf/trunk/distribution/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/all/pom.xml?rev=891946&r1=891945&r2=891946&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/all/pom.xml (original)
+++ cxf/trunk/distribution/bundle/all/pom.xml Thu Dec 17 22:12:06 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/trunk/distribution/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/jaxrs/pom.xml?rev=891946&r1=891945&r2=891946&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/jaxrs/pom.xml (original)
+++ cxf/trunk/distribution/bundle/jaxrs/pom.xml Thu Dec 17 22:12:06 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/trunk/distribution/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/minimal/pom.xml?rev=891946&r1=891945&r2=891946&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/minimal/pom.xml (original)
+++ cxf/trunk/distribution/bundle/minimal/pom.xml Thu Dec 17 22:12:06 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>



Mime
View raw message