fixed errors reported by Checkstyle
git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1406928 13f79535-47bb-0310-9956-ffa450edef68master
parent
7627ead935
commit
215037c7e5
|
|
@ -253,8 +253,7 @@ public abstract class AbstractGeneratorMojo
|
||||||
catch ( LinkageError e )
|
catch ( LinkageError e )
|
||||||
{
|
{
|
||||||
throw new MojoExecutionException( "The API of the mojo scanner is not compatible with this plugin version."
|
throw new MojoExecutionException( "The API of the mojo scanner is not compatible with this plugin version."
|
||||||
+ " Please check the plugin dependencies configured in the POM and ensure the versions match.",
|
+ " Please check the plugin dependencies configured in the POM and ensure the versions match.", e );
|
||||||
e );
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,14 +21,12 @@ package org.apache.maven.plugin.plugin;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import org.apache.maven.plugin.MojoExecutionException;
|
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.LifecyclePhase;
|
||||||
import org.apache.maven.plugins.annotations.Mojo;
|
import org.apache.maven.plugins.annotations.Mojo;
|
||||||
import org.apache.maven.plugins.annotations.Parameter;
|
import org.apache.maven.plugins.annotations.Parameter;
|
||||||
import org.apache.maven.plugins.annotations.ResolutionScope;
|
import org.apache.maven.plugins.annotations.ResolutionScope;
|
||||||
import org.apache.maven.tools.plugin.generator.Generator;
|
import org.apache.maven.tools.plugin.generator.Generator;
|
||||||
import org.apache.maven.tools.plugin.generator.PluginDescriptorGenerator;
|
import org.apache.maven.tools.plugin.generator.PluginDescriptorGenerator;
|
||||||
import org.codehaus.plexus.logging.Logger;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generate a plugin descriptor.
|
* Generate a plugin descriptor.
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,6 @@ import java.lang.annotation.Annotation;
|
||||||
* @author Olivier Lamy
|
* @author Olivier Lamy
|
||||||
* @since 3.0
|
* @since 3.0
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("deprecation")
|
|
||||||
public class MojoAnnotationContent
|
public class MojoAnnotationContent
|
||||||
extends AnnotatedContent
|
extends AnnotatedContent
|
||||||
implements Mojo
|
implements Mojo
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,6 @@ import org.apache.maven.project.MavenProject;
|
||||||
import org.apache.maven.tools.plugin.ExtendedMojoDescriptor;
|
import org.apache.maven.tools.plugin.ExtendedMojoDescriptor;
|
||||||
import org.apache.maven.tools.plugin.PluginToolsRequest;
|
import org.apache.maven.tools.plugin.PluginToolsRequest;
|
||||||
import org.apache.maven.tools.plugin.util.PluginUtils;
|
import org.apache.maven.tools.plugin.util.PluginUtils;
|
||||||
import org.codehaus.plexus.logging.Logger;
|
|
||||||
import org.codehaus.plexus.util.IOUtil;
|
import org.codehaus.plexus.util.IOUtil;
|
||||||
import org.codehaus.plexus.util.StringUtils;
|
import org.codehaus.plexus.util.StringUtils;
|
||||||
import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
|
import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
|
||||||
|
|
|
||||||
|
|
@ -312,7 +312,7 @@ public class PluginHelpGenerator
|
||||||
log.warn( "\n\nUnexpected situation: destinationDirectory not defined in " + HELP_PROPERTIES_FILENAME
|
log.warn( "\n\nUnexpected situation: destinationDirectory not defined in " + HELP_PROPERTIES_FILENAME
|
||||||
+ " during help mojo source generation but expected during XML descriptor generation." );
|
+ " during help mojo source generation but expected during XML descriptor generation." );
|
||||||
log.warn( "Please check helpmojo goal version used in previous build phase." );
|
log.warn( "Please check helpmojo goal version used in previous build phase." );
|
||||||
log.warn("If you just upgraded to plugin-tools >= 3.2 you must run a clean build at least once");
|
log.warn( "If you just upgraded to plugin-tools >= 3.2 you must run a clean build at least once." );
|
||||||
destinationDirectory = new File( "target/generated-sources/plugin" );
|
destinationDirectory = new File( "target/generated-sources/plugin" );
|
||||||
log.warn( "Trying default location: " + destinationDirectory );
|
log.warn( "Trying default location: " + destinationDirectory );
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue