maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject svn commit: r1139435 [2/2] - in /maven/release/trunk/maven-release-manager/src/main: java/org/apache/maven/shared/release/ java/org/apache/maven/shared/release/config/ java/org/apache/maven/shared/release/exec/ java/org/apache/maven/shared/release/phas...
Date Fri, 24 Jun 2011 20:52:15 GMT
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhase.java?rev=1139435&r1=1139434&r2=1139435&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhase.java
(original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhase.java
Fri Jun 24 20:52:14 2011
@@ -37,20 +37,22 @@ import java.util.List;
 public class RunPrepareGoalsPhase
     extends AbstractRunGoalsPhase
 {
-    public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment
releaseEnvironment, List<MavenProject> reactorProjects )
+    public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment
releaseEnvironment,
+                                  List<MavenProject> reactorProjects )
         throws ReleaseExecutionException
     {
         return execute( releaseDescriptor, releaseEnvironment, new File( releaseDescriptor.getWorkingDirectory()
),
                         releaseDescriptor.getAdditionalArguments() );
     }
 
-    public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment
releaseEnvironment, List<MavenProject> reactorProjects )
+    public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment
releaseEnvironment,
+                                   List<MavenProject> reactorProjects )
         throws ReleaseExecutionException
     {
         ReleaseResult result = new ReleaseResult();
 
-        logInfo( result, "Executing preparation goals - since this is simulation mode it
is running against the " +
-            "original project, not the rewritten ones" );
+        logInfo( result, "Executing preparation goals - since this is simulation mode it
is running against the "
+            + "original project, not the rewritten ones" );
 
         execute( releaseDescriptor, releaseEnvironment, reactorProjects );
 

Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java?rev=1139435&r1=1139434&r2=1139435&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
(original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
Fri Jun 24 20:52:14 2011
@@ -56,7 +56,8 @@ public class ScmBranchPhase
      */
     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 relResult = new ReleaseResult();
@@ -69,7 +70,8 @@ public class ScmBranchPhase
         ScmProvider provider;
         try
         {
-            repository = scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor,
releaseEnvironment.getSettings() );
+            repository =
+                scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, releaseEnvironment.getSettings()
);
 
             repository.getProviderRepository().setPushChanges( releaseDescriptor.isPushChanges()
);
             
@@ -96,7 +98,7 @@ public class ScmBranchPhase
             scmBranchParameters.setRemoteBranching( releaseDescriptor.isRemoteTagging() );
             scmBranchParameters.setScmRevision( releaseDescriptor.getScmReleasedPomRevision()
);
             
-            result = provider.branch( repository, fileSet, branchName, scmBranchParameters);
+            result = provider.branch( repository, fileSet, branchName, scmBranchParameters
);
         }
         catch ( ScmException e )
         {
@@ -113,7 +115,8 @@ public class ScmBranchPhase
         return relResult;
     }
 
-    public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment
releaseEnvironment, List<MavenProject> reactorProjects )
+    public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment
releaseEnvironment,
+                                   List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
     {
         ReleaseResult result = new ReleaseResult();

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=1139435&r1=1139434&r2=1139435&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
Fri Jun 24 20:52:14 2011
@@ -66,10 +66,11 @@ public class ScmCheckModificationsPhase
      *
      * @todo proper construction of filenames, especially release properties
      */
-    private Set<String> excludedFiles = new HashSet<String>( Arrays.asList( new
String[] { "pom.xml.backup", "pom.xml.tag",
-        "pom.xml.next", "pom.xml.branch", "release.properties", "pom.xml.releaseBackup" }
) );
+    private Set<String> excludedFiles = new HashSet<String>( Arrays.asList( new
String[] { "pom.xml.backup",
+        "pom.xml.tag", "pom.xml.next", "pom.xml.branch", "release.properties", "pom.xml.releaseBackup"
} ) );
 
-    public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment
releaseEnvironment, List<MavenProject> reactorProjects )
+    public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment
releaseEnvironment,
+                                  List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
     {
         ReleaseResult relResult = new ReleaseResult();
@@ -80,20 +81,19 @@ public class ScmCheckModificationsPhase
         {
             for ( int i1 = 0, additionalExcludesSize = additionalExcludes.size(); i1 <
additionalExcludesSize; i1++ )
             {
-                // fail fast if it is not a string
-                String exclude = (String) additionalExcludes.get( i1 );
-                excludedFiles.add( exclude );
+                excludedFiles.add( additionalExcludes.get( i1 ) );
             }
         }
 
         logInfo( relResult, "Verifying that there are no local modifications..." );
-        logInfo( relResult, "  ignoring changes on: " + StringUtils.join(excludedFiles, ",
"));
+        logInfo( relResult, "  ignoring changes on: " + StringUtils.join( excludedFiles,
", " ) );
 
         ScmRepository repository;
         ScmProvider provider;
         try
         {
-            repository = scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor,
releaseEnvironment.getSettings() );
+            repository =
+                scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, releaseEnvironment.getSettings()
);
 
             provider = scmRepositoryConfigurator.getRepositoryProvider( repository );
         }
@@ -162,7 +162,8 @@ public class ScmCheckModificationsPhase
         return relResult;
     }
 
