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 2015/02/02 19:59:00 UTC
[1/5] cxf git commit: Update plugins to use annotations instead of
the javadoc things
Repository: cxf
Updated Branches:
refs/heads/master 27e877346 -> 96ed80508
Update plugins to use annotations instead of the javadoc things
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/96ed8050
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/96ed8050
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/96ed8050
Branch: refs/heads/master
Commit: 96ed80508cf15f7dc8c2d5a73225a36dbc096ee2
Parents: bfbc0a2
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Feb 2 13:58:09 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 2 13:58:43 2015 -0500
----------------------------------------------------------------------
maven-plugins/codegen-plugin/pom.xml | 42 ++-------
.../cxf/maven_plugin/AbstractCodegenMoho.java | 85 +++++++-----------
.../maven_plugin/wsdl2java/WSDL2JavaMojo.java | 30 +++----
.../wsdl2js/WSDL2JavaScriptMojo.java | 28 +++---
maven-plugins/corba/pom.xml | 37 --------
maven-plugins/java2wadl-plugin/pom.xml | 52 +++--------
.../javatowadl/ParseJavaDocMojo.java | 91 ++++++++------------
maven-plugins/java2ws-plugin/pom.xml | 37 --------
maven-plugins/pom.xml | 20 -----
maven-plugins/wadl2java-plugin/pom.xml | 42 ++-------
.../wadlto/AbstractCodeGeneratorMojo.java | 81 +++++------------
.../cxf/maven_plugin/wadlto/WADL2JavaMojo.java | 29 +++----
maven-plugins/wsdl-validator-plugin/pom.xml | 37 --------
parent/pom.xml | 12 +++
pom.xml | 31 +++++++
15 files changed, 194 insertions(+), 460 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/codegen-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/pom.xml b/maven-plugins/codegen-plugin/pom.xml
index 521d097..0259a06 100644
--- a/maven-plugins/codegen-plugin/pom.xml
+++ b/maven-plugins/codegen-plugin/pom.xml
@@ -56,6 +56,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>2.0.5</version>
@@ -148,41 +153,4 @@
</dependencies>
</profile>
</profiles>
- <build>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-plugin-plugin
- </artifactId>
- <versionRange>
- [2.9,)
- </versionRange>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
index 91206e9..addd797 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
@@ -50,6 +50,8 @@ import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.settings.Proxy;
@@ -92,125 +94,98 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
private static final String HTTP_PROXY_PASSWORD = "http.proxyPassword";
- /**
- * @parameter expression="${project.build.outputDirectory}"
- * @required
- */
+ @Parameter(property = "project.build.outputDirectory", required = true)
protected String classesDirectory;
/**
* By default all maven dependencies of type "wsdl" are added to the effective wsdlOptions. Setting this
* parameter to true disables this functionality
- *
- * @parameter expression="${cxf.disableDependencyScan}" default-value="false"
*/
+ @Parameter(property = "cxf.disableDependencyScan", defaultValue = "false")
protected boolean disableDependencyScan;
+
/**
* Disables the scanning of the wsdlRoot/testWsdlRoot directories.
* By default, we scan for *.wsdl (see include/exclude params as well) in the wsdlRoot
* directories and run the tool on all the wsdls we find. This disables that scan
* and requires an explicit wsdlOption to be set for each wsdl that needs to be processed.
- * @parameter expression="${cxf.disableDirectoryScan}" default-value="false"
*/
+ @Parameter(property = "cxf.disableDirectoryScan", defaultValue = "false")
protected boolean disableDirectoryScan;
+
/**
* Allows running the JavaToWs in a separate process. Valid values are "false", "always", and "once" The
* value of "true" is equal to "once"
- *
- * @parameter default-value="false"
- * @since 2.4
*/
+ @Parameter(defaultValue = "false")
protected String fork;
+
/**
* A list of wsdl files to include. Can contain ant-style wildcards and double wildcards. Defaults to
* *.wsdl
- *
- * @parameter
*/
+ @Parameter
protected String includes[];
/**
* Directory in which the "DONE" markers are saved that
- *
- * @parameter expression="${cxf.markerDirectory}"
- * default-value="${project.build.directory}/cxf-codegen-plugin-markers"
*/
+ @Parameter(property = "cxf.markerDirectory", defaultValue = "${project.build.directory}/cxf-codegen-plugin-markers")
protected File markerDirectory;
+
/**
- * The plugin dependencies, needed for the fork mode.
- *
- * @parameter expression="${plugin.artifacts}"
- * @required
- * @readonly
+ * The plugin dependencies, needed for the fork mode
*/
+ @Parameter(required = true, readonly = true, property = "plugin.artifacts")
protected List<Artifact> pluginArtifacts;
- /**
- * @parameter expression="${project}"
- * @required
- */
+
+ @Parameter(required = true, property = "project")
protected MavenProject project;
+
/**
* Use the compile classpath rather than the test classpath for execution useful if the test dependencies
* clash with those of wsdl2java
- *
- * @parameter expression="${cxf.useCompileClasspath}" default-value="false"
*/
+ @Parameter(property = "cxf.useCompileClasspath", defaultValue = "false")
protected boolean useCompileClasspath;
+
/**
* A list of wsdl files to exclude. Can contain ant-style wildcards and double wildcards.
- *
- * @parameter
*/
+ @Parameter
protected String excludes[];
- /**
- * @parameter expression="${cxf.testWsdlRoot}" default-value="${basedir}/src/test/resources/wsdl"
- */
+
+ @Parameter(property = "cxf.testWsdlRoot", defaultValue = "${basedir}/src/test/resources/wsdl")
protected File testWsdlRoot;
- /**
- * @parameter expression="${cxf.wsdlRoot}" default-value="${basedir}/src/main/resources/wsdl"
- */
+ @Parameter(property = "cxf.wsdlRoot", defaultValue = "${basedir}/src/main/resources/wsdl")
protected File wsdlRoot;
- /** @component */
+ @Component
protected BuildContext buildContext;
/**
* Sets the JVM arguments (i.e. <code>-Xms128m -Xmx128m</code>) if fork is set to <code>true</code>.
- *
- * @parameter expression="${cxf.codegen.jvmArgs}"
- * @since 2.4
*/
+ @Parameter(property = "cxf.codegen.jvmArgs")
private String additionalJvmArgs;
/**
* Sets the Java executable to use when fork parameter is <code>true</code>.
- *
- * @parameter default-value="${java.home}/bin/java"
- * @since 2.4
*/
+ @Parameter(defaultValue = "${java.home}/bin/java")
private String javaExecutable;
/**
* The Maven session.
- *
- * @parameter expression="${session}"
- * @readonly
- * @required
*/
+ @Parameter(readonly = true, required = true, property = "session")
private MavenSession mavenSession;
- /**
- * @component
- * @readonly
- * @required
- */
+
+ @Component
private ProjectDependenciesResolver projectDependencyResolver;
- /**
- * @component
- * @readonly
- * @required
- */
+ @Component
private RepositorySystem repositorySystem;
http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
index 92e6955..a99b988 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
@@ -47,15 +47,14 @@ import org.apache.cxf.tools.util.OutputStreamCreator;
import org.apache.cxf.tools.wsdlto.WSDLToJava;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.sonatype.plexus.build.incremental.BuildContext;
-/**
- * @goal wsdl2java
- * @phase generate-sources
- * @description CXF WSDL To Java Tool
- * @requiresDependencyResolution test
- * @threadSafe
- */
+@Mojo(name = "wsdl2java", defaultPhase = LifecyclePhase.GENERATE_SOURCES, threadSafe = true,
+ requiresDependencyResolution = ResolutionScope.TEST)
public class WSDL2JavaMojo extends AbstractCodegenMoho {
final class MavenToolErrorListener extends ToolErrorListener {
@@ -125,40 +124,35 @@ public class WSDL2JavaMojo extends AbstractCodegenMoho {
}
}
- /**
- * @parameter expression="${cxf.testSourceRoot}"
- */
+ @Parameter(property = "cxf.testSourceRoot")
File testSourceRoot;
/**
* Path where the generated sources should be placed
*
- * @parameter expression="${cxf.sourceRoot}"
- * default-value="${project.build.directory}/generated-sources/cxf"
- * @required
*/
+ @Parameter(required = true, defaultValue = "${project.build.directory}/generated-sources/cxf",
+ property = "cxf.sourceRoot")
File sourceRoot;
/**
* Options that specify WSDLs to process and/or control the processing of wsdls.
* If you have enabled wsdl scanning, these elements attach options to particular wsdls.
* If you have not enabled wsdl scanning, these options call out the wsdls to process.
- * @parameter
*/
+ @Parameter
WsdlOption wsdlOptions[];
/**
* Default options to be used when a wsdl has not had it's options explicitly specified.
- *
- * @parameter
*/
+ @Parameter
Option defaultOptions = new Option();
/**
* Encoding to use for generated sources
- *
- * @parameter default-value="${project.build.sourceEncoding}"
*/
+ @Parameter(defaultValue = "${project.build.sourceEncoding}")
String encoding;
/**
http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
index 1ba97e3..daee4c9 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
@@ -39,44 +39,38 @@ import org.apache.cxf.tools.common.ToolContext;
import org.apache.cxf.tools.wsdlto.javascript.WSDLToJavaScript;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
-/**
- * @goal wsdl2js
- * @phase generate-sources
- * @description CXF WSDL To JavaScript Tool
- * @requiresDependencyResolution test
- * @threadSafe
- */
+@Mojo(name = "wsdl2js", defaultPhase = LifecyclePhase.GENERATE_SOURCES, threadSafe = true,
+ requiresDependencyResolution = ResolutionScope.TEST)
public class WSDL2JavaScriptMojo extends AbstractCodegenMoho {
- /**
- * @parameter expression="${cxf.testJavascriptRoot}"
- */
+ @Parameter(property = "cxf.testJavascriptRoot")
File testSourceRoot;
/**
* Path where the generated sources should be placed
- *
- * @parameter expression="${cxf.sourceJavascriptRoot}"
- * default-value="${project.build.directory}/generated-sources/cxf-js"
- * @required
*/
+ @Parameter(required = true, defaultValue = "${project.build.directory}/generated-sources/cxf-js",
+ property = "cxf.sourceJavascriptRoot")
File sourceRoot;
/**
* Default options to be applied to all of the wsdls.
- *
- * @parameter
*/
+ @Parameter
Option defaultOptions = new Option();
/**
* Options that specify WSDLs to process and/or control the processing of wsdls.
* If you have enabled wsdl scanning, these elements attach options to particular wsdls.
* If you have not enabled wsdl scanning, these options call out the wsdls to process.
- * @parameter
*/
+ @Parameter
WsdlOption wsdlOptions[];
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/corba/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/corba/pom.xml b/maven-plugins/corba/pom.xml
index 622932e..bf21633 100644
--- a/maven-plugins/corba/pom.xml
+++ b/maven-plugins/corba/pom.xml
@@ -69,41 +69,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-plugin-plugin
- </artifactId>
- <versionRange>
- [2.9,)
- </versionRange>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/java2wadl-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/java2wadl-plugin/pom.xml b/maven-plugins/java2wadl-plugin/pom.xml
index 03ea41e..78da0b1 100644
--- a/maven-plugins/java2wadl-plugin/pom.xml
+++ b/maven-plugins/java2wadl-plugin/pom.xml
@@ -118,6 +118,20 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-toolchain</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -194,42 +208,4 @@
</build>
</profile>
</profiles>
-
- <build>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-plugin-plugin
- </artifactId>
- <versionRange>
- [2.9,)
- </versionRange>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
index 9dd47f6..2662b7c 100644
--- a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
+++ b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
@@ -20,18 +20,20 @@ package org.apache.cxf.maven_plugin.javatowadl;
import java.io.File;
import java.lang.reflect.Field;
+import java.lang.reflect.Method;
import java.util.List;
import java.util.Locale;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.javadoc.AbstractJavadocMojo;
+import org.apache.maven.plugin.javadoc.JavadocReport;
import org.apache.maven.plugin.javadoc.options.DocletArtifact;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.reporting.MavenReportException;
import org.apache.maven.toolchain.ToolchainManager;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
@@ -41,7 +43,7 @@ import org.codehaus.plexus.archiver.manager.ArchiverManager;
* @requiresDependencyResolution compile
* @threadSafe
*/
-public class ParseJavaDocMojo extends AbstractJavadocMojo {
+public class ParseJavaDocMojo extends AbstractMojo {
/**
* @parameter expression="${project}"
@@ -118,24 +120,20 @@ public class ParseJavaDocMojo extends AbstractJavadocMojo {
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
- if (skip) {
- getLog().info("Skipping parse javadoc");
- return;
- }
-
+ AbstractJavadocMojo mojo = new JavadocReport();
+ Locale locale = Locale.getDefault();
try {
- Locale locale = Locale.getDefault();
Field f = AbstractJavadocMojo.class.getDeclaredField("doclet");
f.setAccessible(true);
- f.set(this, "org.apache.cxf.maven_plugin.javatowadl.DumpJavaDoc");
+ f.set(mojo, "org.apache.cxf.maven_plugin.javatowadl.DumpJavaDoc");
f = AbstractJavadocMojo.class.getDeclaredField("stylesheet");
f.setAccessible(true);
- f.set(this, "stylesheet");
+ f.set(mojo, "stylesheet");
f = AbstractJavadocMojo.class.getDeclaredField("javadocOptionsDir");
f.setAccessible(true);
- f.set(this, javadocOptionsDir);
+ f.set(mojo, javadocOptionsDir);
f = AbstractJavadocMojo.class.getDeclaredField("docletArtifact");
f.setAccessible(true);
@@ -150,81 +148,68 @@ public class ParseJavaDocMojo extends AbstractJavadocMojo {
}
}
}
- f.set(this, docletArtifact);
+ f.set(mojo, docletArtifact);
f = AbstractJavadocMojo.class.getDeclaredField("factory");
f.setAccessible(true);
- f.set(this, this.mavenArtifactFactory);
+ f.set(mojo, this.mavenArtifactFactory);
f = AbstractJavadocMojo.class.getDeclaredField("mavenProjectBuilder");
f.setAccessible(true);
- f.set(this, this.mavenProjectBuilder);
+ f.set(mojo, this.mavenProjectBuilder);
f = AbstractJavadocMojo.class.getDeclaredField("resolver");
f.setAccessible(true);
- f.set(this, this.artifactResolver);
+ f.set(mojo, this.artifactResolver);
f = AbstractJavadocMojo.class.getDeclaredField("archiverManager");
f.setAccessible(true);
- f.set(this, this.archiverManager);
+ f.set(mojo, this.archiverManager);
f = AbstractJavadocMojo.class.getDeclaredField("artifactMetadataSource");
f.setAccessible(true);
- f.set(this, this.artifactMetadataSource);
+ f.set(mojo, this.artifactMetadataSource);
f = AbstractJavadocMojo.class.getDeclaredField("toolchainManager");
f.setAccessible(true);
- f.set(this, this.toolchainManager);
+ f.set(mojo, this.toolchainManager);
f = AbstractJavadocMojo.class.getDeclaredField("localRepository");
f.setAccessible(true);
- f.set(this, this.localRepository);
+ f.set(mojo, this.localRepository);
f = AbstractJavadocMojo.class.getDeclaredField("remoteRepositories");
f.setAccessible(true);
- f.set(this, this.remoteRepositories);
+ f.set(mojo, this.remoteRepositories);
f = AbstractJavadocMojo.class.getDeclaredField("applyJavadocSecurityFix");
f.setAccessible(true);
- f.set(this, false);
+ f.set(mojo, false);
f = AbstractJavadocMojo.class.getDeclaredField("additionalparam");
f.setAccessible(true);
- f.set(this, "-dumpJavaDocFile " + this.dumpFileOutputDirectory.getAbsolutePath()
+ f.set(mojo, "-dumpJavaDocFile " + this.dumpFileOutputDirectory.getAbsolutePath()
+ File.separator + "dumpFile.properties");
- useStandardDocletOptions = false;
- this.project = mavenProject;
- generate(locale);
- } catch (Exception e) {
- failOnError("An error has occurred in parsing javadoc", e);
- }
-
- }
-
- private void generate(Locale locale) throws MavenReportException {
- try {
- outputDirectory = getReportOutputDirectory();
- executeReport(locale);
- } catch (MavenReportException e) {
- if (failOnError) {
- throw e;
- }
- getLog().error("Error while creating javadoc report: " + e.getMessage(), e);
- } catch (RuntimeException e) {
- if (failOnError) {
- throw e;
+ f = AbstractJavadocMojo.class.getDeclaredField("useStandardDocletOptions");
+ f.setAccessible(true);
+ f.set(mojo, false);
+
+ f = AbstractJavadocMojo.class.getDeclaredField("project");
+ f.setAccessible(true);
+ f.set(mojo, mavenProject);
+
+ if (dumpFileOutputDirectory != null) {
+ f = AbstractJavadocMojo.class.getDeclaredField("outputDirectory");
+ f.setAccessible(true);
+ f.set(mojo, dumpFileOutputDirectory);
}
- getLog().error("Error while creating javadoc report: " + e.getMessage(), e);
- }
- }
-
- private File getReportOutputDirectory() {
- if (dumpFileOutputDirectory == null) {
- return outputDirectory;
+
+ Method m = AbstractJavadocMojo.class.getMethod("executeReport", Locale.class);
+ m.setAccessible(true);
+ m.invoke(mojo, locale);
+ } catch (Exception e) {
+ throw new MojoExecutionException("Failed to generate javadoc", e);
}
-
- return dumpFileOutputDirectory;
}
-
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/java2ws-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/java2ws-plugin/pom.xml b/maven-plugins/java2ws-plugin/pom.xml
index d3ca92c..73c8ede 100644
--- a/maven-plugins/java2ws-plugin/pom.xml
+++ b/maven-plugins/java2ws-plugin/pom.xml
@@ -77,41 +77,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-plugin-plugin
- </artifactId>
- <versionRange>
- [2.9,)
- </versionRange>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
index 8a6f19b..57db354 100644
--- a/maven-plugins/pom.xml
+++ b/maven-plugins/pom.xml
@@ -39,24 +39,4 @@
<module>corba</module>
<module>archetypes</module>
</modules>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>2.9</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>2.9</version>
- </plugin>
- </plugins>
- </reporting>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/wadl2java-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/pom.xml b/maven-plugins/wadl2java-plugin/pom.xml
index 092d859..1e10e63 100644
--- a/maven-plugins/wadl2java-plugin/pom.xml
+++ b/maven-plugins/wadl2java-plugin/pom.xml
@@ -56,6 +56,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>2.0.5</version>
@@ -122,41 +127,4 @@
</dependencies>
</profile>
</profiles>
- <build>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-plugin-plugin
- </artifactId>
- <versionRange>
- [2.9,)
- </versionRange>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
index fe5454d..16e7f84 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
@@ -47,6 +47,8 @@ import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.archiver.jar.JarArchiver;
@@ -60,54 +62,42 @@ import org.codehaus.plexus.util.cli.Commandline;
public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
/**
- * @parameter expression="${cxf.testSourceRoot}"
+ * Source Root
*/
+ @Parameter(property = "cxf.testSourceRoot")
File testSourceRoot;
/**
* Path where the generated sources should be placed
- *
- * @parameter expression="${cxf.sourceRoot}"
- * default-value="${project.build.directory}/generated-sources/cxf"
- * @required
*/
+ @Parameter(required = true,
+ property = "cxf.sourceRoot",
+ defaultValue = "${project.build.directory}/generated-sources/cxf")
File sourceRoot;
- /**
- * @parameter expression="${project.build.outputDirectory}"
- * @required
- */
+ @Parameter(required = true, property = "project.build.outputDirectory")
String classesDirectory;
- /**
- * @parameter expression="${project}"
- * @required
- */
+ @Parameter(required = true, property = "project")
MavenProject project;
/**
* Default options to be used when a wadl has not had it's options explicitly specified.
- *
- * @parameter
*/
+ @Parameter
Option defaultOptions = new Option();
-
-
/**
* Directory in which the "DONE" markers are saved that
- *
- * @parameter expression="${cxf.markerDirectory}"
- * default-value="${project.build.directory}/cxf-codegen-plugin-markers"
*/
+ @Parameter(property = "cxf.markerDirectory", defaultValue = "${project.build.directory}/cxf-codegen-plugin-markers")
File markerDirectory;
/**
* Use the compile classpath rather than the test classpath for execution useful if the test dependencies
* clash with those of wadl2java
- *
- * @parameter expression="${cxf.useCompileClasspath}" default-value="false"
*/
+ @Parameter(property = "cxf.useCompileClasspath", defaultValue = "false")
boolean useCompileClasspath;
@@ -116,94 +106,69 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
* By default, we scan for *.wadl (see include/exclude params as well) in the wadlRoot
* directories and run wadl2java on all the wadl's we find. This disables that scan
* and requires an explicit wadlOption to be set for each wadl that needs to be processed.
- * @parameter expression="${cxf.disableDirectoryScan}" default-value="false"
*/
+ @Parameter(property = "cxf.disableDirectoryScan", defaultValue = "false")
boolean disableDirectoryScan;
/**
* By default all maven dependencies of type "wadl" are added to the effective wadlOptions. Setting this
* parameter to true disables this functionality
- *
- * @parameter expression="${cxf.disableDependencyScan}" default-value="false"
*/
+ @Parameter(property = "cxf.disableDependencyScan", defaultValue = "false")
boolean disableDependencyScan;
/**
* A list of wadl files to include. Can contain ant-style wildcards and double wildcards. Defaults to
* *.wadl
- *
- * @parameter
*/
+ @Parameter
String includes[];
/**
* A list of wadl files to exclude. Can contain ant-style wildcards and double wildcards.
- *
- * @parameter
*/
+ @Parameter
String excludes[];
/**
* Allows running the JavaToWs in a separate process.
* Valid values are "false", "always", and "once"
* The value of "true" is equal to "once"
- *
- * @parameter default-value="false"
- * @since 2.4
*/
+ @Parameter(defaultValue = "false")
String fork;
/**
* The Maven session.
- *
- * @parameter expression="${session}"
- * @readonly
- * @required
*/
+ @Parameter(readonly = true, required = true, property = "session")
private MavenSession mavenSession;
/**
* The plugin dependencies, needed for the fork mode.
- *
- * @parameter expression="${plugin.artifacts}"
- * @required
- * @readonly
*/
+ @Parameter(readonly = true, required = true, property = "plugin.artifacts")
private List<Artifact> pluginArtifacts;
/**
* Sets the Java executable to use when fork parameter is <code>true</code>.
- *
- * @parameter default-value="${java.home}/bin/java"
- * @since 2.4
*/
+ @Parameter(defaultValue = "${java.home}/bin/java")
private String javaExecutable;
/**
* Sets the JVM arguments (i.e. <code>-Xms128m -Xmx128m</code>) if fork is set to <code>true</code>.
- *
- * @parameter
- * @since 2.4
*/
+ @Parameter
private String additionalJvmArgs;
- /**
- * @component
- * @readonly
- * @required
- */
+ @Component
private RepositorySystem repositorySystem;
private ClassLoader resourceClassLoader;
-
- /**
- * Merge WadlOptions that point to the same file by adding the extraargs to the first option and deleting
- * the second from the options list
- *
- * @param options
- */
+
private Artifact resolveRemoteWadlArtifact(Artifact artifact)
throws MojoExecutionException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
index 58503b9..c8280f2 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
@@ -28,34 +28,31 @@ import java.util.Set;
import org.apache.cxf.Bus;
import org.apache.cxf.maven_plugin.common.ClassLoaderSwitcher;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.sonatype.plexus.build.incremental.BuildContext;
/**
- * @goal wadl2java
- * @phase generate-sources
- * @description CXF WADL To Java Tool
- * @requiresDependencyResolution test
- * @threadSafe
+ * CXF WADL To Java Tool
*/
+@Mojo(name = "wadl2java", defaultPhase = LifecyclePhase.GENERATE_SOURCES, threadSafe = true,
+ requiresDependencyResolution = ResolutionScope.TEST)
public class WADL2JavaMojo extends AbstractCodeGeneratorMojo {
- /**
- * @parameter
- */
- WadlOption wadlOptions[];
+ @Parameter
+ WadlOption wadlOptions[];
- /**
- * @parameter expression="${cxf.wadlRoot}" default-value="${basedir}/src/main/resources/wadl"
- */
+ @Parameter(property = "cxf.wadlRoot", defaultValue = "${basedir}/src/main/resources/wad")
File wadlRoot;
- /**
- * @parameter expression="${cxf.testWadlRoot}" default-value="${basedir}/src/test/resources/wadl"
- */
+ @Parameter(property = "cxf.testWadlRoot", defaultValue = "${basedir}/src/test/resources/wadl")
File testWadlRoot;
- /** @component */
+ @Component
BuildContext buildContext;
private void mergeOptions(List<WadlOption> effectiveOptions) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/wsdl-validator-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/wsdl-validator-plugin/pom.xml b/maven-plugins/wsdl-validator-plugin/pom.xml
index afa83f9..12658aa 100644
--- a/maven-plugins/wsdl-validator-plugin/pom.xml
+++ b/maven-plugins/wsdl-validator-plugin/pom.xml
@@ -56,41 +56,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-plugin-plugin
- </artifactId>
- <versionRange>
- [2.9,)
- </versionRange>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0d2678c..5d1f914 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -724,6 +724,18 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.4</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
<version>${cxf.mina.version}</version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0873d69..31debe6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -615,6 +615,37 @@
</dependency>
</dependencies>
</plugin>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-plugin-plugin
+ </artifactId>
+ <versionRange>
+ [3.4,)
+ </versionRange>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
Re: [1/5] cxf git commit: Update plugins to use annotations instead
of the javadoc things
Posted by Aki Yoshida <el...@gmail.com>.
confirmed. I used 3.2.5 and it's building fine.
regards, aki
2015-02-03 11:11 GMT+01:00 Aki Yoshida <el...@gmail.com>:
> Hi Alessio,
> thanks. I'll try with that maven version.
> But that means someone has to update the central jenkins build job to
> use that maven version as well.
> it is currently failing at the same spot.
> https://builds.apache.org/view/A-D/view/CXF/job/CXF-Trunk-JDK17/688/console
> regards, aki
>
> 2015-02-03 11:03 GMT+01:00 Alessio Soldano <as...@redhat.com>:
>> AFAICS, it's a matter of the Maven version being used. Just tried with 3.2.3
>> and it works fine.
>> Could be caused by http://jira.codehaus.org/browse/MNG-5346 .
>>
>> Cheers
>> Alessio
>>
>> On 03/02/15 10:34, Aki Yoshida wrote:
>>>
>>> It looks like this commit has broken cxf-codegen-plugin in trunk.
>>>
>>> [INFO] Apache CXF Command Line Tools WSDL to JavaScript Front End
>>> SUCCESS [2.062s]
>>> [INFO] Apache CXF Command Line Tools WSDLTo JAXB Databinding SUCCESS
>>> [1.981s]
>>> [INFO] Apache CXF Maven Plugins .......................... SUCCESS
>>> [0.057s]
>>> [INFO] Apache CXF WSDL Validator Maven2 Plugin ........... SUCCESS
>>> [1.751s]
>>> [INFO] Apache CXF Code Generation Maven2 Plugins ......... FAILURE
>>> [0.784s]
>>> [INFO] Apache CXF Test Utilities ......................... SKIPPED
>>> ...
>>>
>>> Does anyone know how to fix it or do we have to wait for Dan?
>>>
>>> I just temporarily synch'ed my local branch to one commit earlier to
>>> get the build run.
>>> regards, aki
>>>
>>>
>>> 2015-02-02 19:59 GMT+01:00 <dk...@apache.org>:
>>>>
>>>> Repository: cxf
>>>> Updated Branches:
>>>> refs/heads/master 27e877346 -> 96ed80508
>>>>
>>>>
>>>> Update plugins to use annotations instead of the javadoc things
>>>>
>>>>
>>>> Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
>>>> Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/96ed8050
>>>> Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/96ed8050
>>>> Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/96ed8050
>>>>
>>>> Branch: refs/heads/master
>>>> Commit: 96ed80508cf15f7dc8c2d5a73225a36dbc096ee2
>>>> Parents: bfbc0a2
>>>> Author: Daniel Kulp <dk...@apache.org>
>>>> Authored: Mon Feb 2 13:58:09 2015 -0500
>>>> Committer: Daniel Kulp <dk...@apache.org>
>>>> Committed: Mon Feb 2 13:58:43 2015 -0500
>>>>
>>>> ----------------------------------------------------------------------
>>>> maven-plugins/codegen-plugin/pom.xml | 42 ++-------
>>>> .../cxf/maven_plugin/AbstractCodegenMoho.java | 85 +++++++-----------
>>>> .../maven_plugin/wsdl2java/WSDL2JavaMojo.java | 30 +++----
>>>> .../wsdl2js/WSDL2JavaScriptMojo.java | 28 +++---
>>>> maven-plugins/corba/pom.xml | 37 --------
>>>> maven-plugins/java2wadl-plugin/pom.xml | 52 +++--------
>>>> .../javatowadl/ParseJavaDocMojo.java | 91
>>>> ++++++++------------
>>>> maven-plugins/java2ws-plugin/pom.xml | 37 --------
>>>> maven-plugins/pom.xml | 20 -----
>>>> maven-plugins/wadl2java-plugin/pom.xml | 42 ++-------
>>>> .../wadlto/AbstractCodeGeneratorMojo.java | 81 +++++------------
>>>> .../cxf/maven_plugin/wadlto/WADL2JavaMojo.java | 29 +++----
>>>> maven-plugins/wsdl-validator-plugin/pom.xml | 37 --------
>>>> parent/pom.xml | 12 +++
>>>> pom.xml | 31 +++++++
>>>> 15 files changed, 194 insertions(+), 460 deletions(-)
>>>> ----------------------------------------------------------------------
>>>>
>>>>
>>>>
>>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/codegen-plugin/pom.xml
>>>> ----------------------------------------------------------------------
>>>> diff --git a/maven-plugins/codegen-plugin/pom.xml
>>>> b/maven-plugins/codegen-plugin/pom.xml
>>>> index 521d097..0259a06 100644
>>>> --- a/maven-plugins/codegen-plugin/pom.xml
>>>> +++ b/maven-plugins/codegen-plugin/pom.xml
>>>> @@ -56,6 +56,11 @@
>>>> <scope>provided</scope>
>>>> </dependency>
>>>> <dependency>
>>>> + <groupId>org.apache.maven.plugin-tools</groupId>
>>>> + <artifactId>maven-plugin-annotations</artifactId>
>>>> + <scope>provided</scope>
>>>> + </dependency>
>>>> + <dependency>
>>>> <groupId>org.codehaus.plexus</groupId>
>>>> <artifactId>plexus-utils</artifactId>
>>>> <version>2.0.5</version>
>>>> @@ -148,41 +153,4 @@
>>>> </dependencies>
>>>> </profile>
>>>> </profiles>
>>>> - <build>
>>>> - <pluginManagement>
>>>> - <plugins>
>>>> - <!--This plugin's configuration is used to store
>>>> Eclipse m2e settings only. It has no influence on the Maven build itself.-->
>>>> - <plugin>
>>>> - <groupId>org.eclipse.m2e</groupId>
>>>> -
>>>> <artifactId>lifecycle-mapping</artifactId>
>>>> - <version>1.0.0</version>
>>>> - <configuration>
>>>> - <lifecycleMappingMetadata>
>>>> - <pluginExecutions>
>>>> - <pluginExecution>
>>>> -
>>>> <pluginExecutionFilter>
>>>> -
>>>> <groupId>
>>>> -
>>>> org.apache.maven.plugins
>>>> -
>>>> </groupId>
>>>> -
>>>> <artifactId>
>>>> -
>>>> maven-plugin-plugin
>>>> -
>>>> </artifactId>
>>>> -
>>>> <versionRange>
>>>> -
>>>> [2.9,)
>>>> -
>>>> </versionRange>
>>>> -
>>>> <goals>
>>>> -
>>>> <goal>descriptor</goal>
>>>> -
>>>> </goals>
>>>> -
>>>> </pluginExecutionFilter>
>>>> - <action>
>>>> -
>>>> <ignore></ignore>
>>>> - </action>
>>>> -
>>>> </pluginExecution>
>>>> - </pluginExecutions>
>>>> - </lifecycleMappingMetadata>
>>>> - </configuration>
>>>> - </plugin>
>>>> - </plugins>
>>>> - </pluginManagement>
>>>> - </build>
>>>> </project>
>>>>
>>>>
>>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
>>>> ----------------------------------------------------------------------
>>>> diff --git
>>>> a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
>>>> b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
>>>> index 91206e9..addd797 100644
>>>> ---
>>>> a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
>>>> +++
>>>> b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
>>>> @@ -50,6 +50,8 @@ import org.apache.maven.execution.MavenSession;
>>>> import org.apache.maven.model.Resource;
>>>> import org.apache.maven.plugin.AbstractMojo;
>>>> import org.apache.maven.plugin.MojoExecutionException;
>>>> +import org.apache.maven.plugins.annotations.Component;
>>>> +import org.apache.maven.plugins.annotations.Parameter;
>>>> import org.apache.maven.project.MavenProject;
>>>> import org.apache.maven.repository.RepositorySystem;
>>>> import org.apache.maven.settings.Proxy;
>>>> @@ -92,125 +94,98 @@ public abstract class AbstractCodegenMoho extends
>>>> AbstractMojo {
>>>> private static final String HTTP_PROXY_PASSWORD =
>>>> "http.proxyPassword";
>>>>
>>>>
>>>> - /**
>>>> - * @parameter expression="${project.build.outputDirectory}"
>>>> - * @required
>>>> - */
>>>> + @Parameter(property = "project.build.outputDirectory", required =
>>>> true)
>>>> protected String classesDirectory;
>>>>
>>>> /**
>>>> * By default all maven dependencies of type "wsdl" are added to
>>>> the effective wsdlOptions. Setting this
>>>> * parameter to true disables this functionality
>>>> - *
>>>> - * @parameter expression="${cxf.disableDependencyScan}"
>>>> default-value="false"
>>>> */
>>>> + @Parameter(property = "cxf.disableDependencyScan", defaultValue =
>>>> "false")
>>>> protected boolean disableDependencyScan;
>>>> +
>>>> /**
>>>> * Disables the scanning of the wsdlRoot/testWsdlRoot directories.
>>>> * By default, we scan for *.wsdl (see include/exclude params as
>>>> well) in the wsdlRoot
>>>> * directories and run the tool on all the wsdls we find. This
>>>> disables that scan
>>>> * and requires an explicit wsdlOption to be set for each wsdl that
>>>> needs to be processed.
>>>> - * @parameter expression="${cxf.disableDirectoryScan}"
>>>> default-value="false"
>>>> */
>>>> + @Parameter(property = "cxf.disableDirectoryScan", defaultValue =
>>>> "false")
>>>> protected boolean disableDirectoryScan;
>>>> +
>>>> /**
>>>> * Allows running the JavaToWs in a separate process. Valid values
>>>> are "false", "always", and "once" The
>>>> * value of "true" is equal to "once"
>>>> - *
>>>> - * @parameter default-value="false"
>>>> - * @since 2.4
>>>> */
>>>> + @Parameter(defaultValue = "false")
>>>> protected String fork;
>>>> +
>>>> /**
>>>> * A list of wsdl files to include. Can contain ant-style wildcards
>>>> and double wildcards. Defaults to
>>>> * *.wsdl
>>>> - *
>>>> - * @parameter
>>>> */
>>>> + @Parameter
>>>> protected String includes[];
>>>> /**
>>>> * Directory in which the "DONE" markers are saved that
>>>> - *
>>>> - * @parameter expression="${cxf.markerDirectory}"
>>>> - *
>>>> default-value="${project.build.directory}/cxf-codegen-plugin-markers"
>>>> */
>>>> + @Parameter(property = "cxf.markerDirectory", defaultValue =
>>>> "${project.build.directory}/cxf-codegen-plugin-markers")
>>>> protected File markerDirectory;
>>>> +
>>>> /**
>>>> - * The plugin dependencies, needed for the fork mode.
>>>> - *
>>>> - * @parameter expression="${plugin.artifacts}"
>>>> - * @required
>>>> - * @readonly
>>>> + * The plugin dependencies, needed for the fork mode
>>>> */
>>>> + @Parameter(required = true, readonly = true, property =
>>>> "plugin.artifacts")
>>>> protected List<Artifact> pluginArtifacts;
>>>> - /**
>>>> - * @parameter expression="${project}"
>>>> - * @required
>>>> - */
>>>> +
>>>> + @Parameter(required = true, property = "project")
>>>> protected MavenProject project;
>>>> +
>>>> /**
>>>> * Use the compile classpath rather than the test classpath for
>>>> execution useful if the test dependencies
>>>> * clash with those of wsdl2java
>>>> - *
>>>> - * @parameter expression="${cxf.useCompileClasspath}"
>>>> default-value="false"
>>>> */
>>>> + @Parameter(property = "cxf.useCompileClasspath", defaultValue =
>>>> "false")
>>>> protected boolean useCompileClasspath;
>>>> +
>>>> /**
>>>> * A list of wsdl files to exclude. Can contain ant-style wildcards
>>>> and double wildcards.
>>>> - *
>>>> - * @parameter
>>>> */
>>>> + @Parameter
>>>> protected String excludes[];
>>>> - /**
>>>> - * @parameter expression="${cxf.testWsdlRoot}"
>>>> default-value="${basedir}/src/test/resources/wsdl"
>>>> - */
>>>> +
>>>> + @Parameter(property = "cxf.testWsdlRoot", defaultValue =
>>>> "${basedir}/src/test/resources/wsdl")
>>>> protected File testWsdlRoot;
>>>>
>>>> - /**
>>>> - * @parameter expression="${cxf.wsdlRoot}"
>>>> default-value="${basedir}/src/main/resources/wsdl"
>>>> - */
>>>> + @Parameter(property = "cxf.wsdlRoot", defaultValue =
>>>> "${basedir}/src/main/resources/wsdl")
>>>> protected File wsdlRoot;
>>>>
>>>> - /** @component */
>>>> + @Component
>>>> protected BuildContext buildContext;
>>>>
>>>>
>>>> /**
>>>> * Sets the JVM arguments (i.e. <code>-Xms128m -Xmx128m</code>) if
>>>> fork is set to <code>true</code>.
>>>> - *
>>>> - * @parameter expression="${cxf.codegen.jvmArgs}"
>>>> - * @since 2.4
>>>> */
>>>> + @Parameter(property = "cxf.codegen.jvmArgs")
>>>> private String additionalJvmArgs;
>>>>
>>>> /**
>>>> * Sets the Java executable to use when fork parameter is
>>>> <code>true</code>.
>>>> - *
>>>> - * @parameter default-value="${java.home}/bin/java"
>>>> - * @since 2.4
>>>> */
>>>> + @Parameter(defaultValue = "${java.home}/bin/java")
>>>> private String javaExecutable;
>>>>
>>>> /**
>>>> * The Maven session.
>>>> - *
>>>> - * @parameter expression="${session}"
>>>> - * @readonly
>>>> - * @required
>>>> */
>>>> + @Parameter(readonly = true, required = true, property = "session")
>>>> private MavenSession mavenSession;
>>>> - /**
>>>> - * @component
>>>> - * @readonly
>>>> - * @required
>>>> - */
>>>> +
>>>> + @Component
>>>> private ProjectDependenciesResolver projectDependencyResolver;
>>>>
>>>> - /**
>>>> - * @component
>>>> - * @readonly
>>>> - * @required
>>>> - */
>>>> + @Component
>>>> private RepositorySystem repositorySystem;
>>>>
>>>>
>>>>
>>>>
>>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
>>>> ----------------------------------------------------------------------
>>>> diff --git
>>>> a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
>>>> b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
>>>> index 92e6955..a99b988 100644
>>>> ---
>>>> a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
>>>> +++
>>>> b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
>>>> @@ -47,15 +47,14 @@ import org.apache.cxf.tools.util.OutputStreamCreator;
>>>> import org.apache.cxf.tools.wsdlto.WSDLToJava;
>>>> import org.apache.maven.artifact.Artifact;
>>>> import org.apache.maven.plugin.MojoExecutionException;
>>>> +import org.apache.maven.plugins.annotations.LifecyclePhase;
>>>> +import org.apache.maven.plugins.annotations.Mojo;
>>>> +import org.apache.maven.plugins.annotations.Parameter;
>>>> +import org.apache.maven.plugins.annotations.ResolutionScope;
>>>> import org.sonatype.plexus.build.incremental.BuildContext;
>>>>
>>>> -/**
>>>> - * @goal wsdl2java
>>>> - * @phase generate-sources
>>>> - * @description CXF WSDL To Java Tool
>>>> - * @requiresDependencyResolution test
>>>> - * @threadSafe
>>>> - */
>>>> +@Mojo(name = "wsdl2java", defaultPhase =
>>>> LifecyclePhase.GENERATE_SOURCES, threadSafe = true,
>>>> + requiresDependencyResolution = ResolutionScope.TEST)
>>>> public class WSDL2JavaMojo extends AbstractCodegenMoho {
>>>>
>>>> final class MavenToolErrorListener extends ToolErrorListener {
>>>> @@ -125,40 +124,35 @@ public class WSDL2JavaMojo extends
>>>> AbstractCodegenMoho {
>>>> }
>>>> }
>>>>
>>>> - /**
>>>> - * @parameter expression="${cxf.testSourceRoot}"
>>>> - */
>>>> + @Parameter(property = "cxf.testSourceRoot")
>>>> File testSourceRoot;
>>>>
>>>> /**
>>>> * Path where the generated sources should be placed
>>>> *
>>>> - * @parameter expression="${cxf.sourceRoot}"
>>>> - *
>>>> default-value="${project.build.directory}/generated-sources/cxf"
>>>> - * @required
>>>> */
>>>> + @Parameter(required = true, defaultValue =
>>>> "${project.build.directory}/generated-sources/cxf",
>>>> + property = "cxf.sourceRoot")
>>>> File sourceRoot;
>>>>
>>>> /**
>>>> * Options that specify WSDLs to process and/or control the
>>>> processing of wsdls.
>>>> * If you have enabled wsdl scanning, these elements attach options
>>>> to particular wsdls.
>>>> * If you have not enabled wsdl scanning, these options call out
>>>> the wsdls to process.
>>>> - * @parameter
>>>> */
>>>> + @Parameter
>>>> WsdlOption wsdlOptions[];
>>>>
>>>> /**
>>>> * Default options to be used when a wsdl has not had it's options
>>>> explicitly specified.
>>>> - *
>>>> - * @parameter
>>>> */
>>>> + @Parameter
>>>> Option defaultOptions = new Option();
>>>>
>>>> /**
>>>> * Encoding to use for generated sources
>>>> - *
>>>> - * @parameter default-value="${project.build.sourceEncoding}"
>>>> */
>>>> + @Parameter(defaultValue = "${project.build.sourceEncoding}")
>>>> String encoding;
>>>>
>>>> /**
>>>>
>>>>
>>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
>>>> ----------------------------------------------------------------------
>>>> diff --git
>>>> a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
>>>> b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
>>>> index 1ba97e3..daee4c9 100644
>>>> ---
>>>> a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
>>>> +++
>>>> b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
>>>> @@ -39,44 +39,38 @@ import org.apache.cxf.tools.common.ToolContext;
>>>> import org.apache.cxf.tools.wsdlto.javascript.WSDLToJavaScript;
>>>> import org.apache.maven.artifact.Artifact;
>>>> import org.apache.maven.plugin.MojoExecutionException;
>>>> +import org.apache.maven.plugins.annotations.LifecyclePhase;
>>>> +import org.apache.maven.plugins.annotations.Mojo;
>>>> +import org.apache.maven.plugins.annotations.Parameter;
>>>> +import org.apache.maven.plugins.annotations.ResolutionScope;
>>>> import org.apache.maven.project.MavenProject;
>>>>
>>>> -/**
>>>> - * @goal wsdl2js
>>>> - * @phase generate-sources
>>>> - * @description CXF WSDL To JavaScript Tool
>>>> - * @requiresDependencyResolution test
>>>> - * @threadSafe
>>>> - */
>>>> +@Mojo(name = "wsdl2js", defaultPhase = LifecyclePhase.GENERATE_SOURCES,
>>>> threadSafe = true,
>>>> + requiresDependencyResolution = ResolutionScope.TEST)
>>>> public class WSDL2JavaScriptMojo extends AbstractCodegenMoho {
>>>>
>>>> - /**
>>>> - * @parameter expression="${cxf.testJavascriptRoot}"
>>>> - */
>>>> + @Parameter(property = "cxf.testJavascriptRoot")
>>>> File testSourceRoot;
>>>>
>>>> /**
>>>> * Path where the generated sources should be placed
>>>> - *
>>>> - * @parameter expression="${cxf.sourceJavascriptRoot}"
>>>> - *
>>>> default-value="${project.build.directory}/generated-sources/cxf-js"
>>>> - * @required
>>>> */
>>>> + @Parameter(required = true, defaultValue =
>>>> "${project.build.directory}/generated-sources/cxf-js",
>>>> + property = "cxf.sourceJavascriptRoot")
>>>> File sourceRoot;
>>>>
>>>> /**
>>>> * Default options to be applied to all of the wsdls.
>>>> - *
>>>> - * @parameter
>>>> */
>>>> + @Parameter
>>>> Option defaultOptions = new Option();
>>>>
>>>> /**
>>>> * Options that specify WSDLs to process and/or control the
>>>> processing of wsdls.
>>>> * If you have enabled wsdl scanning, these elements attach options
>>>> to particular wsdls.
>>>> * If you have not enabled wsdl scanning, these options call out
>>>> the wsdls to process.
>>>> - * @parameter
>>>> */
>>>> + @Parameter
>>>> WsdlOption wsdlOptions[];
>>>>
>>>> @Override
>>>>
>>>>
>>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/corba/pom.xml
>>>> ----------------------------------------------------------------------
>>>> diff --git a/maven-plugins/corba/pom.xml b/maven-plugins/corba/pom.xml
>>>> index 622932e..bf21633 100644
>>>> --- a/maven-plugins/corba/pom.xml
>>>> +++ b/maven-plugins/corba/pom.xml
>>>> @@ -69,41 +69,4 @@
>>>> <version>${project.version}</version>
>>>> </dependency>
>>>> </dependencies>
>>>> - <build>
>>>> - <pluginManagement>
>>>> - <plugins>
>>>> - <!--This plugin's configuration is used to store
>>>> Eclipse m2e settings only. It has no influence on the Maven build itself.-->
>>>> - <plugin>
>>>> - <groupId>org.eclipse.m2e</groupId>
>>>> -
>>>> <artifactId>lifecycle-mapping</artifactId>
>>>> - <version>1.0.0</version>
>>>> - <configuration>
>>>> - <lifecycleMappingMetadata>
>>>> - <pluginExecutions>
>>>> - <pluginExecution>
>>>> -
>>>> <pluginExecutionFilter>
>>>> -
>>>> <groupId>
>>>> -
>>>> org.apache.maven.plugins
>>>> -
>>>> </groupId>
>>>> -
>>>> <artifactId>
>>>> -
>>>> maven-plugin-plugin
>>>> -
>>>> </artifactId>
>>>> -
>>>> <versionRange>
>>>> -
>>>> [2.9,)
>>>> -
>>>> </versionRange>
>>>> -
>>>> <goals>
>>>> -
>>>> <goal>descriptor</goal>
>>>> -
>>>> </goals>
>>>> -
>>>> </pluginExecutionFilter>
>>>> - <action>
>>>> -
>>>> <ignore></ignore>
>>>> - </action>
>>>> -
>>>> </pluginExecution>
>>>> - </pluginExecutions>
>>>> - </lifecycleMappingMetadata>
>>>> - </configuration>
>>>> - </plugin>
>>>> - </plugins>
>>>> - </pluginManagement>
>>>> - </build>
>>>> </project>
>>>>
>>>>
>>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/java2wadl-plugin/pom.xml
>>>> ----------------------------------------------------------------------
>>>> diff --git a/maven-plugins/java2wadl-plugin/pom.xml
>>>> b/maven-plugins/java2wadl-plugin/pom.xml
>>>> index 03ea41e..78da0b1 100644
>>>> --- a/maven-plugins/java2wadl-plugin/pom.xml
>>>> +++ b/maven-plugins/java2wadl-plugin/pom.xml
>>>> @@ -118,6 +118,20 @@
>>>> <groupId>org.apache.maven.plugins</groupId>
>>>> <artifactId>maven-javadoc-plugin</artifactId>
>>>> <version>2.9.1</version>
>>>> + <exclusions>
>>>> + <exclusion>
>>>> + <groupId>org.apache.maven</groupId>
>>>> + <artifactId>maven-project</artifactId>
>>>> + </exclusion>
>>>> + <exclusion>
>>>> + <groupId>org.apache.maven</groupId>
>>>> + <artifactId>maven-artifact-manager</artifactId>
>>>> + </exclusion>
>>>> + <exclusion>
>>>> + <groupId>org.apache.maven</groupId>
>>>> + <artifactId>maven-toolchain</artifactId>
>>>> + </exclusion>
>>>> + </exclusions>
>>>> </dependency>
>>>>
>>>> <dependency>
>>>> @@ -194,42 +208,4 @@
>>>> </build>
>>>> </profile>
>>>> </profiles>
>>>> -
>>>> - <build>
>>>> - <pluginManagement>
>>>> - <plugins>
>>>> - <!--This plugin's configuration is used to store
>>>> Eclipse m2e settings only. It has no influence on the Maven build itself.-->
>>>> - <plugin>
>>>> - <groupId>org.eclipse.m2e</groupId>
>>>> -
>>>> <artifactId>lifecycle-mapping</artifactId>
>>>> - <version>1.0.0</version>
>>>> - <configuration>
>>>> - <lifecycleMappingMetadata>
>>>> - <pluginExecutions>
>>>> - <pluginExecution>
>>>> -
>>>> <pluginExecutionFilter>
>>>> -
>>>> <groupId>
>>>> -
>>>> org.apache.maven.plugins
>>>> -
>>>> </groupId>
>>>> -
>>>> <artifactId>
>>>> -
>>>> maven-plugin-plugin
>>>> -
>>>> </artifactId>
>>>> -
>>>> <versionRange>
>>>> -
>>>> [2.9,)
>>>> -
>>>> </versionRange>
>>>> -
>>>> <goals>
>>>> -
>>>> <goal>descriptor</goal>
>>>> -
>>>> </goals>
>>>> -
>>>> </pluginExecutionFilter>
>>>> - <action>
>>>> -
>>>> <ignore></ignore>
>>>> - </action>
>>>> -
>>>> </pluginExecution>
>>>> - </pluginExecutions>
>>>> - </lifecycleMappingMetadata>
>>>> - </configuration>
>>>> - </plugin>
>>>> - </plugins>
>>>> - </pluginManagement>
>>>> - </build>
>>>> </project>
>>>>
>>>>
>>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
>>>> ----------------------------------------------------------------------
>>>> diff --git
>>>> a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
>>>> b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
>>>> index 9dd47f6..2662b7c 100644
>>>> ---
>>>> a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
>>>> +++
>>>> b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
>>>> @@ -20,18 +20,20 @@ package org.apache.cxf.maven_plugin.javatowadl;
>>>>
>>>> import java.io.File;
>>>> import java.lang.reflect.Field;
>>>> +import java.lang.reflect.Method;
>>>> import java.util.List;
>>>> import java.util.Locale;
>>>>
>>>> import org.apache.maven.artifact.Artifact;
>>>> import org.apache.maven.artifact.repository.ArtifactRepository;
>>>> import org.apache.maven.artifact.resolver.ArtifactResolver;
>>>> +import org.apache.maven.plugin.AbstractMojo;
>>>> import org.apache.maven.plugin.MojoExecutionException;
>>>> import org.apache.maven.plugin.MojoFailureException;
>>>> import org.apache.maven.plugin.javadoc.AbstractJavadocMojo;
>>>> +import org.apache.maven.plugin.javadoc.JavadocReport;
>>>> import org.apache.maven.plugin.javadoc.options.DocletArtifact;
>>>> import org.apache.maven.project.MavenProject;
>>>> -import org.apache.maven.reporting.MavenReportException;
>>>> import org.apache.maven.toolchain.ToolchainManager;
>>>> import org.codehaus.plexus.archiver.manager.ArchiverManager;
>>>>
>>>> @@ -41,7 +43,7 @@ import
>>>> org.codehaus.plexus.archiver.manager.ArchiverManager;
>>>> * @requiresDependencyResolution compile
>>>> * @threadSafe
>>>> */
>>>> -public class ParseJavaDocMojo extends AbstractJavadocMojo {
>>>> +public class ParseJavaDocMojo extends AbstractMojo {
>>>>
>>>> /**
>>>> * @parameter expression="${project}"
>>>> @@ -118,24 +120,20 @@ public class ParseJavaDocMojo extends
>>>> AbstractJavadocMojo {
>>>>
>>>> @Override
>>>> public void execute() throws MojoExecutionException,
>>>> MojoFailureException {
>>>> - if (skip) {
>>>> - getLog().info("Skipping parse javadoc");
>>>> - return;
>>>> - }
>>>> -
>>>> + AbstractJavadocMojo mojo = new JavadocReport();
>>>> + Locale locale = Locale.getDefault();
>>>> try {
>>>> - Locale locale = Locale.getDefault();
>>>> Field f =
>>>> AbstractJavadocMojo.class.getDeclaredField("doclet");
>>>> f.setAccessible(true);
>>>> - f.set(this,
>>>> "org.apache.cxf.maven_plugin.javatowadl.DumpJavaDoc");
>>>> + f.set(mojo,
>>>> "org.apache.cxf.maven_plugin.javatowadl.DumpJavaDoc");
>>>>
>>>> f =
>>>> AbstractJavadocMojo.class.getDeclaredField("stylesheet");
>>>> f.setAccessible(true);
>>>> - f.set(this, "stylesheet");
>>>> + f.set(mojo, "stylesheet");
>>>>
>>>> f =
>>>> AbstractJavadocMojo.class.getDeclaredField("javadocOptionsDir");
>>>> f.setAccessible(true);
>>>> - f.set(this, javadocOptionsDir);
>>>> + f.set(mojo, javadocOptionsDir);
>>>>
>>>> f =
>>>> AbstractJavadocMojo.class.getDeclaredField("docletArtifact");
>>>> f.setAccessible(true);
>>>> @@ -150,81 +148,68 @@ public class ParseJavaDocMojo extends
>>>> AbstractJavadocMojo {
>>>> }
>>>> }
>>>> }
>>>> - f.set(this, docletArtifact);
>>>> + f.set(mojo, docletArtifact);
>>>>
>>>> f = AbstractJavadocMojo.class.getDeclaredField("factory");
>>>> f.setAccessible(true);
>>>> - f.set(this, this.mavenArtifactFactory);
>>>> + f.set(mojo, this.mavenArtifactFactory);
>>>>
>>>> f =
>>>> AbstractJavadocMojo.class.getDeclaredField("mavenProjectBuilder");
>>>> f.setAccessible(true);
>>>> - f.set(this, this.mavenProjectBuilder);
>>>> + f.set(mojo, this.mavenProjectBuilder);
>>>>
>>>> f = AbstractJavadocMojo.class.getDeclaredField("resolver");
>>>> f.setAccessible(true);
>>>> - f.set(this, this.artifactResolver);
>>>> + f.set(mojo, this.artifactResolver);
>>>>
>>>> f =
>>>> AbstractJavadocMojo.class.getDeclaredField("archiverManager");
>>>> f.setAccessible(true);
>>>> - f.set(this, this.archiverManager);
>>>> + f.set(mojo, this.archiverManager);
>>>>
>>>> f =
>>>> AbstractJavadocMojo.class.getDeclaredField("artifactMetadataSource");
>>>> f.setAccessible(true);
>>>> - f.set(this, this.artifactMetadataSource);
>>>> + f.set(mojo, this.artifactMetadataSource);
>>>>
>>>> f =
>>>> AbstractJavadocMojo.class.getDeclaredField("toolchainManager");
>>>> f.setAccessible(true);
>>>> - f.set(this, this.toolchainManager);
>>>> + f.set(mojo, this.toolchainManager);
>>>>
>>>> f =
>>>> AbstractJavadocMojo.class.getDeclaredField("localRepository");
>>>> f.setAccessible(true);
>>>> - f.set(this, this.localRepository);
>>>> + f.set(mojo, this.localRepository);
>>>>
>>>> f =
>>>> AbstractJavadocMojo.class.getDeclaredField("remoteRepositories");
>>>> f.setAccessible(true);
>>>> - f.set(this, this.remoteRepositories);
>>>> + f.set(mojo, this.remoteRepositories);
>>>>
>>>> f =
>>>> AbstractJavadocMojo.class.getDeclaredField("applyJavadocSecurityFix");
>>>> f.setAccessible(true);
>>>> - f.set(this, false);
>>>> + f.set(mojo, false);
>>>>
>>>> f =
>>>> AbstractJavadocMojo.class.getDeclaredField("additionalparam");
>>>> f.setAccessible(true);
>>>> - f.set(this, "-dumpJavaDocFile " +
>>>> this.dumpFileOutputDirectory.getAbsolutePath()
>>>> + f.set(mojo, "-dumpJavaDocFile " +
>>>> this.dumpFileOutputDirectory.getAbsolutePath()
>>>> + File.separator + "dumpFile.properties");
>>>>
>>>> - useStandardDocletOptions = false;
>>>> - this.project = mavenProject;
>>>> - generate(locale);
>>>> - } catch (Exception e) {
>>>> - failOnError("An error has occurred in parsing javadoc", e);
>>>> - }
>>>> -
>>>> - }
>>>> -
>>>> - private void generate(Locale locale) throws MavenReportException {
>>>> - try {
>>>> - outputDirectory = getReportOutputDirectory();
>>>> - executeReport(locale);
>>>> - } catch (MavenReportException e) {
>>>> - if (failOnError) {
>>>> - throw e;
>>>> - }
>>>> - getLog().error("Error while creating javadoc report: " +
>>>> e.getMessage(), e);
>>>> - } catch (RuntimeException e) {
>>>> - if (failOnError) {
>>>> - throw e;
>>>> + f =
>>>> AbstractJavadocMojo.class.getDeclaredField("useStandardDocletOptions");
>>>> + f.setAccessible(true);
>>>> + f.set(mojo, false);
>>>> +
>>>> + f = AbstractJavadocMojo.class.getDeclaredField("project");
>>>> + f.setAccessible(true);
>>>> + f.set(mojo, mavenProject);
>>>> +
>>>> + if (dumpFileOutputDirectory != null) {
>>>> + f =
>>>> AbstractJavadocMojo.class.getDeclaredField("outputDirectory");
>>>> + f.setAccessible(true);
>>>> + f.set(mojo, dumpFileOutputDirectory);
>>>> }
>>>> - getLog().error("Error while creating javadoc report: " +
>>>> e.getMessage(), e);
>>>> - }
>>>> - }
>>>> -
>>>> - private File getReportOutputDirectory() {
>>>> - if (dumpFileOutputDirectory == null) {
>>>> - return outputDirectory;
>>>> +
>>>> + Method m =
>>>> AbstractJavadocMojo.class.getMethod("executeReport", Locale.class);
>>>> + m.setAccessible(true);
>>>> + m.invoke(mojo, locale);
>>>> + } catch (Exception e) {
>>>> + throw new MojoExecutionException("Failed to generate
>>>> javadoc", e);
>>>> }
>>>> -
>>>> - return dumpFileOutputDirectory;
>>>> }
>>>> -
>>>> }
>>>>
>>>>
>>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/java2ws-plugin/pom.xml
>>>> ----------------------------------------------------------------------
>>>> diff --git a/maven-plugins/java2ws-plugin/pom.xml
>>>> b/maven-plugins/java2ws-plugin/pom.xml
>>>> index d3ca92c..73c8ede 100644
>>>> --- a/maven-plugins/java2ws-plugin/pom.xml
>>>> +++ b/maven-plugins/java2ws-plugin/pom.xml
>>>> @@ -77,41 +77,4 @@
>>>> <version>${project.version}</version>
>>>> </dependency>
>>>> </dependencies>
>>>> - <build>
>>>> - <pluginManagement>
>>>> - <plugins>
>>>> - <!--This plugin's configuration is used to store
>>>> Eclipse m2e settings only. It has no influence on the Maven build itself.-->
>>>> - <plugin>
>>>> - <groupId>org.eclipse.m2e</groupId>
>>>> -
>>>> <artifactId>lifecycle-mapping</artifactId>
>>>> - <version>1.0.0</version>
>>>> - <configuration>
>>>> - <lifecycleMappingMetadata>
>>>> - <pluginExecutions>
>>>> - <pluginExecution>
>>>> -
>>>> <pluginExecutionFilter>
>>>> -
>>>> <groupId>
>>>> -
>>>> org.apache.maven.plugins
>>>> -
>>>> </groupId>
>>>> -
>>>> <artifactId>
>>>> -
>>>> maven-plugin-plugin
>>>> -
>>>> </artifactId>
>>>> -
>>>> <versionRange>
>>>> -
>>>> [2.9,)
>>>> -
>>>> </versionRange>
>>>> -
>>>> <goals>
>>>> -
>>>> <goal>descriptor</goal>
>>>> -
>>>> </goals>
>>>> -
>>>> </pluginExecutionFilter>
>>>> - <action>
>>>> -
>>>> <ignore></ignore>
>>>> - </action>
>>>> -
>>>> </pluginExecution>
>>>> - </pluginExecutions>
>>>> - </lifecycleMappingMetadata>
>>>> - </configuration>
>>>> - </plugin>
>>>> - </plugins>
>>>> - </pluginManagement>
>>>> - </build>
>>>> </project>
>>>>
>>>>
>>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/pom.xml
>>>> ----------------------------------------------------------------------
>>>> diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
>>>> index 8a6f19b..57db354 100644
>>>> --- a/maven-plugins/pom.xml
>>>> +++ b/maven-plugins/pom.xml
>>>> @@ -39,24 +39,4 @@
>>>> <module>corba</module>
>>>> <module>archetypes</module>
>>>> </modules>
>>>> - <build>
>>>> - <pluginManagement>
>>>> - <plugins>
>>>> - <plugin>
>>>> - <groupId>org.apache.maven.plugins</groupId>
>>>> - <artifactId>maven-plugin-plugin</artifactId>
>>>> - <version>2.9</version>
>>>> - </plugin>
>>>> - </plugins>
>>>> - </pluginManagement>
>>>> - </build>
>>>> - <reporting>
>>>> - <plugins>
>>>> - <plugin>
>>>> - <groupId>org.apache.maven.plugins</groupId>
>>>> - <artifactId>maven-plugin-plugin</artifactId>
>>>> - <version>2.9</version>
>>>> - </plugin>
>>>> - </plugins>
>>>> - </reporting>
>>>> </project>
>>>>
>>>>
>>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/wadl2java-plugin/pom.xml
>>>> ----------------------------------------------------------------------
>>>> diff --git a/maven-plugins/wadl2java-plugin/pom.xml
>>>> b/maven-plugins/wadl2java-plugin/pom.xml
>>>> index 092d859..1e10e63 100644
>>>> --- a/maven-plugins/wadl2java-plugin/pom.xml
>>>> +++ b/maven-plugins/wadl2java-plugin/pom.xml
>>>> @@ -56,6 +56,11 @@
>>>> <scope>provided</scope>
>>>> </dependency>
>>>> <dependency>
>>>> + <groupId>org.apache.maven.plugin-tools</groupId>
>>>> + <artifactId>maven-plugin-annotations</artifactId>
>>>> + <scope>provided</scope>
>>>> + </dependency>
>>>> + <dependency>
>>>> <groupId>org.codehaus.plexus</groupId>
>>>> <artifactId>plexus-utils</artifactId>
>>>> <version>2.0.5</version>
>>>> @@ -122,41 +127,4 @@
>>>> </dependencies>
>>>> </profile>
>>>> </profiles>
>>>> - <build>
>>>> - <pluginManagement>
>>>> - <plugins>
>>>> - <!--This plugin's configuration is used to store
>>>> Eclipse m2e settings only. It has no influence on the Maven build itself.-->
>>>> - <plugin>
>>>> - <groupId>org.eclipse.m2e</groupId>
>>>> -
>>>> <artifactId>lifecycle-mapping</artifactId>
>>>> - <version>1.0.0</version>
>>>> - <configuration>
>>>> - <lifecycleMappingMetadata>
>>>> - <pluginExecutions>
>>>> - <pluginExecution>
>>>> -
>>>> <pluginExecutionFilter>
>>>> -
>>>> <groupId>
>>>> -
>>>> org.apache.maven.plugins
>>>> -
>>>> </groupId>
>>>> -
>>>> <artifactId>
>>>> -
>>>> maven-plugin-plugin
>>>> -
>>>> </artifactId>
>>>> -
>>>> <versionRange>
>>>> -
>>>> [2.9,)
>>>> -
>>>> </versionRange>
>>>> -
>>>> <goals>
>>>> -
>>>> <goal>descriptor</goal>
>>>> -
>>>> </goals>
>>>> -
>>>> </pluginExecutionFilter>
>>>> - <action>
>>>> -
>>>> <ignore></ignore>
>>>> - </action>
>>>> -
>>>> </pluginExecution>
>>>> - </pluginExecutions>
>>>> - </lifecycleMappingMetadata>
>>>> - </configuration>
>>>> - </plugin>
>>>> - </plugins>
>>>> - </pluginManagement>
>>>> - </build>
>>>> </project>
>>>>
>>>>
>>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
>>>> ----------------------------------------------------------------------
>>>> diff --git
>>>> a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
>>>> b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
>>>> index fe5454d..16e7f84 100644
>>>> ---
>>>> a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
>>>> +++
>>>> b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
>>>> @@ -47,6 +47,8 @@ import org.apache.maven.execution.MavenSession;
>>>> import org.apache.maven.model.Resource;
>>>> import org.apache.maven.plugin.AbstractMojo;
>>>> import org.apache.maven.plugin.MojoExecutionException;
>>>> +import org.apache.maven.plugins.annotations.Component;
>>>> +import org.apache.maven.plugins.annotations.Parameter;
>>>> import org.apache.maven.project.MavenProject;
>>>> import org.apache.maven.repository.RepositorySystem;
>>>> import org.codehaus.plexus.archiver.jar.JarArchiver;
>>>> @@ -60,54 +62,42 @@ import org.codehaus.plexus.util.cli.Commandline;
>>>> public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
>>>>
>>>> /**
>>>> - * @parameter expression="${cxf.testSourceRoot}"
>>>> + * Source Root
>>>> */
>>>> + @Parameter(property = "cxf.testSourceRoot")
>>>> File testSourceRoot;
>>>>
>>>> /**
>>>> * Path where the generated sources should be placed
>>>> - *
>>>> - * @parameter expression="${cxf.sourceRoot}"
>>>> - *
>>>> default-value="${project.build.directory}/generated-sources/cxf"
>>>> - * @required
>>>> */
>>>> + @Parameter(required = true,
>>>> + property = "cxf.sourceRoot",
>>>> + defaultValue =
>>>> "${project.build.directory}/generated-sources/cxf")
>>>> File sourceRoot;
>>>>
>>>> - /**
>>>> - * @parameter expression="${project.build.outputDirectory}"
>>>> - * @required
>>>> - */
>>>> + @Parameter(required = true, property =
>>>> "project.build.outputDirectory")
>>>> String classesDirectory;
>>>>
>>>> - /**
>>>> - * @parameter expression="${project}"
>>>> - * @required
>>>> - */
>>>> + @Parameter(required = true, property = "project")
>>>> MavenProject project;
>>>>
>>>> /**
>>>> * Default options to be used when a wadl has not had it's options
>>>> explicitly specified.
>>>> - *
>>>> - * @parameter
>>>> */
>>>> + @Parameter
>>>> Option defaultOptions = new Option();
>>>>
>>>> -
>>>> -
>>>> /**
>>>> * Directory in which the "DONE" markers are saved that
>>>> - *
>>>> - * @parameter expression="${cxf.markerDirectory}"
>>>> - *
>>>> default-value="${project.build.directory}/cxf-codegen-plugin-markers"
>>>> */
>>>> + @Parameter(property = "cxf.markerDirectory", defaultValue =
>>>> "${project.build.directory}/cxf-codegen-plugin-markers")
>>>> File markerDirectory;
>>>>
>>>> /**
>>>> * Use the compile classpath rather than the test classpath for
>>>> execution useful if the test dependencies
>>>> * clash with those of wadl2java
>>>> - *
>>>> - * @parameter expression="${cxf.useCompileClasspath}"
>>>> default-value="false"
>>>> */
>>>> + @Parameter(property = "cxf.useCompileClasspath", defaultValue =
>>>> "false")
>>>> boolean useCompileClasspath;
>>>>
>>>>
>>>> @@ -116,94 +106,69 @@ public abstract class AbstractCodeGeneratorMojo
>>>> extends AbstractMojo {
>>>> * By default, we scan for *.wadl (see include/exclude params as
>>>> well) in the wadlRoot
>>>> * directories and run wadl2java on all the wadl's we find. This
>>>> disables that scan
>>>> * and requires an explicit wadlOption to be set for each wadl that
>>>> needs to be processed.
>>>> - * @parameter expression="${cxf.disableDirectoryScan}"
>>>> default-value="false"
>>>> */
>>>> + @Parameter(property = "cxf.disableDirectoryScan", defaultValue =
>>>> "false")
>>>> boolean disableDirectoryScan;
>>>>
>>>> /**
>>>> * By default all maven dependencies of type "wadl" are added to
>>>> the effective wadlOptions. Setting this
>>>> * parameter to true disables this functionality
>>>> - *
>>>> - * @parameter expression="${cxf.disableDependencyScan}"
>>>> default-value="false"
>>>> */
>>>> + @Parameter(property = "cxf.disableDependencyScan", defaultValue =
>>>> "false")
>>>> boolean disableDependencyScan;
>>>>
>>>> /**
>>>> * A list of wadl files to include. Can contain ant-style wildcards
>>>> and double wildcards. Defaults to
>>>> * *.wadl
>>>> - *
>>>> - * @parameter
>>>> */
>>>> + @Parameter
>>>> String includes[];
>>>>
>>>> /**
>>>> * A list of wadl files to exclude. Can contain ant-style wildcards
>>>> and double wildcards.
>>>> - *
>>>> - * @parameter
>>>> */
>>>> + @Parameter
>>>> String excludes[];
>>>>
>>>> /**
>>>> * Allows running the JavaToWs in a separate process.
>>>> * Valid values are "false", "always", and "once"
>>>> * The value of "true" is equal to "once"
>>>> - *
>>>> - * @parameter default-value="false"
>>>> - * @since 2.4
>>>> */
>>>> + @Parameter(defaultValue = "false")
>>>> String fork;
>>>>
>>>> /**
>>>> * The Maven session.
>>>> - *
>>>> - * @parameter expression="${session}"
>>>> - * @readonly
>>>> - * @required
>>>> */
>>>> + @Parameter(readonly = true, required = true, property = "session")
>>>> private MavenSession mavenSession;
>>>>
>>>> /**
>>>> * The plugin dependencies, needed for the fork mode.
>>>> - *
>>>> - * @parameter expression="${plugin.artifacts}"
>>>> - * @required
>>>> - * @readonly
>>>> */
>>>> + @Parameter(readonly = true, required = true, property =
>>>> "plugin.artifacts")
>>>> private List<Artifact> pluginArtifacts;
>>>>
>>>>
>>>> /**
>>>> * Sets the Java executable to use when fork parameter is
>>>> <code>true</code>.
>>>> - *
>>>> - * @parameter default-value="${java.home}/bin/java"
>>>> - * @since 2.4
>>>> */
>>>> + @Parameter(defaultValue = "${java.home}/bin/java")
>>>> private String javaExecutable;
>>>>
>>>> /**
>>>> * Sets the JVM arguments (i.e. <code>-Xms128m -Xmx128m</code>) if
>>>> fork is set to <code>true</code>.
>>>> - *
>>>> - * @parameter
>>>> - * @since 2.4
>>>> */
>>>> + @Parameter
>>>> private String additionalJvmArgs;
>>>>
>>>> - /**
>>>> - * @component
>>>> - * @readonly
>>>> - * @required
>>>> - */
>>>> + @Component
>>>> private RepositorySystem repositorySystem;
>>>>
>>>>
>>>> private ClassLoader resourceClassLoader;
>>>> -
>>>> - /**
>>>> - * Merge WadlOptions that point to the same file by adding the
>>>> extraargs to the first option and deleting
>>>> - * the second from the options list
>>>> - *
>>>> - * @param options
>>>> - */
>>>> +
>>>>
>>>> private Artifact resolveRemoteWadlArtifact(Artifact artifact)
>>>> throws MojoExecutionException {
>>>>
>>>>
>>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
>>>> ----------------------------------------------------------------------
>>>> diff --git
>>>> a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
>>>> b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
>>>> index 58503b9..c8280f2 100644
>>>> ---
>>>> a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
>>>> +++
>>>> b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
>>>> @@ -28,34 +28,31 @@ import java.util.Set;
>>>> import org.apache.cxf.Bus;
>>>> import org.apache.cxf.maven_plugin.common.ClassLoaderSwitcher;
>>>> import org.apache.maven.plugin.MojoExecutionException;
>>>> +import org.apache.maven.plugins.annotations.Component;
>>>> +import org.apache.maven.plugins.annotations.LifecyclePhase;
>>>> +import org.apache.maven.plugins.annotations.Mojo;
>>>> +import org.apache.maven.plugins.annotations.Parameter;
>>>> +import org.apache.maven.plugins.annotations.ResolutionScope;
>>>> import org.sonatype.plexus.build.incremental.BuildContext;
>>>>
>>>>
>>>> /**
>>>> - * @goal wadl2java
>>>> - * @phase generate-sources
>>>> - * @description CXF WADL To Java Tool
>>>> - * @requiresDependencyResolution test
>>>> - * @threadSafe
>>>> + * CXF WADL To Java Tool
>>>> */
>>>> +@Mojo(name = "wadl2java", defaultPhase =
>>>> LifecyclePhase.GENERATE_SOURCES, threadSafe = true,
>>>> + requiresDependencyResolution = ResolutionScope.TEST)
>>>> public class WADL2JavaMojo extends AbstractCodeGeneratorMojo {
>>>> - /**
>>>> - * @parameter
>>>> - */
>>>> - WadlOption wadlOptions[];
>>>> + @Parameter
>>>> + WadlOption wadlOptions[];
>>>>
>>>> - /**
>>>> - * @parameter expression="${cxf.wadlRoot}"
>>>> default-value="${basedir}/src/main/resources/wadl"
>>>> - */
>>>> + @Parameter(property = "cxf.wadlRoot", defaultValue =
>>>> "${basedir}/src/main/resources/wad")
>>>> File wadlRoot;
>>>>
>>>> - /**
>>>> - * @parameter expression="${cxf.testWadlRoot}"
>>>> default-value="${basedir}/src/test/resources/wadl"
>>>> - */
>>>> + @Parameter(property = "cxf.testWadlRoot", defaultValue =
>>>> "${basedir}/src/test/resources/wadl")
>>>> File testWadlRoot;
>>>>
>>>>
>>>> - /** @component */
>>>> + @Component
>>>> BuildContext buildContext;
>>>>
>>>> private void mergeOptions(List<WadlOption> effectiveOptions) {
>>>>
>>>>
>>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/wsdl-validator-plugin/pom.xml
>>>> ----------------------------------------------------------------------
>>>> diff --git a/maven-plugins/wsdl-validator-plugin/pom.xml
>>>> b/maven-plugins/wsdl-validator-plugin/pom.xml
>>>> index afa83f9..12658aa 100644
>>>> --- a/maven-plugins/wsdl-validator-plugin/pom.xml
>>>> +++ b/maven-plugins/wsdl-validator-plugin/pom.xml
>>>> @@ -56,41 +56,4 @@
>>>> <version>${project.version}</version>
>>>> </dependency>
>>>> </dependencies>
>>>> - <build>
>>>> - <pluginManagement>
>>>> - <plugins>
>>>> - <!--This plugin's configuration is used to store
>>>> Eclipse m2e settings only. It has no influence on the Maven build itself.-->
>>>> - <plugin>
>>>> - <groupId>org.eclipse.m2e</groupId>
>>>> -
>>>> <artifactId>lifecycle-mapping</artifactId>
>>>> - <version>1.0.0</version>
>>>> - <configuration>
>>>> - <lifecycleMappingMetadata>
>>>> - <pluginExecutions>
>>>> - <pluginExecution>
>>>> -
>>>> <pluginExecutionFilter>
>>>> -
>>>> <groupId>
>>>> -
>>>> org.apache.maven.plugins
>>>> -
>>>> </groupId>
>>>> -
>>>> <artifactId>
>>>> -
>>>> maven-plugin-plugin
>>>> -
>>>> </artifactId>
Re: [1/5] cxf git commit: Update plugins to use annotations instead
of the javadoc things
Posted by Aki Yoshida <el...@gmail.com>.
Hi Alessio,
thanks. I'll try with that maven version.
But that means someone has to update the central jenkins build job to
use that maven version as well.
it is currently failing at the same spot.
https://builds.apache.org/view/A-D/view/CXF/job/CXF-Trunk-JDK17/688/console
regards, aki
2015-02-03 11:03 GMT+01:00 Alessio Soldano <as...@redhat.com>:
> AFAICS, it's a matter of the Maven version being used. Just tried with 3.2.3
> and it works fine.
> Could be caused by http://jira.codehaus.org/browse/MNG-5346 .
>
> Cheers
> Alessio
>
> On 03/02/15 10:34, Aki Yoshida wrote:
>>
>> It looks like this commit has broken cxf-codegen-plugin in trunk.
>>
>> [INFO] Apache CXF Command Line Tools WSDL to JavaScript Front End
>> SUCCESS [2.062s]
>> [INFO] Apache CXF Command Line Tools WSDLTo JAXB Databinding SUCCESS
>> [1.981s]
>> [INFO] Apache CXF Maven Plugins .......................... SUCCESS
>> [0.057s]
>> [INFO] Apache CXF WSDL Validator Maven2 Plugin ........... SUCCESS
>> [1.751s]
>> [INFO] Apache CXF Code Generation Maven2 Plugins ......... FAILURE
>> [0.784s]
>> [INFO] Apache CXF Test Utilities ......................... SKIPPED
>> ...
>>
>> Does anyone know how to fix it or do we have to wait for Dan?
>>
>> I just temporarily synch'ed my local branch to one commit earlier to
>> get the build run.
>> regards, aki
>>
>>
>> 2015-02-02 19:59 GMT+01:00 <dk...@apache.org>:
>>>
>>> Repository: cxf
>>> Updated Branches:
>>> refs/heads/master 27e877346 -> 96ed80508
>>>
>>>
>>> Update plugins to use annotations instead of the javadoc things
>>>
>>>
>>> Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
>>> Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/96ed8050
>>> Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/96ed8050
>>> Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/96ed8050
>>>
>>> Branch: refs/heads/master
>>> Commit: 96ed80508cf15f7dc8c2d5a73225a36dbc096ee2
>>> Parents: bfbc0a2
>>> Author: Daniel Kulp <dk...@apache.org>
>>> Authored: Mon Feb 2 13:58:09 2015 -0500
>>> Committer: Daniel Kulp <dk...@apache.org>
>>> Committed: Mon Feb 2 13:58:43 2015 -0500
>>>
>>> ----------------------------------------------------------------------
>>> maven-plugins/codegen-plugin/pom.xml | 42 ++-------
>>> .../cxf/maven_plugin/AbstractCodegenMoho.java | 85 +++++++-----------
>>> .../maven_plugin/wsdl2java/WSDL2JavaMojo.java | 30 +++----
>>> .../wsdl2js/WSDL2JavaScriptMojo.java | 28 +++---
>>> maven-plugins/corba/pom.xml | 37 --------
>>> maven-plugins/java2wadl-plugin/pom.xml | 52 +++--------
>>> .../javatowadl/ParseJavaDocMojo.java | 91
>>> ++++++++------------
>>> maven-plugins/java2ws-plugin/pom.xml | 37 --------
>>> maven-plugins/pom.xml | 20 -----
>>> maven-plugins/wadl2java-plugin/pom.xml | 42 ++-------
>>> .../wadlto/AbstractCodeGeneratorMojo.java | 81 +++++------------
>>> .../cxf/maven_plugin/wadlto/WADL2JavaMojo.java | 29 +++----
>>> maven-plugins/wsdl-validator-plugin/pom.xml | 37 --------
>>> parent/pom.xml | 12 +++
>>> pom.xml | 31 +++++++
>>> 15 files changed, 194 insertions(+), 460 deletions(-)
>>> ----------------------------------------------------------------------
>>>
>>>
>>>
>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/codegen-plugin/pom.xml
>>> ----------------------------------------------------------------------
>>> diff --git a/maven-plugins/codegen-plugin/pom.xml
>>> b/maven-plugins/codegen-plugin/pom.xml
>>> index 521d097..0259a06 100644
>>> --- a/maven-plugins/codegen-plugin/pom.xml
>>> +++ b/maven-plugins/codegen-plugin/pom.xml
>>> @@ -56,6 +56,11 @@
>>> <scope>provided</scope>
>>> </dependency>
>>> <dependency>
>>> + <groupId>org.apache.maven.plugin-tools</groupId>
>>> + <artifactId>maven-plugin-annotations</artifactId>
>>> + <scope>provided</scope>
>>> + </dependency>
>>> + <dependency>
>>> <groupId>org.codehaus.plexus</groupId>
>>> <artifactId>plexus-utils</artifactId>
>>> <version>2.0.5</version>
>>> @@ -148,41 +153,4 @@
>>> </dependencies>
>>> </profile>
>>> </profiles>
>>> - <build>
>>> - <pluginManagement>
>>> - <plugins>
>>> - <!--This plugin's configuration is used to store
>>> Eclipse m2e settings only. It has no influence on the Maven build itself.-->
>>> - <plugin>
>>> - <groupId>org.eclipse.m2e</groupId>
>>> -
>>> <artifactId>lifecycle-mapping</artifactId>
>>> - <version>1.0.0</version>
>>> - <configuration>
>>> - <lifecycleMappingMetadata>
>>> - <pluginExecutions>
>>> - <pluginExecution>
>>> -
>>> <pluginExecutionFilter>
>>> -
>>> <groupId>
>>> -
>>> org.apache.maven.plugins
>>> -
>>> </groupId>
>>> -
>>> <artifactId>
>>> -
>>> maven-plugin-plugin
>>> -
>>> </artifactId>
>>> -
>>> <versionRange>
>>> -
>>> [2.9,)
>>> -
>>> </versionRange>
>>> -
>>> <goals>
>>> -
>>> <goal>descriptor</goal>
>>> -
>>> </goals>
>>> -
>>> </pluginExecutionFilter>
>>> - <action>
>>> -
>>> <ignore></ignore>
>>> - </action>
>>> -
>>> </pluginExecution>
>>> - </pluginExecutions>
>>> - </lifecycleMappingMetadata>
>>> - </configuration>
>>> - </plugin>
>>> - </plugins>
>>> - </pluginManagement>
>>> - </build>
>>> </project>
>>>
>>>
>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
>>> ----------------------------------------------------------------------
>>> diff --git
>>> a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
>>> b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
>>> index 91206e9..addd797 100644
>>> ---
>>> a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
>>> +++
>>> b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
>>> @@ -50,6 +50,8 @@ import org.apache.maven.execution.MavenSession;
>>> import org.apache.maven.model.Resource;
>>> import org.apache.maven.plugin.AbstractMojo;
>>> import org.apache.maven.plugin.MojoExecutionException;
>>> +import org.apache.maven.plugins.annotations.Component;
>>> +import org.apache.maven.plugins.annotations.Parameter;
>>> import org.apache.maven.project.MavenProject;
>>> import org.apache.maven.repository.RepositorySystem;
>>> import org.apache.maven.settings.Proxy;
>>> @@ -92,125 +94,98 @@ public abstract class AbstractCodegenMoho extends
>>> AbstractMojo {
>>> private static final String HTTP_PROXY_PASSWORD =
>>> "http.proxyPassword";
>>>
>>>
>>> - /**
>>> - * @parameter expression="${project.build.outputDirectory}"
>>> - * @required
>>> - */
>>> + @Parameter(property = "project.build.outputDirectory", required =
>>> true)
>>> protected String classesDirectory;
>>>
>>> /**
>>> * By default all maven dependencies of type "wsdl" are added to
>>> the effective wsdlOptions. Setting this
>>> * parameter to true disables this functionality
>>> - *
>>> - * @parameter expression="${cxf.disableDependencyScan}"
>>> default-value="false"
>>> */
>>> + @Parameter(property = "cxf.disableDependencyScan", defaultValue =
>>> "false")
>>> protected boolean disableDependencyScan;
>>> +
>>> /**
>>> * Disables the scanning of the wsdlRoot/testWsdlRoot directories.
>>> * By default, we scan for *.wsdl (see include/exclude params as
>>> well) in the wsdlRoot
>>> * directories and run the tool on all the wsdls we find. This
>>> disables that scan
>>> * and requires an explicit wsdlOption to be set for each wsdl that
>>> needs to be processed.
>>> - * @parameter expression="${cxf.disableDirectoryScan}"
>>> default-value="false"
>>> */
>>> + @Parameter(property = "cxf.disableDirectoryScan", defaultValue =
>>> "false")
>>> protected boolean disableDirectoryScan;
>>> +
>>> /**
>>> * Allows running the JavaToWs in a separate process. Valid values
>>> are "false", "always", and "once" The
>>> * value of "true" is equal to "once"
>>> - *
>>> - * @parameter default-value="false"
>>> - * @since 2.4
>>> */
>>> + @Parameter(defaultValue = "false")
>>> protected String fork;
>>> +
>>> /**
>>> * A list of wsdl files to include. Can contain ant-style wildcards
>>> and double wildcards. Defaults to
>>> * *.wsdl
>>> - *
>>> - * @parameter
>>> */
>>> + @Parameter
>>> protected String includes[];
>>> /**
>>> * Directory in which the "DONE" markers are saved that
>>> - *
>>> - * @parameter expression="${cxf.markerDirectory}"
>>> - *
>>> default-value="${project.build.directory}/cxf-codegen-plugin-markers"
>>> */
>>> + @Parameter(property = "cxf.markerDirectory", defaultValue =
>>> "${project.build.directory}/cxf-codegen-plugin-markers")
>>> protected File markerDirectory;
>>> +
>>> /**
>>> - * The plugin dependencies, needed for the fork mode.
>>> - *
>>> - * @parameter expression="${plugin.artifacts}"
>>> - * @required
>>> - * @readonly
>>> + * The plugin dependencies, needed for the fork mode
>>> */
>>> + @Parameter(required = true, readonly = true, property =
>>> "plugin.artifacts")
>>> protected List<Artifact> pluginArtifacts;
>>> - /**
>>> - * @parameter expression="${project}"
>>> - * @required
>>> - */
>>> +
>>> + @Parameter(required = true, property = "project")
>>> protected MavenProject project;
>>> +
>>> /**
>>> * Use the compile classpath rather than the test classpath for
>>> execution useful if the test dependencies
>>> * clash with those of wsdl2java
>>> - *
>>> - * @parameter expression="${cxf.useCompileClasspath}"
>>> default-value="false"
>>> */
>>> + @Parameter(property = "cxf.useCompileClasspath", defaultValue =
>>> "false")
>>> protected boolean useCompileClasspath;
>>> +
>>> /**
>>> * A list of wsdl files to exclude. Can contain ant-style wildcards
>>> and double wildcards.
>>> - *
>>> - * @parameter
>>> */
>>> + @Parameter
>>> protected String excludes[];
>>> - /**
>>> - * @parameter expression="${cxf.testWsdlRoot}"
>>> default-value="${basedir}/src/test/resources/wsdl"
>>> - */
>>> +
>>> + @Parameter(property = "cxf.testWsdlRoot", defaultValue =
>>> "${basedir}/src/test/resources/wsdl")
>>> protected File testWsdlRoot;
>>>
>>> - /**
>>> - * @parameter expression="${cxf.wsdlRoot}"
>>> default-value="${basedir}/src/main/resources/wsdl"
>>> - */
>>> + @Parameter(property = "cxf.wsdlRoot", defaultValue =
>>> "${basedir}/src/main/resources/wsdl")
>>> protected File wsdlRoot;
>>>
>>> - /** @component */
>>> + @Component
>>> protected BuildContext buildContext;
>>>
>>>
>>> /**
>>> * Sets the JVM arguments (i.e. <code>-Xms128m -Xmx128m</code>) if
>>> fork is set to <code>true</code>.
>>> - *
>>> - * @parameter expression="${cxf.codegen.jvmArgs}"
>>> - * @since 2.4
>>> */
>>> + @Parameter(property = "cxf.codegen.jvmArgs")
>>> private String additionalJvmArgs;
>>>
>>> /**
>>> * Sets the Java executable to use when fork parameter is
>>> <code>true</code>.
>>> - *
>>> - * @parameter default-value="${java.home}/bin/java"
>>> - * @since 2.4
>>> */
>>> + @Parameter(defaultValue = "${java.home}/bin/java")
>>> private String javaExecutable;
>>>
>>> /**
>>> * The Maven session.
>>> - *
>>> - * @parameter expression="${session}"
>>> - * @readonly
>>> - * @required
>>> */
>>> + @Parameter(readonly = true, required = true, property = "session")
>>> private MavenSession mavenSession;
>>> - /**
>>> - * @component
>>> - * @readonly
>>> - * @required
>>> - */
>>> +
>>> + @Component
>>> private ProjectDependenciesResolver projectDependencyResolver;
>>>
>>> - /**
>>> - * @component
>>> - * @readonly
>>> - * @required
>>> - */
>>> + @Component
>>> private RepositorySystem repositorySystem;
>>>
>>>
>>>
>>>
>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
>>> ----------------------------------------------------------------------
>>> diff --git
>>> a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
>>> b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
>>> index 92e6955..a99b988 100644
>>> ---
>>> a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
>>> +++
>>> b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
>>> @@ -47,15 +47,14 @@ import org.apache.cxf.tools.util.OutputStreamCreator;
>>> import org.apache.cxf.tools.wsdlto.WSDLToJava;
>>> import org.apache.maven.artifact.Artifact;
>>> import org.apache.maven.plugin.MojoExecutionException;
>>> +import org.apache.maven.plugins.annotations.LifecyclePhase;
>>> +import org.apache.maven.plugins.annotations.Mojo;
>>> +import org.apache.maven.plugins.annotations.Parameter;
>>> +import org.apache.maven.plugins.annotations.ResolutionScope;
>>> import org.sonatype.plexus.build.incremental.BuildContext;
>>>
>>> -/**
>>> - * @goal wsdl2java
>>> - * @phase generate-sources
>>> - * @description CXF WSDL To Java Tool
>>> - * @requiresDependencyResolution test
>>> - * @threadSafe
>>> - */
>>> +@Mojo(name = "wsdl2java", defaultPhase =
>>> LifecyclePhase.GENERATE_SOURCES, threadSafe = true,
>>> + requiresDependencyResolution = ResolutionScope.TEST)
>>> public class WSDL2JavaMojo extends AbstractCodegenMoho {
>>>
>>> final class MavenToolErrorListener extends ToolErrorListener {
>>> @@ -125,40 +124,35 @@ public class WSDL2JavaMojo extends
>>> AbstractCodegenMoho {
>>> }
>>> }
>>>
>>> - /**
>>> - * @parameter expression="${cxf.testSourceRoot}"
>>> - */
>>> + @Parameter(property = "cxf.testSourceRoot")
>>> File testSourceRoot;
>>>
>>> /**
>>> * Path where the generated sources should be placed
>>> *
>>> - * @parameter expression="${cxf.sourceRoot}"
>>> - *
>>> default-value="${project.build.directory}/generated-sources/cxf"
>>> - * @required
>>> */
>>> + @Parameter(required = true, defaultValue =
>>> "${project.build.directory}/generated-sources/cxf",
>>> + property = "cxf.sourceRoot")
>>> File sourceRoot;
>>>
>>> /**
>>> * Options that specify WSDLs to process and/or control the
>>> processing of wsdls.
>>> * If you have enabled wsdl scanning, these elements attach options
>>> to particular wsdls.
>>> * If you have not enabled wsdl scanning, these options call out
>>> the wsdls to process.
>>> - * @parameter
>>> */
>>> + @Parameter
>>> WsdlOption wsdlOptions[];
>>>
>>> /**
>>> * Default options to be used when a wsdl has not had it's options
>>> explicitly specified.
>>> - *
>>> - * @parameter
>>> */
>>> + @Parameter
>>> Option defaultOptions = new Option();
>>>
>>> /**
>>> * Encoding to use for generated sources
>>> - *
>>> - * @parameter default-value="${project.build.sourceEncoding}"
>>> */
>>> + @Parameter(defaultValue = "${project.build.sourceEncoding}")
>>> String encoding;
>>>
>>> /**
>>>
>>>
>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
>>> ----------------------------------------------------------------------
>>> diff --git
>>> a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
>>> b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
>>> index 1ba97e3..daee4c9 100644
>>> ---
>>> a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
>>> +++
>>> b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
>>> @@ -39,44 +39,38 @@ import org.apache.cxf.tools.common.ToolContext;
>>> import org.apache.cxf.tools.wsdlto.javascript.WSDLToJavaScript;
>>> import org.apache.maven.artifact.Artifact;
>>> import org.apache.maven.plugin.MojoExecutionException;
>>> +import org.apache.maven.plugins.annotations.LifecyclePhase;
>>> +import org.apache.maven.plugins.annotations.Mojo;
>>> +import org.apache.maven.plugins.annotations.Parameter;
>>> +import org.apache.maven.plugins.annotations.ResolutionScope;
>>> import org.apache.maven.project.MavenProject;
>>>
>>> -/**
>>> - * @goal wsdl2js
>>> - * @phase generate-sources
>>> - * @description CXF WSDL To JavaScript Tool
>>> - * @requiresDependencyResolution test
>>> - * @threadSafe
>>> - */
>>> +@Mojo(name = "wsdl2js", defaultPhase = LifecyclePhase.GENERATE_SOURCES,
>>> threadSafe = true,
>>> + requiresDependencyResolution = ResolutionScope.TEST)
>>> public class WSDL2JavaScriptMojo extends AbstractCodegenMoho {
>>>
>>> - /**
>>> - * @parameter expression="${cxf.testJavascriptRoot}"
>>> - */
>>> + @Parameter(property = "cxf.testJavascriptRoot")
>>> File testSourceRoot;
>>>
>>> /**
>>> * Path where the generated sources should be placed
>>> - *
>>> - * @parameter expression="${cxf.sourceJavascriptRoot}"
>>> - *
>>> default-value="${project.build.directory}/generated-sources/cxf-js"
>>> - * @required
>>> */
>>> + @Parameter(required = true, defaultValue =
>>> "${project.build.directory}/generated-sources/cxf-js",
>>> + property = "cxf.sourceJavascriptRoot")
>>> File sourceRoot;
>>>
>>> /**
>>> * Default options to be applied to all of the wsdls.
>>> - *
>>> - * @parameter
>>> */
>>> + @Parameter
>>> Option defaultOptions = new Option();
>>>
>>> /**
>>> * Options that specify WSDLs to process and/or control the
>>> processing of wsdls.
>>> * If you have enabled wsdl scanning, these elements attach options
>>> to particular wsdls.
>>> * If you have not enabled wsdl scanning, these options call out
>>> the wsdls to process.
>>> - * @parameter
>>> */
>>> + @Parameter
>>> WsdlOption wsdlOptions[];
>>>
>>> @Override
>>>
>>>
>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/corba/pom.xml
>>> ----------------------------------------------------------------------
>>> diff --git a/maven-plugins/corba/pom.xml b/maven-plugins/corba/pom.xml
>>> index 622932e..bf21633 100644
>>> --- a/maven-plugins/corba/pom.xml
>>> +++ b/maven-plugins/corba/pom.xml
>>> @@ -69,41 +69,4 @@
>>> <version>${project.version}</version>
>>> </dependency>
>>> </dependencies>
>>> - <build>
>>> - <pluginManagement>
>>> - <plugins>
>>> - <!--This plugin's configuration is used to store
>>> Eclipse m2e settings only. It has no influence on the Maven build itself.-->
>>> - <plugin>
>>> - <groupId>org.eclipse.m2e</groupId>
>>> -
>>> <artifactId>lifecycle-mapping</artifactId>
>>> - <version>1.0.0</version>
>>> - <configuration>
>>> - <lifecycleMappingMetadata>
>>> - <pluginExecutions>
>>> - <pluginExecution>
>>> -
>>> <pluginExecutionFilter>
>>> -
>>> <groupId>
>>> -
>>> org.apache.maven.plugins
>>> -
>>> </groupId>
>>> -
>>> <artifactId>
>>> -
>>> maven-plugin-plugin
>>> -
>>> </artifactId>
>>> -
>>> <versionRange>
>>> -
>>> [2.9,)
>>> -
>>> </versionRange>
>>> -
>>> <goals>
>>> -
>>> <goal>descriptor</goal>
>>> -
>>> </goals>
>>> -
>>> </pluginExecutionFilter>
>>> - <action>
>>> -
>>> <ignore></ignore>
>>> - </action>
>>> -
>>> </pluginExecution>
>>> - </pluginExecutions>
>>> - </lifecycleMappingMetadata>
>>> - </configuration>
>>> - </plugin>
>>> - </plugins>
>>> - </pluginManagement>
>>> - </build>
>>> </project>
>>>
>>>
>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/java2wadl-plugin/pom.xml
>>> ----------------------------------------------------------------------
>>> diff --git a/maven-plugins/java2wadl-plugin/pom.xml
>>> b/maven-plugins/java2wadl-plugin/pom.xml
>>> index 03ea41e..78da0b1 100644
>>> --- a/maven-plugins/java2wadl-plugin/pom.xml
>>> +++ b/maven-plugins/java2wadl-plugin/pom.xml
>>> @@ -118,6 +118,20 @@
>>> <groupId>org.apache.maven.plugins</groupId>
>>> <artifactId>maven-javadoc-plugin</artifactId>
>>> <version>2.9.1</version>
>>> + <exclusions>
>>> + <exclusion>
>>> + <groupId>org.apache.maven</groupId>
>>> + <artifactId>maven-project</artifactId>
>>> + </exclusion>
>>> + <exclusion>
>>> + <groupId>org.apache.maven</groupId>
>>> + <artifactId>maven-artifact-manager</artifactId>
>>> + </exclusion>
>>> + <exclusion>
>>> + <groupId>org.apache.maven</groupId>
>>> + <artifactId>maven-toolchain</artifactId>
>>> + </exclusion>
>>> + </exclusions>
>>> </dependency>
>>>
>>> <dependency>
>>> @@ -194,42 +208,4 @@
>>> </build>
>>> </profile>
>>> </profiles>
>>> -
>>> - <build>
>>> - <pluginManagement>
>>> - <plugins>
>>> - <!--This plugin's configuration is used to store
>>> Eclipse m2e settings only. It has no influence on the Maven build itself.-->
>>> - <plugin>
>>> - <groupId>org.eclipse.m2e</groupId>
>>> -
>>> <artifactId>lifecycle-mapping</artifactId>
>>> - <version>1.0.0</version>
>>> - <configuration>
>>> - <lifecycleMappingMetadata>
>>> - <pluginExecutions>
>>> - <pluginExecution>
>>> -
>>> <pluginExecutionFilter>
>>> -
>>> <groupId>
>>> -
>>> org.apache.maven.plugins
>>> -
>>> </groupId>
>>> -
>>> <artifactId>
>>> -
>>> maven-plugin-plugin
>>> -
>>> </artifactId>
>>> -
>>> <versionRange>
>>> -
>>> [2.9,)
>>> -
>>> </versionRange>
>>> -
>>> <goals>
>>> -
>>> <goal>descriptor</goal>
>>> -
>>> </goals>
>>> -
>>> </pluginExecutionFilter>
>>> - <action>
>>> -
>>> <ignore></ignore>
>>> - </action>
>>> -
>>> </pluginExecution>
>>> - </pluginExecutions>
>>> - </lifecycleMappingMetadata>
>>> - </configuration>
>>> - </plugin>
>>> - </plugins>
>>> - </pluginManagement>
>>> - </build>
>>> </project>
>>>
>>>
>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
>>> ----------------------------------------------------------------------
>>> diff --git
>>> a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
>>> b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
>>> index 9dd47f6..2662b7c 100644
>>> ---
>>> a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
>>> +++
>>> b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
>>> @@ -20,18 +20,20 @@ package org.apache.cxf.maven_plugin.javatowadl;
>>>
>>> import java.io.File;
>>> import java.lang.reflect.Field;
>>> +import java.lang.reflect.Method;
>>> import java.util.List;
>>> import java.util.Locale;
>>>
>>> import org.apache.maven.artifact.Artifact;
>>> import org.apache.maven.artifact.repository.ArtifactRepository;
>>> import org.apache.maven.artifact.resolver.ArtifactResolver;
>>> +import org.apache.maven.plugin.AbstractMojo;
>>> import org.apache.maven.plugin.MojoExecutionException;
>>> import org.apache.maven.plugin.MojoFailureException;
>>> import org.apache.maven.plugin.javadoc.AbstractJavadocMojo;
>>> +import org.apache.maven.plugin.javadoc.JavadocReport;
>>> import org.apache.maven.plugin.javadoc.options.DocletArtifact;
>>> import org.apache.maven.project.MavenProject;
>>> -import org.apache.maven.reporting.MavenReportException;
>>> import org.apache.maven.toolchain.ToolchainManager;
>>> import org.codehaus.plexus.archiver.manager.ArchiverManager;
>>>
>>> @@ -41,7 +43,7 @@ import
>>> org.codehaus.plexus.archiver.manager.ArchiverManager;
>>> * @requiresDependencyResolution compile
>>> * @threadSafe
>>> */
>>> -public class ParseJavaDocMojo extends AbstractJavadocMojo {
>>> +public class ParseJavaDocMojo extends AbstractMojo {
>>>
>>> /**
>>> * @parameter expression="${project}"
>>> @@ -118,24 +120,20 @@ public class ParseJavaDocMojo extends
>>> AbstractJavadocMojo {
>>>
>>> @Override
>>> public void execute() throws MojoExecutionException,
>>> MojoFailureException {
>>> - if (skip) {
>>> - getLog().info("Skipping parse javadoc");
>>> - return;
>>> - }
>>> -
>>> + AbstractJavadocMojo mojo = new JavadocReport();
>>> + Locale locale = Locale.getDefault();
>>> try {
>>> - Locale locale = Locale.getDefault();
>>> Field f =
>>> AbstractJavadocMojo.class.getDeclaredField("doclet");
>>> f.setAccessible(true);
>>> - f.set(this,
>>> "org.apache.cxf.maven_plugin.javatowadl.DumpJavaDoc");
>>> + f.set(mojo,
>>> "org.apache.cxf.maven_plugin.javatowadl.DumpJavaDoc");
>>>
>>> f =
>>> AbstractJavadocMojo.class.getDeclaredField("stylesheet");
>>> f.setAccessible(true);
>>> - f.set(this, "stylesheet");
>>> + f.set(mojo, "stylesheet");
>>>
>>> f =
>>> AbstractJavadocMojo.class.getDeclaredField("javadocOptionsDir");
>>> f.setAccessible(true);
>>> - f.set(this, javadocOptionsDir);
>>> + f.set(mojo, javadocOptionsDir);
>>>
>>> f =
>>> AbstractJavadocMojo.class.getDeclaredField("docletArtifact");
>>> f.setAccessible(true);
>>> @@ -150,81 +148,68 @@ public class ParseJavaDocMojo extends
>>> AbstractJavadocMojo {
>>> }
>>> }
>>> }
>>> - f.set(this, docletArtifact);
>>> + f.set(mojo, docletArtifact);
>>>
>>> f = AbstractJavadocMojo.class.getDeclaredField("factory");
>>> f.setAccessible(true);
>>> - f.set(this, this.mavenArtifactFactory);
>>> + f.set(mojo, this.mavenArtifactFactory);
>>>
>>> f =
>>> AbstractJavadocMojo.class.getDeclaredField("mavenProjectBuilder");
>>> f.setAccessible(true);
>>> - f.set(this, this.mavenProjectBuilder);
>>> + f.set(mojo, this.mavenProjectBuilder);
>>>
>>> f = AbstractJavadocMojo.class.getDeclaredField("resolver");
>>> f.setAccessible(true);
>>> - f.set(this, this.artifactResolver);
>>> + f.set(mojo, this.artifactResolver);
>>>
>>> f =
>>> AbstractJavadocMojo.class.getDeclaredField("archiverManager");
>>> f.setAccessible(true);
>>> - f.set(this, this.archiverManager);
>>> + f.set(mojo, this.archiverManager);
>>>
>>> f =
>>> AbstractJavadocMojo.class.getDeclaredField("artifactMetadataSource");
>>> f.setAccessible(true);
>>> - f.set(this, this.artifactMetadataSource);
>>> + f.set(mojo, this.artifactMetadataSource);
>>>
>>> f =
>>> AbstractJavadocMojo.class.getDeclaredField("toolchainManager");
>>> f.setAccessible(true);
>>> - f.set(this, this.toolchainManager);
>>> + f.set(mojo, this.toolchainManager);
>>>
>>> f =
>>> AbstractJavadocMojo.class.getDeclaredField("localRepository");
>>> f.setAccessible(true);
>>> - f.set(this, this.localRepository);
>>> + f.set(mojo, this.localRepository);
>>>
>>> f =
>>> AbstractJavadocMojo.class.getDeclaredField("remoteRepositories");
>>> f.setAccessible(true);
>>> - f.set(this, this.remoteRepositories);
>>> + f.set(mojo, this.remoteRepositories);
>>>
>>> f =
>>> AbstractJavadocMojo.class.getDeclaredField("applyJavadocSecurityFix");
>>> f.setAccessible(true);
>>> - f.set(this, false);
>>> + f.set(mojo, false);
>>>
>>> f =
>>> AbstractJavadocMojo.class.getDeclaredField("additionalparam");
>>> f.setAccessible(true);
>>> - f.set(this, "-dumpJavaDocFile " +
>>> this.dumpFileOutputDirectory.getAbsolutePath()
>>> + f.set(mojo, "-dumpJavaDocFile " +
>>> this.dumpFileOutputDirectory.getAbsolutePath()
>>> + File.separator + "dumpFile.properties");
>>>
>>> - useStandardDocletOptions = false;
>>> - this.project = mavenProject;
>>> - generate(locale);
>>> - } catch (Exception e) {
>>> - failOnError("An error has occurred in parsing javadoc", e);
>>> - }
>>> -
>>> - }
>>> -
>>> - private void generate(Locale locale) throws MavenReportException {
>>> - try {
>>> - outputDirectory = getReportOutputDirectory();
>>> - executeReport(locale);
>>> - } catch (MavenReportException e) {
>>> - if (failOnError) {
>>> - throw e;
>>> - }
>>> - getLog().error("Error while creating javadoc report: " +
>>> e.getMessage(), e);
>>> - } catch (RuntimeException e) {
>>> - if (failOnError) {
>>> - throw e;
>>> + f =
>>> AbstractJavadocMojo.class.getDeclaredField("useStandardDocletOptions");
>>> + f.setAccessible(true);
>>> + f.set(mojo, false);
>>> +
>>> + f = AbstractJavadocMojo.class.getDeclaredField("project");
>>> + f.setAccessible(true);
>>> + f.set(mojo, mavenProject);
>>> +
>>> + if (dumpFileOutputDirectory != null) {
>>> + f =
>>> AbstractJavadocMojo.class.getDeclaredField("outputDirectory");
>>> + f.setAccessible(true);
>>> + f.set(mojo, dumpFileOutputDirectory);
>>> }
>>> - getLog().error("Error while creating javadoc report: " +
>>> e.getMessage(), e);
>>> - }
>>> - }
>>> -
>>> - private File getReportOutputDirectory() {
>>> - if (dumpFileOutputDirectory == null) {
>>> - return outputDirectory;
>>> +
>>> + Method m =
>>> AbstractJavadocMojo.class.getMethod("executeReport", Locale.class);
>>> + m.setAccessible(true);
>>> + m.invoke(mojo, locale);
>>> + } catch (Exception e) {
>>> + throw new MojoExecutionException("Failed to generate
>>> javadoc", e);
>>> }
>>> -
>>> - return dumpFileOutputDirectory;
>>> }
>>> -
>>> }
>>>
>>>
>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/java2ws-plugin/pom.xml
>>> ----------------------------------------------------------------------
>>> diff --git a/maven-plugins/java2ws-plugin/pom.xml
>>> b/maven-plugins/java2ws-plugin/pom.xml
>>> index d3ca92c..73c8ede 100644
>>> --- a/maven-plugins/java2ws-plugin/pom.xml
>>> +++ b/maven-plugins/java2ws-plugin/pom.xml
>>> @@ -77,41 +77,4 @@
>>> <version>${project.version}</version>
>>> </dependency>
>>> </dependencies>
>>> - <build>
>>> - <pluginManagement>
>>> - <plugins>
>>> - <!--This plugin's configuration is used to store
>>> Eclipse m2e settings only. It has no influence on the Maven build itself.-->
>>> - <plugin>
>>> - <groupId>org.eclipse.m2e</groupId>
>>> -
>>> <artifactId>lifecycle-mapping</artifactId>
>>> - <version>1.0.0</version>
>>> - <configuration>
>>> - <lifecycleMappingMetadata>
>>> - <pluginExecutions>
>>> - <pluginExecution>
>>> -
>>> <pluginExecutionFilter>
>>> -
>>> <groupId>
>>> -
>>> org.apache.maven.plugins
>>> -
>>> </groupId>
>>> -
>>> <artifactId>
>>> -
>>> maven-plugin-plugin
>>> -
>>> </artifactId>
>>> -
>>> <versionRange>
>>> -
>>> [2.9,)
>>> -
>>> </versionRange>
>>> -
>>> <goals>
>>> -
>>> <goal>descriptor</goal>
>>> -
>>> </goals>
>>> -
>>> </pluginExecutionFilter>
>>> - <action>
>>> -
>>> <ignore></ignore>
>>> - </action>
>>> -
>>> </pluginExecution>
>>> - </pluginExecutions>
>>> - </lifecycleMappingMetadata>
>>> - </configuration>
>>> - </plugin>
>>> - </plugins>
>>> - </pluginManagement>
>>> - </build>
>>> </project>
>>>
>>>
>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/pom.xml
>>> ----------------------------------------------------------------------
>>> diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
>>> index 8a6f19b..57db354 100644
>>> --- a/maven-plugins/pom.xml
>>> +++ b/maven-plugins/pom.xml
>>> @@ -39,24 +39,4 @@
>>> <module>corba</module>
>>> <module>archetypes</module>
>>> </modules>
>>> - <build>
>>> - <pluginManagement>
>>> - <plugins>
>>> - <plugin>
>>> - <groupId>org.apache.maven.plugins</groupId>
>>> - <artifactId>maven-plugin-plugin</artifactId>
>>> - <version>2.9</version>
>>> - </plugin>
>>> - </plugins>
>>> - </pluginManagement>
>>> - </build>
>>> - <reporting>
>>> - <plugins>
>>> - <plugin>
>>> - <groupId>org.apache.maven.plugins</groupId>
>>> - <artifactId>maven-plugin-plugin</artifactId>
>>> - <version>2.9</version>
>>> - </plugin>
>>> - </plugins>
>>> - </reporting>
>>> </project>
>>>
>>>
>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/wadl2java-plugin/pom.xml
>>> ----------------------------------------------------------------------
>>> diff --git a/maven-plugins/wadl2java-plugin/pom.xml
>>> b/maven-plugins/wadl2java-plugin/pom.xml
>>> index 092d859..1e10e63 100644
>>> --- a/maven-plugins/wadl2java-plugin/pom.xml
>>> +++ b/maven-plugins/wadl2java-plugin/pom.xml
>>> @@ -56,6 +56,11 @@
>>> <scope>provided</scope>
>>> </dependency>
>>> <dependency>
>>> + <groupId>org.apache.maven.plugin-tools</groupId>
>>> + <artifactId>maven-plugin-annotations</artifactId>
>>> + <scope>provided</scope>
>>> + </dependency>
>>> + <dependency>
>>> <groupId>org.codehaus.plexus</groupId>
>>> <artifactId>plexus-utils</artifactId>
>>> <version>2.0.5</version>
>>> @@ -122,41 +127,4 @@
>>> </dependencies>
>>> </profile>
>>> </profiles>
>>> - <build>
>>> - <pluginManagement>
>>> - <plugins>
>>> - <!--This plugin's configuration is used to store
>>> Eclipse m2e settings only. It has no influence on the Maven build itself.-->
>>> - <plugin>
>>> - <groupId>org.eclipse.m2e</groupId>
>>> -
>>> <artifactId>lifecycle-mapping</artifactId>
>>> - <version>1.0.0</version>
>>> - <configuration>
>>> - <lifecycleMappingMetadata>
>>> - <pluginExecutions>
>>> - <pluginExecution>
>>> -
>>> <pluginExecutionFilter>
>>> -
>>> <groupId>
>>> -
>>> org.apache.maven.plugins
>>> -
>>> </groupId>
>>> -
>>> <artifactId>
>>> -
>>> maven-plugin-plugin
>>> -
>>> </artifactId>
>>> -
>>> <versionRange>
>>> -
>>> [2.9,)
>>> -
>>> </versionRange>
>>> -
>>> <goals>
>>> -
>>> <goal>descriptor</goal>
>>> -
>>> </goals>
>>> -
>>> </pluginExecutionFilter>
>>> - <action>
>>> -
>>> <ignore></ignore>
>>> - </action>
>>> -
>>> </pluginExecution>
>>> - </pluginExecutions>
>>> - </lifecycleMappingMetadata>
>>> - </configuration>
>>> - </plugin>
>>> - </plugins>
>>> - </pluginManagement>
>>> - </build>
>>> </project>
>>>
>>>
>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
>>> ----------------------------------------------------------------------
>>> diff --git
>>> a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
>>> b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
>>> index fe5454d..16e7f84 100644
>>> ---
>>> a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
>>> +++
>>> b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
>>> @@ -47,6 +47,8 @@ import org.apache.maven.execution.MavenSession;
>>> import org.apache.maven.model.Resource;
>>> import org.apache.maven.plugin.AbstractMojo;
>>> import org.apache.maven.plugin.MojoExecutionException;
>>> +import org.apache.maven.plugins.annotations.Component;
>>> +import org.apache.maven.plugins.annotations.Parameter;
>>> import org.apache.maven.project.MavenProject;
>>> import org.apache.maven.repository.RepositorySystem;
>>> import org.codehaus.plexus.archiver.jar.JarArchiver;
>>> @@ -60,54 +62,42 @@ import org.codehaus.plexus.util.cli.Commandline;
>>> public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
>>>
>>> /**
>>> - * @parameter expression="${cxf.testSourceRoot}"
>>> + * Source Root
>>> */
>>> + @Parameter(property = "cxf.testSourceRoot")
>>> File testSourceRoot;
>>>
>>> /**
>>> * Path where the generated sources should be placed
>>> - *
>>> - * @parameter expression="${cxf.sourceRoot}"
>>> - *
>>> default-value="${project.build.directory}/generated-sources/cxf"
>>> - * @required
>>> */
>>> + @Parameter(required = true,
>>> + property = "cxf.sourceRoot",
>>> + defaultValue =
>>> "${project.build.directory}/generated-sources/cxf")
>>> File sourceRoot;
>>>
>>> - /**
>>> - * @parameter expression="${project.build.outputDirectory}"
>>> - * @required
>>> - */
>>> + @Parameter(required = true, property =
>>> "project.build.outputDirectory")
>>> String classesDirectory;
>>>
>>> - /**
>>> - * @parameter expression="${project}"
>>> - * @required
>>> - */
>>> + @Parameter(required = true, property = "project")
>>> MavenProject project;
>>>
>>> /**
>>> * Default options to be used when a wadl has not had it's options
>>> explicitly specified.
>>> - *
>>> - * @parameter
>>> */
>>> + @Parameter
>>> Option defaultOptions = new Option();
>>>
>>> -
>>> -
>>> /**
>>> * Directory in which the "DONE" markers are saved that
>>> - *
>>> - * @parameter expression="${cxf.markerDirectory}"
>>> - *
>>> default-value="${project.build.directory}/cxf-codegen-plugin-markers"
>>> */
>>> + @Parameter(property = "cxf.markerDirectory", defaultValue =
>>> "${project.build.directory}/cxf-codegen-plugin-markers")
>>> File markerDirectory;
>>>
>>> /**
>>> * Use the compile classpath rather than the test classpath for
>>> execution useful if the test dependencies
>>> * clash with those of wadl2java
>>> - *
>>> - * @parameter expression="${cxf.useCompileClasspath}"
>>> default-value="false"
>>> */
>>> + @Parameter(property = "cxf.useCompileClasspath", defaultValue =
>>> "false")
>>> boolean useCompileClasspath;
>>>
>>>
>>> @@ -116,94 +106,69 @@ public abstract class AbstractCodeGeneratorMojo
>>> extends AbstractMojo {
>>> * By default, we scan for *.wadl (see include/exclude params as
>>> well) in the wadlRoot
>>> * directories and run wadl2java on all the wadl's we find. This
>>> disables that scan
>>> * and requires an explicit wadlOption to be set for each wadl that
>>> needs to be processed.
>>> - * @parameter expression="${cxf.disableDirectoryScan}"
>>> default-value="false"
>>> */
>>> + @Parameter(property = "cxf.disableDirectoryScan", defaultValue =
>>> "false")
>>> boolean disableDirectoryScan;
>>>
>>> /**
>>> * By default all maven dependencies of type "wadl" are added to
>>> the effective wadlOptions. Setting this
>>> * parameter to true disables this functionality
>>> - *
>>> - * @parameter expression="${cxf.disableDependencyScan}"
>>> default-value="false"
>>> */
>>> + @Parameter(property = "cxf.disableDependencyScan", defaultValue =
>>> "false")
>>> boolean disableDependencyScan;
>>>
>>> /**
>>> * A list of wadl files to include. Can contain ant-style wildcards
>>> and double wildcards. Defaults to
>>> * *.wadl
>>> - *
>>> - * @parameter
>>> */
>>> + @Parameter
>>> String includes[];
>>>
>>> /**
>>> * A list of wadl files to exclude. Can contain ant-style wildcards
>>> and double wildcards.
>>> - *
>>> - * @parameter
>>> */
>>> + @Parameter
>>> String excludes[];
>>>
>>> /**
>>> * Allows running the JavaToWs in a separate process.
>>> * Valid values are "false", "always", and "once"
>>> * The value of "true" is equal to "once"
>>> - *
>>> - * @parameter default-value="false"
>>> - * @since 2.4
>>> */
>>> + @Parameter(defaultValue = "false")
>>> String fork;
>>>
>>> /**
>>> * The Maven session.
>>> - *
>>> - * @parameter expression="${session}"
>>> - * @readonly
>>> - * @required
>>> */
>>> + @Parameter(readonly = true, required = true, property = "session")
>>> private MavenSession mavenSession;
>>>
>>> /**
>>> * The plugin dependencies, needed for the fork mode.
>>> - *
>>> - * @parameter expression="${plugin.artifacts}"
>>> - * @required
>>> - * @readonly
>>> */
>>> + @Parameter(readonly = true, required = true, property =
>>> "plugin.artifacts")
>>> private List<Artifact> pluginArtifacts;
>>>
>>>
>>> /**
>>> * Sets the Java executable to use when fork parameter is
>>> <code>true</code>.
>>> - *
>>> - * @parameter default-value="${java.home}/bin/java"
>>> - * @since 2.4
>>> */
>>> + @Parameter(defaultValue = "${java.home}/bin/java")
>>> private String javaExecutable;
>>>
>>> /**
>>> * Sets the JVM arguments (i.e. <code>-Xms128m -Xmx128m</code>) if
>>> fork is set to <code>true</code>.
>>> - *
>>> - * @parameter
>>> - * @since 2.4
>>> */
>>> + @Parameter
>>> private String additionalJvmArgs;
>>>
>>> - /**
>>> - * @component
>>> - * @readonly
>>> - * @required
>>> - */
>>> + @Component
>>> private RepositorySystem repositorySystem;
>>>
>>>
>>> private ClassLoader resourceClassLoader;
>>> -
>>> - /**
>>> - * Merge WadlOptions that point to the same file by adding the
>>> extraargs to the first option and deleting
>>> - * the second from the options list
>>> - *
>>> - * @param options
>>> - */
>>> +
>>>
>>> private Artifact resolveRemoteWadlArtifact(Artifact artifact)
>>> throws MojoExecutionException {
>>>
>>>
>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
>>> ----------------------------------------------------------------------
>>> diff --git
>>> a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
>>> b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
>>> index 58503b9..c8280f2 100644
>>> ---
>>> a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
>>> +++
>>> b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
>>> @@ -28,34 +28,31 @@ import java.util.Set;
>>> import org.apache.cxf.Bus;
>>> import org.apache.cxf.maven_plugin.common.ClassLoaderSwitcher;
>>> import org.apache.maven.plugin.MojoExecutionException;
>>> +import org.apache.maven.plugins.annotations.Component;
>>> +import org.apache.maven.plugins.annotations.LifecyclePhase;
>>> +import org.apache.maven.plugins.annotations.Mojo;
>>> +import org.apache.maven.plugins.annotations.Parameter;
>>> +import org.apache.maven.plugins.annotations.ResolutionScope;
>>> import org.sonatype.plexus.build.incremental.BuildContext;
>>>
>>>
>>> /**
>>> - * @goal wadl2java
>>> - * @phase generate-sources
>>> - * @description CXF WADL To Java Tool
>>> - * @requiresDependencyResolution test
>>> - * @threadSafe
>>> + * CXF WADL To Java Tool
>>> */
>>> +@Mojo(name = "wadl2java", defaultPhase =
>>> LifecyclePhase.GENERATE_SOURCES, threadSafe = true,
>>> + requiresDependencyResolution = ResolutionScope.TEST)
>>> public class WADL2JavaMojo extends AbstractCodeGeneratorMojo {
>>> - /**
>>> - * @parameter
>>> - */
>>> - WadlOption wadlOptions[];
>>> + @Parameter
>>> + WadlOption wadlOptions[];
>>>
>>> - /**
>>> - * @parameter expression="${cxf.wadlRoot}"
>>> default-value="${basedir}/src/main/resources/wadl"
>>> - */
>>> + @Parameter(property = "cxf.wadlRoot", defaultValue =
>>> "${basedir}/src/main/resources/wad")
>>> File wadlRoot;
>>>
>>> - /**
>>> - * @parameter expression="${cxf.testWadlRoot}"
>>> default-value="${basedir}/src/test/resources/wadl"
>>> - */
>>> + @Parameter(property = "cxf.testWadlRoot", defaultValue =
>>> "${basedir}/src/test/resources/wadl")
>>> File testWadlRoot;
>>>
>>>
>>> - /** @component */
>>> + @Component
>>> BuildContext buildContext;
>>>
>>> private void mergeOptions(List<WadlOption> effectiveOptions) {
>>>
>>>
>>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/wsdl-validator-plugin/pom.xml
>>> ----------------------------------------------------------------------
>>> diff --git a/maven-plugins/wsdl-validator-plugin/pom.xml
>>> b/maven-plugins/wsdl-validator-plugin/pom.xml
>>> index afa83f9..12658aa 100644
>>> --- a/maven-plugins/wsdl-validator-plugin/pom.xml
>>> +++ b/maven-plugins/wsdl-validator-plugin/pom.xml
>>> @@ -56,41 +56,4 @@
>>> <version>${project.version}</version>
>>> </dependency>
>>> </dependencies>
>>> - <build>
>>> - <pluginManagement>
>>> - <plugins>
>>> - <!--This plugin's configuration is used to store
>>> Eclipse m2e settings only. It has no influence on the Maven build itself.-->
>>> - <plugin>
>>> - <groupId>org.eclipse.m2e</groupId>
>>> -
>>> <artifactId>lifecycle-mapping</artifactId>
>>> - <version>1.0.0</version>
>>> - <configuration>
>>> - <lifecycleMappingMetadata>
>>> - <pluginExecutions>
>>> - <pluginExecution>
>>> -
>>> <pluginExecutionFilter>
>>> -
>>> <groupId>
>>> -
>>> org.apache.maven.plugins
>>> -
>>> </groupId>
>>> -
>>> <artifactId>
>>> -
>>> maven-plugin-plugin
>>> -
>>> </artifactId>
Re: [1/5] cxf git commit: Update plugins to use annotations instead
of the javadoc things
Posted by Alessio Soldano <as...@redhat.com>.
AFAICS, it's a matter of the Maven version being used. Just tried with
3.2.3 and it works fine.
Could be caused by http://jira.codehaus.org/browse/MNG-5346 .
Cheers
Alessio
On 03/02/15 10:34, Aki Yoshida wrote:
> It looks like this commit has broken cxf-codegen-plugin in trunk.
>
> [INFO] Apache CXF Command Line Tools WSDL to JavaScript Front End
> SUCCESS [2.062s]
> [INFO] Apache CXF Command Line Tools WSDLTo JAXB Databinding SUCCESS [1.981s]
> [INFO] Apache CXF Maven Plugins .......................... SUCCESS [0.057s]
> [INFO] Apache CXF WSDL Validator Maven2 Plugin ........... SUCCESS [1.751s]
> [INFO] Apache CXF Code Generation Maven2 Plugins ......... FAILURE [0.784s]
> [INFO] Apache CXF Test Utilities ......................... SKIPPED
> ...
>
> Does anyone know how to fix it or do we have to wait for Dan?
>
> I just temporarily synch'ed my local branch to one commit earlier to
> get the build run.
> regards, aki
>
>
> 2015-02-02 19:59 GMT+01:00 <dk...@apache.org>:
>> Repository: cxf
>> Updated Branches:
>> refs/heads/master 27e877346 -> 96ed80508
>>
>>
>> Update plugins to use annotations instead of the javadoc things
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/96ed8050
>> Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/96ed8050
>> Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/96ed8050
>>
>> Branch: refs/heads/master
>> Commit: 96ed80508cf15f7dc8c2d5a73225a36dbc096ee2
>> Parents: bfbc0a2
>> Author: Daniel Kulp <dk...@apache.org>
>> Authored: Mon Feb 2 13:58:09 2015 -0500
>> Committer: Daniel Kulp <dk...@apache.org>
>> Committed: Mon Feb 2 13:58:43 2015 -0500
>>
>> ----------------------------------------------------------------------
>> maven-plugins/codegen-plugin/pom.xml | 42 ++-------
>> .../cxf/maven_plugin/AbstractCodegenMoho.java | 85 +++++++-----------
>> .../maven_plugin/wsdl2java/WSDL2JavaMojo.java | 30 +++----
>> .../wsdl2js/WSDL2JavaScriptMojo.java | 28 +++---
>> maven-plugins/corba/pom.xml | 37 --------
>> maven-plugins/java2wadl-plugin/pom.xml | 52 +++--------
>> .../javatowadl/ParseJavaDocMojo.java | 91 ++++++++------------
>> maven-plugins/java2ws-plugin/pom.xml | 37 --------
>> maven-plugins/pom.xml | 20 -----
>> maven-plugins/wadl2java-plugin/pom.xml | 42 ++-------
>> .../wadlto/AbstractCodeGeneratorMojo.java | 81 +++++------------
>> .../cxf/maven_plugin/wadlto/WADL2JavaMojo.java | 29 +++----
>> maven-plugins/wsdl-validator-plugin/pom.xml | 37 --------
>> parent/pom.xml | 12 +++
>> pom.xml | 31 +++++++
>> 15 files changed, 194 insertions(+), 460 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/codegen-plugin/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/maven-plugins/codegen-plugin/pom.xml b/maven-plugins/codegen-plugin/pom.xml
>> index 521d097..0259a06 100644
>> --- a/maven-plugins/codegen-plugin/pom.xml
>> +++ b/maven-plugins/codegen-plugin/pom.xml
>> @@ -56,6 +56,11 @@
>> <scope>provided</scope>
>> </dependency>
>> <dependency>
>> + <groupId>org.apache.maven.plugin-tools</groupId>
>> + <artifactId>maven-plugin-annotations</artifactId>
>> + <scope>provided</scope>
>> + </dependency>
>> + <dependency>
>> <groupId>org.codehaus.plexus</groupId>
>> <artifactId>plexus-utils</artifactId>
>> <version>2.0.5</version>
>> @@ -148,41 +153,4 @@
>> </dependencies>
>> </profile>
>> </profiles>
>> - <build>
>> - <pluginManagement>
>> - <plugins>
>> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
>> - <plugin>
>> - <groupId>org.eclipse.m2e</groupId>
>> - <artifactId>lifecycle-mapping</artifactId>
>> - <version>1.0.0</version>
>> - <configuration>
>> - <lifecycleMappingMetadata>
>> - <pluginExecutions>
>> - <pluginExecution>
>> - <pluginExecutionFilter>
>> - <groupId>
>> - org.apache.maven.plugins
>> - </groupId>
>> - <artifactId>
>> - maven-plugin-plugin
>> - </artifactId>
>> - <versionRange>
>> - [2.9,)
>> - </versionRange>
>> - <goals>
>> - <goal>descriptor</goal>
>> - </goals>
>> - </pluginExecutionFilter>
>> - <action>
>> - <ignore></ignore>
>> - </action>
>> - </pluginExecution>
>> - </pluginExecutions>
>> - </lifecycleMappingMetadata>
>> - </configuration>
>> - </plugin>
>> - </plugins>
>> - </pluginManagement>
>> - </build>
>> </project>
>>
>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
>> ----------------------------------------------------------------------
>> diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
>> index 91206e9..addd797 100644
>> --- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
>> +++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
>> @@ -50,6 +50,8 @@ import org.apache.maven.execution.MavenSession;
>> import org.apache.maven.model.Resource;
>> import org.apache.maven.plugin.AbstractMojo;
>> import org.apache.maven.plugin.MojoExecutionException;
>> +import org.apache.maven.plugins.annotations.Component;
>> +import org.apache.maven.plugins.annotations.Parameter;
>> import org.apache.maven.project.MavenProject;
>> import org.apache.maven.repository.RepositorySystem;
>> import org.apache.maven.settings.Proxy;
>> @@ -92,125 +94,98 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
>> private static final String HTTP_PROXY_PASSWORD = "http.proxyPassword";
>>
>>
>> - /**
>> - * @parameter expression="${project.build.outputDirectory}"
>> - * @required
>> - */
>> + @Parameter(property = "project.build.outputDirectory", required = true)
>> protected String classesDirectory;
>>
>> /**
>> * By default all maven dependencies of type "wsdl" are added to the effective wsdlOptions. Setting this
>> * parameter to true disables this functionality
>> - *
>> - * @parameter expression="${cxf.disableDependencyScan}" default-value="false"
>> */
>> + @Parameter(property = "cxf.disableDependencyScan", defaultValue = "false")
>> protected boolean disableDependencyScan;
>> +
>> /**
>> * Disables the scanning of the wsdlRoot/testWsdlRoot directories.
>> * By default, we scan for *.wsdl (see include/exclude params as well) in the wsdlRoot
>> * directories and run the tool on all the wsdls we find. This disables that scan
>> * and requires an explicit wsdlOption to be set for each wsdl that needs to be processed.
>> - * @parameter expression="${cxf.disableDirectoryScan}" default-value="false"
>> */
>> + @Parameter(property = "cxf.disableDirectoryScan", defaultValue = "false")
>> protected boolean disableDirectoryScan;
>> +
>> /**
>> * Allows running the JavaToWs in a separate process. Valid values are "false", "always", and "once" The
>> * value of "true" is equal to "once"
>> - *
>> - * @parameter default-value="false"
>> - * @since 2.4
>> */
>> + @Parameter(defaultValue = "false")
>> protected String fork;
>> +
>> /**
>> * A list of wsdl files to include. Can contain ant-style wildcards and double wildcards. Defaults to
>> * *.wsdl
>> - *
>> - * @parameter
>> */
>> + @Parameter
>> protected String includes[];
>> /**
>> * Directory in which the "DONE" markers are saved that
>> - *
>> - * @parameter expression="${cxf.markerDirectory}"
>> - * default-value="${project.build.directory}/cxf-codegen-plugin-markers"
>> */
>> + @Parameter(property = "cxf.markerDirectory", defaultValue = "${project.build.directory}/cxf-codegen-plugin-markers")
>> protected File markerDirectory;
>> +
>> /**
>> - * The plugin dependencies, needed for the fork mode.
>> - *
>> - * @parameter expression="${plugin.artifacts}"
>> - * @required
>> - * @readonly
>> + * The plugin dependencies, needed for the fork mode
>> */
>> + @Parameter(required = true, readonly = true, property = "plugin.artifacts")
>> protected List<Artifact> pluginArtifacts;
>> - /**
>> - * @parameter expression="${project}"
>> - * @required
>> - */
>> +
>> + @Parameter(required = true, property = "project")
>> protected MavenProject project;
>> +
>> /**
>> * Use the compile classpath rather than the test classpath for execution useful if the test dependencies
>> * clash with those of wsdl2java
>> - *
>> - * @parameter expression="${cxf.useCompileClasspath}" default-value="false"
>> */
>> + @Parameter(property = "cxf.useCompileClasspath", defaultValue = "false")
>> protected boolean useCompileClasspath;
>> +
>> /**
>> * A list of wsdl files to exclude. Can contain ant-style wildcards and double wildcards.
>> - *
>> - * @parameter
>> */
>> + @Parameter
>> protected String excludes[];
>> - /**
>> - * @parameter expression="${cxf.testWsdlRoot}" default-value="${basedir}/src/test/resources/wsdl"
>> - */
>> +
>> + @Parameter(property = "cxf.testWsdlRoot", defaultValue = "${basedir}/src/test/resources/wsdl")
>> protected File testWsdlRoot;
>>
>> - /**
>> - * @parameter expression="${cxf.wsdlRoot}" default-value="${basedir}/src/main/resources/wsdl"
>> - */
>> + @Parameter(property = "cxf.wsdlRoot", defaultValue = "${basedir}/src/main/resources/wsdl")
>> protected File wsdlRoot;
>>
>> - /** @component */
>> + @Component
>> protected BuildContext buildContext;
>>
>>
>> /**
>> * Sets the JVM arguments (i.e. <code>-Xms128m -Xmx128m</code>) if fork is set to <code>true</code>.
>> - *
>> - * @parameter expression="${cxf.codegen.jvmArgs}"
>> - * @since 2.4
>> */
>> + @Parameter(property = "cxf.codegen.jvmArgs")
>> private String additionalJvmArgs;
>>
>> /**
>> * Sets the Java executable to use when fork parameter is <code>true</code>.
>> - *
>> - * @parameter default-value="${java.home}/bin/java"
>> - * @since 2.4
>> */
>> + @Parameter(defaultValue = "${java.home}/bin/java")
>> private String javaExecutable;
>>
>> /**
>> * The Maven session.
>> - *
>> - * @parameter expression="${session}"
>> - * @readonly
>> - * @required
>> */
>> + @Parameter(readonly = true, required = true, property = "session")
>> private MavenSession mavenSession;
>> - /**
>> - * @component
>> - * @readonly
>> - * @required
>> - */
>> +
>> + @Component
>> private ProjectDependenciesResolver projectDependencyResolver;
>>
>> - /**
>> - * @component
>> - * @readonly
>> - * @required
>> - */
>> + @Component
>> private RepositorySystem repositorySystem;
>>
>>
>>
>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
>> ----------------------------------------------------------------------
>> diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
>> index 92e6955..a99b988 100644
>> --- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
>> +++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
>> @@ -47,15 +47,14 @@ import org.apache.cxf.tools.util.OutputStreamCreator;
>> import org.apache.cxf.tools.wsdlto.WSDLToJava;
>> import org.apache.maven.artifact.Artifact;
>> import org.apache.maven.plugin.MojoExecutionException;
>> +import org.apache.maven.plugins.annotations.LifecyclePhase;
>> +import org.apache.maven.plugins.annotations.Mojo;
>> +import org.apache.maven.plugins.annotations.Parameter;
>> +import org.apache.maven.plugins.annotations.ResolutionScope;
>> import org.sonatype.plexus.build.incremental.BuildContext;
>>
>> -/**
>> - * @goal wsdl2java
>> - * @phase generate-sources
>> - * @description CXF WSDL To Java Tool
>> - * @requiresDependencyResolution test
>> - * @threadSafe
>> - */
>> +@Mojo(name = "wsdl2java", defaultPhase = LifecyclePhase.GENERATE_SOURCES, threadSafe = true,
>> + requiresDependencyResolution = ResolutionScope.TEST)
>> public class WSDL2JavaMojo extends AbstractCodegenMoho {
>>
>> final class MavenToolErrorListener extends ToolErrorListener {
>> @@ -125,40 +124,35 @@ public class WSDL2JavaMojo extends AbstractCodegenMoho {
>> }
>> }
>>
>> - /**
>> - * @parameter expression="${cxf.testSourceRoot}"
>> - */
>> + @Parameter(property = "cxf.testSourceRoot")
>> File testSourceRoot;
>>
>> /**
>> * Path where the generated sources should be placed
>> *
>> - * @parameter expression="${cxf.sourceRoot}"
>> - * default-value="${project.build.directory}/generated-sources/cxf"
>> - * @required
>> */
>> + @Parameter(required = true, defaultValue = "${project.build.directory}/generated-sources/cxf",
>> + property = "cxf.sourceRoot")
>> File sourceRoot;
>>
>> /**
>> * Options that specify WSDLs to process and/or control the processing of wsdls.
>> * If you have enabled wsdl scanning, these elements attach options to particular wsdls.
>> * If you have not enabled wsdl scanning, these options call out the wsdls to process.
>> - * @parameter
>> */
>> + @Parameter
>> WsdlOption wsdlOptions[];
>>
>> /**
>> * Default options to be used when a wsdl has not had it's options explicitly specified.
>> - *
>> - * @parameter
>> */
>> + @Parameter
>> Option defaultOptions = new Option();
>>
>> /**
>> * Encoding to use for generated sources
>> - *
>> - * @parameter default-value="${project.build.sourceEncoding}"
>> */
>> + @Parameter(defaultValue = "${project.build.sourceEncoding}")
>> String encoding;
>>
>> /**
>>
>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
>> ----------------------------------------------------------------------
>> diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
>> index 1ba97e3..daee4c9 100644
>> --- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
>> +++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
>> @@ -39,44 +39,38 @@ import org.apache.cxf.tools.common.ToolContext;
>> import org.apache.cxf.tools.wsdlto.javascript.WSDLToJavaScript;
>> import org.apache.maven.artifact.Artifact;
>> import org.apache.maven.plugin.MojoExecutionException;
>> +import org.apache.maven.plugins.annotations.LifecyclePhase;
>> +import org.apache.maven.plugins.annotations.Mojo;
>> +import org.apache.maven.plugins.annotations.Parameter;
>> +import org.apache.maven.plugins.annotations.ResolutionScope;
>> import org.apache.maven.project.MavenProject;
>>
>> -/**
>> - * @goal wsdl2js
>> - * @phase generate-sources
>> - * @description CXF WSDL To JavaScript Tool
>> - * @requiresDependencyResolution test
>> - * @threadSafe
>> - */
>> +@Mojo(name = "wsdl2js", defaultPhase = LifecyclePhase.GENERATE_SOURCES, threadSafe = true,
>> + requiresDependencyResolution = ResolutionScope.TEST)
>> public class WSDL2JavaScriptMojo extends AbstractCodegenMoho {
>>
>> - /**
>> - * @parameter expression="${cxf.testJavascriptRoot}"
>> - */
>> + @Parameter(property = "cxf.testJavascriptRoot")
>> File testSourceRoot;
>>
>> /**
>> * Path where the generated sources should be placed
>> - *
>> - * @parameter expression="${cxf.sourceJavascriptRoot}"
>> - * default-value="${project.build.directory}/generated-sources/cxf-js"
>> - * @required
>> */
>> + @Parameter(required = true, defaultValue = "${project.build.directory}/generated-sources/cxf-js",
>> + property = "cxf.sourceJavascriptRoot")
>> File sourceRoot;
>>
>> /**
>> * Default options to be applied to all of the wsdls.
>> - *
>> - * @parameter
>> */
>> + @Parameter
>> Option defaultOptions = new Option();
>>
>> /**
>> * Options that specify WSDLs to process and/or control the processing of wsdls.
>> * If you have enabled wsdl scanning, these elements attach options to particular wsdls.
>> * If you have not enabled wsdl scanning, these options call out the wsdls to process.
>> - * @parameter
>> */
>> + @Parameter
>> WsdlOption wsdlOptions[];
>>
>> @Override
>>
>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/corba/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/maven-plugins/corba/pom.xml b/maven-plugins/corba/pom.xml
>> index 622932e..bf21633 100644
>> --- a/maven-plugins/corba/pom.xml
>> +++ b/maven-plugins/corba/pom.xml
>> @@ -69,41 +69,4 @@
>> <version>${project.version}</version>
>> </dependency>
>> </dependencies>
>> - <build>
>> - <pluginManagement>
>> - <plugins>
>> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
>> - <plugin>
>> - <groupId>org.eclipse.m2e</groupId>
>> - <artifactId>lifecycle-mapping</artifactId>
>> - <version>1.0.0</version>
>> - <configuration>
>> - <lifecycleMappingMetadata>
>> - <pluginExecutions>
>> - <pluginExecution>
>> - <pluginExecutionFilter>
>> - <groupId>
>> - org.apache.maven.plugins
>> - </groupId>
>> - <artifactId>
>> - maven-plugin-plugin
>> - </artifactId>
>> - <versionRange>
>> - [2.9,)
>> - </versionRange>
>> - <goals>
>> - <goal>descriptor</goal>
>> - </goals>
>> - </pluginExecutionFilter>
>> - <action>
>> - <ignore></ignore>
>> - </action>
>> - </pluginExecution>
>> - </pluginExecutions>
>> - </lifecycleMappingMetadata>
>> - </configuration>
>> - </plugin>
>> - </plugins>
>> - </pluginManagement>
>> - </build>
>> </project>
>>
>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/java2wadl-plugin/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/maven-plugins/java2wadl-plugin/pom.xml b/maven-plugins/java2wadl-plugin/pom.xml
>> index 03ea41e..78da0b1 100644
>> --- a/maven-plugins/java2wadl-plugin/pom.xml
>> +++ b/maven-plugins/java2wadl-plugin/pom.xml
>> @@ -118,6 +118,20 @@
>> <groupId>org.apache.maven.plugins</groupId>
>> <artifactId>maven-javadoc-plugin</artifactId>
>> <version>2.9.1</version>
>> + <exclusions>
>> + <exclusion>
>> + <groupId>org.apache.maven</groupId>
>> + <artifactId>maven-project</artifactId>
>> + </exclusion>
>> + <exclusion>
>> + <groupId>org.apache.maven</groupId>
>> + <artifactId>maven-artifact-manager</artifactId>
>> + </exclusion>
>> + <exclusion>
>> + <groupId>org.apache.maven</groupId>
>> + <artifactId>maven-toolchain</artifactId>
>> + </exclusion>
>> + </exclusions>
>> </dependency>
>>
>> <dependency>
>> @@ -194,42 +208,4 @@
>> </build>
>> </profile>
>> </profiles>
>> -
>> - <build>
>> - <pluginManagement>
>> - <plugins>
>> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
>> - <plugin>
>> - <groupId>org.eclipse.m2e</groupId>
>> - <artifactId>lifecycle-mapping</artifactId>
>> - <version>1.0.0</version>
>> - <configuration>
>> - <lifecycleMappingMetadata>
>> - <pluginExecutions>
>> - <pluginExecution>
>> - <pluginExecutionFilter>
>> - <groupId>
>> - org.apache.maven.plugins
>> - </groupId>
>> - <artifactId>
>> - maven-plugin-plugin
>> - </artifactId>
>> - <versionRange>
>> - [2.9,)
>> - </versionRange>
>> - <goals>
>> - <goal>descriptor</goal>
>> - </goals>
>> - </pluginExecutionFilter>
>> - <action>
>> - <ignore></ignore>
>> - </action>
>> - </pluginExecution>
>> - </pluginExecutions>
>> - </lifecycleMappingMetadata>
>> - </configuration>
>> - </plugin>
>> - </plugins>
>> - </pluginManagement>
>> - </build>
>> </project>
>>
>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
>> ----------------------------------------------------------------------
>> diff --git a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
>> index 9dd47f6..2662b7c 100644
>> --- a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
>> +++ b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
>> @@ -20,18 +20,20 @@ package org.apache.cxf.maven_plugin.javatowadl;
>>
>> import java.io.File;
>> import java.lang.reflect.Field;
>> +import java.lang.reflect.Method;
>> import java.util.List;
>> import java.util.Locale;
>>
>> import org.apache.maven.artifact.Artifact;
>> import org.apache.maven.artifact.repository.ArtifactRepository;
>> import org.apache.maven.artifact.resolver.ArtifactResolver;
>> +import org.apache.maven.plugin.AbstractMojo;
>> import org.apache.maven.plugin.MojoExecutionException;
>> import org.apache.maven.plugin.MojoFailureException;
>> import org.apache.maven.plugin.javadoc.AbstractJavadocMojo;
>> +import org.apache.maven.plugin.javadoc.JavadocReport;
>> import org.apache.maven.plugin.javadoc.options.DocletArtifact;
>> import org.apache.maven.project.MavenProject;
>> -import org.apache.maven.reporting.MavenReportException;
>> import org.apache.maven.toolchain.ToolchainManager;
>> import org.codehaus.plexus.archiver.manager.ArchiverManager;
>>
>> @@ -41,7 +43,7 @@ import org.codehaus.plexus.archiver.manager.ArchiverManager;
>> * @requiresDependencyResolution compile
>> * @threadSafe
>> */
>> -public class ParseJavaDocMojo extends AbstractJavadocMojo {
>> +public class ParseJavaDocMojo extends AbstractMojo {
>>
>> /**
>> * @parameter expression="${project}"
>> @@ -118,24 +120,20 @@ public class ParseJavaDocMojo extends AbstractJavadocMojo {
>>
>> @Override
>> public void execute() throws MojoExecutionException, MojoFailureException {
>> - if (skip) {
>> - getLog().info("Skipping parse javadoc");
>> - return;
>> - }
>> -
>> + AbstractJavadocMojo mojo = new JavadocReport();
>> + Locale locale = Locale.getDefault();
>> try {
>> - Locale locale = Locale.getDefault();
>> Field f = AbstractJavadocMojo.class.getDeclaredField("doclet");
>> f.setAccessible(true);
>> - f.set(this, "org.apache.cxf.maven_plugin.javatowadl.DumpJavaDoc");
>> + f.set(mojo, "org.apache.cxf.maven_plugin.javatowadl.DumpJavaDoc");
>>
>> f = AbstractJavadocMojo.class.getDeclaredField("stylesheet");
>> f.setAccessible(true);
>> - f.set(this, "stylesheet");
>> + f.set(mojo, "stylesheet");
>>
>> f = AbstractJavadocMojo.class.getDeclaredField("javadocOptionsDir");
>> f.setAccessible(true);
>> - f.set(this, javadocOptionsDir);
>> + f.set(mojo, javadocOptionsDir);
>>
>> f = AbstractJavadocMojo.class.getDeclaredField("docletArtifact");
>> f.setAccessible(true);
>> @@ -150,81 +148,68 @@ public class ParseJavaDocMojo extends AbstractJavadocMojo {
>> }
>> }
>> }
>> - f.set(this, docletArtifact);
>> + f.set(mojo, docletArtifact);
>>
>> f = AbstractJavadocMojo.class.getDeclaredField("factory");
>> f.setAccessible(true);
>> - f.set(this, this.mavenArtifactFactory);
>> + f.set(mojo, this.mavenArtifactFactory);
>>
>> f = AbstractJavadocMojo.class.getDeclaredField("mavenProjectBuilder");
>> f.setAccessible(true);
>> - f.set(this, this.mavenProjectBuilder);
>> + f.set(mojo, this.mavenProjectBuilder);
>>
>> f = AbstractJavadocMojo.class.getDeclaredField("resolver");
>> f.setAccessible(true);
>> - f.set(this, this.artifactResolver);
>> + f.set(mojo, this.artifactResolver);
>>
>> f = AbstractJavadocMojo.class.getDeclaredField("archiverManager");
>> f.setAccessible(true);
>> - f.set(this, this.archiverManager);
>> + f.set(mojo, this.archiverManager);
>>
>> f = AbstractJavadocMojo.class.getDeclaredField("artifactMetadataSource");
>> f.setAccessible(true);
>> - f.set(this, this.artifactMetadataSource);
>> + f.set(mojo, this.artifactMetadataSource);
>>
>> f = AbstractJavadocMojo.class.getDeclaredField("toolchainManager");
>> f.setAccessible(true);
>> - f.set(this, this.toolchainManager);
>> + f.set(mojo, this.toolchainManager);
>>
>> f = AbstractJavadocMojo.class.getDeclaredField("localRepository");
>> f.setAccessible(true);
>> - f.set(this, this.localRepository);
>> + f.set(mojo, this.localRepository);
>>
>> f = AbstractJavadocMojo.class.getDeclaredField("remoteRepositories");
>> f.setAccessible(true);
>> - f.set(this, this.remoteRepositories);
>> + f.set(mojo, this.remoteRepositories);
>>
>> f = AbstractJavadocMojo.class.getDeclaredField("applyJavadocSecurityFix");
>> f.setAccessible(true);
>> - f.set(this, false);
>> + f.set(mojo, false);
>>
>> f = AbstractJavadocMojo.class.getDeclaredField("additionalparam");
>> f.setAccessible(true);
>> - f.set(this, "-dumpJavaDocFile " + this.dumpFileOutputDirectory.getAbsolutePath()
>> + f.set(mojo, "-dumpJavaDocFile " + this.dumpFileOutputDirectory.getAbsolutePath()
>> + File.separator + "dumpFile.properties");
>>
>> - useStandardDocletOptions = false;
>> - this.project = mavenProject;
>> - generate(locale);
>> - } catch (Exception e) {
>> - failOnError("An error has occurred in parsing javadoc", e);
>> - }
>> -
>> - }
>> -
>> - private void generate(Locale locale) throws MavenReportException {
>> - try {
>> - outputDirectory = getReportOutputDirectory();
>> - executeReport(locale);
>> - } catch (MavenReportException e) {
>> - if (failOnError) {
>> - throw e;
>> - }
>> - getLog().error("Error while creating javadoc report: " + e.getMessage(), e);
>> - } catch (RuntimeException e) {
>> - if (failOnError) {
>> - throw e;
>> + f = AbstractJavadocMojo.class.getDeclaredField("useStandardDocletOptions");
>> + f.setAccessible(true);
>> + f.set(mojo, false);
>> +
>> + f = AbstractJavadocMojo.class.getDeclaredField("project");
>> + f.setAccessible(true);
>> + f.set(mojo, mavenProject);
>> +
>> + if (dumpFileOutputDirectory != null) {
>> + f = AbstractJavadocMojo.class.getDeclaredField("outputDirectory");
>> + f.setAccessible(true);
>> + f.set(mojo, dumpFileOutputDirectory);
>> }
>> - getLog().error("Error while creating javadoc report: " + e.getMessage(), e);
>> - }
>> - }
>> -
>> - private File getReportOutputDirectory() {
>> - if (dumpFileOutputDirectory == null) {
>> - return outputDirectory;
>> +
>> + Method m = AbstractJavadocMojo.class.getMethod("executeReport", Locale.class);
>> + m.setAccessible(true);
>> + m.invoke(mojo, locale);
>> + } catch (Exception e) {
>> + throw new MojoExecutionException("Failed to generate javadoc", e);
>> }
>> -
>> - return dumpFileOutputDirectory;
>> }
>> -
>> }
>>
>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/java2ws-plugin/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/maven-plugins/java2ws-plugin/pom.xml b/maven-plugins/java2ws-plugin/pom.xml
>> index d3ca92c..73c8ede 100644
>> --- a/maven-plugins/java2ws-plugin/pom.xml
>> +++ b/maven-plugins/java2ws-plugin/pom.xml
>> @@ -77,41 +77,4 @@
>> <version>${project.version}</version>
>> </dependency>
>> </dependencies>
>> - <build>
>> - <pluginManagement>
>> - <plugins>
>> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
>> - <plugin>
>> - <groupId>org.eclipse.m2e</groupId>
>> - <artifactId>lifecycle-mapping</artifactId>
>> - <version>1.0.0</version>
>> - <configuration>
>> - <lifecycleMappingMetadata>
>> - <pluginExecutions>
>> - <pluginExecution>
>> - <pluginExecutionFilter>
>> - <groupId>
>> - org.apache.maven.plugins
>> - </groupId>
>> - <artifactId>
>> - maven-plugin-plugin
>> - </artifactId>
>> - <versionRange>
>> - [2.9,)
>> - </versionRange>
>> - <goals>
>> - <goal>descriptor</goal>
>> - </goals>
>> - </pluginExecutionFilter>
>> - <action>
>> - <ignore></ignore>
>> - </action>
>> - </pluginExecution>
>> - </pluginExecutions>
>> - </lifecycleMappingMetadata>
>> - </configuration>
>> - </plugin>
>> - </plugins>
>> - </pluginManagement>
>> - </build>
>> </project>
>>
>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
>> index 8a6f19b..57db354 100644
>> --- a/maven-plugins/pom.xml
>> +++ b/maven-plugins/pom.xml
>> @@ -39,24 +39,4 @@
>> <module>corba</module>
>> <module>archetypes</module>
>> </modules>
>> - <build>
>> - <pluginManagement>
>> - <plugins>
>> - <plugin>
>> - <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-plugin-plugin</artifactId>
>> - <version>2.9</version>
>> - </plugin>
>> - </plugins>
>> - </pluginManagement>
>> - </build>
>> - <reporting>
>> - <plugins>
>> - <plugin>
>> - <groupId>org.apache.maven.plugins</groupId>
>> - <artifactId>maven-plugin-plugin</artifactId>
>> - <version>2.9</version>
>> - </plugin>
>> - </plugins>
>> - </reporting>
>> </project>
>>
>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/wadl2java-plugin/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/maven-plugins/wadl2java-plugin/pom.xml b/maven-plugins/wadl2java-plugin/pom.xml
>> index 092d859..1e10e63 100644
>> --- a/maven-plugins/wadl2java-plugin/pom.xml
>> +++ b/maven-plugins/wadl2java-plugin/pom.xml
>> @@ -56,6 +56,11 @@
>> <scope>provided</scope>
>> </dependency>
>> <dependency>
>> + <groupId>org.apache.maven.plugin-tools</groupId>
>> + <artifactId>maven-plugin-annotations</artifactId>
>> + <scope>provided</scope>
>> + </dependency>
>> + <dependency>
>> <groupId>org.codehaus.plexus</groupId>
>> <artifactId>plexus-utils</artifactId>
>> <version>2.0.5</version>
>> @@ -122,41 +127,4 @@
>> </dependencies>
>> </profile>
>> </profiles>
>> - <build>
>> - <pluginManagement>
>> - <plugins>
>> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
>> - <plugin>
>> - <groupId>org.eclipse.m2e</groupId>
>> - <artifactId>lifecycle-mapping</artifactId>
>> - <version>1.0.0</version>
>> - <configuration>
>> - <lifecycleMappingMetadata>
>> - <pluginExecutions>
>> - <pluginExecution>
>> - <pluginExecutionFilter>
>> - <groupId>
>> - org.apache.maven.plugins
>> - </groupId>
>> - <artifactId>
>> - maven-plugin-plugin
>> - </artifactId>
>> - <versionRange>
>> - [2.9,)
>> - </versionRange>
>> - <goals>
>> - <goal>descriptor</goal>
>> - </goals>
>> - </pluginExecutionFilter>
>> - <action>
>> - <ignore></ignore>
>> - </action>
>> - </pluginExecution>
>> - </pluginExecutions>
>> - </lifecycleMappingMetadata>
>> - </configuration>
>> - </plugin>
>> - </plugins>
>> - </pluginManagement>
>> - </build>
>> </project>
>>
>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
>> ----------------------------------------------------------------------
>> diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
>> index fe5454d..16e7f84 100644
>> --- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
>> +++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
>> @@ -47,6 +47,8 @@ import org.apache.maven.execution.MavenSession;
>> import org.apache.maven.model.Resource;
>> import org.apache.maven.plugin.AbstractMojo;
>> import org.apache.maven.plugin.MojoExecutionException;
>> +import org.apache.maven.plugins.annotations.Component;
>> +import org.apache.maven.plugins.annotations.Parameter;
>> import org.apache.maven.project.MavenProject;
>> import org.apache.maven.repository.RepositorySystem;
>> import org.codehaus.plexus.archiver.jar.JarArchiver;
>> @@ -60,54 +62,42 @@ import org.codehaus.plexus.util.cli.Commandline;
>> public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
>>
>> /**
>> - * @parameter expression="${cxf.testSourceRoot}"
>> + * Source Root
>> */
>> + @Parameter(property = "cxf.testSourceRoot")
>> File testSourceRoot;
>>
>> /**
>> * Path where the generated sources should be placed
>> - *
>> - * @parameter expression="${cxf.sourceRoot}"
>> - * default-value="${project.build.directory}/generated-sources/cxf"
>> - * @required
>> */
>> + @Parameter(required = true,
>> + property = "cxf.sourceRoot",
>> + defaultValue = "${project.build.directory}/generated-sources/cxf")
>> File sourceRoot;
>>
>> - /**
>> - * @parameter expression="${project.build.outputDirectory}"
>> - * @required
>> - */
>> + @Parameter(required = true, property = "project.build.outputDirectory")
>> String classesDirectory;
>>
>> - /**
>> - * @parameter expression="${project}"
>> - * @required
>> - */
>> + @Parameter(required = true, property = "project")
>> MavenProject project;
>>
>> /**
>> * Default options to be used when a wadl has not had it's options explicitly specified.
>> - *
>> - * @parameter
>> */
>> + @Parameter
>> Option defaultOptions = new Option();
>>
>> -
>> -
>> /**
>> * Directory in which the "DONE" markers are saved that
>> - *
>> - * @parameter expression="${cxf.markerDirectory}"
>> - * default-value="${project.build.directory}/cxf-codegen-plugin-markers"
>> */
>> + @Parameter(property = "cxf.markerDirectory", defaultValue = "${project.build.directory}/cxf-codegen-plugin-markers")
>> File markerDirectory;
>>
>> /**
>> * Use the compile classpath rather than the test classpath for execution useful if the test dependencies
>> * clash with those of wadl2java
>> - *
>> - * @parameter expression="${cxf.useCompileClasspath}" default-value="false"
>> */
>> + @Parameter(property = "cxf.useCompileClasspath", defaultValue = "false")
>> boolean useCompileClasspath;
>>
>>
>> @@ -116,94 +106,69 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
>> * By default, we scan for *.wadl (see include/exclude params as well) in the wadlRoot
>> * directories and run wadl2java on all the wadl's we find. This disables that scan
>> * and requires an explicit wadlOption to be set for each wadl that needs to be processed.
>> - * @parameter expression="${cxf.disableDirectoryScan}" default-value="false"
>> */
>> + @Parameter(property = "cxf.disableDirectoryScan", defaultValue = "false")
>> boolean disableDirectoryScan;
>>
>> /**
>> * By default all maven dependencies of type "wadl" are added to the effective wadlOptions. Setting this
>> * parameter to true disables this functionality
>> - *
>> - * @parameter expression="${cxf.disableDependencyScan}" default-value="false"
>> */
>> + @Parameter(property = "cxf.disableDependencyScan", defaultValue = "false")
>> boolean disableDependencyScan;
>>
>> /**
>> * A list of wadl files to include. Can contain ant-style wildcards and double wildcards. Defaults to
>> * *.wadl
>> - *
>> - * @parameter
>> */
>> + @Parameter
>> String includes[];
>>
>> /**
>> * A list of wadl files to exclude. Can contain ant-style wildcards and double wildcards.
>> - *
>> - * @parameter
>> */
>> + @Parameter
>> String excludes[];
>>
>> /**
>> * Allows running the JavaToWs in a separate process.
>> * Valid values are "false", "always", and "once"
>> * The value of "true" is equal to "once"
>> - *
>> - * @parameter default-value="false"
>> - * @since 2.4
>> */
>> + @Parameter(defaultValue = "false")
>> String fork;
>>
>> /**
>> * The Maven session.
>> - *
>> - * @parameter expression="${session}"
>> - * @readonly
>> - * @required
>> */
>> + @Parameter(readonly = true, required = true, property = "session")
>> private MavenSession mavenSession;
>>
>> /**
>> * The plugin dependencies, needed for the fork mode.
>> - *
>> - * @parameter expression="${plugin.artifacts}"
>> - * @required
>> - * @readonly
>> */
>> + @Parameter(readonly = true, required = true, property = "plugin.artifacts")
>> private List<Artifact> pluginArtifacts;
>>
>>
>> /**
>> * Sets the Java executable to use when fork parameter is <code>true</code>.
>> - *
>> - * @parameter default-value="${java.home}/bin/java"
>> - * @since 2.4
>> */
>> + @Parameter(defaultValue = "${java.home}/bin/java")
>> private String javaExecutable;
>>
>> /**
>> * Sets the JVM arguments (i.e. <code>-Xms128m -Xmx128m</code>) if fork is set to <code>true</code>.
>> - *
>> - * @parameter
>> - * @since 2.4
>> */
>> + @Parameter
>> private String additionalJvmArgs;
>>
>> - /**
>> - * @component
>> - * @readonly
>> - * @required
>> - */
>> + @Component
>> private RepositorySystem repositorySystem;
>>
>>
>> private ClassLoader resourceClassLoader;
>> -
>> - /**
>> - * Merge WadlOptions that point to the same file by adding the extraargs to the first option and deleting
>> - * the second from the options list
>> - *
>> - * @param options
>> - */
>> +
>>
>> private Artifact resolveRemoteWadlArtifact(Artifact artifact)
>> throws MojoExecutionException {
>>
>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
>> ----------------------------------------------------------------------
>> diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
>> index 58503b9..c8280f2 100644
>> --- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
>> +++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
>> @@ -28,34 +28,31 @@ import java.util.Set;
>> import org.apache.cxf.Bus;
>> import org.apache.cxf.maven_plugin.common.ClassLoaderSwitcher;
>> import org.apache.maven.plugin.MojoExecutionException;
>> +import org.apache.maven.plugins.annotations.Component;
>> +import org.apache.maven.plugins.annotations.LifecyclePhase;
>> +import org.apache.maven.plugins.annotations.Mojo;
>> +import org.apache.maven.plugins.annotations.Parameter;
>> +import org.apache.maven.plugins.annotations.ResolutionScope;
>> import org.sonatype.plexus.build.incremental.BuildContext;
>>
>>
>> /**
>> - * @goal wadl2java
>> - * @phase generate-sources
>> - * @description CXF WADL To Java Tool
>> - * @requiresDependencyResolution test
>> - * @threadSafe
>> + * CXF WADL To Java Tool
>> */
>> +@Mojo(name = "wadl2java", defaultPhase = LifecyclePhase.GENERATE_SOURCES, threadSafe = true,
>> + requiresDependencyResolution = ResolutionScope.TEST)
>> public class WADL2JavaMojo extends AbstractCodeGeneratorMojo {
>> - /**
>> - * @parameter
>> - */
>> - WadlOption wadlOptions[];
>> + @Parameter
>> + WadlOption wadlOptions[];
>>
>> - /**
>> - * @parameter expression="${cxf.wadlRoot}" default-value="${basedir}/src/main/resources/wadl"
>> - */
>> + @Parameter(property = "cxf.wadlRoot", defaultValue = "${basedir}/src/main/resources/wad")
>> File wadlRoot;
>>
>> - /**
>> - * @parameter expression="${cxf.testWadlRoot}" default-value="${basedir}/src/test/resources/wadl"
>> - */
>> + @Parameter(property = "cxf.testWadlRoot", defaultValue = "${basedir}/src/test/resources/wadl")
>> File testWadlRoot;
>>
>>
>> - /** @component */
>> + @Component
>> BuildContext buildContext;
>>
>> private void mergeOptions(List<WadlOption> effectiveOptions) {
>>
>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/wsdl-validator-plugin/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/maven-plugins/wsdl-validator-plugin/pom.xml b/maven-plugins/wsdl-validator-plugin/pom.xml
>> index afa83f9..12658aa 100644
>> --- a/maven-plugins/wsdl-validator-plugin/pom.xml
>> +++ b/maven-plugins/wsdl-validator-plugin/pom.xml
>> @@ -56,41 +56,4 @@
>> <version>${project.version}</version>
>> </dependency>
>> </dependencies>
>> - <build>
>> - <pluginManagement>
>> - <plugins>
>> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
>> - <plugin>
>> - <groupId>org.eclipse.m2e</groupId>
>> - <artifactId>lifecycle-mapping</artifactId>
>> - <version>1.0.0</version>
>> - <configuration>
>> - <lifecycleMappingMetadata>
>> - <pluginExecutions>
>> - <pluginExecution>
>> - <pluginExecutionFilter>
>> - <groupId>
>> - org.apache.maven.plugins
>> - </groupId>
>> - <artifactId>
>> - maven-plugin-plugin
>> - </artifactId>
>> - <versionRange>
>> - [2.9,)
>> - </versionRange>
>> - <goals>
>> - <goal>descriptor</goal>
>> - </goals>
>> - </pluginExecutionFilter>
>> - <action>
>> - <ignore></ignore>
>> - </action>
>> - </pluginExecution>
>> - </pluginExecutions>
>> - </lifecycleMappingMetadata>
>> - </configuration>
>> - </plugin>
>> - </plugins>
>> - </pluginManagement>
>> - </build>
>> </project>
>>
>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/parent/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/parent/pom.xml b/parent/pom.xml
>> index 0d2678c..5d1f914 100644
>> --- a/parent/pom.xml
>> +++ b/parent/pom.xml
>> @@ -724,6 +724,18 @@
>> </exclusions>
>> </dependency>
>> <dependency>
>> + <groupId>org.apache.maven.plugin-tools</groupId>
>> + <artifactId>maven-plugin-annotations</artifactId>
>> + <version>3.4</version>
>> + <scope>provided</scope>
>> + <exclusions>
>> + <exclusion>
>> + <groupId>junit</groupId>
>> + <artifactId>junit</artifactId>
>> + </exclusion>
>> + </exclusions>
>> + </dependency>
>> + <dependency>
>> <groupId>org.apache.mina</groupId>
>> <artifactId>mina-core</artifactId>
>> <version>${cxf.mina.version}</version>
>>
>> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/pom.xml b/pom.xml
>> index 0873d69..31debe6 100644
>> --- a/pom.xml
>> +++ b/pom.xml
>> @@ -615,6 +615,37 @@
>> </dependency>
>> </dependencies>
>> </plugin>
>> + <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
>> + <plugin>
>> + <groupId>org.eclipse.m2e</groupId>
>> + <artifactId>lifecycle-mapping</artifactId>
>> + <version>1.0.0</version>
>> + <configuration>
>> + <lifecycleMappingMetadata>
>> + <pluginExecutions>
>> + <pluginExecution>
>> + <pluginExecutionFilter>
>> + <groupId>
>> + org.apache.maven.plugins
>> + </groupId>
>> + <artifactId>
>> + maven-plugin-plugin
>> + </artifactId>
>> + <versionRange>
>> + [3.4,)
>> + </versionRange>
>> + <goals>
>> + <goal>descriptor</goal>
>> + </goals>
>> + </pluginExecutionFilter>
>> + <action>
>> + <ignore></ignore>
>> + </action>
>> + </pluginExecution>
>> + </pluginExecutions>
>> + </lifecycleMappingMetadata>
>> + </configuration>
>> + </plugin>
>> </plugins>
>> </pluginManagement>
>> </build>
>>
--
Alessio Soldano
Web Service Lead, JBoss
Re: [1/5] cxf git commit: Update plugins to use annotations instead
of the javadoc things
Posted by Aki Yoshida <el...@gmail.com>.
It looks like this commit has broken cxf-codegen-plugin in trunk.
[INFO] Apache CXF Command Line Tools WSDL to JavaScript Front End
SUCCESS [2.062s]
[INFO] Apache CXF Command Line Tools WSDLTo JAXB Databinding SUCCESS [1.981s]
[INFO] Apache CXF Maven Plugins .......................... SUCCESS [0.057s]
[INFO] Apache CXF WSDL Validator Maven2 Plugin ........... SUCCESS [1.751s]
[INFO] Apache CXF Code Generation Maven2 Plugins ......... FAILURE [0.784s]
[INFO] Apache CXF Test Utilities ......................... SKIPPED
...
Does anyone know how to fix it or do we have to wait for Dan?
I just temporarily synch'ed my local branch to one commit earlier to
get the build run.
regards, aki
2015-02-02 19:59 GMT+01:00 <dk...@apache.org>:
> Repository: cxf
> Updated Branches:
> refs/heads/master 27e877346 -> 96ed80508
>
>
> Update plugins to use annotations instead of the javadoc things
>
>
> Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
> Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/96ed8050
> Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/96ed8050
> Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/96ed8050
>
> Branch: refs/heads/master
> Commit: 96ed80508cf15f7dc8c2d5a73225a36dbc096ee2
> Parents: bfbc0a2
> Author: Daniel Kulp <dk...@apache.org>
> Authored: Mon Feb 2 13:58:09 2015 -0500
> Committer: Daniel Kulp <dk...@apache.org>
> Committed: Mon Feb 2 13:58:43 2015 -0500
>
> ----------------------------------------------------------------------
> maven-plugins/codegen-plugin/pom.xml | 42 ++-------
> .../cxf/maven_plugin/AbstractCodegenMoho.java | 85 +++++++-----------
> .../maven_plugin/wsdl2java/WSDL2JavaMojo.java | 30 +++----
> .../wsdl2js/WSDL2JavaScriptMojo.java | 28 +++---
> maven-plugins/corba/pom.xml | 37 --------
> maven-plugins/java2wadl-plugin/pom.xml | 52 +++--------
> .../javatowadl/ParseJavaDocMojo.java | 91 ++++++++------------
> maven-plugins/java2ws-plugin/pom.xml | 37 --------
> maven-plugins/pom.xml | 20 -----
> maven-plugins/wadl2java-plugin/pom.xml | 42 ++-------
> .../wadlto/AbstractCodeGeneratorMojo.java | 81 +++++------------
> .../cxf/maven_plugin/wadlto/WADL2JavaMojo.java | 29 +++----
> maven-plugins/wsdl-validator-plugin/pom.xml | 37 --------
> parent/pom.xml | 12 +++
> pom.xml | 31 +++++++
> 15 files changed, 194 insertions(+), 460 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/codegen-plugin/pom.xml
> ----------------------------------------------------------------------
> diff --git a/maven-plugins/codegen-plugin/pom.xml b/maven-plugins/codegen-plugin/pom.xml
> index 521d097..0259a06 100644
> --- a/maven-plugins/codegen-plugin/pom.xml
> +++ b/maven-plugins/codegen-plugin/pom.xml
> @@ -56,6 +56,11 @@
> <scope>provided</scope>
> </dependency>
> <dependency>
> + <groupId>org.apache.maven.plugin-tools</groupId>
> + <artifactId>maven-plugin-annotations</artifactId>
> + <scope>provided</scope>
> + </dependency>
> + <dependency>
> <groupId>org.codehaus.plexus</groupId>
> <artifactId>plexus-utils</artifactId>
> <version>2.0.5</version>
> @@ -148,41 +153,4 @@
> </dependencies>
> </profile>
> </profiles>
> - <build>
> - <pluginManagement>
> - <plugins>
> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
> - <plugin>
> - <groupId>org.eclipse.m2e</groupId>
> - <artifactId>lifecycle-mapping</artifactId>
> - <version>1.0.0</version>
> - <configuration>
> - <lifecycleMappingMetadata>
> - <pluginExecutions>
> - <pluginExecution>
> - <pluginExecutionFilter>
> - <groupId>
> - org.apache.maven.plugins
> - </groupId>
> - <artifactId>
> - maven-plugin-plugin
> - </artifactId>
> - <versionRange>
> - [2.9,)
> - </versionRange>
> - <goals>
> - <goal>descriptor</goal>
> - </goals>
> - </pluginExecutionFilter>
> - <action>
> - <ignore></ignore>
> - </action>
> - </pluginExecution>
> - </pluginExecutions>
> - </lifecycleMappingMetadata>
> - </configuration>
> - </plugin>
> - </plugins>
> - </pluginManagement>
> - </build>
> </project>
>
> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
> ----------------------------------------------------------------------
> diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
> index 91206e9..addd797 100644
> --- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
> +++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
> @@ -50,6 +50,8 @@ import org.apache.maven.execution.MavenSession;
> import org.apache.maven.model.Resource;
> import org.apache.maven.plugin.AbstractMojo;
> import org.apache.maven.plugin.MojoExecutionException;
> +import org.apache.maven.plugins.annotations.Component;
> +import org.apache.maven.plugins.annotations.Parameter;
> import org.apache.maven.project.MavenProject;
> import org.apache.maven.repository.RepositorySystem;
> import org.apache.maven.settings.Proxy;
> @@ -92,125 +94,98 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
> private static final String HTTP_PROXY_PASSWORD = "http.proxyPassword";
>
>
> - /**
> - * @parameter expression="${project.build.outputDirectory}"
> - * @required
> - */
> + @Parameter(property = "project.build.outputDirectory", required = true)
> protected String classesDirectory;
>
> /**
> * By default all maven dependencies of type "wsdl" are added to the effective wsdlOptions. Setting this
> * parameter to true disables this functionality
> - *
> - * @parameter expression="${cxf.disableDependencyScan}" default-value="false"
> */
> + @Parameter(property = "cxf.disableDependencyScan", defaultValue = "false")
> protected boolean disableDependencyScan;
> +
> /**
> * Disables the scanning of the wsdlRoot/testWsdlRoot directories.
> * By default, we scan for *.wsdl (see include/exclude params as well) in the wsdlRoot
> * directories and run the tool on all the wsdls we find. This disables that scan
> * and requires an explicit wsdlOption to be set for each wsdl that needs to be processed.
> - * @parameter expression="${cxf.disableDirectoryScan}" default-value="false"
> */
> + @Parameter(property = "cxf.disableDirectoryScan", defaultValue = "false")
> protected boolean disableDirectoryScan;
> +
> /**
> * Allows running the JavaToWs in a separate process. Valid values are "false", "always", and "once" The
> * value of "true" is equal to "once"
> - *
> - * @parameter default-value="false"
> - * @since 2.4
> */
> + @Parameter(defaultValue = "false")
> protected String fork;
> +
> /**
> * A list of wsdl files to include. Can contain ant-style wildcards and double wildcards. Defaults to
> * *.wsdl
> - *
> - * @parameter
> */
> + @Parameter
> protected String includes[];
> /**
> * Directory in which the "DONE" markers are saved that
> - *
> - * @parameter expression="${cxf.markerDirectory}"
> - * default-value="${project.build.directory}/cxf-codegen-plugin-markers"
> */
> + @Parameter(property = "cxf.markerDirectory", defaultValue = "${project.build.directory}/cxf-codegen-plugin-markers")
> protected File markerDirectory;
> +
> /**
> - * The plugin dependencies, needed for the fork mode.
> - *
> - * @parameter expression="${plugin.artifacts}"
> - * @required
> - * @readonly
> + * The plugin dependencies, needed for the fork mode
> */
> + @Parameter(required = true, readonly = true, property = "plugin.artifacts")
> protected List<Artifact> pluginArtifacts;
> - /**
> - * @parameter expression="${project}"
> - * @required
> - */
> +
> + @Parameter(required = true, property = "project")
> protected MavenProject project;
> +
> /**
> * Use the compile classpath rather than the test classpath for execution useful if the test dependencies
> * clash with those of wsdl2java
> - *
> - * @parameter expression="${cxf.useCompileClasspath}" default-value="false"
> */
> + @Parameter(property = "cxf.useCompileClasspath", defaultValue = "false")
> protected boolean useCompileClasspath;
> +
> /**
> * A list of wsdl files to exclude. Can contain ant-style wildcards and double wildcards.
> - *
> - * @parameter
> */
> + @Parameter
> protected String excludes[];
> - /**
> - * @parameter expression="${cxf.testWsdlRoot}" default-value="${basedir}/src/test/resources/wsdl"
> - */
> +
> + @Parameter(property = "cxf.testWsdlRoot", defaultValue = "${basedir}/src/test/resources/wsdl")
> protected File testWsdlRoot;
>
> - /**
> - * @parameter expression="${cxf.wsdlRoot}" default-value="${basedir}/src/main/resources/wsdl"
> - */
> + @Parameter(property = "cxf.wsdlRoot", defaultValue = "${basedir}/src/main/resources/wsdl")
> protected File wsdlRoot;
>
> - /** @component */
> + @Component
> protected BuildContext buildContext;
>
>
> /**
> * Sets the JVM arguments (i.e. <code>-Xms128m -Xmx128m</code>) if fork is set to <code>true</code>.
> - *
> - * @parameter expression="${cxf.codegen.jvmArgs}"
> - * @since 2.4
> */
> + @Parameter(property = "cxf.codegen.jvmArgs")
> private String additionalJvmArgs;
>
> /**
> * Sets the Java executable to use when fork parameter is <code>true</code>.
> - *
> - * @parameter default-value="${java.home}/bin/java"
> - * @since 2.4
> */
> + @Parameter(defaultValue = "${java.home}/bin/java")
> private String javaExecutable;
>
> /**
> * The Maven session.
> - *
> - * @parameter expression="${session}"
> - * @readonly
> - * @required
> */
> + @Parameter(readonly = true, required = true, property = "session")
> private MavenSession mavenSession;
> - /**
> - * @component
> - * @readonly
> - * @required
> - */
> +
> + @Component
> private ProjectDependenciesResolver projectDependencyResolver;
>
> - /**
> - * @component
> - * @readonly
> - * @required
> - */
> + @Component
> private RepositorySystem repositorySystem;
>
>
>
> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
> ----------------------------------------------------------------------
> diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
> index 92e6955..a99b988 100644
> --- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
> +++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
> @@ -47,15 +47,14 @@ import org.apache.cxf.tools.util.OutputStreamCreator;
> import org.apache.cxf.tools.wsdlto.WSDLToJava;
> import org.apache.maven.artifact.Artifact;
> import org.apache.maven.plugin.MojoExecutionException;
> +import org.apache.maven.plugins.annotations.LifecyclePhase;
> +import org.apache.maven.plugins.annotations.Mojo;
> +import org.apache.maven.plugins.annotations.Parameter;
> +import org.apache.maven.plugins.annotations.ResolutionScope;
> import org.sonatype.plexus.build.incremental.BuildContext;
>
> -/**
> - * @goal wsdl2java
> - * @phase generate-sources
> - * @description CXF WSDL To Java Tool
> - * @requiresDependencyResolution test
> - * @threadSafe
> - */
> +@Mojo(name = "wsdl2java", defaultPhase = LifecyclePhase.GENERATE_SOURCES, threadSafe = true,
> + requiresDependencyResolution = ResolutionScope.TEST)
> public class WSDL2JavaMojo extends AbstractCodegenMoho {
>
> final class MavenToolErrorListener extends ToolErrorListener {
> @@ -125,40 +124,35 @@ public class WSDL2JavaMojo extends AbstractCodegenMoho {
> }
> }
>
> - /**
> - * @parameter expression="${cxf.testSourceRoot}"
> - */
> + @Parameter(property = "cxf.testSourceRoot")
> File testSourceRoot;
>
> /**
> * Path where the generated sources should be placed
> *
> - * @parameter expression="${cxf.sourceRoot}"
> - * default-value="${project.build.directory}/generated-sources/cxf"
> - * @required
> */
> + @Parameter(required = true, defaultValue = "${project.build.directory}/generated-sources/cxf",
> + property = "cxf.sourceRoot")
> File sourceRoot;
>
> /**
> * Options that specify WSDLs to process and/or control the processing of wsdls.
> * If you have enabled wsdl scanning, these elements attach options to particular wsdls.
> * If you have not enabled wsdl scanning, these options call out the wsdls to process.
> - * @parameter
> */
> + @Parameter
> WsdlOption wsdlOptions[];
>
> /**
> * Default options to be used when a wsdl has not had it's options explicitly specified.
> - *
> - * @parameter
> */
> + @Parameter
> Option defaultOptions = new Option();
>
> /**
> * Encoding to use for generated sources
> - *
> - * @parameter default-value="${project.build.sourceEncoding}"
> */
> + @Parameter(defaultValue = "${project.build.sourceEncoding}")
> String encoding;
>
> /**
>
> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
> ----------------------------------------------------------------------
> diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
> index 1ba97e3..daee4c9 100644
> --- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
> +++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
> @@ -39,44 +39,38 @@ import org.apache.cxf.tools.common.ToolContext;
> import org.apache.cxf.tools.wsdlto.javascript.WSDLToJavaScript;
> import org.apache.maven.artifact.Artifact;
> import org.apache.maven.plugin.MojoExecutionException;
> +import org.apache.maven.plugins.annotations.LifecyclePhase;
> +import org.apache.maven.plugins.annotations.Mojo;
> +import org.apache.maven.plugins.annotations.Parameter;
> +import org.apache.maven.plugins.annotations.ResolutionScope;
> import org.apache.maven.project.MavenProject;
>
> -/**
> - * @goal wsdl2js
> - * @phase generate-sources
> - * @description CXF WSDL To JavaScript Tool
> - * @requiresDependencyResolution test
> - * @threadSafe
> - */
> +@Mojo(name = "wsdl2js", defaultPhase = LifecyclePhase.GENERATE_SOURCES, threadSafe = true,
> + requiresDependencyResolution = ResolutionScope.TEST)
> public class WSDL2JavaScriptMojo extends AbstractCodegenMoho {
>
> - /**
> - * @parameter expression="${cxf.testJavascriptRoot}"
> - */
> + @Parameter(property = "cxf.testJavascriptRoot")
> File testSourceRoot;
>
> /**
> * Path where the generated sources should be placed
> - *
> - * @parameter expression="${cxf.sourceJavascriptRoot}"
> - * default-value="${project.build.directory}/generated-sources/cxf-js"
> - * @required
> */
> + @Parameter(required = true, defaultValue = "${project.build.directory}/generated-sources/cxf-js",
> + property = "cxf.sourceJavascriptRoot")
> File sourceRoot;
>
> /**
> * Default options to be applied to all of the wsdls.
> - *
> - * @parameter
> */
> + @Parameter
> Option defaultOptions = new Option();
>
> /**
> * Options that specify WSDLs to process and/or control the processing of wsdls.
> * If you have enabled wsdl scanning, these elements attach options to particular wsdls.
> * If you have not enabled wsdl scanning, these options call out the wsdls to process.
> - * @parameter
> */
> + @Parameter
> WsdlOption wsdlOptions[];
>
> @Override
>
> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/corba/pom.xml
> ----------------------------------------------------------------------
> diff --git a/maven-plugins/corba/pom.xml b/maven-plugins/corba/pom.xml
> index 622932e..bf21633 100644
> --- a/maven-plugins/corba/pom.xml
> +++ b/maven-plugins/corba/pom.xml
> @@ -69,41 +69,4 @@
> <version>${project.version}</version>
> </dependency>
> </dependencies>
> - <build>
> - <pluginManagement>
> - <plugins>
> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
> - <plugin>
> - <groupId>org.eclipse.m2e</groupId>
> - <artifactId>lifecycle-mapping</artifactId>
> - <version>1.0.0</version>
> - <configuration>
> - <lifecycleMappingMetadata>
> - <pluginExecutions>
> - <pluginExecution>
> - <pluginExecutionFilter>
> - <groupId>
> - org.apache.maven.plugins
> - </groupId>
> - <artifactId>
> - maven-plugin-plugin
> - </artifactId>
> - <versionRange>
> - [2.9,)
> - </versionRange>
> - <goals>
> - <goal>descriptor</goal>
> - </goals>
> - </pluginExecutionFilter>
> - <action>
> - <ignore></ignore>
> - </action>
> - </pluginExecution>
> - </pluginExecutions>
> - </lifecycleMappingMetadata>
> - </configuration>
> - </plugin>
> - </plugins>
> - </pluginManagement>
> - </build>
> </project>
>
> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/java2wadl-plugin/pom.xml
> ----------------------------------------------------------------------
> diff --git a/maven-plugins/java2wadl-plugin/pom.xml b/maven-plugins/java2wadl-plugin/pom.xml
> index 03ea41e..78da0b1 100644
> --- a/maven-plugins/java2wadl-plugin/pom.xml
> +++ b/maven-plugins/java2wadl-plugin/pom.xml
> @@ -118,6 +118,20 @@
> <groupId>org.apache.maven.plugins</groupId>
> <artifactId>maven-javadoc-plugin</artifactId>
> <version>2.9.1</version>
> + <exclusions>
> + <exclusion>
> + <groupId>org.apache.maven</groupId>
> + <artifactId>maven-project</artifactId>
> + </exclusion>
> + <exclusion>
> + <groupId>org.apache.maven</groupId>
> + <artifactId>maven-artifact-manager</artifactId>
> + </exclusion>
> + <exclusion>
> + <groupId>org.apache.maven</groupId>
> + <artifactId>maven-toolchain</artifactId>
> + </exclusion>
> + </exclusions>
> </dependency>
>
> <dependency>
> @@ -194,42 +208,4 @@
> </build>
> </profile>
> </profiles>
> -
> - <build>
> - <pluginManagement>
> - <plugins>
> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
> - <plugin>
> - <groupId>org.eclipse.m2e</groupId>
> - <artifactId>lifecycle-mapping</artifactId>
> - <version>1.0.0</version>
> - <configuration>
> - <lifecycleMappingMetadata>
> - <pluginExecutions>
> - <pluginExecution>
> - <pluginExecutionFilter>
> - <groupId>
> - org.apache.maven.plugins
> - </groupId>
> - <artifactId>
> - maven-plugin-plugin
> - </artifactId>
> - <versionRange>
> - [2.9,)
> - </versionRange>
> - <goals>
> - <goal>descriptor</goal>
> - </goals>
> - </pluginExecutionFilter>
> - <action>
> - <ignore></ignore>
> - </action>
> - </pluginExecution>
> - </pluginExecutions>
> - </lifecycleMappingMetadata>
> - </configuration>
> - </plugin>
> - </plugins>
> - </pluginManagement>
> - </build>
> </project>
>
> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
> ----------------------------------------------------------------------
> diff --git a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
> index 9dd47f6..2662b7c 100644
> --- a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
> +++ b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
> @@ -20,18 +20,20 @@ package org.apache.cxf.maven_plugin.javatowadl;
>
> import java.io.File;
> import java.lang.reflect.Field;
> +import java.lang.reflect.Method;
> import java.util.List;
> import java.util.Locale;
>
> import org.apache.maven.artifact.Artifact;
> import org.apache.maven.artifact.repository.ArtifactRepository;
> import org.apache.maven.artifact.resolver.ArtifactResolver;
> +import org.apache.maven.plugin.AbstractMojo;
> import org.apache.maven.plugin.MojoExecutionException;
> import org.apache.maven.plugin.MojoFailureException;
> import org.apache.maven.plugin.javadoc.AbstractJavadocMojo;
> +import org.apache.maven.plugin.javadoc.JavadocReport;
> import org.apache.maven.plugin.javadoc.options.DocletArtifact;
> import org.apache.maven.project.MavenProject;
> -import org.apache.maven.reporting.MavenReportException;
> import org.apache.maven.toolchain.ToolchainManager;
> import org.codehaus.plexus.archiver.manager.ArchiverManager;
>
> @@ -41,7 +43,7 @@ import org.codehaus.plexus.archiver.manager.ArchiverManager;
> * @requiresDependencyResolution compile
> * @threadSafe
> */
> -public class ParseJavaDocMojo extends AbstractJavadocMojo {
> +public class ParseJavaDocMojo extends AbstractMojo {
>
> /**
> * @parameter expression="${project}"
> @@ -118,24 +120,20 @@ public class ParseJavaDocMojo extends AbstractJavadocMojo {
>
> @Override
> public void execute() throws MojoExecutionException, MojoFailureException {
> - if (skip) {
> - getLog().info("Skipping parse javadoc");
> - return;
> - }
> -
> + AbstractJavadocMojo mojo = new JavadocReport();
> + Locale locale = Locale.getDefault();
> try {
> - Locale locale = Locale.getDefault();
> Field f = AbstractJavadocMojo.class.getDeclaredField("doclet");
> f.setAccessible(true);
> - f.set(this, "org.apache.cxf.maven_plugin.javatowadl.DumpJavaDoc");
> + f.set(mojo, "org.apache.cxf.maven_plugin.javatowadl.DumpJavaDoc");
>
> f = AbstractJavadocMojo.class.getDeclaredField("stylesheet");
> f.setAccessible(true);
> - f.set(this, "stylesheet");
> + f.set(mojo, "stylesheet");
>
> f = AbstractJavadocMojo.class.getDeclaredField("javadocOptionsDir");
> f.setAccessible(true);
> - f.set(this, javadocOptionsDir);
> + f.set(mojo, javadocOptionsDir);
>
> f = AbstractJavadocMojo.class.getDeclaredField("docletArtifact");
> f.setAccessible(true);
> @@ -150,81 +148,68 @@ public class ParseJavaDocMojo extends AbstractJavadocMojo {
> }
> }
> }
> - f.set(this, docletArtifact);
> + f.set(mojo, docletArtifact);
>
> f = AbstractJavadocMojo.class.getDeclaredField("factory");
> f.setAccessible(true);
> - f.set(this, this.mavenArtifactFactory);
> + f.set(mojo, this.mavenArtifactFactory);
>
> f = AbstractJavadocMojo.class.getDeclaredField("mavenProjectBuilder");
> f.setAccessible(true);
> - f.set(this, this.mavenProjectBuilder);
> + f.set(mojo, this.mavenProjectBuilder);
>
> f = AbstractJavadocMojo.class.getDeclaredField("resolver");
> f.setAccessible(true);
> - f.set(this, this.artifactResolver);
> + f.set(mojo, this.artifactResolver);
>
> f = AbstractJavadocMojo.class.getDeclaredField("archiverManager");
> f.setAccessible(true);
> - f.set(this, this.archiverManager);
> + f.set(mojo, this.archiverManager);
>
> f = AbstractJavadocMojo.class.getDeclaredField("artifactMetadataSource");
> f.setAccessible(true);
> - f.set(this, this.artifactMetadataSource);
> + f.set(mojo, this.artifactMetadataSource);
>
> f = AbstractJavadocMojo.class.getDeclaredField("toolchainManager");
> f.setAccessible(true);
> - f.set(this, this.toolchainManager);
> + f.set(mojo, this.toolchainManager);
>
> f = AbstractJavadocMojo.class.getDeclaredField("localRepository");
> f.setAccessible(true);
> - f.set(this, this.localRepository);
> + f.set(mojo, this.localRepository);
>
> f = AbstractJavadocMojo.class.getDeclaredField("remoteRepositories");
> f.setAccessible(true);
> - f.set(this, this.remoteRepositories);
> + f.set(mojo, this.remoteRepositories);
>
> f = AbstractJavadocMojo.class.getDeclaredField("applyJavadocSecurityFix");
> f.setAccessible(true);
> - f.set(this, false);
> + f.set(mojo, false);
>
> f = AbstractJavadocMojo.class.getDeclaredField("additionalparam");
> f.setAccessible(true);
> - f.set(this, "-dumpJavaDocFile " + this.dumpFileOutputDirectory.getAbsolutePath()
> + f.set(mojo, "-dumpJavaDocFile " + this.dumpFileOutputDirectory.getAbsolutePath()
> + File.separator + "dumpFile.properties");
>
> - useStandardDocletOptions = false;
> - this.project = mavenProject;
> - generate(locale);
> - } catch (Exception e) {
> - failOnError("An error has occurred in parsing javadoc", e);
> - }
> -
> - }
> -
> - private void generate(Locale locale) throws MavenReportException {
> - try {
> - outputDirectory = getReportOutputDirectory();
> - executeReport(locale);
> - } catch (MavenReportException e) {
> - if (failOnError) {
> - throw e;
> - }
> - getLog().error("Error while creating javadoc report: " + e.getMessage(), e);
> - } catch (RuntimeException e) {
> - if (failOnError) {
> - throw e;
> + f = AbstractJavadocMojo.class.getDeclaredField("useStandardDocletOptions");
> + f.setAccessible(true);
> + f.set(mojo, false);
> +
> + f = AbstractJavadocMojo.class.getDeclaredField("project");
> + f.setAccessible(true);
> + f.set(mojo, mavenProject);
> +
> + if (dumpFileOutputDirectory != null) {
> + f = AbstractJavadocMojo.class.getDeclaredField("outputDirectory");
> + f.setAccessible(true);
> + f.set(mojo, dumpFileOutputDirectory);
> }
> - getLog().error("Error while creating javadoc report: " + e.getMessage(), e);
> - }
> - }
> -
> - private File getReportOutputDirectory() {
> - if (dumpFileOutputDirectory == null) {
> - return outputDirectory;
> +
> + Method m = AbstractJavadocMojo.class.getMethod("executeReport", Locale.class);
> + m.setAccessible(true);
> + m.invoke(mojo, locale);
> + } catch (Exception e) {
> + throw new MojoExecutionException("Failed to generate javadoc", e);
> }
> -
> - return dumpFileOutputDirectory;
> }
> -
> }
>
> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/java2ws-plugin/pom.xml
> ----------------------------------------------------------------------
> diff --git a/maven-plugins/java2ws-plugin/pom.xml b/maven-plugins/java2ws-plugin/pom.xml
> index d3ca92c..73c8ede 100644
> --- a/maven-plugins/java2ws-plugin/pom.xml
> +++ b/maven-plugins/java2ws-plugin/pom.xml
> @@ -77,41 +77,4 @@
> <version>${project.version}</version>
> </dependency>
> </dependencies>
> - <build>
> - <pluginManagement>
> - <plugins>
> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
> - <plugin>
> - <groupId>org.eclipse.m2e</groupId>
> - <artifactId>lifecycle-mapping</artifactId>
> - <version>1.0.0</version>
> - <configuration>
> - <lifecycleMappingMetadata>
> - <pluginExecutions>
> - <pluginExecution>
> - <pluginExecutionFilter>
> - <groupId>
> - org.apache.maven.plugins
> - </groupId>
> - <artifactId>
> - maven-plugin-plugin
> - </artifactId>
> - <versionRange>
> - [2.9,)
> - </versionRange>
> - <goals>
> - <goal>descriptor</goal>
> - </goals>
> - </pluginExecutionFilter>
> - <action>
> - <ignore></ignore>
> - </action>
> - </pluginExecution>
> - </pluginExecutions>
> - </lifecycleMappingMetadata>
> - </configuration>
> - </plugin>
> - </plugins>
> - </pluginManagement>
> - </build>
> </project>
>
> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/pom.xml
> ----------------------------------------------------------------------
> diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
> index 8a6f19b..57db354 100644
> --- a/maven-plugins/pom.xml
> +++ b/maven-plugins/pom.xml
> @@ -39,24 +39,4 @@
> <module>corba</module>
> <module>archetypes</module>
> </modules>
> - <build>
> - <pluginManagement>
> - <plugins>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-plugin-plugin</artifactId>
> - <version>2.9</version>
> - </plugin>
> - </plugins>
> - </pluginManagement>
> - </build>
> - <reporting>
> - <plugins>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-plugin-plugin</artifactId>
> - <version>2.9</version>
> - </plugin>
> - </plugins>
> - </reporting>
> </project>
>
> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/wadl2java-plugin/pom.xml
> ----------------------------------------------------------------------
> diff --git a/maven-plugins/wadl2java-plugin/pom.xml b/maven-plugins/wadl2java-plugin/pom.xml
> index 092d859..1e10e63 100644
> --- a/maven-plugins/wadl2java-plugin/pom.xml
> +++ b/maven-plugins/wadl2java-plugin/pom.xml
> @@ -56,6 +56,11 @@
> <scope>provided</scope>
> </dependency>
> <dependency>
> + <groupId>org.apache.maven.plugin-tools</groupId>
> + <artifactId>maven-plugin-annotations</artifactId>
> + <scope>provided</scope>
> + </dependency>
> + <dependency>
> <groupId>org.codehaus.plexus</groupId>
> <artifactId>plexus-utils</artifactId>
> <version>2.0.5</version>
> @@ -122,41 +127,4 @@
> </dependencies>
> </profile>
> </profiles>
> - <build>
> - <pluginManagement>
> - <plugins>
> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
> - <plugin>
> - <groupId>org.eclipse.m2e</groupId>
> - <artifactId>lifecycle-mapping</artifactId>
> - <version>1.0.0</version>
> - <configuration>
> - <lifecycleMappingMetadata>
> - <pluginExecutions>
> - <pluginExecution>
> - <pluginExecutionFilter>
> - <groupId>
> - org.apache.maven.plugins
> - </groupId>
> - <artifactId>
> - maven-plugin-plugin
> - </artifactId>
> - <versionRange>
> - [2.9,)
> - </versionRange>
> - <goals>
> - <goal>descriptor</goal>
> - </goals>
> - </pluginExecutionFilter>
> - <action>
> - <ignore></ignore>
> - </action>
> - </pluginExecution>
> - </pluginExecutions>
> - </lifecycleMappingMetadata>
> - </configuration>
> - </plugin>
> - </plugins>
> - </pluginManagement>
> - </build>
> </project>
>
> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
> ----------------------------------------------------------------------
> diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
> index fe5454d..16e7f84 100644
> --- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
> +++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
> @@ -47,6 +47,8 @@ import org.apache.maven.execution.MavenSession;
> import org.apache.maven.model.Resource;
> import org.apache.maven.plugin.AbstractMojo;
> import org.apache.maven.plugin.MojoExecutionException;
> +import org.apache.maven.plugins.annotations.Component;
> +import org.apache.maven.plugins.annotations.Parameter;
> import org.apache.maven.project.MavenProject;
> import org.apache.maven.repository.RepositorySystem;
> import org.codehaus.plexus.archiver.jar.JarArchiver;
> @@ -60,54 +62,42 @@ import org.codehaus.plexus.util.cli.Commandline;
> public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
>
> /**
> - * @parameter expression="${cxf.testSourceRoot}"
> + * Source Root
> */
> + @Parameter(property = "cxf.testSourceRoot")
> File testSourceRoot;
>
> /**
> * Path where the generated sources should be placed
> - *
> - * @parameter expression="${cxf.sourceRoot}"
> - * default-value="${project.build.directory}/generated-sources/cxf"
> - * @required
> */
> + @Parameter(required = true,
> + property = "cxf.sourceRoot",
> + defaultValue = "${project.build.directory}/generated-sources/cxf")
> File sourceRoot;
>
> - /**
> - * @parameter expression="${project.build.outputDirectory}"
> - * @required
> - */
> + @Parameter(required = true, property = "project.build.outputDirectory")
> String classesDirectory;
>
> - /**
> - * @parameter expression="${project}"
> - * @required
> - */
> + @Parameter(required = true, property = "project")
> MavenProject project;
>
> /**
> * Default options to be used when a wadl has not had it's options explicitly specified.
> - *
> - * @parameter
> */
> + @Parameter
> Option defaultOptions = new Option();
>
> -
> -
> /**
> * Directory in which the "DONE" markers are saved that
> - *
> - * @parameter expression="${cxf.markerDirectory}"
> - * default-value="${project.build.directory}/cxf-codegen-plugin-markers"
> */
> + @Parameter(property = "cxf.markerDirectory", defaultValue = "${project.build.directory}/cxf-codegen-plugin-markers")
> File markerDirectory;
>
> /**
> * Use the compile classpath rather than the test classpath for execution useful if the test dependencies
> * clash with those of wadl2java
> - *
> - * @parameter expression="${cxf.useCompileClasspath}" default-value="false"
> */
> + @Parameter(property = "cxf.useCompileClasspath", defaultValue = "false")
> boolean useCompileClasspath;
>
>
> @@ -116,94 +106,69 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
> * By default, we scan for *.wadl (see include/exclude params as well) in the wadlRoot
> * directories and run wadl2java on all the wadl's we find. This disables that scan
> * and requires an explicit wadlOption to be set for each wadl that needs to be processed.
> - * @parameter expression="${cxf.disableDirectoryScan}" default-value="false"
> */
> + @Parameter(property = "cxf.disableDirectoryScan", defaultValue = "false")
> boolean disableDirectoryScan;
>
> /**
> * By default all maven dependencies of type "wadl" are added to the effective wadlOptions. Setting this
> * parameter to true disables this functionality
> - *
> - * @parameter expression="${cxf.disableDependencyScan}" default-value="false"
> */
> + @Parameter(property = "cxf.disableDependencyScan", defaultValue = "false")
> boolean disableDependencyScan;
>
> /**
> * A list of wadl files to include. Can contain ant-style wildcards and double wildcards. Defaults to
> * *.wadl
> - *
> - * @parameter
> */
> + @Parameter
> String includes[];
>
> /**
> * A list of wadl files to exclude. Can contain ant-style wildcards and double wildcards.
> - *
> - * @parameter
> */
> + @Parameter
> String excludes[];
>
> /**
> * Allows running the JavaToWs in a separate process.
> * Valid values are "false", "always", and "once"
> * The value of "true" is equal to "once"
> - *
> - * @parameter default-value="false"
> - * @since 2.4
> */
> + @Parameter(defaultValue = "false")
> String fork;
>
> /**
> * The Maven session.
> - *
> - * @parameter expression="${session}"
> - * @readonly
> - * @required
> */
> + @Parameter(readonly = true, required = true, property = "session")
> private MavenSession mavenSession;
>
> /**
> * The plugin dependencies, needed for the fork mode.
> - *
> - * @parameter expression="${plugin.artifacts}"
> - * @required
> - * @readonly
> */
> + @Parameter(readonly = true, required = true, property = "plugin.artifacts")
> private List<Artifact> pluginArtifacts;
>
>
> /**
> * Sets the Java executable to use when fork parameter is <code>true</code>.
> - *
> - * @parameter default-value="${java.home}/bin/java"
> - * @since 2.4
> */
> + @Parameter(defaultValue = "${java.home}/bin/java")
> private String javaExecutable;
>
> /**
> * Sets the JVM arguments (i.e. <code>-Xms128m -Xmx128m</code>) if fork is set to <code>true</code>.
> - *
> - * @parameter
> - * @since 2.4
> */
> + @Parameter
> private String additionalJvmArgs;
>
> - /**
> - * @component
> - * @readonly
> - * @required
> - */
> + @Component
> private RepositorySystem repositorySystem;
>
>
> private ClassLoader resourceClassLoader;
> -
> - /**
> - * Merge WadlOptions that point to the same file by adding the extraargs to the first option and deleting
> - * the second from the options list
> - *
> - * @param options
> - */
> +
>
> private Artifact resolveRemoteWadlArtifact(Artifact artifact)
> throws MojoExecutionException {
>
> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
> ----------------------------------------------------------------------
> diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
> index 58503b9..c8280f2 100644
> --- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
> +++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
> @@ -28,34 +28,31 @@ import java.util.Set;
> import org.apache.cxf.Bus;
> import org.apache.cxf.maven_plugin.common.ClassLoaderSwitcher;
> import org.apache.maven.plugin.MojoExecutionException;
> +import org.apache.maven.plugins.annotations.Component;
> +import org.apache.maven.plugins.annotations.LifecyclePhase;
> +import org.apache.maven.plugins.annotations.Mojo;
> +import org.apache.maven.plugins.annotations.Parameter;
> +import org.apache.maven.plugins.annotations.ResolutionScope;
> import org.sonatype.plexus.build.incremental.BuildContext;
>
>
> /**
> - * @goal wadl2java
> - * @phase generate-sources
> - * @description CXF WADL To Java Tool
> - * @requiresDependencyResolution test
> - * @threadSafe
> + * CXF WADL To Java Tool
> */
> +@Mojo(name = "wadl2java", defaultPhase = LifecyclePhase.GENERATE_SOURCES, threadSafe = true,
> + requiresDependencyResolution = ResolutionScope.TEST)
> public class WADL2JavaMojo extends AbstractCodeGeneratorMojo {
> - /**
> - * @parameter
> - */
> - WadlOption wadlOptions[];
> + @Parameter
> + WadlOption wadlOptions[];
>
> - /**
> - * @parameter expression="${cxf.wadlRoot}" default-value="${basedir}/src/main/resources/wadl"
> - */
> + @Parameter(property = "cxf.wadlRoot", defaultValue = "${basedir}/src/main/resources/wad")
> File wadlRoot;
>
> - /**
> - * @parameter expression="${cxf.testWadlRoot}" default-value="${basedir}/src/test/resources/wadl"
> - */
> + @Parameter(property = "cxf.testWadlRoot", defaultValue = "${basedir}/src/test/resources/wadl")
> File testWadlRoot;
>
>
> - /** @component */
> + @Component
> BuildContext buildContext;
>
> private void mergeOptions(List<WadlOption> effectiveOptions) {
>
> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/maven-plugins/wsdl-validator-plugin/pom.xml
> ----------------------------------------------------------------------
> diff --git a/maven-plugins/wsdl-validator-plugin/pom.xml b/maven-plugins/wsdl-validator-plugin/pom.xml
> index afa83f9..12658aa 100644
> --- a/maven-plugins/wsdl-validator-plugin/pom.xml
> +++ b/maven-plugins/wsdl-validator-plugin/pom.xml
> @@ -56,41 +56,4 @@
> <version>${project.version}</version>
> </dependency>
> </dependencies>
> - <build>
> - <pluginManagement>
> - <plugins>
> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
> - <plugin>
> - <groupId>org.eclipse.m2e</groupId>
> - <artifactId>lifecycle-mapping</artifactId>
> - <version>1.0.0</version>
> - <configuration>
> - <lifecycleMappingMetadata>
> - <pluginExecutions>
> - <pluginExecution>
> - <pluginExecutionFilter>
> - <groupId>
> - org.apache.maven.plugins
> - </groupId>
> - <artifactId>
> - maven-plugin-plugin
> - </artifactId>
> - <versionRange>
> - [2.9,)
> - </versionRange>
> - <goals>
> - <goal>descriptor</goal>
> - </goals>
> - </pluginExecutionFilter>
> - <action>
> - <ignore></ignore>
> - </action>
> - </pluginExecution>
> - </pluginExecutions>
> - </lifecycleMappingMetadata>
> - </configuration>
> - </plugin>
> - </plugins>
> - </pluginManagement>
> - </build>
> </project>
>
> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/parent/pom.xml
> ----------------------------------------------------------------------
> diff --git a/parent/pom.xml b/parent/pom.xml
> index 0d2678c..5d1f914 100644
> --- a/parent/pom.xml
> +++ b/parent/pom.xml
> @@ -724,6 +724,18 @@
> </exclusions>
> </dependency>
> <dependency>
> + <groupId>org.apache.maven.plugin-tools</groupId>
> + <artifactId>maven-plugin-annotations</artifactId>
> + <version>3.4</version>
> + <scope>provided</scope>
> + <exclusions>
> + <exclusion>
> + <groupId>junit</groupId>
> + <artifactId>junit</artifactId>
> + </exclusion>
> + </exclusions>
> + </dependency>
> + <dependency>
> <groupId>org.apache.mina</groupId>
> <artifactId>mina-core</artifactId>
> <version>${cxf.mina.version}</version>
>
> http://git-wip-us.apache.org/repos/asf/cxf/blob/96ed8050/pom.xml
> ----------------------------------------------------------------------
> diff --git a/pom.xml b/pom.xml
> index 0873d69..31debe6 100644
> --- a/pom.xml
> +++ b/pom.xml
> @@ -615,6 +615,37 @@
> </dependency>
> </dependencies>
> </plugin>
> + <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
> + <plugin>
> + <groupId>org.eclipse.m2e</groupId>
> + <artifactId>lifecycle-mapping</artifactId>
> + <version>1.0.0</version>
> + <configuration>
> + <lifecycleMappingMetadata>
> + <pluginExecutions>
> + <pluginExecution>
> + <pluginExecutionFilter>
> + <groupId>
> + org.apache.maven.plugins
> + </groupId>
> + <artifactId>
> + maven-plugin-plugin
> + </artifactId>
> + <versionRange>
> + [3.4,)
> + </versionRange>
> + <goals>
> + <goal>descriptor</goal>
> + </goals>
> + </pluginExecutionFilter>
> + <action>
> + <ignore></ignore>
> + </action>
> + </pluginExecution>
> + </pluginExecutions>
> + </lifecycleMappingMetadata>
> + </configuration>
> + </plugin>
> </plugins>
> </pluginManagement>
> </build>
>
[3/5] cxf git commit: Upate jibx version
Posted by dk...@apache.org.
Upate jibx version
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3d3d495a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3d3d495a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3d3d495a
Branch: refs/heads/master
Commit: 3d3d495a2c58164abfb54b64208b3f72b4d235dd
Parents: 27e8773
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Feb 2 10:01:06 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 2 13:58:43 2015 -0500
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/3d3d495a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 1d259bb..0d2678c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -115,7 +115,7 @@
<cxf.jetty9.version>9.2.3.v20140905</cxf.jetty9.version>
<cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
<cxf.jetty.osgi.version>[8.1,10)</cxf.jetty.osgi.version>
- <cxf.jibx.version>1.2.5</cxf.jibx.version>
+ <cxf.jibx.version>1.2.6</cxf.jibx.version>
<cxf.junit.version>4.12</cxf.junit.version>
<cxf.maven.core.version>3.0.5</cxf.maven.core.version>
<cxf.msv.version>2013.6.1</cxf.msv.version>
[4/5] cxf git commit: Add m2e lifecycle stuff
Posted by dk...@apache.org.
Add m2e lifecycle stuff
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bfbc0a25
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bfbc0a25
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bfbc0a25
Branch: refs/heads/master
Commit: bfbc0a25c377e43395fb1f7beee045e4412c4d8d
Parents: ad5763e
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Feb 2 11:12:47 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 2 13:58:43 2015 -0500
----------------------------------------------------------------------
.../META-INF/m2e/lifecycle-mapping-metadata.xml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/bfbc0a25/maven-plugins/wadl2java-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml b/maven-plugins/wadl2java-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
new file mode 100644
index 0000000..3642bf3
--- /dev/null
+++ b/maven-plugins/wadl2java-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <goals>
+ <goal>wadl2java</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute>
+ <runOnIncremental>true</runOnIncremental>
+ <runOnConfiguration>true</runOnConfiguration>
+ </execute>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+</lifecycleMappingMetadata>
[2/5] cxf git commit: Update compiler plugin version
Posted by dk...@apache.org.
Update compiler plugin version
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ad5763ef
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ad5763ef
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ad5763ef
Branch: refs/heads/master
Commit: ad5763ef8ea1ff3c8ddea2c3a6fabdaae6acddd6
Parents: 4b4a515
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Feb 2 11:02:57 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 2 13:58:43 2015 -0500
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ad5763ef/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 23d1673..0873d69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,7 +216,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
<configuration>
<source>${cxf.jdk.version}</source>
<target>${cxf.jdk.version}</target>
@@ -482,7 +482,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
[5/5] cxf git commit: Update plugin-plugin version
Posted by dk...@apache.org.
Update plugin-plugin version
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4b4a5151
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4b4a5151
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4b4a5151
Branch: refs/heads/master
Commit: 4b4a5151c83113bb53d65e0304b8c9fee524d28a
Parents: 3d3d495
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Feb 2 10:54:41 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 2 13:58:43 2015 -0500
----------------------------------------------------------------------
distribution/javadoc/pom.xml | 35 ++++++++++++
maven-plugins/codegen-plugin/pom.xml | 37 +++++++++++++
maven-plugins/corba/pom.xml | 37 +++++++++++++
maven-plugins/java2wadl-plugin/pom.xml | 37 +++++++++++++
maven-plugins/java2ws-plugin/pom.xml | 37 +++++++++++++
maven-plugins/wadl2java-plugin/pom.xml | 43 +++++++++++++++
.../cxf/maven_plugin/wadlto/WADL2JavaMojo.java | 25 ++++++---
maven-plugins/wsdl-validator-plugin/pom.xml | 37 +++++++++++++
osgi/bundle/compatible/pom.xml | 56 ++++++++++++++++++++
osgi/itests-felix/pom.xml | 37 +++++++++++++
osgi/itests/pom.xml | 37 +++++++++++++
pom.xml | 2 +-
rt/management-web/pom.xml | 35 ++++++++++++
rt/transports/http/pom.xml | 35 ++++++++++++
services/xkms/xkms-itests/pom.xml | 37 +++++++++++++
systests/jibx/databinding-jibx/pom.xml | 35 ++++++++++++
systests/jibx/jaxrs-jibx/pom.xml | 36 +++++++++++++
systests/wsdl_maven/java2ws/pom.xml | 35 ++++++++++++
testutils/pom.xml | 37 +++++++++++++
19 files changed, 663 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/4b4a5151/distribution/javadoc/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index 31492d8..18ff1b6 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -484,5 +484,40 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-antrun-plugin
+ </artifactId>
+ <versionRange>
+ [1.7,)
+ </versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/4b4a5151/maven-plugins/codegen-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/pom.xml b/maven-plugins/codegen-plugin/pom.xml
index e19027f..521d097 100644
--- a/maven-plugins/codegen-plugin/pom.xml
+++ b/maven-plugins/codegen-plugin/pom.xml
@@ -148,4 +148,41 @@
</dependencies>
</profile>
</profiles>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-plugin-plugin
+ </artifactId>
+ <versionRange>
+ [2.9,)
+ </versionRange>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/4b4a5151/maven-plugins/corba/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/corba/pom.xml b/maven-plugins/corba/pom.xml
index bf21633..622932e 100644
--- a/maven-plugins/corba/pom.xml
+++ b/maven-plugins/corba/pom.xml
@@ -69,4 +69,41 @@
<version>${project.version}</version>
</dependency>
</dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-plugin-plugin
+ </artifactId>
+ <versionRange>
+ [2.9,)
+ </versionRange>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/4b4a5151/maven-plugins/java2wadl-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/java2wadl-plugin/pom.xml b/maven-plugins/java2wadl-plugin/pom.xml
index ea02b34..03ea41e 100644
--- a/maven-plugins/java2wadl-plugin/pom.xml
+++ b/maven-plugins/java2wadl-plugin/pom.xml
@@ -195,4 +195,41 @@
</profile>
</profiles>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-plugin-plugin
+ </artifactId>
+ <versionRange>
+ [2.9,)
+ </versionRange>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/4b4a5151/maven-plugins/java2ws-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/java2ws-plugin/pom.xml b/maven-plugins/java2ws-plugin/pom.xml
index 73c8ede..d3ca92c 100644
--- a/maven-plugins/java2ws-plugin/pom.xml
+++ b/maven-plugins/java2ws-plugin/pom.xml
@@ -77,4 +77,41 @@
<version>${project.version}</version>
</dependency>
</dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-plugin-plugin
+ </artifactId>
+ <versionRange>
+ [2.9,)
+ </versionRange>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/4b4a5151/maven-plugins/wadl2java-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/pom.xml b/maven-plugins/wadl2java-plugin/pom.xml
index ec501f3..092d859 100644
--- a/maven-plugins/wadl2java-plugin/pom.xml
+++ b/maven-plugins/wadl2java-plugin/pom.xml
@@ -98,6 +98,12 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-nodeps</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.sonatype.plexus</groupId>
+ <artifactId>plexus-build-api</artifactId>
+ <version>0.0.7</version>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
<profile>
@@ -116,4 +122,41 @@
</dependencies>
</profile>
</profiles>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-plugin-plugin
+ </artifactId>
+ <versionRange>
+ [2.9,)
+ </versionRange>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/4b4a5151/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
index 071135c..58503b9 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
@@ -28,6 +28,7 @@ import java.util.Set;
import org.apache.cxf.Bus;
import org.apache.cxf.maven_plugin.common.ClassLoaderSwitcher;
import org.apache.maven.plugin.MojoExecutionException;
+import org.sonatype.plexus.build.incremental.BuildContext;
/**
@@ -53,6 +54,10 @@ public class WADL2JavaMojo extends AbstractCodeGeneratorMojo {
*/
File testWadlRoot;
+
+ /** @component */
+ BuildContext buildContext;
+
private void mergeOptions(List<WadlOption> effectiveOptions) {
if (wadlOptions == null) {
return;
@@ -74,6 +79,20 @@ public class WADL2JavaMojo extends AbstractCodeGeneratorMojo {
File classesDir = new File(classesDirectory);
classesDir.mkdirs();
markerDirectory.mkdirs();
+
+ // add the generated source into compile source
+ // do this step first to ensure the source folder will be added to the Eclipse classpath
+ if (project != null && sourceRoot != null) {
+ project.addCompileSourceRoot(sourceRoot.getAbsolutePath());
+ }
+ if (project != null && testSourceRoot != null) {
+ project.addTestCompileSourceRoot(testSourceRoot.getAbsolutePath());
+ }
+
+ // if this is an m2e configuration build then return immediately without doing any work
+ if (project != null && buildContext.isIncremental() && !buildContext.hasDelta(project.getBasedir())) {
+ return;
+ }
List<WadlOption> effectiveWsdlOptions = createWadlOptionsFromScansAndExplicitWadlOptions(classesDir);
@@ -110,12 +129,6 @@ public class WADL2JavaMojo extends AbstractCodeGeneratorMojo {
}
classLoaderSwitcher.restoreClassLoader();
}
- if (project != null && sourceRoot != null && sourceRoot.exists()) {
- project.addCompileSourceRoot(sourceRoot.getAbsolutePath());
- }
- if (project != null && testSourceRoot != null && testSourceRoot.exists()) {
- project.addTestCompileSourceRoot(testSourceRoot.getAbsolutePath());
- }
System.gc();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/4b4a5151/maven-plugins/wsdl-validator-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/wsdl-validator-plugin/pom.xml b/maven-plugins/wsdl-validator-plugin/pom.xml
index 12658aa..afa83f9 100644
--- a/maven-plugins/wsdl-validator-plugin/pom.xml
+++ b/maven-plugins/wsdl-validator-plugin/pom.xml
@@ -56,4 +56,41 @@
<version>${project.version}</version>
</dependency>
</dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-plugin-plugin
+ </artifactId>
+ <versionRange>
+ [2.9,)
+ </versionRange>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/4b4a5151/osgi/bundle/compatible/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/bundle/compatible/pom.xml b/osgi/bundle/compatible/pom.xml
index 82674f1..0bdf623 100644
--- a/osgi/bundle/compatible/pom.xml
+++ b/osgi/bundle/compatible/pom.xml
@@ -259,5 +259,61 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-antrun-plugin
+ </artifactId>
+ <versionRange>
+ [1.7,)
+ </versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.codehaus.mojo
+ </groupId>
+ <artifactId>
+ properties-maven-plugin
+ </artifactId>
+ <versionRange>
+ [1.0-alpha-2,)
+ </versionRange>
+ <goals>
+ <goal>
+ read-project-properties
+ </goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/4b4a5151/osgi/itests-felix/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/itests-felix/pom.xml b/osgi/itests-felix/pom.xml
index 4a84317..f180322 100644
--- a/osgi/itests-felix/pom.xml
+++ b/osgi/itests-felix/pom.xml
@@ -162,5 +162,42 @@
</executions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.servicemix.tooling
+ </groupId>
+ <artifactId>
+ depends-maven-plugin
+ </artifactId>
+ <versionRange>
+ [1.2,)
+ </versionRange>
+ <goals>
+ <goal>
+ generate-depends-file
+ </goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/4b4a5151/osgi/itests/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index 17607d7..378a69a 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -190,5 +190,42 @@
</executions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.servicemix.tooling
+ </groupId>
+ <artifactId>
+ depends-maven-plugin
+ </artifactId>
+ <versionRange>
+ [1.2,)
+ </versionRange>
+ <goals>
+ <goal>
+ generate-depends-file
+ </goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/4b4a5151/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a0e06f9..23d1673 100644
--- a/pom.xml
+++ b/pom.xml
@@ -560,7 +560,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.3</version>
+ <version>3.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/cxf/blob/4b4a5151/rt/management-web/pom.xml
----------------------------------------------------------------------
diff --git a/rt/management-web/pom.xml b/rt/management-web/pom.xml
index 88c261b..ac3ef88 100644
--- a/rt/management-web/pom.xml
+++ b/rt/management-web/pom.xml
@@ -184,6 +184,41 @@
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.codehaus.mojo
+ </groupId>
+ <artifactId>
+ gwt-maven-plugin
+ </artifactId>
+ <versionRange>
+ [2.6.0,)
+ </versionRange>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<profiles>
<profile>
http://git-wip-us.apache.org/repos/asf/cxf/blob/4b4a5151/rt/transports/http/pom.xml
----------------------------------------------------------------------
diff --git a/rt/transports/http/pom.xml b/rt/transports/http/pom.xml
index 5e0f90b..cf6aa24 100644
--- a/rt/transports/http/pom.xml
+++ b/rt/transports/http/pom.xml
@@ -218,5 +218,40 @@
</executions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ com.googlecode.maven-download-plugin
+ </groupId>
+ <artifactId>
+ download-maven-plugin
+ </artifactId>
+ <versionRange>
+ [1.2.0,)
+ </versionRange>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/4b4a5151/services/xkms/xkms-itests/pom.xml
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-itests/pom.xml b/services/xkms/xkms-itests/pom.xml
index 27a1b7a..f34247c 100644
--- a/services/xkms/xkms-itests/pom.xml
+++ b/services/xkms/xkms-itests/pom.xml
@@ -125,5 +125,42 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.servicemix.tooling
+ </groupId>
+ <artifactId>
+ depends-maven-plugin
+ </artifactId>
+ <versionRange>
+ [1.2,)
+ </versionRange>
+ <goals>
+ <goal>
+ generate-depends-file
+ </goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/4b4a5151/systests/jibx/databinding-jibx/pom.xml
----------------------------------------------------------------------
diff --git a/systests/jibx/databinding-jibx/pom.xml b/systests/jibx/databinding-jibx/pom.xml
index 55a9af6..12479d7 100644
--- a/systests/jibx/databinding-jibx/pom.xml
+++ b/systests/jibx/databinding-jibx/pom.xml
@@ -123,6 +123,41 @@
</executions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.jibx</groupId>
+ <artifactId>
+ maven-jibx-plugin
+ </artifactId>
+ <versionRange>
+ [1.2.5,)
+ </versionRange>
+ <goals>
+ <goal>test-bind</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute>
+ <runOnIncremental>false</runOnIncremental>
+ </execute>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<profiles>
<profile>
http://git-wip-us.apache.org/repos/asf/cxf/blob/4b4a5151/systests/jibx/jaxrs-jibx/pom.xml
----------------------------------------------------------------------
diff --git a/systests/jibx/jaxrs-jibx/pom.xml b/systests/jibx/jaxrs-jibx/pom.xml
index 82b9f74..1ee81c5 100644
--- a/systests/jibx/jaxrs-jibx/pom.xml
+++ b/systests/jibx/jaxrs-jibx/pom.xml
@@ -283,5 +283,41 @@
</executions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.jibx</groupId>
+ <artifactId>
+ jibx-maven-plugin
+ </artifactId>
+ <versionRange>
+ [1.2.5,)
+ </versionRange>
+ <goals>
+ <goal>bind</goal>
+ <goal>schema-codegen</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute>
+ <runOnIncremental>false</runOnIncremental>
+ </execute>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/4b4a5151/systests/wsdl_maven/java2ws/pom.xml
----------------------------------------------------------------------
diff --git a/systests/wsdl_maven/java2ws/pom.xml b/systests/wsdl_maven/java2ws/pom.xml
index 1f28db8..a3245dc 100644
--- a/systests/wsdl_maven/java2ws/pom.xml
+++ b/systests/wsdl_maven/java2ws/pom.xml
@@ -65,6 +65,41 @@
</executions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.cxf
+ </groupId>
+ <artifactId>
+ cxf-java2ws-plugin
+ </artifactId>
+ <versionRange>
+ [3.1.0-SNAPSHOT,)
+ </versionRange>
+ <goals>
+ <goal>java2ws</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/cxf/blob/4b4a5151/testutils/pom.xml
----------------------------------------------------------------------
diff --git a/testutils/pom.xml b/testutils/pom.xml
index 9a17951..f8d8db3 100644
--- a/testutils/pom.xml
+++ b/testutils/pom.xml
@@ -279,6 +279,43 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-antrun-plugin
+ </artifactId>
+ <versionRange>
+ [1.7,)
+ </versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute>
+ <runOnIncremental>false</runOnIncremental>
+ </execute>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<profiles>
<profile>