Author: rfscholte
Date: Tue Dec 11 20:58:35 2012
New Revision: 1420401
URL: http://svn.apache.org/viewvc?rev=1420401&view=rev
Log:
code format
Modified:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareWithPomReleaseMojo.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java
Modified:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareWithPomReleaseMojo.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareWithPomReleaseMojo.java?rev=1420401&r1=1420400&r2=1420401&view=diff
==============================================================================
---
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareWithPomReleaseMojo.java
(original)
+++
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareWithPomReleaseMojo.java
Tue Dec 11 20:58:35 2012
@@ -27,11 +27,11 @@ import org.apache.maven.plugins.annotati
/**
* Prepare for a release in SCM, fully resolving dependencies for the purpose
of producing a "release POM".
- *
+ *
* @author <a href="mailto:br...@apache.org";>Brett Porter</a>
* @since 2.0
*/
-@Mojo( name="prepare-with-pom", aggregator = true,
requiresDependencyResolution = ResolutionScope.TEST )
+@Mojo( name = "prepare-with-pom", aggregator = true,
requiresDependencyResolution = ResolutionScope.TEST )
public class PrepareWithPomReleaseMojo
extends PrepareReleaseMojo
{
Modified:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java?rev=1420401&r1=1420400&r2=1420401&view=diff
==============================================================================
---
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java
(original)
+++
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java
Tue Dec 11 20:58:35 2012
@@ -32,7 +32,7 @@ import org.codehaus.plexus.util.StringUt
/**
* Perform a release from SCM to a staging repository.
- *
+ *
* @author <a href="mailto:nico...@apache.org";>Nicolas De Loof</a>
* @version $Id$
* @since 2.0-beta-8
@@ -44,35 +44,35 @@ public class StageReleaseMojo
/**
* A comma or space separated list of goals to execute on deployment.
Default value is either <code>deploy</code> or
* <code>deploy site-deploy</code>, if the project has a
<distributionManagement>/<site> element.
- *
+ *
* @since 2.0-beta-8
*/
- @Parameter( property="goals" )
+ @Parameter( property = "goals" )
private String goals;
/**
* Comma separated profiles to enable on deployment, in addition to active
profiles for project execution.
- *
+ *
* @since 2.0-beta-8
*/
- @Parameter( property="releaseProfiles" )
+ @Parameter( property = "releaseProfiles" )
private String releaseProfiles;
/**
* The checkout directory.
- *
+ *
* @since 2.0-beta-8
*/
- @Parameter( defaultValue="${project.build.directory}/checkout",
property="workingDirectory", required = true )
+ @Parameter( defaultValue = "${project.build.directory}/checkout", property
= "workingDirectory", required = true )
private File workingDirectory;
/**
* The SCM URL to checkout from. If omitted, the one from the
<code>release.properties</code> file is used, followed
* by the URL from the current POM.
- *
+ *
* @since 2.0-beta-8
*/
- @Parameter( property="connectionUrl" )
+ @Parameter( property = "connectionUrl" )
private String connectionUrl;
/**
@@ -80,15 +80,15 @@ public class StageReleaseMojo
*
* @since 2.0-beta-8
*/
- @Parameter( defaultValue="true", property="useReleaseProfile" )
+ @Parameter( defaultValue = "true", property = "useReleaseProfile" )
private boolean useReleaseProfile;
/**
* URL of the staging repository to use.
- *
+ *
* @since 2.0-beta-8
*/
- @Parameter( property="stagingRepository", required = true )
+ @Parameter( property = "stagingRepository", required = true )
private String stagingRepository;
/**
Modified:
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java?rev=1420401&r1=1420400&r2=1420401&view=diff
==============================================================================
---
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java
(original)
+++
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/UpdateVersionsMojo.java
Tue Dec 11 20:58:35 2012
@@ -34,15 +34,16 @@ import org.apache.maven.shared.release.c
import org.apache.maven.shared.release.config.ReleaseUtils;
/**
- * Update the POM versions for a project. This performs the normal version
updates of the <tt>release:prepare</tt>
- * goal without making other modifications to the SCM such as tagging.
- * For more info see <a
href="http://maven.apache.org/plugins/maven-release-plugin/examples/update-versions.html";>http://maven.apache.org/plugins/maven-release-plugin/examples/update-versions.html</a>.
- *
+ * Update the POM versions for a project. This performs the normal version
updates of the <tt>release:prepare</tt> goal
+ * without making other modifications to the SCM such as tagging. For more
info see <a
+ *
href="http://maven.apache.org/plugins/maven-release-plugin/examples/update-versions.html";
+ *
>http://maven.apache.org/plugins/maven-release-plugin/examples/update-versions.html</a>.
+ *
* @author Paul Gier
* @version $Id$
* @since 2.0
*/
-@Mojo( name="update-versions", aggregator = true )
+@Mojo( name = "update-versions", aggregator = true )
public class UpdateVersionsMojo
extends AbstractReleaseMojo
{
@@ -50,10 +51,10 @@ public class UpdateVersionsMojo
/**
* Whether to automatically assign submodules the parent version. If set
to false, the user will be prompted for the
* version of each submodules.
- *
+ *
* @since 2.0
*/
- @Parameter( defaultValue="false", property="autoVersionSubmodules" )
+ @Parameter( defaultValue = "false", property = "autoVersionSubmodules" )
private boolean autoVersionSubmodules;
/**
@@ -61,15 +62,15 @@ public class UpdateVersionsMojo
*
* @since 2.0
*/
- @Parameter( defaultValue="true", property="addSchema" )
+ @Parameter( defaultValue = "true", property = "addSchema" )
private boolean addSchema;
/**
* Default version to use for new local working copy.
- *
+ *
* @since 2.0
*/
- @Parameter( property="developmentVersion" )
+ @Parameter( property = "developmentVersion" )
private String developmentVersion;
/**
@@ -84,12 +85,13 @@ public class UpdateVersionsMojo
config.setDefaultDevelopmentVersion( developmentVersion );
Map<String, Scm> originalScmInfo = new HashMap<String, Scm>();
- originalScmInfo.put( ArtifactUtils.versionlessKey(
project.getGroupId(), project.getArtifactId() ), project.getScm() );
+ originalScmInfo.put( ArtifactUtils.versionlessKey(
project.getGroupId(), project.getArtifactId() ),
+ project.getScm() );
config.setOriginalScmInfo( originalScmInfo );
// Create a config containing values from the session properties (ie
command line properties with cli).
- ReleaseDescriptor sysPropertiesConfig
- = ReleaseUtils.copyPropertiesToReleaseDescriptor(
session.getExecutionProperties() );
+ ReleaseDescriptor sysPropertiesConfig =
+ ReleaseUtils.copyPropertiesToReleaseDescriptor(
session.getExecutionProperties() );
mergeCommandLineConfig( config, sysPropertiesConfig );
try