-    public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment
releaseEnvironment, List<MavenProject> reactorProjects )
+    public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment
releaseEnvironment,
+                                   List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
     {
         // It makes no modifications, so simulate is the same as execute

Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java?rev=1139435&r1=1139434&r2=1139435&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
(original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
Fri Jun 24 20:52:14 2011
@@ -22,6 +22,7 @@ package org.apache.maven.shared.release.
 import java.io.File;
 import java.util.List;
 
+import org.apache.maven.project.MavenProject;
 import org.apache.maven.scm.ScmException;
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.ScmTagParameters;
@@ -57,7 +58,7 @@ public class ScmTagPhase
     private ScmRepositoryConfigurator scmRepositoryConfigurator;
 
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment
releaseEnvironment,
-                                  List reactorProjects )
+                                  List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
     {
         ReleaseResult relResult = new ReleaseResult();
@@ -66,12 +67,14 @@ public class ScmTagPhase
 
         if ( releaseDescriptor.getWaitBeforeTagging() > 0 )
         {
-            logInfo( relResult, "Waiting for " + releaseDescriptor.getWaitBeforeTagging()
+ " seconds before tagging the release." );
+            logInfo( relResult, "Waiting for " + releaseDescriptor.getWaitBeforeTagging()
+                + " seconds before tagging the release." );
             try
             {
                 Thread.sleep( releaseDescriptor.getWaitBeforeTagging() * 1000 );
             }
-            catch( InterruptedException e ) {
+            catch ( InterruptedException e )
+            {
                 // Ignore
             }
         }
@@ -139,7 +142,7 @@ public class ScmTagPhase
     }
 
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment
releaseEnvironment,
-                                   List reactorProjects )
+                                   List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
     {
         ReleaseResult result = new ReleaseResult();
@@ -152,13 +155,13 @@ public class ScmTagPhase
         if ( releaseDescriptor.isRemoteTagging() )
         {
             logInfo( result,
-                     "Full run would be tagging working copy " + basedirAlignedReleaseDescriptor.getWorkingDirectory()
+
-                         " with label: '" + releaseDescriptor.getScmReleaseLabel() + "'"
);
+                     "Full run would be tagging working copy " + basedirAlignedReleaseDescriptor.getWorkingDirectory()
+                         + " with label: '" + releaseDescriptor.getScmReleaseLabel() + "'"
);
         }
         else
         {
-            logInfo( result, "Full run would be tagging remotely " + basedirAlignedReleaseDescriptor.getScmSourceUrl()
+
-                " with label: '" + releaseDescriptor.getScmReleaseLabel() + "'" );
+            logInfo( result, "Full run would be tagging remotely " + basedirAlignedReleaseDescriptor.getScmSourceUrl()
+                + " with label: '" + releaseDescriptor.getScmReleaseLabel() + "'" );
         }
 
         result.setResultCode( ReleaseResult.SUCCESS );

Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ReleaseScmCommandException.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ReleaseScmCommandException.java?rev=1139435&r1=1139434&r2=1139435&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ReleaseScmCommandException.java
(original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ReleaseScmCommandException.java
Fri Jun 24 20:52:14 2011
@@ -32,7 +32,7 @@ public class ReleaseScmCommandException
 {
     public ReleaseScmCommandException( String message, ScmResult result )
     {
-        super( message + "\nProvider message:\n" + result.getProviderMessage() + "\nCommand
output:\n" +
-            result.getCommandOutput() );
+        super( message + "\nProvider message:\n" + result.getProviderMessage() + "\nCommand
output:\n"
+            + result.getCommandOutput() );
     }
 }

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=1139435&r1=1139434&r2=1139435&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
Fri Jun 24 20:52:14 2011
@@ -31,8 +31,6 @@ import org.codehaus.plexus.util.ReaderFa
 import org.codehaus.plexus.util.xml.XmlStreamReader;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
-
-
 /**
  * <p>This utility class helps with finding a maven pom file
  * which got parsed previously. It uses the fact that the
@@ -68,7 +66,7 @@ public class PomFinder
     private Logger log;
     private PomInfo foundPomInfo;
 
-    public PomFinder(Logger log)
+    public PomFinder( Logger log )
     {
         this.log = log;
     }
@@ -78,11 +76,11 @@ public class PomFinder
      * @param originPom the pom File which should be used as blueprint for the search
      * @return <code>true</code> if a pom got parsed successfully, <code>false</code>
otherwise
      */
-    public boolean parsePom(File originPom)
+    public boolean parsePom( File originPom )
     {
         if ( !originPom.exists() )
         {
-          return false;
+            return false;
         }
 
         try
@@ -133,9 +131,9 @@ public class PomFinder
             {
                 pi = readPomInfo( matchingPom );
             }
-            catch (Exception e)
+            catch ( Exception e )
             {
-                log.warn( "Error while parsing pom file", e);
+                log.warn( "Error while parsing pom file", e );
                 // do nothing, just continue with the search
                 // this might happen if a build contains unfinished pom.xml
                 // files in integration tests, etc
@@ -171,7 +169,6 @@ public class PomFinder
             }
         }
 
-
         return matchingPom;
     }
 
@@ -286,7 +283,7 @@ public class PomFinder
             this.parentGroupId = parentGroupId;
         }
 
