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:48:03 UTC
svn commit: r955736 - 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 Jun 17 20:48:03 2010
New Revision: 955736
URL: http://svn.apache.org/viewvc?rev=955736&view=rev
Log:
Merged revisions 955730 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r955730 | dkulp | 2010-06-17 16:24:18 -0400 (Thu, 17 Jun 2010) | 1 line
Mark some more stuff optional
........
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/
------------------------------------------------------------------------------
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=955736&r1=955735&r2=955736&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 Jun 17 20:48:03 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.velocity*;resolution:=optional,
org.apache.xmlbeans*;resolution:=optional,
@@ -302,7 +304,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/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=955736&r1=955735&r2=955736&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 Jun 17 20:48:03 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/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=955736&r1=955735&r2=955736&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 Jun 17 20:48:03 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.velocity*;resolution:=optional,
org.apache.xmlbeans*;resolution:=optional,
@@ -204,7 +206,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)",
*