Author: ningjiang
Date: Thu Dec 9 12:03:41 2010
New Revision: 1043921
URL: http://svn.apache.org/viewvc?rev=1043921&view=rev
Log:
Merged revisions 1043907 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1043907 | ningjiang | 2010-12-09 19:52:00 +0800 (Thu, 09 Dec 2010) | 1 line
CXF-3177 Update to latest JAXB version 2.2.2 from 2.2.1
........
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/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 9 12:03:41 2010
@@ -1 +1 @@
-/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902
+/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907
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=1043921&r1=1043920&r2=1043921&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/parent/pom.xml Thu Dec 9 12:03:41 2010
@@ -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.2</cxf.jaxb22.version>
+ <cxf.jaxb22.impl.version>2.2.2</cxf.jaxb22.impl.version>
+ <cxf.jaxb22.xjc.version>2.2.2</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>
