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 2010/06/17 22:24:18 UTC

svn commit: r955730 - in /cxf/trunk/distribution/bundle: all/pom.xml jaxrs/pom.xml minimal/pom.xml

Author: dkulp
Date: Thu Jun 17 20:24:18 2010
New Revision: 955730

URL: http://svn.apache.org/viewvc?rev=955730&view=rev
Log:
Mark some more stuff optional

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=955730&r1=955729&r2=955730&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/all/pom.xml (original)
+++ cxf/trunk/distribution/bundle/all/pom.xml Thu Jun 17 20:24:18 2010
@@ -270,6 +270,7 @@
                         <Import-Package>
                             !org.apache.cxf.*,
                             !META-INF.cxf,
+                            !META-INF.cxf.osgi,
                             antlr*;resolution:=optional,
                             com.ibm*;resolution:=optional,
                             com.sun*;resolution:=optional,
@@ -283,6 +284,7 @@
                             org.apache.abdera*;resolution:=optional,
                             org.apache.commons.lang*;resolution:=optional,
                             org.apache.commons.codec*;resolution:=optional,
+                            org.apache.commons.pool*;resolution:=optional,
                             org.apache.log4j*;resolution:=optional,
                             org.apache.mina*;resolution:=optional,
                             org.apache.velocity*;resolution:=optional,
@@ -303,7 +305,7 @@
                             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.servlet.*;version="[0.0,3)";resolution:=optional,
                             javax.xml.stream*;version="[0.0,2)",
                             javax.xml.ws*;version="[0.0,3)",
                             *

Modified: cxf/trunk/distribution/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/jaxrs/pom.xml?rev=955730&r1=955729&r2=955730&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/jaxrs/pom.xml (original)
+++ cxf/trunk/distribution/bundle/jaxrs/pom.xml Thu Jun 17 20:24:18 2010
@@ -126,6 +126,7 @@
                         <Import-Package>
                             !org.apache.cxf.*,
                             !META-INF.cxf,
+                            !META-INF.cxf.osgi,
                             antlr*;resolution:=optional,
                             com.ibm*;resolution:=optional,
                             com.sun*;resolution:=optional,
@@ -138,6 +139,7 @@
                             org.apache.abdera*;resolution:=optional,
                             org.apache.commons.lang*;resolution:=optional,
                             org.apache.commons.codec*;resolution:=optional,
+                            org.apache.commons.pool*;resolution:=optional,
                             org.apache.log4j*;resolution:=optional,
                             org.apache.velocity*;resolution:=optional,
                             org.apache.xmlbeans*;resolution:=optional,
@@ -155,7 +157,7 @@
                             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.servlet.*;version="[0.0,3)";resolution:=optional,
                             javax.xml.stream*;version="[0.0,2)",
                             javax.xml.ws*;version="[0.0,3)",
                             *

Modified: cxf/trunk/distribution/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/minimal/pom.xml?rev=955730&r1=955729&r2=955730&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/minimal/pom.xml (original)
+++ cxf/trunk/distribution/bundle/minimal/pom.xml Thu Jun 17 20:24:18 2010
@@ -170,6 +170,7 @@
                         <Import-Package>
                             !org.apache.cxf.*,
                             !META-INF.cxf,
+                            !META-INF.cxf.osgi,
                             !schemas*,
                             org.apache.cxf.tools.*;version=${cxf.osgi.version.clean};resolution:=optional,
                             antlr*;resolution:=optional,
@@ -185,6 +186,7 @@
                             org.apache.abdera*;resolution:=optional,
                             org.apache.commons.lang*;resolution:=optional,
                             org.apache.commons.codec*;resolution:=optional,
+                            org.apache.commons.pool*;resolution:=optional,
                             org.apache.log4j*;resolution:=optional,
                             org.apache.mina*;resolution:=optional,
                             org.apache.velocity*;resolution:=optional,
@@ -205,7 +207,7 @@
                             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.servlet.*;version="[0.0,3)";resolution:=optional,
                             javax.xml.stream*;version="[0.0,2)",
                             javax.xml.ws*;version="[0.0,3)",
                             *