Author: dkulp
Date: Thu May 26 21:22:01 2011
New Revision: 1128094
URL: http://svn.apache.org/viewvc?rev=1128094&view=rev
Log:
Merged revisions 1128092 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1128092 | dkulp | 2011-05-26 17:18:42 -0400 (Thu, 26 May 2011) | 2 lines
[CXF-3500] Mark more jaxrs deps optional
Patch from Ka-Lok Fung applied
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1128092
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
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=1128094&r1=1128093&r2=1128094&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 May 26
21:22:01 2011
@@ -143,7 +143,10 @@
org.apache.commons.codec*;resolution:=optional,
org.apache.commons.pool*;resolution:=optional,
org.apache.log4j*;resolution:=optional,
+ org.apache.neethi;resolution:=optional,
org.apache.velocity*;resolution:=optional,
+ org.apache.ws.commons.schema*;resolution:=optional,
+ org.apache.xml.resolver*;resolution:=optional,
org.apache.xmlbeans*;resolution:=optional,
org.codehaus.jra*;resolution:=optional,
org.codehaus.jettison*;resolution:=optional,
@@ -152,13 +155,14 @@
org.junit*;resolution:=optional,
org.eclipse.jetty*;resolution:=optional;resolution:=optional;version="[7.2,8)",
org.mozilla.javascript*;resolution:=optional,
+
org.objectweb.asm*;version="[2.0,4)";resolution:=optional,
org.slf4j*;resolution:=optional;version="[1.5,2)",
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.mail*;version="[0.0,2)";resolution:=optional,
javax.servlet.*;version="[0.0,4)";resolution:=optional,
javax.xml.stream*;version="[0.0,2)",
javax.xml.ws*;version="[0.0,3)";resolution:=optional,