-        public boolean equals(Object o)
+        public boolean equals( Object o )
         {
             if ( this == o )
             {
@@ -300,7 +297,7 @@ public class PomFinder
 
             PomInfo pomInfo = (PomInfo) o;
 
-            if ( artifactId != null ? !artifactId.equals( pomInfo.artifactId ) : pomInfo.artifactId
!= null)
+            if ( artifactId != null ? !artifactId.equals( pomInfo.artifactId ) : pomInfo.artifactId
!= null )
             {
                 return false;
             }
@@ -323,9 +320,9 @@ public class PomFinder
         public int hashCode()
         {
             int result = artifactId != null ? artifactId.hashCode() : 0;
-            result = 31 * result + (groupId != null ? groupId.hashCode() : 0);
-            result = 31 * result + (parentArtifactId != null ? parentArtifactId.hashCode()
: 0);
-            result = 31 * result + (parentGroupId != null ? parentGroupId.hashCode() : 0);
+            result = 31 * result + ( groupId != null ? groupId.hashCode() : 0 );
+            result = 31 * result + ( parentArtifactId != null ? parentArtifactId.hashCode()
: 0 );
+            result = 31 * result + ( parentGroupId != null ? parentGroupId.hashCode() : 0
);
             return result;
         }
     }

Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java?rev=1139435&r1=1139434&r2=1139435&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
(original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
Fri Jun 24 20:52:14 2011
@@ -172,7 +172,8 @@ public class ReleaseUtil
         }
         catch ( IOException e )
         {
-        	throw new ReleaseExecutionException("Exception occurred while calculating common
basedir: " + e.getMessage(), e);
+            throw new ReleaseExecutionException( "Exception occurred while calculating common
basedir: "
+                + e.getMessage(), e );
         }
 
         int parentLevels =
@@ -277,7 +278,7 @@ public class ReleaseUtil
         return url;
     }
     
-    public static boolean isSymlink(File file) 
+    public static boolean isSymlink( File file )
         throws IOException
     {
         return !file.getAbsolutePath().equals( file.getCanonicalPath() );

Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java?rev=1139435&r1=1139434&r2=1139435&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java
(original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java
Fri Jun 24 20:52:14 2011
@@ -93,12 +93,12 @@ public class DefaultVersionInfo
     private static final String DIGIT_SEPARATOR_STRING = ".";
 
     public static final Pattern STANDARD_PATTERN = Pattern.compile(
-        "^((?:\\d+\\.)*\\d+)" +      // digit(s) and '.' repeated - followed by digit (version
digits 1.22.0, etc)
-            "([-_])?" +                 // optional - or _  (annotation separator)
-            "([a-zA-Z]*)" +             // alpha characters (looking for annotation - alpha,
beta, RC, etc.)
-            "([-_])?" +                 // optional - or _  (annotation revision separator)
-            "(\\d*)" +                  // digits  (any digits after rc or beta is an annotation
revision)
-            "(?:([-_])?(.*?))?$" );      // - or _ followed everything else (build specifier)
+        "^((?:\\d+\\.)*\\d+)"      // digit(s) and '.' repeated - followed by digit (version
digits 1.22.0, etc)
+        + "([-_])?"                // optional - or _  (annotation separator)
+        + "([a-zA-Z]*)"            // alpha characters (looking for annotation - alpha, beta,
RC, etc.)
+        + "([-_])?"                // optional - or _  (annotation revision separator)
+        + "(\\d*)"                 // digits  (any digits after rc or beta is an annotation
revision)
+        + "(?:([-_])?(.*?))?$" );  // - or _ followed everything else (build specifier)
 
     /* *
      * cmaki 02242009
@@ -109,7 +109,7 @@ public class DefaultVersionInfo
      * SNAPSHOT
      */
     public static final Pattern ALTERNATE_PATTERN = Pattern.compile(
-      "^(SNAPSHOT|[a-zA-Z]+[_-]SNAPSHOT)"      // for SNAPSHOT releases only (possible versions
include: trunk-SNAPSHOT or SNAPSHOT)
+        "^(SNAPSHOT|[a-zA-Z]+[_-]SNAPSHOT)"      // for SNAPSHOT releases only (possible
versions include: trunk-SNAPSHOT or SNAPSHOT)
     );
 
     /**
@@ -125,7 +125,7 @@ public class DefaultVersionInfo
         // FIX for non-digit release numbers, e.g. trunk-SNAPSHOT or just SNAPSHOT
         Matcher matcher = ALTERNATE_PATTERN.matcher( strVersion );
         // TODO: hack because it didn't support "SNAPSHOT"
-        if (matcher.matches())
+        if ( matcher.matches() )
         {
             annotation = null;
             digits = null;
@@ -143,8 +143,8 @@ public class DefaultVersionInfo
                 annotationSeparator = m.group( ANNOTATION_SEPARATOR_INDEX );
                 annotation = nullIfEmpty( m.group( ANNOTATION_INDEX ) );
 
-                if ( StringUtils.isNotEmpty( m.group( ANNOTATION_REV_SEPARATOR_INDEX ) )
&&
-                    StringUtils.isEmpty( m.group( ANNOTATION_REVISION_INDEX ) ) )
+                if ( StringUtils.isNotEmpty( m.group( ANNOTATION_REV_SEPARATOR_INDEX ) )
+                    && StringUtils.isEmpty( m.group( ANNOTATION_REVISION_INDEX )
) )
                 {
                     // The build separator was picked up as the annotation revision separator
                     buildSeparator = m.group( ANNOTATION_REV_SEPARATOR_INDEX );
@@ -235,13 +235,13 @@ public class DefaultVersionInfo
 
         int result;
         // TODO: this is a workaround for a bug in DefaultArtifactVersion - fix there - 1.01
< 1.01.01
-        if ( strVersion.startsWith( that.strVersion ) && !strVersion.equals( that.strVersion
) &&
-            strVersion.charAt( that.strVersion.length() ) != '-' )
+        if ( strVersion.startsWith( that.strVersion ) && !strVersion.equals( that.strVersion
)
+            && strVersion.charAt( that.strVersion.length() ) != '-' )
         {
             result = 1;
         }
-        else if ( that.strVersion.startsWith( strVersion ) && !strVersion.equals(
that.strVersion ) &&
-            that.strVersion.charAt( strVersion.length() ) != '-' )
+        else if ( that.strVersion.startsWith( strVersion ) && !strVersion.equals(
that.strVersion )
+            && that.strVersion.charAt( strVersion.length() ) != '-' )
         {
             result = -1;
         }

Modified: maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo?rev=1139435&r1=1139434&r2=1139435&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo (original)
+++ maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo Fri Jun
24 20:52:14 2011
@@ -18,8 +18,8 @@
   ~ under the License.
   -->
 
-<model xmlns="http://modello.codehaus.org/MODELLO/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.1.0 http://modello.codehaus.org/xsd/modello-1.1.0.xsd">
+<model xmlns="http://modello.codehaus.org/MODELLO/1.4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.4.0 http://modello.codehaus.org/xsd/modello-1.4.0.xsd">
   <id>release-descriptor</id>
   <name>ReleaseDescriptor</name>
   <description>
@@ -511,9 +511,12 @@
      */
     public void mapResolvedSnapshotDependencies( String artifactName, String releaseVersion,
String developmentVersion )
     {
-        if (resolvedSnapshotDependencies == null) {
+        if ( resolvedSnapshotDependencies == null )
+        {
             resolvedSnapshotDependencies = new java.util.HashMap();
-        } else {
+        }
+        else
+        {
             assert !resolvedSnapshotDependencies.containsKey( artifactName );
         }
 
@@ -532,7 +535,8 @@
      */
     public void mapReleaseVersion( String projectId, String nextVersion )
     {
-        if (releaseVersions == null) {
+        if ( releaseVersions == null )
+        {
             releaseVersions = new java.util.HashMap();
         }
 
@@ -547,7 +551,8 @@
      */
     public void mapDevelopmentVersion( String projectId, String nextVersion )
     {
-        if (developmentVersions == null) {
+        if ( developmentVersions == null )
+        {
             developmentVersions = new java.util.HashMap();
         }
 
@@ -562,9 +567,12 @@
      */
     public void mapOriginalScmInfo( String projectId, org.apache.maven.model.Scm scm )
     {
-        if (originalScmInfo == null) {
+        if ( originalScmInfo == null )
+        {
             originalScmInfo = new java.util.HashMap();
-        } else {
+        }
+        else
+        {
             assert !originalScmInfo.containsKey( projectId );
         }
 
@@ -591,8 +599,8 @@
             for ( java.util.Iterator i = reactorProjects.iterator(); i.hasNext(); )
             {
                 org.apache.maven.project.MavenProject project = (org.apache.maven.project.MavenProject)
i.next();
-                originalVersions.put( org.apache.maven.artifact.ArtifactUtils.versionlessKey(
project.getGroupId(), project.getArtifactId() ),
-                                      project.getVersion() );
+                originalVersions.put( org.apache.maven.artifact.ArtifactUtils.versionlessKey(
project.getGroupId(),
+                                      project.getArtifactId() ), project.getVersion() );
             }
         }
         return originalVersions;
@@ -695,9 +703,12 @@
             return false;
         }
         if ( ( checkModificationExcludes == null || ( checkModificationExcludes != null &&
checkModificationExcludes.size() == 0) ) &&
-            ( that.checkModificationExcludes == null || ( that.checkModificationExcludes
!= null && that.checkModificationExcludes.size() == 0) ) ) {
+            ( that.checkModificationExcludes == null || ( that.checkModificationExcludes
!= null && that.checkModificationExcludes.size() == 0) ) )
+        {
             // Do nothing.  This is a Modello workaround
-        } else {
+        }
+        else
+        {
             if ( checkModificationExcludes != null ? !checkModificationExcludes.equals( that.checkModificationExcludes
)
                 : that.checkModificationExcludes != null )
             {
@@ -705,9 +716,12 @@
             }
         }
         if ( ( developmentVersions == null || ( developmentVersions != null && developmentVersions.size()
== 0) ) &&
-            ( that.developmentVersions == null || ( that.developmentVersions != null &&
that.developmentVersions.size() == 0) ) ) {
+            ( that.developmentVersions == null || ( that.developmentVersions != null &&
that.developmentVersions.size() == 0) ) )
+        {
             // Do nothing.  This is a Modello workaround
-        } else {
+        }
+        else
+        {
             if ( developmentVersions != null ? !developmentVersions.equals( that.developmentVersions
)
                 : that.developmentVersions != null )
             {
@@ -715,18 +729,24 @@
             }
         }
         if ( ( originalScmInfo == null || (originalScmInfo != null && originalScmInfo.size()
== 0 ) ) &&
-            ( that.originalScmInfo == null || ( that.originalScmInfo != null && that.originalScmInfo.size()
== 0 ) ) ) {
+            ( that.originalScmInfo == null || ( that.originalScmInfo != null && that.originalScmInfo.size()
== 0 ) ) )
+        {
             // Do nothing.  This is a Modello workaround
-        } else {
+        }
+        else
+        {
             if ( originalScmInfo != null ? !compareScmCollections( that.originalScmInfo )
: that.originalScmInfo != null )
             {
                 return false;
             }
         }
         if ( ( releaseVersions == null || ( releaseVersions != null && releaseVersions.size()
== 0 ) ) &&
-            ( that.releaseVersions == null || ( that.releaseVersions != null && that.releaseVersions.size()
== 0 ) ) ) {
+            ( that.releaseVersions == null || ( that.releaseVersions != null && that.releaseVersions.size()
== 0 ) ) )
+        {
             // Do nothing.  This is a Modello workaround
-        } else {
+        }
+        else
+        {
             if ( releaseVersions != null ? !releaseVersions.equals( that.releaseVersions
) : that.releaseVersions != null )
             {
                 return false;
@@ -791,14 +811,17 @@
 
         return true;
     }
+
     private boolean compareScmCollections( java.util.Map that )
     {
         // Must manually compare as Scm doesn't have an equals method
-        if (that == null && originalScmInfo == null) {
+        if ( that == null && originalScmInfo == null )
+        {
             return true;
         }
 
-        if ( ( that == null && originalScmInfo != null ) || ( that != null &&
originalScmInfo == null ) ) {
+        if ( ( that == null && originalScmInfo != null ) || ( that != null &&
originalScmInfo == null ) )
+        {
             return false;
         }
 



Mime
View raw message