Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3411CC26B for ; Tue, 8 May 2012 11:38:37 +0000 (UTC) Received: (qmail 87682 invoked by uid 500); 8 May 2012 11:38:36 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 87613 invoked by uid 500); 8 May 2012 11:38:36 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 87604 invoked by uid 99); 8 May 2012 11:38:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 May 2012 11:38:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 May 2012 11:35:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C4F1D2388C6A for ; Tue, 8 May 2012 11:35:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r816525 [9/25] - in /websites/production/maventest/content/plugins/maven-release-plugin-latest: ./ apidocs/ apidocs/org/apache/maven/plugins/release/ apidocs/org/apache/maven/plugins/release/class-use/ cobertura/ css/ examples/ testapidocs/... Date: Tue, 08 May 2012 11:35:16 -0000 To: commits@maven.apache.org From: hboutemy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120508113524.C4F1D2388C6A@eris.apache.org> Modified: websites/production/maventest/content/plugins/maven-release-plugin-latest/cobertura/org.apache.maven.plugins.release.PrepareReleaseMojo.html ============================================================================== --- websites/production/maventest/content/plugins/maven-release-plugin-latest/cobertura/org.apache.maven.plugins.release.PrepareReleaseMojo.html (original) +++ websites/production/maventest/content/plugins/maven-release-plugin-latest/cobertura/org.apache.maven.plugins.release.PrepareReleaseMojo.html Tue May 8 11:35:10 2012 @@ -12,7 +12,7 @@
 
- +
Classes in this File Line Coverage Branch Coverage Complexity
PrepareReleaseMojo
100%
29/29
50%
2/4
4
PrepareReleaseMojo
97%
32/33
50%
3/6
3,667
 
@@ -60,366 +60,420 @@  21  
 
 22   -
 import org.apache.maven.plugin.MojoExecutionException;
+
 import org.apache.maven.execution.MavenSession;
 23   -
 import org.apache.maven.plugin.MojoFailureException;
+
 import org.apache.maven.plugin.MojoExecutionException;
 24   -
 import org.apache.maven.shared.release.ReleaseExecutionException;
+
 import org.apache.maven.plugin.MojoFailureException;
 25   -
 import org.apache.maven.shared.release.ReleaseFailureException;
+
 import org.apache.maven.shared.release.ReleaseExecutionException;
 26   -
 import org.apache.maven.shared.release.config.ReleaseDescriptor;
+
 import org.apache.maven.shared.release.ReleaseFailureException;
 27   -
 import org.apache.maven.shared.release.config.ReleaseUtils;
+
 import org.apache.maven.shared.release.config.ReleaseDescriptor;
 28   -
 
+
 import org.apache.maven.shared.release.config.ReleaseUtils;
 29   -
 /**
+
 
 30   -
  * Prepare for a release in SCM.
+
 /**
 31   -
  *
+
  * Prepare for a release in SCM.
 32   -
  * @author <a href="mailto:jdcasey@apache.org">John Casey</a>
+
  * For more info see <a href="/plugins/maven-release-plugin/examples/prepare-release.html">this example</a>.
 33   -
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+
  *
 34   -
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
+
  * @author <a href="mailto:jdcasey@apache.org">John Casey</a>
 35   -
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
+
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
 36   -
  * @version $Id$
+
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
 37   -
  * @aggregator
+
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
 38   -
  * @goal prepare
+
  * @version $Id$
 39   -
  * @requiresDependencyResolution test
+
  * @aggregator
 40   -
  * @todo [!] check how this works with version ranges
+
  * @goal prepare
 41   +
  * @todo [!] check how this works with version ranges
+  42  
  */
-  42  3
 public class PrepareReleaseMojo
-  43   -
     extends AbstractReleaseMojo
