You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/10/25 16:55:29 UTC

svn commit: r1402177 - /cxf/branches/2.5.x-fixes/parent/pom.xml

Author: dkulp
Date: Thu Oct 25 14:55:29 2012
New Revision: 1402177

URL: http://svn.apache.org/viewvc?rev=1402177&view=rev
Log:
Merged revisions 1401463 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1401463 | dkulp | 2012-10-23 16:54:38 -0400 (Tue, 23 Oct 2012) | 2 lines

  Apparently something in JAXB 2.2.6 is not Java 5 compatible anymore

........

Modified:
    cxf/branches/2.5.x-fixes/parent/pom.xml

Modified: cxf/branches/2.5.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/parent/pom.xml?rev=1402177&r1=1402176&r2=1402177&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/parent/pom.xml Thu Oct 25 14:55:29 2012
@@ -64,9 +64,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.6</cxf.jaxb22.version>
-        <cxf.jaxb22.impl.version>2.2.6</cxf.jaxb22.impl.version>
-        <cxf.jaxb22.xjc.version>2.2.6</cxf.jaxb22.xjc.version>
+        <cxf.jaxb22.version>2.2.5</cxf.jaxb22.version>
+        <cxf.jaxb22.impl.version>2.2.5.1</cxf.jaxb22.impl.version>
+        <cxf.jaxb22.xjc.version>2.2.5.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>