Author: dkulp
Date: Fri Apr 10 20:36:06 2009
New Revision: 764039
URL: http://svn.apache.org/viewvc?rev=764039&view=rev
Log:
Merged revisions 761317 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r761317 | dkulp | 2009-04-02 11:00:37 -0400 (Thu, 02 Apr 2009) | 2 lines
Update xmlbeans versions and make sure a single version is used across
everything.
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/parent/pom.xml
cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/pom.xml
cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/pom.xml
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 10 20:36:06 2009
@@ -1 +1 @@
-/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761759,761789,762393,762567
+/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762567
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/parent/pom.xml?rev=764039&r1=764038&r2=764039&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/parent/pom.xml Fri Apr 10 20:36:06 2009
@@ -63,7 +63,7 @@
<activemq.version>4.1.1</activemq.version>
<rhino.version>1.6R7</rhino.version>
<jdom.version>1.0</jdom.version>
- <xmlbeans.version>2.3.0</xmlbeans.version>
+ <xmlbeans.version>2.4.0</xmlbeans.version>
<abdera.version>0.4.0-incubating</abdera.version>
<xmlschema.version>1.4.4</xmlschema.version>
<checkstyle.extension />
Modified: cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/pom.xml?rev=764039&r1=764038&r2=764039&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/pom.xml Fri Apr 10
20:36:06 2009
@@ -79,7 +79,6 @@
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
- <version>2.3.0</version>
<exclusions>
<exclusion>
<groupId>stax</groupId>
Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/pom.xml?rev=764039&r1=764038&r2=764039&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/pom.xml Fri Apr 10 20:36:06 2009
@@ -141,7 +141,6 @@
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
- <version>2.3.0</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
