You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2010/11/13 04:34:41 UTC
svn commit: r1034638 - in /cxf/branches/2.3.x-fixes: ./ distribution/pom.xml
Author: ningjiang
Date: Sat Nov 13 03:34:39 2010
New Revision: 1034638
URL: http://svn.apache.org/viewvc?rev=1034638&view=rev
Log:
Merged revisions 1034637 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1034637 | ningjiang | 2010-11-13 11:26:56 +0800 (Sat, 13 Nov 2010) | 1 line
Fixed the CS errors of distribution build
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/distribution/pom.xml
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 13 03:34:39 2010
@@ -1 +1 @@
-/cxf/trunk:1031124-1031158,1031210,1034113,1034165
+/cxf/trunk:1031124-1031158,1031210,1034113,1034165,1034637
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Nov 13 03:34:39 2010
@@ -1 +1 @@
-/cxf/trunk:1-1022155,1022157-1023401,1023420-1030540,1030542-1031074,1031076-1033529,1033531,1033533-1033888,1033890-1033925,1033927-1034174
+/cxf/trunk:1-1022155,1022157-1023401,1023420-1030540,1030542-1031074,1031076-1033529,1033531,1033533-1033888,1033890-1033925,1033927-1034174,1034637
Modified: cxf/branches/2.3.x-fixes/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/pom.xml?rev=1034638&r1=1034637&r2=1034638&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/pom.xml Sat Nov 13 03:34:39 2010
@@ -35,11 +35,11 @@
<properties>
<maven.test.skip>true</maven.test.skip>
<cxf.version>${project.version}</cxf.version>
- <checkstyle.extension>-corba</checkstyle.extension>
+ <cxf.checkstyle.extension>-corba</cxf.checkstyle.extension>
- <jaxb.version>${jaxb22.version}</jaxb.version>
- <jaxb.impl.version>${jaxb22.impl.version}</jaxb.impl.version>
- <jaxb.xjc.version>${jaxb22.impl.version}</jaxb.xjc.version>
+ <cxf.jaxb.version>${cxf.jaxb22.version}</cxf.jaxb.version>
+ <cxf.jaxb.impl.version>${cxf.jaxb22.impl.version}</cxf.jaxb.impl.version>
+ <cxf.jaxb.xjc.version>${cxf.jaxb22.impl.version}</cxf.jaxb.xjc.version>
</properties>
<modules>