You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/09/13 15:49:21 UTC
svn commit: r1384333 - in /maven/plugins/trunk:
maven-changes-plugin/src/main/java/org/apache/maven/plugin/github/
maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/
maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/ maven-e...
Author: olamy
Date: Thu Sep 13 13:49:20 2012
New Revision: 1384333
URL: http://svn.apache.org/viewvc?rev=1384333&view=rev
Log:
use Integer.valueOf rather than new Integer
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/github/GitHubMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/JavaEEVersion.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/github/GitHubMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/github/GitHubMojo.java?rev=1384333&r1=1384332&r2=1384333&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/github/GitHubMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/github/GitHubMojo.java Thu Sep 13 13:49:20 2012
@@ -43,7 +43,7 @@ import java.util.ResourceBundle;
* @author Bryan Baugher
* @since 2.8
*/
-@Mojo( name = "github-report", threadSafe = true )
+@Mojo (name = "github-report", threadSafe = true)
public class GitHubMojo
extends AbstractChangesReport
{
@@ -55,15 +55,15 @@ public class GitHubMojo
static
{
- GITHUB_COLUMNS.put( "Assignee", new Integer( IssuesReportHelper.COLUMN_ASSIGNEE ) );
- GITHUB_COLUMNS.put( "Created", new Integer( IssuesReportHelper.COLUMN_CREATED ) );
- GITHUB_COLUMNS.put( "Fix Version", new Integer( IssuesReportHelper.COLUMN_FIX_VERSION ) );
- GITHUB_COLUMNS.put( "Id", new Integer( IssuesReportHelper.COLUMN_ID ) );
- GITHUB_COLUMNS.put( "Reporter", new Integer( IssuesReportHelper.COLUMN_REPORTER ) );
- GITHUB_COLUMNS.put( "Status", new Integer( IssuesReportHelper.COLUMN_STATUS ) );
- GITHUB_COLUMNS.put( "Summary", new Integer( IssuesReportHelper.COLUMN_SUMMARY ) );
- GITHUB_COLUMNS.put( "Type", new Integer( IssuesReportHelper.COLUMN_TYPE ) );
- GITHUB_COLUMNS.put( "Updated", new Integer( IssuesReportHelper.COLUMN_UPDATED ) );
+ GITHUB_COLUMNS.put( "Assignee", Integer.valueOf( IssuesReportHelper.COLUMN_ASSIGNEE ) );
+ GITHUB_COLUMNS.put( "Created", Integer.valueOf( IssuesReportHelper.COLUMN_CREATED ) );
+ GITHUB_COLUMNS.put( "Fix Version", Integer.valueOf( IssuesReportHelper.COLUMN_FIX_VERSION ) );
+ GITHUB_COLUMNS.put( "Id", Integer.valueOf( IssuesReportHelper.COLUMN_ID ) );
+ GITHUB_COLUMNS.put( "Reporter", Integer.valueOf( IssuesReportHelper.COLUMN_REPORTER ) );
+ GITHUB_COLUMNS.put( "Status", Integer.valueOf( IssuesReportHelper.COLUMN_STATUS ) );
+ GITHUB_COLUMNS.put( "Summary", Integer.valueOf( IssuesReportHelper.COLUMN_SUMMARY ) );
+ GITHUB_COLUMNS.put( "Type", Integer.valueOf( IssuesReportHelper.COLUMN_TYPE ) );
+ GITHUB_COLUMNS.put( "Updated", Integer.valueOf( IssuesReportHelper.COLUMN_UPDATED ) );
}
/**
@@ -77,31 +77,31 @@ public class GitHubMojo
* <code>Updated</code>.
* </p>
*/
- @Parameter( defaultValue = "Id,Type,Summary,Assignee,Reporter,Status,Created,Updated,Fix Version" )
+ @Parameter (defaultValue = "Id,Type,Summary,Assignee,Reporter,Status,Created,Updated,Fix Version")
private String columnNames;
/**
* The scheme of your github api domain. Only use if using github enterprise.
*/
- @Parameter( defaultValue = "http" )
+ @Parameter (defaultValue = "http")
private String githubAPIScheme;
/**
* The port of your github api domain. Only use if using github enterprise.
*/
- @Parameter( defaultValue = "80" )
+ @Parameter (defaultValue = "80")
private int githubAPIPort;
/**
* Boolean which says if we should include open issues in the report.
*/
- @Parameter( defaultValue = "true" )
+ @Parameter (defaultValue = "true")
private boolean includeOpenIssues;
/**
* Boolean which says if we should include only issues with milestones.
*/
- @Parameter( defaultValue = "true" )
+ @Parameter (defaultValue = "true")
private boolean onlyMilestoneIssues;
/**
@@ -109,7 +109,7 @@ public class GitHubMojo
* The current version being used is <code>${project.version}</code> minus
* any "-SNAPSHOT" suffix.
*/
- @Parameter( defaultValue = "false" )
+ @Parameter (defaultValue = "false")
private boolean onlyCurrentVersion;
public String getOutputName()
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java?rev=1384333&r1=1384332&r2=1384333&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java Thu Sep 13 13:49:20 2012
@@ -56,20 +56,20 @@ public class JiraMojo
static
{
- JIRA_COLUMNS.put( "Assignee", new Integer( IssuesReportHelper.COLUMN_ASSIGNEE ) );
- JIRA_COLUMNS.put( "Component", new Integer( IssuesReportHelper.COLUMN_COMPONENT ) );
- JIRA_COLUMNS.put( "Created", new Integer( IssuesReportHelper.COLUMN_CREATED ) );
- JIRA_COLUMNS.put( "Fix Version", new Integer( IssuesReportHelper.COLUMN_FIX_VERSION ) );
- JIRA_COLUMNS.put( "Id", new Integer( IssuesReportHelper.COLUMN_ID ) );
- JIRA_COLUMNS.put( "Key", new Integer( IssuesReportHelper.COLUMN_KEY ) );
- JIRA_COLUMNS.put( "Priority", new Integer( IssuesReportHelper.COLUMN_PRIORITY ) );
- JIRA_COLUMNS.put( "Reporter", new Integer( IssuesReportHelper.COLUMN_REPORTER ) );
- JIRA_COLUMNS.put( "Resolution", new Integer( IssuesReportHelper.COLUMN_RESOLUTION ) );
- JIRA_COLUMNS.put( "Status", new Integer( IssuesReportHelper.COLUMN_STATUS ) );
- JIRA_COLUMNS.put( "Summary", new Integer( IssuesReportHelper.COLUMN_SUMMARY ) );
- JIRA_COLUMNS.put( "Type", new Integer( IssuesReportHelper.COLUMN_TYPE ) );
- JIRA_COLUMNS.put( "Updated", new Integer( IssuesReportHelper.COLUMN_UPDATED ) );
- JIRA_COLUMNS.put( "Version", new Integer( IssuesReportHelper.COLUMN_VERSION ) );
+ JIRA_COLUMNS.put( "Assignee", Integer.valueOf( IssuesReportHelper.COLUMN_ASSIGNEE ) );
+ JIRA_COLUMNS.put( "Component", Integer.valueOf( IssuesReportHelper.COLUMN_COMPONENT ) );
+ JIRA_COLUMNS.put( "Created", Integer.valueOf( IssuesReportHelper.COLUMN_CREATED ) );
+ JIRA_COLUMNS.put( "Fix Version", Integer.valueOf( IssuesReportHelper.COLUMN_FIX_VERSION ) );
+ JIRA_COLUMNS.put( "Id", Integer.valueOf( IssuesReportHelper.COLUMN_ID ) );
+ JIRA_COLUMNS.put( "Key", Integer.valueOf( IssuesReportHelper.COLUMN_KEY ) );
+ JIRA_COLUMNS.put( "Priority", Integer.valueOf( IssuesReportHelper.COLUMN_PRIORITY ) );
+ JIRA_COLUMNS.put( "Reporter", Integer.valueOf( IssuesReportHelper.COLUMN_REPORTER ) );
+ JIRA_COLUMNS.put( "Resolution", Integer.valueOf( IssuesReportHelper.COLUMN_RESOLUTION ) );
+ JIRA_COLUMNS.put( "Status", Integer.valueOf( IssuesReportHelper.COLUMN_STATUS ) );
+ JIRA_COLUMNS.put( "Summary", Integer.valueOf( IssuesReportHelper.COLUMN_SUMMARY ) );
+ JIRA_COLUMNS.put( "Type", Integer.valueOf( IssuesReportHelper.COLUMN_TYPE ) );
+ JIRA_COLUMNS.put( "Updated", Integer.valueOf( IssuesReportHelper.COLUMN_UPDATED ) );
+ JIRA_COLUMNS.put( "Version", Integer.valueOf( IssuesReportHelper.COLUMN_VERSION ) );
}
/**
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/JavaEEVersion.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/JavaEEVersion.java?rev=1384333&r1=1384332&r2=1384333&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/JavaEEVersion.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/util/JavaEEVersion.java Thu Sep 13 13:49:20 2012
@@ -45,22 +45,22 @@ public class JavaEEVersion
/**
* Represents the J2EE 1.3 version.
*/
- public static final JavaEEVersion OneDotThree = new JavaEEVersion( new Integer( 0 ), VERSION_1_3 );
+ public static final JavaEEVersion OneDotThree = new JavaEEVersion( Integer.valueOf( 0 ), VERSION_1_3 );
/**
* Represents the J2EE 1.4 version.
*/
- public static final JavaEEVersion OneDotFour = new JavaEEVersion( new Integer( 1 ), VERSION_1_4 );
+ public static final JavaEEVersion OneDotFour = new JavaEEVersion( Integer.valueOf( 1 ), VERSION_1_4 );
/**
* Represents the JavaEE 5 version.
*/
- public static final JavaEEVersion Five = new JavaEEVersion( new Integer( 2 ), VERSION_5 );
+ public static final JavaEEVersion Five = new JavaEEVersion( Integer.valueOf( 2 ), VERSION_5 );
/**
* Represents the JavaEE 7 version.
*/
- public static final JavaEEVersion Six = new JavaEEVersion( new Integer( 3 ), VERSION_6 );
+ public static final JavaEEVersion Six = new JavaEEVersion( Integer.valueOf( 3 ), VERSION_6 );
private final Integer index;
@@ -81,7 +81,7 @@ public class JavaEEVersion
{
throw new InvalidJavaEEVersion( "Invalid version [" + version + "]", version );
}
- return (JavaEEVersion) versionsMap.get( version );
+ return versionsMap.get( version );
}
/**
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java?rev=1384333&r1=1384332&r2=1384333&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java Thu Sep 13 13:49:20 2012
@@ -18,19 +18,7 @@
*/
package org.apache.maven.plugin.eclipse;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
+import aQute.lib.osgi.Analyzer;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.deployer.ArtifactDeployer;
import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
@@ -62,7 +50,18 @@ import org.codehaus.plexus.personality.p
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
-import aQute.lib.osgi.Analyzer;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* Add eclipse artifacts from an eclipse installation to the local repo. This mojo automatically analize the eclipse
@@ -70,7 +69,7 @@ import aQute.lib.osgi.Analyzer;
* repository builder for Eclipse plugins, so it has the necessary default values. For customized repositories see
* {@link MakeArtifactsMojo} Typical usage:
* <code>mvn eclipse:to-maven -DdeployTo=maven.org::default::scpexe://repo1.maven.org/home/maven/repository-staging/to-ibiblio/eclipse-staging -DeclipseDir=.</code>
- *
+ *
* @author Fabrizio Giustina
* @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
* @version $Id$
@@ -99,7 +98,7 @@ public class EclipseToMavenMojo
/**
* Local maven repository.
- *
+ *
* @parameter expression="${localRepository}"
* @required
* @readonly
@@ -108,42 +107,42 @@ public class EclipseToMavenMojo
/**
* ArtifactRepositoryFactory component.
- *
+ *
* @component
*/
private ArtifactRepositoryFactory artifactRepositoryFactory;
/**
* ArtifactFactory component.
- *
+ *
* @component
*/
private ArtifactFactory artifactFactory;
/**
* ArtifactInstaller component.
- *
+ *
* @component
*/
protected ArtifactInstaller installer;
/**
* ArtifactDeployer component.
- *
+ *
* @component
*/
private ArtifactDeployer deployer;
/**
* Eclipse installation dir. If not set, a value for this parameter will be asked on the command line.
- *
+ *
* @parameter expression="${eclipseDir}"
*/
private File eclipseDir;
/**
* Input handler, needed for comand line handling.
- *
+ *
* @component
*/
protected InputHandler inputHandler;
@@ -154,7 +153,7 @@ public class EclipseToMavenMojo
* release <code>3.2</code> can be named <code>org.eclipse.core.filesystem_1.0.0.v20060603.jar</code>. It's usually
* handy to not to include this qualifier when generating maven artifacts for major releases, while it's needed when
* working with eclipse integration/nightly builds.
- *
+ *
* @parameter expression="${stripQualifier}" default-value="false"
*/
private boolean stripQualifier;
@@ -162,7 +161,7 @@ public class EclipseToMavenMojo
/**
* Specifies a remote repository to which generated artifacts should be deployed to. If this property is specified,
* artifacts are also deployed to the remote repo. The format for this parameter is <code>id::layout::url</code>
- *
+ *
* @parameter expression="${deployTo}"
*/
private String deployTo;
@@ -184,25 +183,24 @@ public class EclipseToMavenMojo
}
catch ( IOException e )
{
- throw new MojoFailureException( Messages.getString( "EclipseToMavenMojo.errorreadingfromstandardinput" ) ); //$NON-NLS-1$
+ throw new MojoFailureException(
+ Messages.getString( "EclipseToMavenMojo.errorreadingfromstandardinput" ) ); //$NON-NLS-1$
}
eclipseDir = new File( eclipseDirString );
}
if ( !eclipseDir.isDirectory() )
{
- throw new MojoFailureException(
- Messages.getString(
- "EclipseToMavenMojo.directoydoesnotexist", eclipseDir.getAbsolutePath() ) ); //$NON-NLS-1$
+ throw new MojoFailureException( Messages.getString( "EclipseToMavenMojo.directoydoesnotexist",
+ eclipseDir.getAbsolutePath() ) ); //$NON-NLS-1$
}
File pluginDir = new File( eclipseDir, "plugins" ); //$NON-NLS-1$
if ( !pluginDir.isDirectory() )
{
- throw new MojoFailureException(
- Messages.getString(
- "EclipseToMavenMojo.plugindirectorydoesnotexist", pluginDir.getAbsolutePath() ) ); //$NON-NLS-1$
+ throw new MojoFailureException( Messages.getString( "EclipseToMavenMojo.plugindirectorydoesnotexist",
+ pluginDir.getAbsolutePath() ) ); //$NON-NLS-1$
}
File[] files = pluginDir.listFiles();
@@ -211,7 +209,8 @@ public class EclipseToMavenMojo
if ( remoteRepo != null )
{
- getLog().info( Messages.getString( "EclipseToMavenMojo.remoterepositorydeployto", deployTo ) ); //$NON-NLS-1$
+ getLog().info(
+ Messages.getString( "EclipseToMavenMojo.remoterepositorydeployto", deployTo ) ); //$NON-NLS-1$
}
Map plugins = new HashMap();
@@ -221,7 +220,8 @@ public class EclipseToMavenMojo
{
File file = files[j];
- getLog().info( Messages.getString( "EclipseToMavenMojo.processingfile", file.getAbsolutePath() ) ); //$NON-NLS-1$
+ getLog().info(
+ Messages.getString( "EclipseToMavenMojo.processingfile", file.getAbsolutePath() ) ); //$NON-NLS-1$
processFile( file, plugins, models );
}
@@ -229,9 +229,9 @@ public class EclipseToMavenMojo
int i = 1;
for ( Iterator it = plugins.keySet().iterator(); it.hasNext(); )
{
- getLog().info(
- Messages.getString(
- "EclipseToMavenMojo.processingplugin", new Object[] { new Integer( i++ ), new Integer( plugins.keySet().size() ) } ) ); //$NON-NLS-1$
+ getLog().info( Messages.getString( "EclipseToMavenMojo.processingplugin",
+ new Object[]{ Integer.valueOf( i++ ),
+ Integer.valueOf( plugins.keySet().size() ) } ) ); //$NON-NLS-1$
String key = (String) it.next();
EclipseOsgiPlugin plugin = (EclipseOsgiPlugin) plugins.get( key );
Model model = (Model) models.get( key );
@@ -246,7 +246,8 @@ public class EclipseToMavenMojo
if ( plugin == null )
{
- getLog().warn( Messages.getString( "EclipseToMavenMojo.skippingfile", file.getAbsolutePath() ) ); //$NON-NLS-1$
+ getLog().warn(
+ Messages.getString( "EclipseToMavenMojo.skippingfile", file.getAbsolutePath() ) ); //$NON-NLS-1$
return;
}
@@ -280,7 +281,7 @@ public class EclipseToMavenMojo
/**
* Resolve version ranges in the model provided, overriding version ranges with versions from the dependency in the
* provided map of models. TODO doesn't check if the version is in range, it just overwrites it
- *
+ *
* @param model
* @param models
* @throws MojoFailureException
@@ -291,7 +292,8 @@ public class EclipseToMavenMojo
for ( Iterator it = model.getDependencies().iterator(); it.hasNext(); )
{
Dependency dep = (Dependency) it.next();
- if ( dep.getVersion().indexOf( "[" ) > -1 || dep.getVersion().indexOf( "(" ) > -1 ) //$NON-NLS-1$ //$NON-NLS-2$
+ if ( dep.getVersion().indexOf( "[" ) > -1
+ || dep.getVersion().indexOf( "(" ) > -1 ) //$NON-NLS-1$ //$NON-NLS-2$
{
String key = getKey( model );
Model dependencyModel = (Model) models.get( getKey( dep ) );
@@ -302,9 +304,9 @@ public class EclipseToMavenMojo
else
{
throw new MojoFailureException(
- Messages.getString(
- "EclipseToMavenMojo.unabletoresolveversionrange", new Object[] { dep //$NON-NLS-1$
- , key } ) ); //$NON-NLS-1$
+ Messages.getString( "EclipseToMavenMojo.unabletoresolveversionrange",
+ new Object[]{ dep //$NON-NLS-1$
+ , key } ) ); //$NON-NLS-1$
}
}
}
@@ -312,7 +314,7 @@ public class EclipseToMavenMojo
/**
* Get a {@link EclipseOsgiPlugin} object from a plugin jar/dir found in the target dir.
- *
+ *
* @param file plugin jar or dir
* @throws MojoExecutionException if anything bad happens while parsing files
*/
@@ -332,8 +334,8 @@ public class EclipseToMavenMojo
catch ( IOException e )
{
throw new MojoExecutionException(
- Messages.getString(
- "EclipseToMavenMojo.unabletoaccessjar", file.getAbsolutePath() ), e ); //$NON-NLS-1$
+ Messages.getString( "EclipseToMavenMojo.unabletoaccessjar", file.getAbsolutePath() ),
+ e ); //$NON-NLS-1$
}
}
@@ -342,7 +344,7 @@ public class EclipseToMavenMojo
/**
* Create the {@link Model} from a plugin manifest
- *
+ *
* @param plugin Eclipse plugin jar or dir
* @throws MojoExecutionException if anything bad happens while parsing files
*/
@@ -356,7 +358,8 @@ public class EclipseToMavenMojo
{
if ( !plugin.hasManifest() )
{
- getLog().warn( Messages.getString( "EclipseToMavenMojo.plugindoesnothavemanifest", plugin ) ); //$NON-NLS-1$
+ getLog().warn(
+ Messages.getString( "EclipseToMavenMojo.plugindoesnothavemanifest", plugin ) ); //$NON-NLS-1$
return null;
}
@@ -369,7 +372,8 @@ public class EclipseToMavenMojo
if ( bundleName == null || version == null )
{
- getLog().error( Messages.getString( "EclipseToMavenMojo.unabletoreadbundlefrommanifest" ) ); //$NON-NLS-1$
+ getLog().error(
+ Messages.getString( "EclipseToMavenMojo.unabletoreadbundlefrommanifest" ) ); //$NON-NLS-1$
return null;
}
@@ -382,8 +386,8 @@ public class EclipseToMavenMojo
}
catch ( IOException e )
{
- throw new MojoExecutionException(
- Messages.getString( "EclipseToMavenMojo.errorprocessingplugin", plugin ), e ); //$NON-NLS-1$
+ throw new MojoExecutionException( Messages.getString( "EclipseToMavenMojo.errorprocessingplugin", plugin ),
+ e ); //$NON-NLS-1$
}
Dependency[] deps = parseDependencies( requireBundle );
@@ -432,7 +436,7 @@ public class EclipseToMavenMojo
/**
* Writes the artifact to the repo
- *
+ *
* @param model
* @param remoteRepo remote repository (if set)
* @throws MojoExecutionException
@@ -444,7 +448,8 @@ public class EclipseToMavenMojo
ArtifactMetadata metadata = null;
File pomFile = null;
Artifact pomArtifact =
- artifactFactory.createArtifact( model.getGroupId(), model.getArtifactId(), model.getVersion(), null, "pom" ); //$NON-NLS-1$
+ artifactFactory.createArtifact( model.getGroupId(), model.getArtifactId(), model.getVersion(), null,
+ "pom" ); //$NON-NLS-1$
Artifact artifact =
artifactFactory.createArtifact( model.getGroupId(), model.getArtifactId(), model.getVersion(), null,
Constants.PROJECT_PACKAGING_JAR );
@@ -454,7 +459,8 @@ public class EclipseToMavenMojo
// TODO use WriterFactory.newXmlWriter() when plexus-utils is upgraded to 1.4.5+
fw = new OutputStreamWriter( new FileOutputStream( pomFile ), "UTF-8" ); //$NON-NLS-1$
- model.setModelEncoding( "UTF-8" ); // to be removed when encoding is detected instead of forced to UTF-8 //$NON-NLS-1$
+ model.setModelEncoding(
+ "UTF-8" ); // to be removed when encoding is detected instead of forced to UTF-8 //$NON-NLS-1$
pomFile.deleteOnExit();
new MavenXpp3Writer().write( fw, model );
metadata = new ProjectArtifactMetadata( pomArtifact, pomFile );
@@ -463,8 +469,7 @@ public class EclipseToMavenMojo
catch ( IOException e )
{
throw new MojoExecutionException(
- Messages.getString(
- "EclipseToMavenMojo.errorwritingtemporarypom", e.getMessage() ), e ); //$NON-NLS-1$
+ Messages.getString( "EclipseToMavenMojo.errorwritingtemporarypom", e.getMessage() ), e ); //$NON-NLS-1$
}
finally
{
@@ -489,18 +494,17 @@ public class EclipseToMavenMojo
catch ( ArtifactDeploymentException e )
{
throw new MojoExecutionException(
- Messages.getString( "EclipseToMavenMojo.errordeployartifacttorepository" ), e ); //$NON-NLS-1$
+ Messages.getString( "EclipseToMavenMojo.errordeployartifacttorepository" ), e ); //$NON-NLS-1$
}
catch ( ArtifactInstallationException e )
{
throw new MojoExecutionException(
- Messages.getString( "EclipseToMavenMojo.errorinstallartifacttorepository" ), e ); //$NON-NLS-1$
+ Messages.getString( "EclipseToMavenMojo.errorinstallartifacttorepository" ), e ); //$NON-NLS-1$
}
catch ( IOException e )
{
throw new MojoExecutionException(
- Messages.getString(
- "EclipseToMavenMojo.errorgettingjarfileforplugin", plugin ), e ); //$NON-NLS-1$
+ Messages.getString( "EclipseToMavenMojo.errorgettingjarfileforplugin", plugin ), e ); //$NON-NLS-1$
}
finally
{
@@ -517,10 +521,10 @@ public class EclipseToMavenMojo
/**
* The 4th (build) token MUST be separed with "-" and not with "." in maven. A version with 4 dots is not parsed,
* and the whole string is considered a qualifier. See tests in DefaultArtifactVersion for reference.
- *
- * @param version initial version
+ *
+ * @param version initial version
* @param forcedQualifier build number
- * @param stripQualifier always remove 4th token in version
+ * @param stripQualifier always remove 4th token in version
* @return converted version
*/
protected String osgiVersionToMavenVersion( String version, String forcedQualifier, boolean stripQualifier )
@@ -547,10 +551,10 @@ public class EclipseToMavenMojo
/**
* Resolves the deploy<code>deployTo</code> parameter to an <code>ArtifactRepository</code> instance (if set).
- *
+ *
+ * @return ArtifactRepository instance of null if <code>deployTo</code> is not set.
* @throws MojoFailureException
* @throws MojoExecutionException
- * @return ArtifactRepository instance of null if <code>deployTo</code> is not set.
*/
private ArtifactRepository resolveRemoteRepo()
throws MojoFailureException, MojoExecutionException
@@ -562,8 +566,10 @@ public class EclipseToMavenMojo
if ( !matcher.matches() )
{
throw new MojoFailureException( deployTo,
- Messages.getString( "EclipseToMavenMojo.invalidsyntaxforrepository" ), //$NON-NLS-1$
- Messages.getString( "EclipseToMavenMojo.invalidremoterepositorysyntax" ) ); //$NON-NLS-1$
+ Messages.getString( "EclipseToMavenMojo.invalidsyntaxforrepository" ),
+ //$NON-NLS-1$
+ Messages.getString(
+ "EclipseToMavenMojo.invalidremoterepositorysyntax" ) ); //$NON-NLS-1$
}
else
{
@@ -579,8 +585,8 @@ public class EclipseToMavenMojo
catch ( ComponentLookupException e )
{
throw new MojoExecutionException(
- Messages.getString(
- "EclipseToMavenMojo.cannotfindrepositorylayout", layout ), e ); //$NON-NLS-1$
+ Messages.getString( "EclipseToMavenMojo.cannotfindrepositorylayout", layout ),
+ e ); //$NON-NLS-1$
}
return artifactRepositoryFactory.createDeploymentArtifactRepository( id, url, repoLayout, true );
@@ -600,7 +606,7 @@ public class EclipseToMavenMojo
/**
* Get the group id as the tokens until last dot e.g. <code>org.eclipse.jdt</code> -> <code>org.eclipse</code>
- *
+ *
* @param bundleName bundle name
* @return group id
*/
@@ -612,12 +618,14 @@ public class EclipseToMavenMojo
return bundleName.substring( 0, i );
}
else
+ {
return bundleName;
+ }
}
/**
* Get the artifact id as the tokens after last dot e.g. <code>org.eclipse.jdt</code> -> <code>jdt</code>
- *
+ *
* @param bundleName bundle name
* @return artifact id
*/
@@ -629,12 +637,14 @@ public class EclipseToMavenMojo
return bundleName.substring( i + 1 );
}
else
+ {
return bundleName;
+ }
}
/**
* Parses the "Require-Bundle" and convert it to a list of dependencies.
- *
+ *
* @param requireBundle "Require-Bundle" entry
* @return an array of <code>Dependency</code>
*/
@@ -663,7 +673,8 @@ public class EclipseToMavenMojo
if ( version == null )
{
- getLog().info( Messages.getString( "EclipseToMavenMojo.missingversionforbundle", bundleName ) ); //$NON-NLS-1$
+ getLog().info(
+ Messages.getString( "EclipseToMavenMojo.missingversionforbundle", bundleName ) ); //$NON-NLS-1$
version = "[0,)"; //$NON-NLS-1$
}
@@ -685,7 +696,7 @@ public class EclipseToMavenMojo
/**
* Fix the separator for the 4th token in a versions. In maven this must be "-", in OSGI it's "."
- *
+ *
* @param versionRange input range
* @return modified version range
*/
Modified: maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java?rev=1384333&r1=1384332&r2=1384333&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java (original)
+++ maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java Thu Sep 13 13:49:20 2012
@@ -19,16 +19,6 @@ package org.apache.maven.plugins.help;
* under the License.
*/
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -64,14 +54,24 @@ import org.apache.maven.tools.plugin.uti
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.util.StringUtils;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
+
/**
* Displays a list of the attributes for a Maven Plugin and/or goals (aka Mojo - Maven plain Old Java Object).
*
* @version $Id$
- * @since 2.0
* @see <a href="http://maven.apache.org/general.html#What_is_a_Mojo">What is a Mojo?</a>
+ * @since 2.0
*/
-@Mojo( name = "describe", requiresProject = false, aggregator = true )
+@Mojo (name = "describe", requiresProject = false, aggregator = true)
public class DescribeMojo
extends AbstractHelpMojo
{
@@ -110,7 +110,7 @@ public class DescribeMojo
/**
* The Plugin manager instance used to resolve Plugin descriptors.
*/
- @Component( role = PluginManager.class )
+ @Component (role = PluginManager.class)
private PluginManager pluginManager;
/**
@@ -118,7 +118,7 @@ public class DescribeMojo
* in the event there is no current MavenProject instance. Some MavenProject
* instance has to be present to use in the plugin manager APIs.
*/
- @Component( role = MavenProjectBuilder.class )
+ @Component (role = MavenProjectBuilder.class)
private MavenProjectBuilder projectBuilder;
// ----------------------------------------------------------------------
@@ -152,7 +152,7 @@ public class DescribeMojo
* The local repository ArtifactRepository instance. This is used
* for plugin manager API calls.
*/
- @org.apache.maven.plugins.annotations.Parameter( property = "localRepository", required = true, readonly = true )
+ @org.apache.maven.plugins.annotations.Parameter (property = "localRepository", required = true, readonly = true)
private ArtifactRepository localRepository;
/**
@@ -160,8 +160,8 @@ public class DescribeMojo
*
* @since 2.1
*/
- @org.apache.maven.plugins.annotations.Parameter( property = "project.remoteArtifactRepositories", required = true,
- readonly = true )
+ @org.apache.maven.plugins.annotations.Parameter (property = "project.remoteArtifactRepositories", required = true,
+ readonly = true)
private List remoteRepositories;
/**
@@ -173,7 +173,7 @@ public class DescribeMojo
* <li>groupId:artifactId:version, i.e. 'org.apache.maven.plugins:maven-help-plugin:2.0'</li>
* </ol>
*/
- @org.apache.maven.plugins.annotations.Parameter( property = "plugin", alias = "prefix" )
+ @org.apache.maven.plugins.annotations.Parameter (property = "plugin", alias = "prefix")
private String plugin;
/**
@@ -181,7 +181,7 @@ public class DescribeMojo
* <br/>
* <b>Note</b>: Should be used with <code>artifactId</code> parameter.
*/
- @org.apache.maven.plugins.annotations.Parameter( property = "groupId" )
+ @org.apache.maven.plugins.annotations.Parameter (property = "groupId")
private String groupId;
/**
@@ -189,7 +189,7 @@ public class DescribeMojo
* <br/>
* <b>Note</b>: Should be used with <code>groupId</code> parameter.
*/
- @org.apache.maven.plugins.annotations.Parameter( property = "artifactId" )
+ @org.apache.maven.plugins.annotations.Parameter (property = "artifactId")
private String artifactId;
/**
@@ -197,7 +197,7 @@ public class DescribeMojo
* <br/>
* <b>Note</b>: Should be used with <code>groupId/artifactId</code> parameters.
*/
- @org.apache.maven.plugins.annotations.Parameter( property = "version" )
+ @org.apache.maven.plugins.annotations.Parameter (property = "version")
private String version;
/**
@@ -207,7 +207,7 @@ public class DescribeMojo
*
* @since 2.1, was <code>mojo</code> in 2.0.x
*/
- @org.apache.maven.plugins.annotations.Parameter( property = "goal", alias = "mojo" )
+ @org.apache.maven.plugins.annotations.Parameter (property = "goal", alias = "mojo")
private String goal;
/**
@@ -215,7 +215,7 @@ public class DescribeMojo
*
* @since 2.1, was <code>full</code> in 2.0.x
*/
- @org.apache.maven.plugins.annotations.Parameter( property = "detail", defaultValue = "false", alias = "full" )
+ @org.apache.maven.plugins.annotations.Parameter (property = "detail", defaultValue = "false", alias = "full")
private boolean detail;
/**
@@ -223,7 +223,7 @@ public class DescribeMojo
*
* @since 2.0.2
*/
- @org.apache.maven.plugins.annotations.Parameter( property = "medium", defaultValue = "true" )
+ @org.apache.maven.plugins.annotations.Parameter (property = "medium", defaultValue = "true")
private boolean medium;
/**
@@ -231,7 +231,7 @@ public class DescribeMojo
*
* @since 2.1
*/
- @org.apache.maven.plugins.annotations.Parameter( property = "minimal", defaultValue = "false" )
+ @org.apache.maven.plugins.annotations.Parameter (property = "minimal", defaultValue = "false")
private boolean minimal;
/**
@@ -241,14 +241,16 @@ public class DescribeMojo
*
* @since 2.1
*/
- @org.apache.maven.plugins.annotations.Parameter( property = "cmd" )
+ @org.apache.maven.plugins.annotations.Parameter (property = "cmd")
private String cmd;
// ----------------------------------------------------------------------
// Public methods
// ----------------------------------------------------------------------
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void execute()
throws MojoExecutionException, MojoFailureException
{
@@ -367,9 +369,9 @@ public class DescribeMojo
* Method for retrieving the description of the plugin
*
* @param pi holds information of the plugin whose description is to be retrieved
- * @return a PluginDescriptor where the plugin description is to be retrieved
+ * @return a PluginDescriptor where the plugin description is to be retrieved
* @throws MojoExecutionException if the plugin could not be verify
- * @throws MojoFailureException if groupId or artifactId is empty
+ * @throws MojoFailureException if groupId or artifactId is empty
*/
private PluginDescriptor lookupPluginDescriptor( PluginInfo pi )
throws MojoExecutionException, MojoFailureException
@@ -402,7 +404,7 @@ public class DescribeMojo
{
StringBuffer msg = new StringBuffer();
msg.append( "You must specify either: both 'groupId' and 'artifactId' parameters OR a 'plugin' parameter"
- + " OR a 'cmd' parameter. For instance:\n" );
+ + " OR a 'cmd' parameter. For instance:\n" );
msg.append( " # mvn help:describe -Dcmd=install\n" );
msg.append( "or\n" );
msg.append( " # mvn help:describe -Dcmd=help:describe\n" );
@@ -423,18 +425,21 @@ public class DescribeMojo
}
catch ( ArtifactResolutionException e )
{
- throw new MojoExecutionException( "Error retrieving plugin descriptor for:\n\ngroupId: '"
- + groupId + "'\nartifactId: '" + artifactId + "'\nversion: '" + version + "'\n\n", e );
+ throw new MojoExecutionException(
+ "Error retrieving plugin descriptor for:\n\ngroupId: '" + groupId + "'\nartifactId: '" + artifactId
+ + "'\nversion: '" + version + "'\n\n", e );
}
catch ( PluginManagerException e )
{
- throw new MojoExecutionException( "Error retrieving plugin descriptor for:\n\ngroupId: '"
- + groupId + "'\nartifactId: '" + artifactId + "'\nversion: '" + version + "'\n\n", e );
+ throw new MojoExecutionException(
+ "Error retrieving plugin descriptor for:\n\ngroupId: '" + groupId + "'\nartifactId: '" + artifactId
+ + "'\nversion: '" + version + "'\n\n", e );
}
catch ( PluginVersionResolutionException e )
{
- throw new MojoExecutionException( "Error retrieving plugin descriptor for:\n\ngroupId: '"
- + groupId + "'\nartifactId: '" + artifactId + "'\nversion: '" + version + "'\n\n", e );
+ throw new MojoExecutionException(
+ "Error retrieving plugin descriptor for:\n\ngroupId: '" + groupId + "'\nartifactId: '" + artifactId
+ + "'\nversion: '" + version + "'\n\n", e );
}
catch ( ArtifactNotFoundException e )
{
@@ -442,13 +447,15 @@ public class DescribeMojo
}
catch ( InvalidVersionSpecificationException e )
{
- throw new MojoExecutionException( "Error retrieving plugin descriptor for:\n\ngroupId: '"
- + groupId + "'\nartifactId: '" + artifactId + "'\nversion: '" + version + "'\n\n", e );
+ throw new MojoExecutionException(
+ "Error retrieving plugin descriptor for:\n\ngroupId: '" + groupId + "'\nartifactId: '" + artifactId
+ + "'\nversion: '" + version + "'\n\n", e );
}
catch ( InvalidPluginException e )
{
- throw new MojoExecutionException( "Error retrieving plugin descriptor for:\n\ngroupId: '"
- + groupId + "'\nartifactId: '" + artifactId + "'\nversion: '" + version + "'\n\n", e );
+ throw new MojoExecutionException(
+ "Error retrieving plugin descriptor for:\n\ngroupId: '" + groupId + "'\nartifactId: '" + artifactId
+ + "'\nversion: '" + version + "'\n\n", e );
}
catch ( PluginNotFoundException e )
{
@@ -471,7 +478,7 @@ public class DescribeMojo
if ( descriptor == null )
{
throw new MojoFailureException( "Plugin could not be found. If you believe it is correct,"
- + " check your pluginGroups setting, and run with -U to update the remote configuration" );
+ + " check your pluginGroups setting, and run with -U to update the remote configuration" );
}
return descriptor;
@@ -482,7 +489,7 @@ public class DescribeMojo
*
* @param pi contains information about the plugin whose description is to be retrieved
* @throws MojoFailureException if <code>plugin<*code> parameter is not conform to
- * <code>groupId:artifactId[:version]</code>
+ * <code>groupId:artifactId[:version]</code>
*/
private void parsePluginLookupInfo( PluginInfo pi )
throws MojoFailureException
@@ -509,7 +516,7 @@ public class DescribeMojo
break;
default:
throw new MojoFailureException( "plugin parameter must be a plugin prefix,"
- + " or conform to: 'groupId:artifactId[:version]'." );
+ + " or conform to: 'groupId:artifactId[:version]'." );
}
}
else
@@ -528,9 +535,9 @@ public class DescribeMojo
/**
* Method for retrieving the plugin description
*
- * @param pd contains the plugin description
+ * @param pd contains the plugin description
* @param buffer contains the information to be displayed or printed
- * @throws MojoFailureException if any reflection exceptions occur.
+ * @throws MojoFailureException if any reflection exceptions occur.
* @throws MojoExecutionException if any
*/
private void describePlugin( PluginDescriptor pd, StringBuffer buffer )
@@ -546,9 +553,9 @@ public class DescribeMojo
// TODO remove when maven-plugin-tools-api:2.4.4
try
{
- Artifact artifact =
- artifactFactory.createPluginArtifact( pd.getGroupId(), pd.getArtifactId(),
- VersionRange.createFromVersion( pd.getVersion() ) );
+ Artifact artifact = artifactFactory.createPluginArtifact( pd.getGroupId(), pd.getArtifactId(),
+ VersionRange.createFromVersion(
+ pd.getVersion() ) );
MavenProject pluginProject =
projectBuilder.buildFromRepository( artifact, remoteRepositories, localRepository );
@@ -611,9 +618,9 @@ public class DescribeMojo
/**
* Displays information about the Plugin Mojo
*
- * @param md contains the description of the Plugin Mojo
+ * @param md contains the description of the Plugin Mojo
* @param buffer the displayed output
- * @throws MojoFailureException if any reflection exceptions occur.
+ * @throws MojoFailureException if any reflection exceptions occur.
* @throws MojoExecutionException if any
*/
private void describeMojo( MojoDescriptor md, StringBuffer buffer )
@@ -635,10 +642,10 @@ public class DescribeMojo
/**
* Displays detailed information about the Plugin Mojo
*
- * @param md contains the description of the Plugin Mojo
- * @param buffer contains information to be printed or displayed
+ * @param md contains the description of the Plugin Mojo
+ * @param buffer contains information to be printed or displayed
* @param fullDescription specifies whether all the details about the Plugin Mojo is to be displayed
- * @throws MojoFailureException if any reflection exceptions occur.
+ * @throws MojoFailureException if any reflection exceptions occur.
* @throws MojoExecutionException if any
*/
private void describeMojoGuts( MojoDescriptor md, StringBuffer buffer, boolean fullDescription )
@@ -708,9 +715,9 @@ public class DescribeMojo
/**
* Displays parameter information of the Plugin Mojo
*
- * @param md contains the description of the Plugin Mojo
+ * @param md contains the description of the Plugin Mojo
* @param buffer contains information to be printed or displayed
- * @throws MojoFailureException if any reflection exceptions occur.
+ * @throws MojoFailureException if any reflection exceptions occur.
* @throws MojoExecutionException if any
*/
private void describeMojoParameters( MojoDescriptor md, StringBuffer buffer )
@@ -806,7 +813,7 @@ public class DescribeMojo
*
* @param descriptionBuffer not null
* @return <code>true</code> if it implies to describe a plugin, <code>false</code> otherwise.
- * @throws MojoFailureException if any reflection exceptions occur or missing components.
+ * @throws MojoFailureException if any reflection exceptions occur or missing components.
* @throws MojoExecutionException if any
*/
private boolean describeCommand( StringBuffer descriptionBuffer )
@@ -848,8 +855,9 @@ public class DescribeMojo
}
descriptionBuffer.append( "\n" );
- descriptionBuffer.append( "It is a part of the lifecycle for the POM packaging '"
- + project.getPackaging() + "'. This lifecycle includes the following phases:" );
+ descriptionBuffer.append(
+ "It is a part of the lifecycle for the POM packaging '" + project.getPackaging()
+ + "'. This lifecycle includes the following phases:" );
descriptionBuffer.append( "\n" );
for ( Iterator it = lifecycle.getPhases().iterator(); it.hasNext(); )
{
@@ -926,12 +934,12 @@ public class DescribeMojo
* Invoke the following private method
* <code>HelpMojo#toLines(String, int, int, int)</code>
*
- * @param text The text to split into lines, must not be <code>null</code>.
- * @param indent The base indentation level of each line, must not be negative.
+ * @param text The text to split into lines, must not be <code>null</code>.
+ * @param indent The base indentation level of each line, must not be negative.
* @param indentSize The size of each indentation, must not be negative.
* @param lineLength The length of the line, must not be negative.
* @return The sequence of display lines, never <code>null</code>.
- * @throws MojoFailureException if any can not invoke the method
+ * @throws MojoFailureException if any can not invoke the method
* @throws MojoExecutionException if no line was found for <code>text</code>
* @see HelpMojo#toLines(String, int, int, int)
*/
@@ -940,13 +948,13 @@ public class DescribeMojo
{
try
{
- Method m =
- HelpMojo.class.getDeclaredMethod( "toLines", new Class[] { String.class, Integer.TYPE,
- Integer.TYPE, Integer.TYPE } );
+ Method m = HelpMojo.class.getDeclaredMethod( "toLines",
+ new Class[]{ String.class, Integer.TYPE, Integer.TYPE,
+ Integer.TYPE } );
m.setAccessible( true );
- List output =
- (List) m.invoke( HelpMojo.class, new Object[] { text, new Integer( indent ),
- new Integer( indentSize ), new Integer( lineLength ) } );
+ List output = (List) m.invoke( HelpMojo.class,
+ new Object[]{ text, Integer.valueOf( indent ), Integer.valueOf( indentSize ),
+ Integer.valueOf( lineLength ) } );
if ( output == null )
{
@@ -988,10 +996,10 @@ public class DescribeMojo
* Append a description to the buffer by respecting the indentSize and lineLength parameters.
* <b>Note</b>: The last character is always a new line.
*
- * @param sb The buffer to append the description, not <code>null</code>.
+ * @param sb The buffer to append the description, not <code>null</code>.
* @param description The description, not <code>null</code>.
- * @param indent The base indentation level of each line, must not be negative.
- * @throws MojoFailureException if any reflection exceptions occur.
+ * @param indent The base indentation level of each line, must not be negative.
+ * @throws MojoFailureException if any reflection exceptions occur.
* @throws MojoExecutionException if any
* @see #toLines(String, int, int, int)
*/
@@ -1014,11 +1022,11 @@ public class DescribeMojo
* Append a description to the buffer by respecting the indentSize and lineLength parameters.
* <b>Note</b>: The last character is always a new line.
*
- * @param sb The buffer to append the description, not <code>null</code>.
- * @param key The key, not <code>null</code>.
- * @param value The value associated to the key, could be <code>null</code>.
+ * @param sb The buffer to append the description, not <code>null</code>.
+ * @param key The key, not <code>null</code>.
+ * @param value The value associated to the key, could be <code>null</code>.
* @param indent The base indentation level of each line, must not be negative.
- * @throws MojoFailureException if any reflection exceptions occur.
+ * @throws MojoFailureException if any reflection exceptions occur.
* @throws MojoExecutionException if any
* @see #toLines(String, int, int, int)
*/
@@ -1047,11 +1055,11 @@ public class DescribeMojo
* and append the next lines with <code>indent + 1</code> like a paragraph.
* <b>Note</b>: The last character is always a new line.
*
- * @param sb The buffer to append the description, not <code>null</code>.
- * @param key The key, not <code>null</code>.
- * @param value The value, could be <code>null</code>.
+ * @param sb The buffer to append the description, not <code>null</code>.
+ * @param key The key, not <code>null</code>.
+ * @param value The value, could be <code>null</code>.
* @param indent The base indentation level of each line, must not be negative.
- * @throws MojoFailureException if any reflection exceptions occur.
+ * @throws MojoFailureException if any reflection exceptions occur.
* @throws MojoExecutionException if any
* @see #toLines(String, int, int, int)
*/
Modified: maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java?rev=1384333&r1=1384332&r2=1384333&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java (original)
+++ maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java Thu Sep 13 13:49:20 2012
@@ -262,7 +262,7 @@ public abstract class AbstractJarsignerM
}
}
- getLog().info( getMessage( "processed", new Integer( processed ) ) );
+ getLog().info( getMessage( "processed", Integer.valueOf( processed ) ) );
}
else
{