maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rfscho...@apache.org
Subject svn commit: r1332838 - /maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/
Date Tue, 01 May 2012 21:21:48 GMT
Author: rfscholte
Date: Tue May  1 21:21:47 2012
New Revision: 1332838

URL: http://svn.apache.org/viewvc?rev=1332838&view=rev
Log:
code formatting

Modified:
    maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
    maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.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/ReleasePhase.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/RewritePomsForBranchPhase.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/phase/ScmCheckModificationsPhase.java

Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java?rev=1332838&r1=1332837&r2=1332838&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
(original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
Tue May  1 21:21:47 2012
@@ -89,8 +89,8 @@ public class CheckDependencySnapshotsPha
         {
             logInfo( result, "Checking dependencies and plugins for snapshots ..." );
 
-            @SuppressWarnings("unchecked")
-			Map<String, String> originalVersions = releaseDescriptor.getOriginalVersions( reactorProjects
);
+            @SuppressWarnings( "unchecked" )
+            Map<String, String> originalVersions = releaseDescriptor.getOriginalVersions(
reactorProjects );
 
             for ( MavenProject project : reactorProjects )
             {
@@ -109,8 +109,8 @@ public class CheckDependencySnapshotsPha
     private void checkProject( MavenProject project, Map<String, String> originalVersions,
ReleaseDescriptor releaseDescriptor )
         throws ReleaseFailureException, ReleaseExecutionException
     {
-        @SuppressWarnings("unchecked")
-		Map<String, Artifact> artifactMap = ArtifactUtils.artifactMapByVersionlessId( project.getArtifacts()
);
+        @SuppressWarnings( "unchecked" )
+        Map<String, Artifact> artifactMap = ArtifactUtils.artifactMapByVersionlessId(
project.getArtifacts() );
 
         Set<Artifact> snapshotDependencies = new HashSet<Artifact>();
         Set<Artifact> snapshotReportDependencies = new HashSet<Artifact>();
@@ -127,8 +127,8 @@ public class CheckDependencySnapshotsPha
 
         try
         {
-            @SuppressWarnings("unchecked")
-			Set<Artifact> dependencyArtifacts = project.createArtifacts( artifactFactory, null,
null );
+            @SuppressWarnings( "unchecked" )
+            Set<Artifact> dependencyArtifacts = project.createArtifacts( artifactFactory,
null, null );
 
             for ( Artifact artifact : dependencyArtifacts )
             {
@@ -143,8 +143,8 @@ public class CheckDependencySnapshotsPha
             throw new ReleaseExecutionException( "Failed to create dependency artifacts",
e );
         }
 
-        @SuppressWarnings("unchecked")
-		Set<Artifact> pluginArtifacts = project.getPluginArtifacts();
+        @SuppressWarnings( "unchecked" )
+        Set<Artifact> pluginArtifacts = project.getPluginArtifacts();
 
         for ( Artifact artifact : pluginArtifacts )
         {
@@ -210,8 +210,8 @@ public class CheckDependencySnapshotsPha
             }
         }
 
-        @SuppressWarnings("unchecked")
-		Set<Artifact> reportArtifacts = project.getReportArtifacts();
+        @SuppressWarnings( "unchecked" )
+        Set<Artifact> reportArtifacts = project.getReportArtifacts();
 
         for ( Artifact artifact : reportArtifacts )
         {
@@ -222,8 +222,8 @@ public class CheckDependencySnapshotsPha
             }
         }
 
-        @SuppressWarnings("unchecked")
-		Set<Artifact> extensionArtifacts = project.getExtensionArtifacts();
+        @SuppressWarnings( "unchecked" )
+        Set<Artifact> extensionArtifacts = project.getExtensionArtifacts();
 
         for ( Artifact artifact : extensionArtifacts )
         {
@@ -233,8 +233,8 @@ public class CheckDependencySnapshotsPha
             }
         }
 
-        if ( !snapshotDependencies.isEmpty() || !snapshotReportDependencies.isEmpty() ||
-            !snapshotExtensionsDependencies.isEmpty() || !snapshotPluginDependencies.isEmpty()
)
+        if ( !snapshotDependencies.isEmpty() || !snapshotReportDependencies.isEmpty()
+                        || !snapshotExtensionsDependencies.isEmpty() || !snapshotPluginDependencies.isEmpty()
)
         {
             if ( releaseDescriptor.isInteractive() )
             {
@@ -242,8 +242,8 @@ public class CheckDependencySnapshotsPha
                                   snapshotPluginDependencies, releaseDescriptor );
             }
 
-            if ( !snapshotDependencies.isEmpty() || !snapshotReportDependencies.isEmpty()
||
-                !snapshotExtensionsDependencies.isEmpty() || !snapshotPluginDependencies.isEmpty()
)
+            if ( !snapshotDependencies.isEmpty() || !snapshotReportDependencies.isEmpty()
+                            || !snapshotExtensionsDependencies.isEmpty() || !snapshotPluginDependencies.isEmpty()
)
             {
                 StringBuffer message = new StringBuffer();
 
@@ -271,7 +271,7 @@ public class CheckDependencySnapshotsPha
         String versionlessId = ArtifactUtils.versionlessKey( artifact );
         Artifact checkArtifact = artifactMapByVersionlessId.get( versionlessId );
 
-        if ( checkArtifact == null)
+        if ( checkArtifact == null )
         {
             checkArtifact = artifact;
         }
@@ -339,7 +339,7 @@ public class CheckDependencySnapshotsPha
 
             if ( result.toLowerCase( Locale.ENGLISH ).startsWith( "y" ) )
             {
-				Map<String, Map<String, String>> resolvedSnapshots = null;
+                Map<String, Map<String, String>> resolvedSnapshots = null;
                 prompter.showMessage( RESOLVE_SNAPSHOT_TYPE_MESSAGE );
                 result = prompter.prompt( RESOLVE_SNAPSHOT_TYPE_PROMPT,
                                           Arrays.asList( new String[]{"0", "1", "2", "3"}
), "1" );
@@ -398,7 +398,7 @@ public class CheckDependencySnapshotsPha
     private Map<String, Map<String, String>> processSnapshot( Set<Artifact>
snapshotSet )
         throws PrompterException, VersionParseException
     {
-		Map<String, Map<String, String>> resolvedSnapshots = new HashMap<String,
Map<String, String>>();
+        Map<String, Map<String, String>> resolvedSnapshots = new HashMap<String,
Map<String, String>>();
         Iterator<Artifact> iterator = snapshotSet.iterator();
 
         while ( iterator.hasNext() )

Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java?rev=1332838&r1=1332837&r2=1332838&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
(original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
Tue May  1 21:21:47 2012
@@ -85,7 +85,7 @@ public class CheckoutProjectFromScm
             {
                 try
                 {
-                    if ( scmPath.startsWith("/") )
+                    if ( scmPath.startsWith( "/" ) )
                     {
                         // cut off the first '/'
                         scmPath = scmPath.substring( 1 );
@@ -97,7 +97,7 @@ public class CheckoutProjectFromScm
 
                     releaseResult = performCheckout( releaseDescriptor, releaseEnvironment,
reactorProjects );
                 }
-                catch ( ScmException scmEx)
+                catch ( ScmException scmEx )
                 {
                     // the checkout from _this_ directory failed
                     releaseResult = null;

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=1332838&r1=1332837&r2=1332838&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
Tue May  1 21:21:47 2012
@@ -291,11 +291,14 @@ public class GenerateReleasePomsPhase
         return execute( releaseDescriptor, releaseEnvironment, reactorProjects, true );
     }
 
-    protected Map<String, String> getOriginalVersionMap( ReleaseDescriptor releaseDescriptor,
List<MavenProject> reactorProjects )
+    @SuppressWarnings( "unchecked" )
+    protected Map<String, String> getOriginalVersionMap( ReleaseDescriptor releaseDescriptor,
+                                                         List<MavenProject> reactorProjects
)
     {
         return releaseDescriptor.getOriginalVersions( reactorProjects );
     }
 
+    @SuppressWarnings( "unchecked" )
     protected Map<String, String> getNextVersionMap( ReleaseDescriptor releaseDescriptor
)
     {
         return releaseDescriptor.getReleaseVersions();
@@ -359,11 +362,12 @@ public class GenerateReleasePomsPhase
         return releaseScm;
     }
 
-    private List<Dependency> createReleaseDependencies( Map<String, String> originalVersions,
Map<String, String> mappedVersions, MavenProject project )
+    private List<Dependency> createReleaseDependencies( Map<String, String> originalVersions,
+                                                        Map<String, String> mappedVersions,
MavenProject project )
         throws ReleaseFailureException
     {
-        @SuppressWarnings("unchecked")
-		Set<Artifact> artifacts = project.getArtifacts();
+        @SuppressWarnings( "unchecked" )
+        Set<Artifact> artifacts = project.getArtifacts();
 
         List<Dependency> releaseDependencies = null;
 
@@ -439,12 +443,12 @@ public class GenerateReleasePomsPhase
 
         if ( build != null )
         {
-			List<Plugin> plugins = build.getPlugins();
+            List<Plugin> plugins = build.getPlugins();
 
             if ( plugins != null )
             {
-                @SuppressWarnings("unchecked")
-				Map<String, Artifact> artifactsById = project.getPluginArtifactMap();
+                @SuppressWarnings( "unchecked" )
+                Map<String, Artifact> artifactsById = project.getPluginArtifactMap();
 
                 releasePlugins = new ArrayList<Plugin>();
 
@@ -483,12 +487,12 @@ public class GenerateReleasePomsPhase
 
         if ( reporting != null )
         {
-			List<ReportPlugin> reportPlugins = reporting.getPlugins();
+            List<ReportPlugin> reportPlugins = reporting.getPlugins();
 
             if ( reportPlugins != null )
             {
-                @SuppressWarnings("unchecked")
-				Map<String, Artifact> artifactsById = project.getReportArtifactMap();
+                @SuppressWarnings( "unchecked" )
+                Map<String, Artifact> artifactsById = project.getReportArtifactMap();
 
                 releaseReportPlugins = new ArrayList<ReportPlugin>();
 
@@ -524,7 +528,7 @@ public class GenerateReleasePomsPhase
 
         if ( build != null )
         {
-			List<Extension> extensions = build.getExtensions();
+            List<Extension> extensions = build.getExtensions();
 
             if ( extensions != null )
             {

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=1332838&r1=1332837&r2=1332838&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
Tue May  1 21:21:47 2012
@@ -158,7 +158,9 @@ public class MapVersionsPhase
         return result;
     }
 
-    private String getNextVersion( MavenProject project, String projectId, ReleaseDescriptor
releaseDescriptor,
+    private String getNextVersion( MavenProject project, 
+                                   String projectId, 
+                                   ReleaseDescriptor releaseDescriptor,
                                    ReleaseResult result )
         throws ReleaseExecutionException
     {

Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java?rev=1332838&r1=1332837&r2=1332838&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java
(original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java
Tue May  1 21:21:47 2012
@@ -49,6 +49,7 @@ public interface ReleasePhase
      * @param reactorProjects   the reactor projects
      * @throws ReleaseExecutionException an exception during the execution of the phase
      * @throws ReleaseFailureException   a failure during the execution of the phase
+     * @return the release result
      */
     ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException;
@@ -61,6 +62,7 @@ public interface ReleasePhase
      * @param reactorProjects   the reactor projects
      * @throws ReleaseExecutionException an exception during the execution of the phase
      * @throws ReleaseFailureException   a failure during the execution of the phase
+     * @return the release result
      */
     ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException;
@@ -73,6 +75,7 @@ public interface ReleasePhase
      * @param reactorProjects   the reactor projects
      * @throws ReleaseExecutionException an exception during the execution of the phase
      * @throws ReleaseFailureException   a failure during the execution of the phase
+     * @return the release result
      *
      * @deprecated Use {@link ReleasePhase#execute(ReleaseDescriptor, ReleaseEnvironment,
List)} instead.
      */
@@ -87,6 +90,7 @@ public interface ReleasePhase
      * @param reactorProjects   the reactor projects
      * @throws ReleaseExecutionException an exception during the execution of the phase
      * @throws ReleaseFailureException   a failure during the execution of the phase
+     * @return the release result
      *
      * @deprecated Use {@link ReleasePhase#simulate(ReleaseDescriptor, ReleaseEnvironment,
List)} instead.
      */
@@ -97,6 +101,7 @@ public interface ReleasePhase
      * Clean up after a phase if it leaves any additional files in the checkout.
      *
      * @param reactorProjects the reactor projects
+     * @return the release result
      */
     ReleaseResult clean( List<MavenProject> reactorProjects );
 }

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=1332838&r1=1332837&r2=1332838&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
Tue May  1 21:21:47 2012
@@ -47,15 +47,15 @@ public class RewritePomVersionsPhase
         // We are only updating versions no mods to scm needed
     }
 
-    @SuppressWarnings("unchecked")
-	protected Map<String, String> getOriginalVersionMap( ReleaseDescriptor releaseDescriptor,
List<MavenProject> reactorProjects,
+    @SuppressWarnings( "unchecked" )
+    protected Map<String, String> getOriginalVersionMap( ReleaseDescriptor releaseDescriptor,
List<MavenProject> reactorProjects,
                                          boolean simulate )
     {
         return releaseDescriptor.getReleaseVersions();
     }
 
-    @SuppressWarnings("unchecked")
-	protected Map<String, String> getNextVersionMap( ReleaseDescriptor releaseDescriptor
)
+    @SuppressWarnings( "unchecked" )
+    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/RewritePomsForBranchPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java?rev=1332838&r1=1332837&r2=1332838&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
(original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
Tue May  1 21:21:47 2012
@@ -211,19 +211,21 @@ public class RewritePomsForBranchPhase
         return result;
     }
 
-    @SuppressWarnings("unchecked")
-	protected Map<String,String> getOriginalVersionMap( ReleaseDescriptor releaseDescriptor,
List<MavenProject> reactorProjects, boolean simulate )
+    @SuppressWarnings( "unchecked" )
+    protected Map<String, String> getOriginalVersionMap( ReleaseDescriptor releaseDescriptor,
+                                                         List<MavenProject> reactorProjects,
boolean simulate )
     {
         return releaseDescriptor.getOriginalVersions( reactorProjects );
     }
 
-    @SuppressWarnings("unchecked")
-	protected Map<String, String> getNextVersionMap( ReleaseDescriptor releaseDescriptor)
+    @SuppressWarnings( "unchecked" )
+    protected Map<String, String> getNextVersionMap( ReleaseDescriptor releaseDescriptor
)
     {
         return releaseDescriptor.getReleaseVersions();
     }
 
-    protected String getResolvedSnapshotVersion( String artifactVersionlessKey, Map<String,
Map<String,String>> resolvedSnapshotsMap )
+    protected String getResolvedSnapshotVersion( String artifactVersionlessKey,
+                                                 Map<String, Map<String, String>>
resolvedSnapshotsMap )
     {
         Map<String, String> versionsMap = resolvedSnapshotsMap.get( artifactVersionlessKey
);
 

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=1332838&r1=1332837&r2=1332838&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
Tue May  1 21:21:47 2012
@@ -56,8 +56,8 @@ public class RewritePomsForDevelopmentPh
             Element scmRoot = rootElement.getChild( "scm", namespace );
             if ( scmRoot != null )
             {
-                @SuppressWarnings("unchecked")
-				Map<String, Scm> originalScmInfo = releaseDescriptor.getOriginalScmInfo();
+                @SuppressWarnings( "unchecked" )
+                Map<String, Scm> originalScmInfo = releaseDescriptor.getOriginalScmInfo();
                 // check containsKey, not == null, as we store null as a value
                 if ( !originalScmInfo.containsKey( projectId ) )
                 {
@@ -93,21 +93,23 @@ public class RewritePomsForDevelopmentPh
         }
     }
 
-    @SuppressWarnings("unchecked")
-	protected Map<String,String> getOriginalVersionMap( ReleaseDescriptor releaseDescriptor,
List<MavenProject> reactorProjects, boolean simulate )
+    @SuppressWarnings( "unchecked" )
+    protected Map<String, String> getOriginalVersionMap( ReleaseDescriptor releaseDescriptor,
+                                                         List<MavenProject> reactorProjects,
boolean simulate )
     {
         return simulate
             ? releaseDescriptor.getOriginalVersions( reactorProjects )
             : releaseDescriptor.getReleaseVersions();
     }
 
-    @SuppressWarnings("unchecked")
-	protected Map<String,String> getNextVersionMap( ReleaseDescriptor releaseDescriptor
)
+    @SuppressWarnings( "unchecked" )
+    protected Map<String,String> getNextVersionMap( ReleaseDescriptor releaseDescriptor
)
     {
         return releaseDescriptor.getDevelopmentVersions();
     }
 
-	protected String getResolvedSnapshotVersion(String artifactVersionlessKey, Map<String,
Map<String, String>> resolvedSnapshotsMap )
+    protected String getResolvedSnapshotVersion( String artifactVersionlessKey,
+                                                 Map<String, Map<String, String>>
resolvedSnapshotsMap )
     {
         Map<String, String> versionsMap = resolvedSnapshotsMap.get( artifactVersionlessKey
);
 

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=1332838&r1=1332837&r2=1332838&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
Tue May  1 21:21:47 2012
@@ -234,19 +234,21 @@ public class RewritePomsForReleasePhase
         return result;
     }
 
-    @SuppressWarnings("unchecked")
-	protected Map<String,String> getOriginalVersionMap( ReleaseDescriptor releaseDescriptor,
List<MavenProject> reactorProjects, boolean simulate )
+    @SuppressWarnings( "unchecked" )
+    protected Map<String, String> getOriginalVersionMap( ReleaseDescriptor releaseDescriptor,
+                                                         List<MavenProject> reactorProjects,
boolean simulate )
     {
         return releaseDescriptor.getOriginalVersions( reactorProjects );
     }
 
-    @SuppressWarnings("unchecked")
-	protected Map<String,String> getNextVersionMap( ReleaseDescriptor releaseDescriptor
)
+    @SuppressWarnings( "unchecked" )
+    protected Map<String,String> getNextVersionMap( ReleaseDescriptor releaseDescriptor
)
     {
         return releaseDescriptor.getReleaseVersions();
     }
 
-    protected String getResolvedSnapshotVersion( String artifactVersionlessKey, Map<String,
Map<String, String>> resolvedSnapshotsMap )
+    protected String getResolvedSnapshotVersion( String artifactVersionlessKey,
+                                                 Map<String, Map<String, String>>
resolvedSnapshotsMap )
     {
         Map<String, String> versionsMap = resolvedSnapshotsMap.get( artifactVersionlessKey
);
 

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=1332838&r1=1332837&r2=1332838&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
Tue May  1 21:21:47 2012
@@ -83,7 +83,7 @@ public class ScmCheckModificationsPhase
         if ( additionalExcludes != null )
         {
             // SelectorUtils expects OS-specific paths and patterns
-            for( String additionalExclude : additionalExcludes )
+            for ( String additionalExclude : additionalExcludes )
             {
                 exclusionPatterns.add( additionalExclude.replace( "\\", File.separator ).replace(
"/", File.separator ) );
             }
@@ -138,7 +138,7 @@ public class ScmCheckModificationsPhase
             // SelectorUtils expects File.separator, don't standardize!
             String fileName = f.getPath().replace( "\\", File.separator ).replace( "/", File.separator
);
 
-            for( String exclusionPattern : exclusionPatterns )
+            for ( String exclusionPattern : exclusionPatterns )
             {
                 if ( SelectorUtils.matchPath( exclusionPattern, fileName ) )
                 {



Mime
View raw message