Author: dkulp Date: Wed Aug 24 15:36:13 2011 New Revision: 1161160 URL: http://svn.apache.org/viewvc?rev=1161160&view=rev Log: Merged revisions 1161156 via svnmerge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1161156 | dkulp | 2011-08-24 11:32:04 -0400 (Wed, 24 Aug 2011) | 9 lines Merged revisions 1161155 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1161155 | dkulp | 2011-08-24 11:30:11 -0400 (Wed, 24 Aug 2011) | 1 line Use latest jaxb 2.2.4 as that fixes the java5 test failure ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/parent/pom.xml Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/parent/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/parent/pom.xml?rev=1161160&r1=1161159&r2=1161160&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/parent/pom.xml (original) +++ cxf/branches/2.3.x-fixes/parent/pom.xml Wed Aug 24 15:36:13 2011 @@ -55,9 +55,9 @@ <cxf.jaxb21.version>2.1</cxf.jaxb21.version> <cxf.jaxb21.impl.version>2.1.13</cxf.jaxb21.impl.version> <cxf.jaxb21.xjc.version>2.1.13</cxf.jaxb21.xjc.version> - <cxf.jaxb22.version>2.2.1</cxf.jaxb22.version> - <cxf.jaxb22.impl.version>2.2.1.1</cxf.jaxb22.impl.version> - <cxf.jaxb22.xjc.version>2.2.1.1</cxf.jaxb22.xjc.version> + <cxf.jaxb22.version>2.2.4</cxf.jaxb22.version> + <cxf.jaxb22.impl.version>2.2.4-1</cxf.jaxb22.impl.version> + <cxf.jaxb22.xjc.version>2.2.4-1</cxf.jaxb22.xjc.version> <!-- by default, we use jaxb 2.1, but java5 profile will override to 2.2 --> <cxf.jaxb.version>${cxf.jaxb21.version}</cxf.jaxb.version>