+  43  9
 public class PrepareReleaseMojo
 44   -
 {
+
     extends AbstractReleaseMojo
 45   -
 
+
 {
 46   -
     /**
+
 
 47   -
      * Resume a previous release attempt from the point where it was stopped.
+
     /**
 48   -
      * 
+
      * Resume a previous release attempt from the point where it was stopped.
 49   -
      * @parameter expression="${resume}" default-value="true"
+
      *
 50   -
      */
+
      * @parameter expression="${resume}" default-value="true"
 51   -
     private boolean resume;
+
      */
 52   -
 
+
     private boolean resume;
 53   -
     /**
+
 
 54   -
      * Whether to generate <code>release-pom.xml</code> files that contain resolved information about the project.
+
     /**
 55   -
      * 
+
      * @deprecated Please use release:prepare-with-pom instead.
 56   -
      * @parameter default-value="false" expression="${generateReleasePoms}"
+
      *
 57   -
      */
+
      * @parameter default-value="false" expression="${generateReleasePoms}"
 58   -
     private boolean generateReleasePoms;
+
      */
 59   -
 
+
     private boolean generateReleasePoms;
 60   -
     /**
+
 
 61   -
      * Whether to use "edit" mode on the SCM, to lock the file for editing during SCM operations.
+
     /**
 62   -
      * 
+
      * Whether to use "edit" mode on the SCM, to lock the file for editing during SCM operations.
 63   -
      * @parameter expression="${useEditMode}" default-value="false"
+
      *
 64   -
      */
+
      * @parameter expression="${useEditMode}" default-value="false"
 65   -
     private boolean useEditMode;
+
      */
 66   -
 
+
     private boolean useEditMode;
 67   -
     /**
+
 
 68   -
      * Whether to update dependencies version to the next development version.
+
     /**
 69   -
      * 
+
      * Whether to update dependencies version to the next development version.
 70   -
      * @parameter expression="${updateDependencies}" default-value="true"
+
      *
 71   -
      */
+
      * @parameter expression="${updateDependencies}" default-value="true"
 72   -
     private boolean updateDependencies;
+
      * @since 2.0-beta-5
 73   -
 
+
      */
 74   -
     /**
+
     private boolean updateDependencies;
 75   -
      * Whether to automatically assign submodules the parent version. If set to false, the user will be prompted for the
+
 
 76   -
      * version of each submodules.
+
     /**
 77   -
      * 
+
      * Whether to automatically assign submodules the parent version. If set to false, the user will be prompted for the
 78   -
      * @parameter expression="${autoVersionSubmodules}" default-value="false"
+
      * version of each submodules.
 79   -
      */
+
      *
 80   -
     private boolean autoVersionSubmodules;
+
      * @parameter expression="${autoVersionSubmodules}" default-value="false"
 81   -
 
+
      * @since 2.0-beta-5
 82   -
     /**
+
      */
 83   -
      * Dry run: don't checkin or tag anything in the scm repository, or modify the checkout. Running
+
     private boolean autoVersionSubmodules;
 84   -
      * <code>mvn -DdryRun=true release:prepare</code> is useful in order to check that modifications to poms and scm
+
 
 85   -
      * operations (only listed on the console) are working as expected. Modified POMs are written alongside the
+
     /**
 86   -
      * originals without modifying them.
+
      * Dry run: don't checkin or tag anything in the scm repository, or modify the checkout. Running
 87   -
      * 
+
      * <code>mvn -DdryRun=true release:prepare</code> is useful in order to check that modifications to poms and scm
 88   -
      * @parameter expression="${dryRun}" default-value="false"
+
      * operations (only listed on the console) are working as expected. Modified POMs are written alongside the
 89   -
      */
+
      * originals without modifying them.
 90   -
     private boolean dryRun;
+
      *
 91   -
 
+
      * @parameter expression="${dryRun}" default-value="false"
 92   -
     /**
+
      */
 93   -
      * Whether to add a schema to the POM if it was previously missing on release.
+
     private boolean dryRun;
 94   -
      * 
+
 
 95   -
      * @parameter expression="${addSchema}" default-value="true"
+
     /**
 96   -
      */
+
      * Whether to add a schema to the POM if it was previously missing on release.
 97   -
     private boolean addSchema;
+
      *
 98   -
 
+
      * @parameter expression="${addSchema}" default-value="true"
 99   -
     /**
+
      */
 100   -
      * Goals to run as part of the preparation step, after transformation but before committing. Space delimited.
+
     private boolean addSchema;
 101   -
      * 
+
 
 102   -
      * @parameter expression="${preparationGoals}" default-value="clean verify"
+
     /**
 103   -
      */
+
      * Goals to run as part of the preparation step, after transformation but before committing. Space delimited.
 104   -
     private String preparationGoals;
+
      *
 105   -
 
+
      * @parameter expression="${preparationGoals}" default-value="clean verify"
 106   -
     /**
+
      */
 107   -
      * Commits to do are atomic or by project.
+
     private String preparationGoals;
 108   -
      * 
+
 
 109   -
      * @parameter expression="${commitByProject}" default-value="false"
+
     /**
 110   -
      */
+
      * Commits to do are atomic or by project.
 111   -
     private boolean commitByProject;
+
      *
 112   -
 
+
      * @parameter expression="${commitByProject}" default-value="false"
 113   -
     /**
+
      * @since 2.0-beta-5
 114   -
      * Whether to allow timestamped SNAPSHOT dependencies. Default is to fail when finding any SNAPSHOT.
+
      */
 115   -
      * 
+
     private boolean commitByProject;
 116   -
      * @parameter expression="${ignoreSnapshots}" default-value="false"
+
 
 117   -
      */
+
     /**
 118   -
     private boolean allowTimestampedSnapshots;
+
      * Whether to allow timestamped SNAPSHOT dependencies. Default is to fail when finding any SNAPSHOT.
 119   -
 
+
      *
 120   -
     /**
+
      * @parameter expression="${ignoreSnapshots}" default-value="false"
 121   -
      * Whether to allow usage of a SNAPSHOT version of the Release Plugin. This in an internal property used to support
+
      * @since 2.0-beta-7
 122   -
      * testing of the plugin itself in batch mode.
+
      */
 123   -
      * 
+
     private boolean allowTimestampedSnapshots;
 124   -
      * @parameter expression="${allowReleasePluginSnapshot}" default-value="false"
+
 
 125   -
      * @readonly
+
     /**
 126   -
      */
+
      * Whether to allow usage of a SNAPSHOT version of the Release Plugin. This in an internal property used to support
 127   -
     private boolean allowReleasePluginSnapshot;
+
      * testing of the plugin itself in batch mode.
 128   -
 
+
      *
 129   -
     /**
+
      * @parameter expression="${allowReleasePluginSnapshot}" default-value="false"
 130   -
      * Default version to use when preparing a release or a branch.
+
      * @readonly
 131   -
      * 
+
      * @since 2.0-beta-9
 132   -
      * @parameter expression="${releaseVersion}"
-  133  
      */
+  133   +
     private boolean allowReleasePluginSnapshot;
 134   -
     private String releaseVersion;
-  135  
 
-  136   +  135  
     /**
+  136   +
      * Default version to use when preparing a release or a branch.
 137   -
      * Default version to use for new local working copy.
+
      *
 138   -
      * 
+
      * @parameter expression="${releaseVersion}"
 139   -
      * @parameter expression="${developmentVersion}"
+
      * @since 2.0-beta-8
 140  
      */
 141   -
     private String developmentVersion;
+
     private String releaseVersion;
 142   -
     
+
 
 143  
     /**
 144   -
      * currently only implemented with svn scm. Enable a workaround to prevent issue 
+
      * Default version to use for new local working copy.
 145   -
      * due to svn client > 1.5.0 (http://jira.codehaus.org/browse/SCM-406)
+
      *
 146   -
      *      
+
      * @parameter expression="${developmentVersion}"
 147   -
      * 
+
      * @since 2.0-beta-8
 148   -
      * @parameter expression="${remoteTagging}" default-value="true"
+
      */
 149   -
      * @since 2.0-beta-9
+
     private String developmentVersion;
 150   -
      */    
+
 
 151   -
     private boolean remoteTagging;
+
     /**
 152   -
     
+
      * currently only implemented with svn scm. Enable a workaround to prevent issue
 153   -
     /**
+
      * due to svn client > 1.5.0 (http://jira.codehaus.org/browse/SCM-406)
 154   -
      * {@inheritDoc}
+
      *
 155   -
      */
+
      *
 156   -
     public void execute()
+
      * @parameter expression="${remoteTagging}" default-value="true"
 157   -
         throws MojoExecutionException, MojoFailureException
+
      * @since 2.0-beta-9
 158   -
     {
-  159  3
         super.execute();
+
      */
+  159   +
     private boolean remoteTagging;
 160  
 
-  161  3
         ReleaseDescriptor config = createReleaseDescriptor();
-  162  3
         config.setAddSchema( addSchema );
-  163  3
         config.setGenerateReleasePoms( generateReleasePoms );
-  164  3
         config.setScmUseEditMode( useEditMode );
-  165  3
         config.setPreparationGoals( preparationGoals );
-  166  3
         config.setCommitByProject( commitByProject );
-  167  3
         config.setUpdateDependencies( updateDependencies );
-  168  3
         config.setAutoVersionSubmodules( autoVersionSubmodules );
-  169  3
         config.setAllowTimestampedSnapshots( allowTimestampedSnapshots );
-  170  3
         config.setSnapshotReleasePluginAllowed( allowReleasePluginSnapshot );
-  171  3
         config.setDefaultReleaseVersion( releaseVersion );
-  172  3
         config.setDefaultDevelopmentVersion( developmentVersion );
-  173  3
         config.setRemoteTagging( remoteTagging );
-  174   +  161   +
     /**
+  162   +
      * @parameter expression="${session}"
+  163   +
      * @readonly
+  164   +
      * @required
+  165   +
      * @since 2.0
+  166   +
      */
+  167   +
     protected MavenSession session;
+  168  
 
-  175   -
         // Create a config containing values from the system properties (command line properties).
-  176  3
         ReleaseDescriptor sysPropertiesConfig
-  177   -
                 = ReleaseUtils.copyPropertiesToReleaseDescriptor( System.getProperties() );
-  178  3
         mergeCommandLineConfig( config, sysPropertiesConfig );
+  169   +
     /**
+  170   +
      * {@inheritDoc}
+  171   +
      */
+  172   +
     public void execute()
+  173   +
         throws MojoExecutionException, MojoFailureException
+  174   +
     {
+  175  9
         if ( generateReleasePoms )
+  176   +
         {
+  177  0
             throw new MojoFailureException(
+  178   +
                 "Generating release POMs is no longer supported in release:prepare. Please run release:prepare-with-pom instead." );
 179   -
 
+
         }
 180   +
 
+  181  9
         prepareRelease( generateReleasePoms );
+  182  3
     }
+  183   +
 
+  184   +
     protected void prepareRelease( boolean generateReleasePoms )
+  185   +
         throws MojoExecutionException, MojoFailureException
+  186   +
     {
+  187   +
         // this is here so the subclass can call it without getting the extra generateReleasePoms check in execute() above
+  188  9
         super.execute();
+  189   +
 
+  190  9
         ReleaseDescriptor config = createReleaseDescriptor();
+  191  9
         config.setAddSchema( addSchema );
+  192  9
         config.setGenerateReleasePoms( generateReleasePoms );
+  193  9
         config.setScmUseEditMode( useEditMode );
+  194  9
         config.setPreparationGoals( preparationGoals );
+  195  9
         config.setCommitByProject( commitByProject );
+  196  9
         config.setUpdateDependencies( updateDependencies );
+  197  9
         config.setAutoVersionSubmodules( autoVersionSubmodules );
+  198  9
         config.setAllowTimestampedSnapshots( allowTimestampedSnapshots );
+  199  9
         config.setSnapshotReleasePluginAllowed( allowReleasePluginSnapshot );
+  200  9
         config.setDefaultReleaseVersion( releaseVersion );
+  201  9
         config.setDefaultDevelopmentVersion( developmentVersion );
+  202  9
         config.setRemoteTagging( remoteTagging );
+  203   +
 
+  204   +
         // Create a config containing values from the session properties (ie command line properties with cli).
+  205  9
         ReleaseDescriptor sysPropertiesConfig
+  206   +
                 = ReleaseUtils.copyPropertiesToReleaseDescriptor( session.getExecutionProperties() );
+  207  9
         mergeCommandLineConfig( config, sysPropertiesConfig );
+  208   +
 
+  209  
         try
-  181   +  210  
         {
-  182  3
             releaseManager.prepare( config, getReleaseEnvironment(), reactorProjects, resume, dryRun );
-  183   +  211  9
             releaseManager.prepare( config, getReleaseEnvironment(), reactorProjects, resume, dryRun );
+  212  
         }
-  184  1
         catch ( ReleaseExecutionException e )
-  185   +  213  3
         catch ( ReleaseExecutionException e )
+  214  
         {
-  186  1
             throw new MojoExecutionException( e.getMessage(), e );
-  187   +  215  3
             throw new MojoExecutionException( e.getMessage(), e );
+  216  
         }
-  188  1
         catch ( ReleaseFailureException e )
-  189   +  217  3
         catch ( ReleaseFailureException e )
+  218  
         {
-  190  1
             throw new MojoFailureException( e.getMessage() );
-  191  1
         }
-  192  1
     }
-  193   +  219  3
             throw new MojoFailureException( e.getMessage(), e );
+  220  3
         }
+  221  3
     }
+  222  
 
-  194   +  223  
     /**
-  195   +  224  
      * This method takes some of the release configuration picked up from the command line system properties and copies
-  196   +  225  
      * it into the release config object.
-  197   -
      * 
-  198   +  226   +
      *
+  227  
      * @param config The release configuration to merge the system properties into, must not be <code>null</code>.
-  199   +  228  
      * @param sysPropertiesConfig The configuration from the system properties to merge in, must not be
-  200   +  229  
      *            <code>null</code>.
-  201   +  230  
      */
-  202   +  231  
     private void mergeCommandLineConfig( ReleaseDescriptor config, ReleaseDescriptor sysPropertiesConfig )
-  203   +  232  
     {
-  204   -
         // If the user specifies versions, these should be override the existing versions
-  205  3
         if ( sysPropertiesConfig.getReleaseVersions() != null )
-  206   +  233   +
         // If the user specifies versions, these should override the existing versions
+  234  9
         if ( sysPropertiesConfig.getReleaseVersions() != null )
+  235  
         {
-  207  3
             config.getReleaseVersions().putAll( sysPropertiesConfig.getReleaseVersions() );
-  208   +  236  9
             config.getReleaseVersions().putAll( sysPropertiesConfig.getReleaseVersions() );
+  237  
         }
-  209  3
         if ( sysPropertiesConfig.getDevelopmentVersions() != null )
-  210   +  238  9
         if ( sysPropertiesConfig.getDevelopmentVersions() != null )
+  239  
         {
-  211  3
             config.getDevelopmentVersions().putAll( sysPropertiesConfig.getDevelopmentVersions() );
-  212   +  240  9
             config.getDevelopmentVersions().putAll( sysPropertiesConfig.getDevelopmentVersions() );
+  241  
         }
-  213  3
     }
-  214   +  242  9
     }
