Author: ningjiang
Date: Wed Jul 7 01:37:10 2010
New Revision: 961054
URL: http://svn.apache.org/viewvc?rev=961054&view=rev
Log:
Merged revisions 961051 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r961051 | ningjiang | 2010-07-07 08:52:53 +0800 (Wed, 07 Jul 2010) | 1 line
CXF-2885 Changed the package version rang of javax.servlet
........
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/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 7 01:37:10 2010
@@ -1 +1 @@
-/cxf/trunk:960506
+/cxf/trunk:960506,961051
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=961054&r1=961053&r2=961054&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 Wed Jul 7
01:37:10 2010
@@ -304,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)";resolution:=optional,
+
javax.servlet.*;version="[0.0,4)";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=961054&r1=961053&r2=961054&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 Wed Jul 7
01:37:10 2010
@@ -157,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)";resolution:=optional,
+
javax.servlet.*;version="[0.0,4)";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=961054&r1=961053&r2=961054&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 Wed Jul 7
01:37:10 2010
@@ -206,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)";resolution:=optional,
+
javax.servlet.*;version="[0.0,4)";resolution:=optional,
javax.xml.stream*;version="[0.0,2)",
javax.xml.ws*;version="[0.0,3)",
*
