You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/07/04 00:45:41 UTC
svn commit: r1607760 - in
/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site:
SiteDescriptorAttachMojo.java deploy/AbstractDeployMojo.java
run/SiteRunMojo.java
Author: hboutemy
Date: Thu Jul 3 22:45:40 2014
New Revision: 1607760
URL: http://svn.apache.org/r1607760
Log:
fixed errors reported by Checkstyle
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java?rev=1607760&r1=1607759&r2=1607760&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java Thu Jul 3 22:45:40 2014
@@ -36,15 +36,16 @@ import org.codehaus.plexus.util.FileUtil
/**
* Adds the site descriptor (<code>site.xml</code>) to the list of files to be installed/deployed.<br/>
- * For Maven-2.x this is enabled by default only when the project has <code>pom</code> packaging since it will be used by modules inheriting,
- * but this can be enabled for other projects packaging if needed.<br/>
+ * For Maven-2.x this is enabled by default only when the project has <code>pom</code> packaging since it will be used
+ * by modules inheriting, but this can be enabled for other projects packaging if needed.<br/>
* This default execution has been removed from the built-in lifecycle of Maven 3.x for <code>pom</code>-projects.
- * Users that actually use those projects to provide a common site descriptor for sub modules will need to explicitly define this goal execution to restore the intended behavior.
+ * Users that actually use those projects to provide a common site descriptor for sub modules will need to explicitly
+ * define this goal execution to restore the intended behavior.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @version $Id$
*/
-@Mojo( name = "attach-descriptor", defaultPhase = LifecyclePhase.PACKAGE, threadSafe = true)
+@Mojo( name = "attach-descriptor", defaultPhase = LifecyclePhase.PACKAGE, threadSafe = true )
public class SiteDescriptorAttachMojo
extends AbstractSiteMojo
{
@@ -56,15 +57,11 @@ public class SiteDescriptorAttachMojo
/**
* Maven ProjectHelper.
*
- * @readonly
* @since 2.1.1
*/
@Component
private MavenProjectHelper projectHelper;
- /**
- * @parameter default-value="true"
- */
@Parameter( defaultValue = "true" )
private boolean pomPackagingOnly;
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java?rev=1607760&r1=1607759&r2=1607760&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java Thu Jul 3 22:45:40 2014
@@ -623,7 +623,9 @@ public abstract class AbstractDeployMojo
proxyInfo.setUserName( proxy.getUsername() );
proxyInfo.setPassword( proxy.getPassword() );
- getLog().debug("found proxyInfo " + ("host:port " + proxyInfo.getHost() + ":" + proxyInfo.getPort() + ", " + proxyInfo.getUserName()));
+ getLog().debug( "found proxyInfo "
+ + ( "host:port " + proxyInfo.getHost() + ":" + proxyInfo.getPort()
+ + ", " + proxyInfo.getUserName() ) );
return proxyInfo;
}
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java?rev=1607760&r1=1607759&r2=1607760&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java Thu Jul 3 22:45:40 2014
@@ -64,9 +64,8 @@ public class SiteRunMojo
/**
* The port to execute the HTTP server on.
- *
*/
- @Parameter(property = "port", defaultValue = "8080")
+ @Parameter( property = "port", defaultValue = "8080" )
private int port;
private static final int MAX_IDLE_TIME = 30000;