Author: hboutemy
Date: Sun Jun 26 22:34:17 2011
New Revision: 1139959
URL: http://svn.apache.org/viewvc?rev=1139959&view=rev
Log:
fixed errors reported by Checkstyle
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseResult.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java?rev=1139959&r1=1139958&r2=1139959&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
Sun Jun 26 22:34:17 2011
@@ -76,7 +76,7 @@ public class DefaultReleaseManager
/**
* The available phases.
*/
- private Map<String,ReleasePhase> releasePhases;
+ private Map<String, ReleasePhase> releasePhases;
/**
* The configuration storage.
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseResult.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseResult.java?rev=1139959&r1=1139958&r2=1139959&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseResult.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseResult.java
Sun Jun 26 22:34:17 2011
@@ -27,7 +27,7 @@ import java.io.PrintStream;
*/
public class ReleaseResult
{
- public static final int UNDEFINED = -1, SUCCESS = 0, ERROR = 1;
+ public final static int UNDEFINED = -1, SUCCESS = 0, ERROR = 1;
private StringBuffer stdOut = new StringBuffer();
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java?rev=1139959&r1=1139958&r2=1139959&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
Sun Jun 26 22:34:17 2011
@@ -253,7 +253,7 @@ public abstract class AbstractRewritePom
Element properties = rootElement.getChild( "properties", namespace );
String parentVersion = rewriteParent( project, rootElement, namespace,
mappedVersions,
- resolvedSnapshotDependencies,
originalVersions);
+ resolvedSnapshotDependencies,
originalVersions );
String projectId = ArtifactUtils.versionlessKey( project.getGroupId(),
project.getArtifactId() );
@@ -403,7 +403,7 @@ public abstract class AbstractRewritePom
}
private String rewriteParent( MavenProject project, Element rootElement,
Namespace namespace, Map mappedVersions,
- Map resolvedSnapshotDependencies, Map
originalVersions)
+ Map resolvedSnapshotDependencies, Map
originalVersions )
throws ReleaseFailureException
{
String parentVersion = null;
@@ -417,7 +417,7 @@ public abstract class AbstractRewritePom
if ( parentVersion == null )
{
//MRELEASE-317
- parentVersion = getResolvedSnapshotVersion(key,
resolvedSnapshotDependencies);
+ parentVersion = getResolvedSnapshotVersion( key,
resolvedSnapshotDependencies );
}
if ( parentVersion == null )
{
@@ -626,13 +626,13 @@ public abstract class AbstractRewritePom
String versionText =
versionElement.getTextTrim();
// avoid if it was not originally set to the
original value (it may be an expression), unless mapped version differs
- if ( originalVersion.equals( versionText ) ||
- !mappedVersion.equals( mappedVersions.get(
projectId ) ) )
+ if ( originalVersion.equals( versionText )
+ || !mappedVersion.equals(
mappedVersions.get( projectId ) ) )
{
rewriteValue( versionElement,
mappedVersion );
}
- else if ( versionText.matches(
"\\$\\{project.+\\}" ) ||
- versionText.matches( "\\$\\{pom.+\\}" ) ||
"${version}".equals( versionText ) )
+ else if ( versionText.matches(
"\\$\\{project.+\\}" )
+ || versionText.matches( "\\$\\{pom.+\\}" )
|| "${version}".equals( versionText ) )
{
logInfo( result,
"Ignoring artifact version update
for expression: " + versionText );
@@ -664,8 +664,8 @@ public abstract class AbstractRewritePom
|| mappedVersion.matches(
"\\$\\{pom.+\\}" )
|| "${version}".equals(
mappedVersion ) )
{
- logInfo( result, "Ignoring
artifact version update for expression: " +
- mappedVersion );
+ logInfo( result, "Ignoring
artifact version update for expression: "
+ + mappedVersion );
//ignore... we cannot update
this expression
}
else
@@ -750,8 +750,8 @@ public abstract class AbstractRewritePom
if ( rootElement.getAttribute( "schemaLocation", xsiNamespace ) ==
null )
{
- rootElement.setAttribute( "schemaLocation",
"http://maven.apache.org/POM/"; + modelVersion +
- " http://maven.apache.org/maven-v"; + modelVersion.replace(
'.', '_' ) + ".xsd", xsiNamespace );
+ rootElement.setAttribute( "schemaLocation",
"http://maven.apache.org/POM/"; + modelVersion
+ + " http://maven.apache.org/maven-v"; +
modelVersion.replace( '.', '_' ) + ".xsd", xsiNamespace );
}
// the empty namespace is considered equal to the POM namespace,
so match them up to avoid extra xmlns=""
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhase.java?rev=1139959&r1=1139958&r2=1139959&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhase.java
Sun Jun 26 22:34:17 2011
@@ -35,7 +35,6 @@ import org.apache.maven.shared.release.u
import java.io.File;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
/**
@@ -48,20 +47,22 @@ import java.util.List;
public class RemoveReleasePomsPhase
extends AbstractReleasePomsPhase
{
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor,
ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor,
ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseFailureException, ReleaseExecutionException
{
return execute( releaseDescriptor, releaseEnvironment,
reactorProjects, false );
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor,
ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor,
ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseFailureException, ReleaseExecutionException
{
return execute( releaseDescriptor, releaseEnvironment,
reactorProjects, true );
}
- private ReleaseResult execute( ReleaseDescriptor releaseDescriptor,
ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects,
- boolean simulate )
+ private ReleaseResult execute( ReleaseDescriptor releaseDescriptor,
ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects, boolean
simulate )
throws ReleaseFailureException, ReleaseExecutionException
{
ReleaseResult result = new ReleaseResult();
@@ -82,16 +83,14 @@ public class RemoveReleasePomsPhase
return result;
}
- private void removeReleasePoms( ReleaseDescriptor releaseDescriptor,
ReleaseEnvironment releaseEnvironment, boolean simulate,
- ReleaseResult result, List<MavenProject>
projects )
+ private void removeReleasePoms( ReleaseDescriptor releaseDescriptor,
ReleaseEnvironment releaseEnvironment,
+ boolean simulate, ReleaseResult result,
List<MavenProject> projects )
throws ReleaseFailureException, ReleaseExecutionException
{
List<File> releasePoms = new ArrayList<File>();
- for ( Iterator<MavenProject> iterator = projects.iterator();
iterator.hasNext(); )
+ for ( MavenProject project : projects )
{
- MavenProject project = iterator.next();
-
logInfo( result, "Removing release POM for '" + project.getName()
+ "'..." );
releasePoms.add( ReleaseUtil.getReleasePom( project ) );
@@ -100,8 +99,8 @@ public class RemoveReleasePomsPhase
removeReleasePomsFromScm( releaseDescriptor, releaseEnvironment,
simulate, result, releasePoms );
}
- private void removeReleasePomsFromScm( ReleaseDescriptor
releaseDescriptor, ReleaseEnvironment releaseEnvironment, boolean simulate,
- ReleaseResult result, List<File>
releasePoms )
+ private void removeReleasePomsFromScm( ReleaseDescriptor
releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ boolean simulate, ReleaseResult
result, List<File> releasePoms )
throws ReleaseFailureException, ReleaseExecutionException
{
if ( simulate )
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhase.java?rev=1139959&r1=1139958&r2=1139959&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhase.java
Sun Jun 26 22:34:17 2011
@@ -40,7 +40,6 @@ import org.codehaus.plexus.util.FileUtil
import java.io.File;
import java.io.IOException;
-import java.util.Iterator;
import java.util.List;
/**
@@ -57,15 +56,14 @@ public class RestoreBackupPomsPhase
*/
private ScmRepositoryConfigurator scmRepositoryConfigurator;
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor,
ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor,
ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
ReleaseResult result = new ReleaseResult();
- for ( Iterator<MavenProject> projects = reactorProjects.iterator();
projects.hasNext(); )
+ for ( MavenProject project : reactorProjects )
{
- MavenProject project = projects.next();
-
restorePomBackup( releaseDescriptor, releaseEnvironment, project );
}
@@ -74,13 +72,15 @@ public class RestoreBackupPomsPhase
return result;
}
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor,
ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
+ public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor,
ReleaseEnvironment releaseEnvironment,
+ List<MavenProject> reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
return execute( releaseDescriptor, releaseEnvironment, reactorProjects
);
}
- protected void restorePomBackup( ReleaseDescriptor releaseDescriptor,
ReleaseEnvironment releaseEnvironment, MavenProject project )
+ protected void restorePomBackup( ReleaseDescriptor releaseDescriptor,
ReleaseEnvironment releaseEnvironment,
+ MavenProject project )
throws ReleaseExecutionException, ReleaseFailureException
{
File pomBackup = getPomBackup( project );
@@ -97,7 +97,9 @@ public class RestoreBackupPomsPhase
ScmProvider provider;
try
{
- scmRepository =
scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor,
releaseEnvironment.getSettings() );
+ scmRepository =
+ scmRepositoryConfigurator.getConfiguredRepository(
releaseDescriptor,
+
releaseEnvironment.getSettings() );
provider = scmRepositoryConfigurator.getRepositoryProvider(
scmRepository );
}
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java?rev=1139959&r1=1139958&r2=1139959&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
Sun Jun 26 22:34:17 2011
@@ -47,7 +47,8 @@ public class RewritePomVersionsPhase
// We are only updating versions no mods to scm needed
}
- protected Map getOriginalVersionMap( ReleaseDescriptor releaseDescriptor,
List<MavenProject> reactorProjects, boolean simulate )
+ protected Map getOriginalVersionMap( ReleaseDescriptor releaseDescriptor,
List<MavenProject> reactorProjects,
+ boolean simulate )
{
return releaseDescriptor.getReleaseVersions();
}
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java?rev=1139959&r1=1139958&r2=1139959&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
Sun Jun 26 22:34:17 2011
@@ -144,12 +144,9 @@ public class ScmCheckModificationsPhase
{
StringBuffer message = new StringBuffer();
- for ( Iterator<ScmFile> i = changedFiles.iterator(); i.hasNext(); )
+ for ( ScmFile file : changedFiles )
{
- ScmFile file = i.next();
-
message.append( file.toString() );
-
message.append( "\n" );
}
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java?rev=1139959&r1=1139958&r2=1139959&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java
Sun Jun 26 22:34:17 2011
@@ -116,7 +116,7 @@ public class PomFinder
return null;
}
- if ( foundPomInfo == null)
+ if ( foundPomInfo == null )
{
log.error( "Please run parsePom first!" );
return null;
@@ -305,7 +305,8 @@ public class PomFinder
{
return false;
}
- if ( parentArtifactId != null ? !parentArtifactId.equals(
pomInfo.parentArtifactId ) : pomInfo.parentArtifactId != null )
+ if ( parentArtifactId != null ? !parentArtifactId.equals(
pomInfo.parentArtifactId )
+ : pomInfo.parentArtifactId != null )
{
return false;
}
