You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2012/02/10 06:09:26 UTC

svn commit: r1242677 - in /camel/branches/camel-2.9.x: ./ components/camel-cxf-transport/pom.xml components/camel-cxf/pom.xml parent/pom.xml

Author: hadrian
Date: Fri Feb 10 05:09:25 2012
New Revision: 1242677

URL: http://svn.apache.org/viewvc?rev=1242677&view=rev
Log:
Merged revisions 1240753 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1240753 | bvahdat | 2012-02-05 10:58:23 -0500 (Sun, 05 Feb 2012) | 1 line
  
  CAMEL-4980: Instruct the cxf-codegen-plugin globally at the parent pom level.
........

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    camel/branches/camel-2.9.x/components/camel-cxf-transport/pom.xml
    camel/branches/camel-2.9.x/components/camel-cxf/pom.xml
    camel/branches/camel-2.9.x/parent/pom.xml

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.9.x/components/camel-cxf-transport/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf-transport/pom.xml?rev=1242677&r1=1242676&r2=1242677&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf-transport/pom.xml (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf-transport/pom.xml Fri Feb 10 05:09:25 2012
@@ -171,10 +171,6 @@
                   <wsdl>${basedir}/src/test/resources/person.wsdl</wsdl>
                 </wsdlOption>
               </wsdlOptions>
-              <defaultOptions>
-                  <markGenerated>true</markGenerated>
-                  <faultSerialVersionUID>1</faultSerialVersionUID>
-              </defaultOptions>
             </configuration>
             <goals>
               <goal>wsdl2java</goal>

Modified: camel/branches/camel-2.9.x/components/camel-cxf/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/pom.xml?rev=1242677&r1=1242676&r2=1242677&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/pom.xml (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/pom.xml Fri Feb 10 05:09:25 2012
@@ -269,10 +269,6 @@
             <phase>generate-sources</phase>
             <configuration>
               <sourceRoot>${basedir}/target/generated</sourceRoot>
-              <defaultOptions>
-                  <markGenerated>true</markGenerated>
-                  <faultSerialVersionUID>1</faultSerialVersionUID>
-              </defaultOptions>
               <wsdlOptions>
                 <wsdlOption>
                   <wsdl>${basedir}/src/test/resources/mtom.wsdl</wsdl>

Modified: camel/branches/camel-2.9.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/parent/pom.xml?rev=1242677&r1=1242676&r2=1242677&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/parent/pom.xml (original)
+++ camel/branches/camel-2.9.x/parent/pom.xml Fri Feb 10 05:09:25 2012
@@ -1631,6 +1631,10 @@
           <version>${cxf-version}</version>
           <configuration>
             <fork>once</fork>
+            <defaultOptions>
+              <markGenerated>true</markGenerated>
+              <faultSerialVersionUID>1</faultSerialVersionUID>
+            </defaultOptions>
           </configuration>
           <dependencies>
             <!--