+  243  
 
-  215   +  244  
 }
- + \ No newline at end of file Added: websites/production/maventest/content/plugins/maven-release-plugin-latest/cobertura/org.apache.maven.plugins.release.PrepareWithPomReleaseMojo.html ============================================================================== --- websites/production/maventest/content/plugins/maven-release-plugin-latest/cobertura/org.apache.maven.plugins.release.PrepareWithPomReleaseMojo.html (added) +++ websites/production/maventest/content/plugins/maven-release-plugin-latest/cobertura/org.apache.maven.plugins.release.PrepareWithPomReleaseMojo.html Tue May 8 11:35:10 2012 @@ -0,0 +1,121 @@ + + + + +Coverage Report + + + + +
Coverage Report - org.apache.maven.plugins.release.PrepareWithPomReleaseMojo
+
 
+ + + + +
Classes in this File Line Coverage Branch Coverage Complexity
PrepareWithPomReleaseMojo
0%
0/3
N/A
1
+
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 1  
 package org.apache.maven.plugins.release;
 2  
 
 3  
 /*
 4  
  * Licensed to the Apache Software Foundation (ASF) under one
 5  
  * or more contributor license agreements.  See the NOTICE file
 6  
  * distributed with this work for additional information
 7  
  * regarding copyright ownership.  The ASF licenses this file
 8  
  * to you under the Apache License, Version 2.0 (the
 9  
  * "License"); you may not use this file except in compliance
 10  
  * with the License.  You may obtain a copy of the License at
 11  
  *
 12  
  *   http://www.apache.org/licenses/LICENSE-2.0
 13  
  *
 14  
  * Unless required by applicable law or agreed to in writing,
 15  
  * software distributed under the License is distributed on an
 16  
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 17  
  * KIND, either express or implied.  See the License for the
 18  
  * specific language governing permissions and limitations
 19  
  * under the License.
 20  
  */
 21  
 
 22  
 import org.apache.maven.plugin.MojoExecutionException;
 23  
 import org.apache.maven.plugin.MojoFailureException;
 24  
 
 25  
 /**
 26  
  * Prepare for a release in SCM, fully resolving dependencies for the purpose of producing a "release POM".
 27  
  * For more info see <a href="/plugins/maven-release-plugin/examples/prepare-release.html">this example</a>.
 28  
  *
 29  
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
 30  
  * @aggregator
 31  
  * @goal prepare-with-pom
 32  
  * @requiresDependencyResolution test
 33  
  * @since 2.0
 34  
  */
 35  0
 public class PrepareWithPomReleaseMojo
 36  
     extends PrepareReleaseMojo
 37  
 {
 38  
     /**
 39  
      * Whether to generate <code>release-pom.xml</code> files that contain resolved information about the project.
 40  
      *
 41  
      * @parameter default-value="true" expression="${generateReleasePoms}"
 42  
      */
 43  
     private boolean generateReleasePoms;
 44  
 
 45  
     public void execute()
 46  
         throws MojoExecutionException, MojoFailureException
 47  
     {
 48  0
         prepareRelease( generateReleasePoms );
 49  0
     }
 50  
 }
+ + + + \ No newline at end of file Propchange: websites/production/maventest/content/plugins/maven-release-plugin-latest/cobertura/org.apache.maven.plugins.release.PrepareWithPomReleaseMojo.html ------------------------------------------------------------------------------ svn:eol-style = native Propchange: websites/production/maventest/content/plugins/maven-release-plugin-latest/cobertura/org.apache.maven.plugins.release.PrepareWithPomReleaseMojo.html ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision