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 2013/11/18 17:36:15 UTC
svn commit: r1543071 - in /cxf/trunk: core/pom.xml pom.xml
rt/transports/http/pom.xml
Author: dkulp
Date: Mon Nov 18 16:36:15 2013
New Revision: 1543071
URL: http://svn.apache.org/r1543071
Log:
[CXF-5375] Use the javadoc plugin to help with better javadoc
Modified:
cxf/trunk/core/pom.xml
cxf/trunk/pom.xml
cxf/trunk/rt/transports/http/pom.xml
Modified: cxf/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/core/pom.xml?rev=1543071&r1=1543070&r2=1543071&view=diff
==============================================================================
--- cxf/trunk/core/pom.xml (original)
+++ cxf/trunk/core/pom.xml Mon Nov 18 16:36:15 2013
@@ -239,6 +239,7 @@
</goals>
<configuration>
<extensions>
+ <extension>org.apache.cxf.xjcplugins:cxf-xjc-javadoc:${cxf.xjc-utils.version}</extension>
<extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version}</extension>
</extensions>
<sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
@@ -249,12 +250,14 @@
<catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
<extensionArgs>
<extensionArg>-npa</extensionArg>
+ <extensionArg>-Xjavadoc</extensionArg>
</extensionArgs>
</xsdOption>
<xsdOption>
<xsd>${basedir}/src/main/resources/schemas/wsdl/ws-addr.xsd</xsd>
<packagename>org.apache.cxf.ws.addressing</packagename>
<extensionArgs>
+ <extensionArg>-Xjavadoc</extensionArg>
<extensionArg>-npa</extensionArg>
</extensionArgs>
</xsdOption>
@@ -263,6 +266,7 @@
<bindingFile>${basedir}/src/main/resources/schemas/wsdl/addressing.xjb</bindingFile>
<extensionArgs>
<extensionArg>-npa</extensionArg>
+ <extensionArg>-Xjavadoc</extensionArg>
</extensionArgs>
</xsdOption>
<xsdOption>
@@ -272,6 +276,7 @@
<extensionArgs>
<extensionArg>-npa</extensionArg>
<extensionArg>-Xdv</extensionArg>
+ <extensionArg>-Xjavadoc</extensionArg>
</extensionArgs>
</xsdOption>
<xsdOption>
@@ -280,12 +285,14 @@
<extension>true</extension>
<extensionArgs>
<extensionArg>-npa</extensionArg>
+ <extensionArg>-Xjavadoc</extensionArg>
</extensionArgs>
</xsdOption>
<xsdOption>
<xsd>${basedir}/src/main/resources/schemas/wsdl/addressing200403.xsd</xsd>
<bindingFile>${basedir}/src/main/resources/schemas/wsdl/addressing200403.xjb</bindingFile>
<extensionArgs>
+ <extensionArg>-Xjavadoc</extensionArg>
<extensionArg>-npa</extensionArg>
</extensionArgs>
</xsdOption>
@@ -293,11 +300,6 @@
</configuration>
</execution>
</executions>
- <configuration>
- <extensions>
- <extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version}</extension>
- </extensions>
- </configuration>
</plugin>
</plugins>
<pluginManagement>
Modified: cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/pom.xml?rev=1543071&r1=1543070&r2=1543071&view=diff
==============================================================================
--- cxf/trunk/pom.xml (original)
+++ cxf/trunk/pom.xml Mon Nov 18 16:36:15 2013
@@ -41,8 +41,8 @@
</prerequisites>
<properties>
<cxf.compiler.fork>false</cxf.compiler.fork>
- <cxf.build-utils.version>2.5.1-SNAPSHOT</cxf.build-utils.version>
- <cxf.xjc-utils.version>2.6.2</cxf.xjc-utils.version>
+ <cxf.build-utils.version>2.6.0</cxf.build-utils.version>
+ <cxf.xjc-utils.version>2.6.3-SNAPSHOT</cxf.xjc-utils.version>
<cxf.jdk.version>1.6</cxf.jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<site.deploy.url>scp://people.apache.org/www/cxf.apache.org/maven-site</site.deploy.url>
Modified: cxf/trunk/rt/transports/http/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/pom.xml?rev=1543071&r1=1543070&r2=1543071&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/pom.xml (original)
+++ cxf/trunk/rt/transports/http/pom.xml Mon Nov 18 16:36:15 2013
@@ -126,6 +126,7 @@
<extensionArgs>
<extensionArg>-Xdv</extensionArg>
<extensionArg>-Xproperty-listener</extensionArg>
+ <extensionArg>-Xjavadoc</extensionArg>
</extensionArgs>
<deleteDirs>
<deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
@@ -141,6 +142,7 @@
<configuration>
<extensions>
<extension>org.apache.cxf.xjcplugins:cxf-xjc-pl:${cxf.xjc-utils.version}</extension>
+ <extension>org.apache.cxf.xjcplugins:cxf-xjc-javadoc:${cxf.xjc-utils.version}</extension>
<extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version}</extension>
</extensions>
</configuration>