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 2013/10/27 16:40:51 UTC
svn commit: r1536155 - in
/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release:
exec/ phase/ scm/
Author: hboutemy
Date: Sun Oct 27 15:40:51 2013
New Revision: 1536155
URL: http://svn.apache.org/r1536155
Log:
code formatting
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.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/GenerateReleasePomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/JazzScmTranslator.java
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java?rev=1536155&r1=1536154&r2=1536155&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java Sun Oct 27 15:40:51 2013
@@ -134,7 +134,7 @@ public abstract class AbstractMavenExecu
for ( Server server : encryptedSettings.getServers() )
{
String password = server.getPassword();
- if( password != null && !isEncryptedString( password ) )
+ if ( password != null && !isEncryptedString( password ) )
{
try
{
@@ -155,7 +155,7 @@ public abstract class AbstractMavenExecu
}
String passphrase = server.getPassphrase();
- if( passphrase != null && !isEncryptedString( passphrase ) )
+ if ( passphrase != null && !isEncryptedString( passphrase ) )
{
try
{
@@ -179,7 +179,7 @@ public abstract class AbstractMavenExecu
for ( Proxy proxy : encryptedSettings.getProxies() )
{
String password = proxy.getPassword();
- if( password != null && !isEncryptedString( password ) )
+ if ( password != null && !isEncryptedString( password ) )
{
try
{
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java?rev=1536155&r1=1536154&r2=1536155&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java Sun Oct 27 15:40:51 2013
@@ -310,7 +310,7 @@ public class InvokerMavenExecutor
}
}
- if( cli.hasOption( THREADS ) )
+ if ( cli.hasOption( THREADS ) )
{
req.setThreads( cli.getOptionValue( THREADS ) );
}
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=1536155&r1=1536154&r2=1536155&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 Oct 27 15:40:51 2013
@@ -207,7 +207,7 @@ public abstract class AbstractRewritePom
ScmRepository scmRepository = null;
ScmProvider provider = null;
- if( isUpdateScm() )
+ if ( isUpdateScm() )
{
try
{
@@ -265,8 +265,9 @@ public abstract class AbstractRewritePom
Namespace namespace = rootElement.getNamespace();
Map<String, String> mappedVersions = getNextVersionMap( releaseDescriptor );
Map<String, String> originalVersions = getOriginalVersionMap( releaseDescriptor, reactorProjects, simulate );
- @SuppressWarnings("unchecked")
- Map<String, Map<String, String>> resolvedSnapshotDependencies = releaseDescriptor.getResolvedSnapshotDependencies();
+ @SuppressWarnings( "unchecked" )
+ Map<String, Map<String, String>> resolvedSnapshotDependencies =
+ releaseDescriptor.getResolvedSnapshotDependencies();
Model model = project.getModel();
Element properties = rootElement.getChild( "properties", namespace );
@@ -499,7 +500,7 @@ public abstract class AbstractRewritePom
// incomplete element
continue;
}
- String artifactId = ReleaseUtil.interpolate( artifactIdElement.getTextTrim(), projectModel);
+ String artifactId = ReleaseUtil.interpolate( artifactIdElement.getTextTrim(), projectModel );
String key = ArtifactUtils.versionlessKey( groupId, artifactId );
String resolvedSnapshotVersion = getResolvedSnapshotVersion( key, resolvedSnapshotDependencies );
@@ -730,10 +731,11 @@ public abstract class AbstractRewritePom
return result;
}
- protected abstract String getResolvedSnapshotVersion( String artifactVersionlessKey, Map<String, Map<String,String>> resolvedSnapshots );
+ protected abstract String getResolvedSnapshotVersion( String artifactVersionlessKey,
+ Map<String, Map<String, String>> resolvedSnapshots );
- protected abstract Map<String, String> getOriginalVersionMap( ReleaseDescriptor releaseDescriptor, List<MavenProject> reactorProjects,
- boolean simulate );
+ protected abstract Map<String, String> getOriginalVersionMap( ReleaseDescriptor releaseDescriptor,
+ List<MavenProject> reactorProjects, boolean simulate );
protected abstract Map<String,String> getNextVersionMap( ReleaseDescriptor releaseDescriptor );
@@ -752,7 +754,8 @@ public abstract class AbstractRewritePom
return true;
}
- protected String getOriginalResolvedSnapshotVersion( String artifactVersionlessKey, Map<String, Map<String, String>> resolvedSnapshots )
+ protected String getOriginalResolvedSnapshotVersion( String artifactVersionlessKey,
+ Map<String, Map<String, String>> resolvedSnapshots )
{
Map<String, String> versionsMap = resolvedSnapshots.get( artifactVersionlessKey );
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java?rev=1536155&r1=1536154&r2=1536155&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java Sun Oct 27 15:40:51 2013
@@ -238,7 +238,7 @@ public class GenerateReleasePomsPhase
{
String originalFinalName = findOriginalFinalName( project );
- if( originalFinalName == null )
+ if ( originalFinalName == null )
{
// as defined in super-pom
originalFinalName = FINALNAME_EXPRESSION;
@@ -298,11 +298,12 @@ public class GenerateReleasePomsPhase
private String findOriginalFinalName( MavenProject project )
{
- if ( project.getOriginalModel().getBuild() != null && project.getOriginalModel().getBuild().getFinalName() != null )
+ if ( project.getOriginalModel().getBuild() != null
+ && project.getOriginalModel().getBuild().getFinalName() != null )
{
return project.getOriginalModel().getBuild().getFinalName();
}
- else if( project.hasParent() )
+ else if ( project.hasParent() )
{
return findOriginalFinalName( project.getParent() );
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java?rev=1536155&r1=1536154&r2=1536155&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java Sun Oct 27 15:40:51 2013
@@ -24,7 +24,6 @@ import java.util.List;
import java.util.ResourceBundle;
import org.apache.maven.artifact.ArtifactUtils;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseResult;
@@ -196,7 +195,7 @@ public class MapVersionsPhase
if ( convertToBranch )
{
// no branch modification
- if( !( releaseDescriptor.isUpdateBranchVersions()
+ if ( !( releaseDescriptor.isUpdateBranchVersions()
&& ( ArtifactUtils.isSnapshot( project.getVersion() ) || releaseDescriptor.isUpdateVersionsToSnapshot() ) ) )
{
return project.getVersion();
@@ -211,7 +210,7 @@ public class MapVersionsPhase
else if ( releaseDescriptor.isBranchCreation() )
{
// no working copy modification
- if( !( ArtifactUtils.isSnapshot( project.getVersion() )
+ if ( !( ArtifactUtils.isSnapshot( project.getVersion() )
&& releaseDescriptor.isUpdateWorkingCopyVersions() ) )
{
return project.getVersion();
@@ -222,7 +221,7 @@ public class MapVersionsPhase
else
{
// no working copy modification
- if( !( releaseDescriptor.isUpdateWorkingCopyVersions() ) )
+ if ( !( releaseDescriptor.isUpdateWorkingCopyVersions() ) )
{
return project.getVersion();
}
@@ -236,7 +235,7 @@ public class MapVersionsPhase
String messageKey = null;
try
{
- while( nextVersion == null || ArtifactUtils.isSnapshot( nextVersion ) != convertToSnapshot )
+ while ( nextVersion == null || ArtifactUtils.isSnapshot( nextVersion ) != convertToSnapshot )
{
if ( suggestedVersion == null )
{
@@ -244,12 +243,12 @@ public class MapVersionsPhase
try
{
String baseVersion = null;
- if( convertToSnapshot )
+ if ( convertToSnapshot )
{
baseVersion = getReleaseVersion( projectId, releaseDescriptor );
}
// unspecified and unmapped version, so use project version
- if( baseVersion == null )
+ if ( baseVersion == null )
{
baseVersion = project.getVersion();
}
@@ -257,7 +256,7 @@ public class MapVersionsPhase
}
catch ( VersionParseException e )
{
- if( releaseDescriptor.isInteractive() )
+ if ( releaseDescriptor.isInteractive() )
{
try
{
@@ -271,7 +270,9 @@ public class MapVersionsPhase
}
else
{
- throw new ReleaseExecutionException( "Error parsing version, cannot determine next version: " + e.getMessage(), e );
+ throw new ReleaseExecutionException(
+ "Error parsing version, cannot determine next version: "
+ + e.getMessage(), e );
}
}
suggestedVersion =
@@ -279,15 +280,14 @@ public class MapVersionsPhase
: versionInfo.getReleaseVersionString();
}
- if( releaseDescriptor.isInteractive() )
+ if ( releaseDescriptor.isInteractive() )
{
- if( messageKey == null )
+ if ( messageKey == null )
{
messageKey = getMapversionPromptKey( releaseDescriptor );
}
String message =
- MessageFormat.format( resourceBundle.getString( messageKey ),
- project.getName(), projectId );
+ MessageFormat.format( resourceBundle.getString( messageKey ), project.getName(), projectId );
nextVersion = prompter.prompt( message, suggestedVersion );
//@todo validate next version, maybe with DefaultArtifactVersion
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java?rev=1536155&r1=1536154&r2=1536155&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java Sun Oct 27 15:40:51 2013
@@ -101,7 +101,7 @@ public class RewritePomsForDevelopmentPh
@SuppressWarnings( "unchecked" )
@Override
- protected Map<String,String> getNextVersionMap( ReleaseDescriptor releaseDescriptor )
+ protected Map<String, String> getNextVersionMap( ReleaseDescriptor releaseDescriptor )
{
return releaseDescriptor.getDevelopmentVersions();
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java?rev=1536155&r1=1536154&r2=1536155&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java Sun Oct 27 15:40:51 2013
@@ -239,7 +239,7 @@ public class RewritePomsForReleasePhase
@SuppressWarnings( "unchecked" )
@Override
- protected Map<String,String> getNextVersionMap( ReleaseDescriptor releaseDescriptor )
+ protected Map<String, String> getNextVersionMap( ReleaseDescriptor releaseDescriptor )
{
return releaseDescriptor.getReleaseVersions();
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/JazzScmTranslator.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/JazzScmTranslator.java?rev=1536155&r1=1536154&r2=1536155&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/JazzScmTranslator.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/JazzScmTranslator.java Sun Oct 27 15:40:51 2013
@@ -1,7 +1,5 @@
package org.apache.maven.shared.release.scm;
-import java.io.File;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,6 +19,8 @@ import java.io.File;
* under the License.
*/
+import java.io.File;
+
/**
* Jazz tag translator.
*