Author: dkulp
Date: Thu Nov 11 20:41:56 2010
New Revision: 1034109
URL: http://svn.apache.org/viewvc?rev=1034109&view=rev
Log:
Merged revisions 1034063 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1034063 | dkulp | 2010-11-11 14:32:21 -0500 (Thu, 11 Nov 2010) | 1 line
Make the new JAX-WS 2.2 spi.http stuff optional so it works with jaxws 2.1
api jars
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/distribution/bundle/all/pom.xml
cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml
cxf/branches/2.3.x-fixes/distribution/bundle/minimal/pom.xml
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/distribution/bundle/all/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/bundle/all/pom.xml?rev=1034109&r1=1034108&r2=1034109&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/bundle/all/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/bundle/all/pom.xml Thu Nov 11
20:41:56 2010
@@ -341,6 +341,7 @@
javax.mail*;version="[0.0,2)",
javax.servlet.*;version="[0.0,4)";resolution:=optional,
javax.xml.stream*;version="[0.0,2)",
+
javax.xml.ws.spi.http*;version="[0.0,3)";resolution:=optional,
javax.xml.ws*;version="[0.0,3)",
*
</Import-Package>
Modified: cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml?rev=1034109&r1=1034108&r2=1034109&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml Thu Nov 11
20:41:56 2010
@@ -161,7 +161,7 @@
javax.mail*;version="[0.0,2)",
javax.servlet.*;version="[0.0,4)";resolution:=optional,
javax.xml.stream*;version="[0.0,2)",
- javax.xml.ws*;version="[0.0,3)",
+
javax.xml.ws*;version="[0.0,3)";resolution:=optional,
*
</Import-Package>
<Export-Package>
Modified: cxf/branches/2.3.x-fixes/distribution/bundle/minimal/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/bundle/minimal/pom.xml?rev=1034109&r1=1034108&r2=1034109&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/bundle/minimal/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/bundle/minimal/pom.xml Thu Nov 11
20:41:56 2010
@@ -217,6 +217,7 @@
javax.mail*;version="[0.0,2)",
javax.servlet.*;version="[0.0,4)";resolution:=optional,
javax.xml.stream*;version="[0.0,2)",
+
javax.xml.ws.spi.http*;version="[0.0,3)";resolution:=optional,
javax.xml.ws*;version="[0.0,3)",
*
</Import-Package>
