You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-commits@maven.apache.org by hb...@apache.org on 2019/12/08 22:23:58 UTC
svn commit: r1871062 [28/37] - in
/maven/website/components/maven-release-archives/maven-release-LATEST: ./
maven-release-api/ maven-release-api/apidocs/
maven-release-api/apidocs/org/apache/maven/shared/release/
maven-release-api/apidocs/org/apache/ma...
Modified: maven/website/components/maven-release-archives/maven-release-LATEST/maven-release-manager/xref/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.html
==============================================================================
--- maven/website/components/maven-release-archives/maven-release-LATEST/maven-release-manager/xref/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.html (original)
+++ maven/website/components/maven-release-archives/maven-release-LATEST/maven-release-manager/xref/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.html Sun Dec 8 22:23:50 2019
@@ -47,188 +47,224 @@
<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong class="jxr_keyword">import</strong> org.apache.maven.shared.release.util.ReleaseUtil;
<a class="jxr_linenumber" name="L40" href="#L40">40</a>
<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">import</strong> java.io.File;
-<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong class="jxr_keyword">import</strong> java.text.MessageFormat;
-<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong class="jxr_keyword">import</strong> java.util.ArrayList;
-<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong class="jxr_keyword">import</strong> java.util.Collection;
-<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong class="jxr_keyword">import</strong> java.util.List;
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>
-<a class="jxr_linenumber" name="L47" href="#L47">47</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L48" href="#L48">48</a> <em class="jxr_javadoccomment"> * Holds the basic concept of committing changes to the current working copy.</em>
-<a class="jxr_linenumber" name="L49" href="#L49">49</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L50" href="#L50">50</a> <em class="jxr_javadoccomment"> * @author <a href="<a href="mailto:brett@apache.org" target="alexandria_uri">mailto:brett@apache.org</a>">Brett Porter</a></em>
-<a class="jxr_linenumber" name="L51" href="#L51">51</a> <em class="jxr_javadoccomment"> * @author <a href="<a href="mailto:me@lcorneliussen.de" target="alexandria_uri">mailto:me@lcorneliussen.de</a>">Lars Corneliussen</a></em>
-<a class="jxr_linenumber" name="L52" href="#L52">52</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">abstract</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/maven/shared/release/phase/AbstractScmCommitPhase.html">AbstractScmCommitPhase</a>
-<a class="jxr_linenumber" name="L54" href="#L54">54</a> <strong class="jxr_keyword">extends</strong> AbstractReleasePhase
-<a class="jxr_linenumber" name="L55" href="#L55">55</a> {
-<a class="jxr_linenumber" name="L56" href="#L56">56</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> beforeBranchOrTag = false;
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>
-<a class="jxr_linenumber" name="L58" href="#L58">58</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> afterBranchOrTag = false;
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>
-<a class="jxr_linenumber" name="L60" href="#L60">60</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L61" href="#L61">61</a> <em class="jxr_javadoccomment"> * Tool that gets a configured SCM repository from release configuration.</em>
-<a class="jxr_linenumber" name="L62" href="#L62">62</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/maven/shared/release/scm/ScmRepositoryConfigurator.html">ScmRepositoryConfigurator</a> scmRepositoryConfigurator;
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>
-<a class="jxr_linenumber" name="L65" href="#L65">65</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L66" href="#L66">66</a> <em class="jxr_javadoccomment"> * The format for the commit message.</em>
-<a class="jxr_linenumber" name="L67" href="#L67">67</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L68" href="#L68">68</a> <strong class="jxr_keyword">protected</strong> String messageFormat;
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>
-<a class="jxr_linenumber" name="L70" href="#L70">70</a> @Override
-<a class="jxr_linenumber" name="L71" href="#L71">71</a> <strong class="jxr_keyword">public</strong> ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
-<a class="jxr_linenumber" name="L72" href="#L72">72</a> List<MavenProject> reactorProjects )
-<a class="jxr_linenumber" name="L73" href="#L73">73</a> <strong class="jxr_keyword">throws</strong> ReleaseExecutionException, ReleaseFailureException
-<a class="jxr_linenumber" name="L74" href="#L74">74</a> {
-<a class="jxr_linenumber" name="L75" href="#L75">75</a> ReleaseResult relResult = <strong class="jxr_keyword">new</strong> ReleaseResult();
-<a class="jxr_linenumber" name="L76" href="#L76">76</a>
-<a class="jxr_linenumber" name="L77" href="#L77">77</a> validateConfiguration( releaseDescriptor );
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>
-<a class="jxr_linenumber" name="L79" href="#L79">79</a> runLogic( releaseDescriptor, releaseEnvironment, reactorProjects, relResult, false );
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>
-<a class="jxr_linenumber" name="L81" href="#L81">81</a> relResult.setResultCode( ReleaseResult.SUCCESS );
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>
-<a class="jxr_linenumber" name="L83" href="#L83">83</a> <strong class="jxr_keyword">return</strong> relResult;
-<a class="jxr_linenumber" name="L84" href="#L84">84</a> }
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>
-<a class="jxr_linenumber" name="L86" href="#L86">86</a> @Override
-<a class="jxr_linenumber" name="L87" href="#L87">87</a> <strong class="jxr_keyword">public</strong> ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
-<a class="jxr_linenumber" name="L88" href="#L88">88</a> List<MavenProject> reactorProjects )
-<a class="jxr_linenumber" name="L89" href="#L89">89</a> <strong class="jxr_keyword">throws</strong> ReleaseExecutionException, ReleaseFailureException
-<a class="jxr_linenumber" name="L90" href="#L90">90</a> {
-<a class="jxr_linenumber" name="L91" href="#L91">91</a> ReleaseResult result = <strong class="jxr_keyword">new</strong> ReleaseResult();
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>
-<a class="jxr_linenumber" name="L93" href="#L93">93</a> validateConfiguration( releaseDescriptor );
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>
-<a class="jxr_linenumber" name="L95" href="#L95">95</a> runLogic( releaseDescriptor, releaseEnvironment, reactorProjects, result, <strong class="jxr_keyword">true</strong> );
-<a class="jxr_linenumber" name="L96" href="#L96">96</a>
-<a class="jxr_linenumber" name="L97" href="#L97">97</a> result.setResultCode( ReleaseResult.SUCCESS );
-<a class="jxr_linenumber" name="L98" href="#L98">98</a> <strong class="jxr_keyword">return</strong> result;
-<a class="jxr_linenumber" name="L99" href="#L99">99</a> }
-<a class="jxr_linenumber" name="L100" href="#L100">100</a>
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">abstract</strong> <strong class="jxr_keyword">void</strong> runLogic( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> List<MavenProject> reactorProjects, ReleaseResult result, <strong class="jxr_keyword">boolean</strong> simulating )
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> <strong class="jxr_keyword">throws</strong> ReleaseScmCommandException, ReleaseExecutionException, ReleaseScmRepositoryException;
-<a class="jxr_linenumber" name="L104" href="#L104">104</a>
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> performCheckins( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> List<MavenProject> reactorProjects, String message )
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> <strong class="jxr_keyword">throws</strong> ReleaseScmRepositoryException, ReleaseExecutionException, <a href="../../../../../../org/apache/maven/shared/release/scm/ReleaseScmCommandException.html">ReleaseScmCommandException</a>
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> {
-<a class="jxr_linenumber" name="L109" href="#L109">109</a>
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> getLogger().info( <span class="jxr_string">"Checking in modified POMs..."</span> );
-<a class="jxr_linenumber" name="L111" href="#L111">111</a>
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> ScmRepository repository;
-<a class="jxr_linenumber" name="L113" href="#L113">113</a> ScmProvider provider;
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L115" href="#L115">115</a> {
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> repository = scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor,
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> releaseEnvironment.getSettings() );
-<a class="jxr_linenumber" name="L118" href="#L118">118</a>
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> repository.getProviderRepository().setPushChanges( releaseDescriptor.isPushChanges() );
-<a class="jxr_linenumber" name="L120" href="#L120">120</a>
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> repository.getProviderRepository().setWorkItem( releaseDescriptor.getWorkItem() );
-<a class="jxr_linenumber" name="L122" href="#L122">122</a>
-<a class="jxr_linenumber" name="L123" href="#L123">123</a> provider = scmRepositoryConfigurator.getRepositoryProvider( repository );
-<a class="jxr_linenumber" name="L124" href="#L124">124</a> }
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> <strong class="jxr_keyword">catch</strong> ( ScmRepositoryException e )
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> {
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/maven/shared/release/scm/ReleaseScmRepositoryException.html">ReleaseScmRepositoryException</a>( e.getMessage(), e.getValidationMessages() );
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> }
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> <strong class="jxr_keyword">catch</strong> ( NoSuchScmProviderException e )
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> {
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> ReleaseExecutionException( <span class="jxr_string">"Unable to configure SCM repository: "</span> + e.getMessage(), e );
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> }
-<a class="jxr_linenumber" name="L133" href="#L133">133</a>
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> <strong class="jxr_keyword">if</strong> ( releaseDescriptor.isCommitByProject() )
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> {
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> <strong class="jxr_keyword">for</strong> ( MavenProject project : reactorProjects )
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> {
-<a class="jxr_linenumber" name="L138" href="#L138">138</a> List<File> pomFiles = createPomFiles( releaseDescriptor, project );
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> ScmFileSet fileSet = <strong class="jxr_keyword">new</strong> ScmFileSet( project.getFile().getParentFile(), pomFiles );
-<a class="jxr_linenumber" name="L140" href="#L140">140</a>
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> checkin( provider, repository, fileSet, releaseDescriptor, message );
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> }
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> }
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L145" href="#L145">145</a> {
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> List<File> pomFiles = createPomFiles( releaseDescriptor, reactorProjects );
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> ScmFileSet fileSet = <strong class="jxr_keyword">new</strong> ScmFileSet( <strong class="jxr_keyword">new</strong> File( releaseDescriptor.getWorkingDirectory() ), pomFiles );
-<a class="jxr_linenumber" name="L148" href="#L148">148</a>
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> checkin( provider, repository, fileSet, releaseDescriptor, message );
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> }
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> }
-<a class="jxr_linenumber" name="L152" href="#L152">152</a>
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> checkin( ScmProvider provider, ScmRepository repository, ScmFileSet fileSet,
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> ReleaseDescriptor releaseDescriptor, String message )
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> <strong class="jxr_keyword">throws</strong> ReleaseExecutionException, <a href="../../../../../../org/apache/maven/shared/release/scm/ReleaseScmCommandException.html">ReleaseScmCommandException</a>
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> {
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> CheckInScmResult result;
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> {
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> result = provider.checkIn( repository, fileSet, (ScmVersion) <strong class="jxr_keyword">null</strong>, message );
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> }
-<a class="jxr_linenumber" name="L162" href="#L162">162</a> <strong class="jxr_keyword">catch</strong> ( ScmException e )
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> {
-<a class="jxr_linenumber" name="L164" href="#L164">164</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> ReleaseExecutionException( <span class="jxr_string">"An error is occurred in the checkin process: "</span> + e.getMessage(), e );
-<a class="jxr_linenumber" name="L165" href="#L165">165</a> }
-<a class="jxr_linenumber" name="L166" href="#L166">166</a>
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> <strong class="jxr_keyword">if</strong> ( !result.isSuccess() )
-<a class="jxr_linenumber" name="L168" href="#L168">168</a> {
-<a class="jxr_linenumber" name="L169" href="#L169">169</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/maven/shared/release/scm/ReleaseScmCommandException.html">ReleaseScmCommandException</a>( <span class="jxr_string">"Unable to commit files"</span>, result );
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> }
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> <strong class="jxr_keyword">if</strong> ( releaseDescriptor.isRemoteTagging() )
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> {
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> releaseDescriptor.setScmReleasedPomRevision( result.getScmRevision() );
-<a class="jxr_linenumber" name="L174" href="#L174">174</a> }
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> }
-<a class="jxr_linenumber" name="L176" href="#L176">176</a>
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> simulateCheckins( ReleaseDescriptor releaseDescriptor, List<MavenProject> reactorProjects,
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> ReleaseResult result, String message )
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> {
-<a class="jxr_linenumber" name="L180" href="#L180">180</a> Collection<File> pomFiles = createPomFiles( releaseDescriptor, reactorProjects );
-<a class="jxr_linenumber" name="L181" href="#L181">181</a> logInfo( result, <span class="jxr_string">"Full run would be commit "</span> + pomFiles.size() + <span class="jxr_string">" files with message: '"</span> + message + <span class="jxr_string">"'"</span> );
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> }
-<a class="jxr_linenumber" name="L183" href="#L183">183</a>
-<a class="jxr_linenumber" name="L184" href="#L184">184</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> validateConfiguration( ReleaseDescriptor releaseDescriptor )
-<a class="jxr_linenumber" name="L185" href="#L185">185</a> <strong class="jxr_keyword">throws</strong> ReleaseFailureException
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> {
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> <strong class="jxr_keyword">if</strong> ( releaseDescriptor.getScmReleaseLabel() == <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L188" href="#L188">188</a> {
-<a class="jxr_linenumber" name="L189" href="#L189">189</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> ReleaseFailureException( <span class="jxr_string">"A release label is required for committing"</span> );
-<a class="jxr_linenumber" name="L190" href="#L190">190</a> }
-<a class="jxr_linenumber" name="L191" href="#L191">191</a> }
-<a class="jxr_linenumber" name="L192" href="#L192">192</a>
-<a class="jxr_linenumber" name="L193" href="#L193">193</a> <strong class="jxr_keyword">protected</strong> String createMessage( ReleaseDescriptor releaseDescriptor )
-<a class="jxr_linenumber" name="L194" href="#L194">194</a> {
-<a class="jxr_linenumber" name="L195" href="#L195">195</a> <strong class="jxr_keyword">return</strong> MessageFormat.format( releaseDescriptor.getScmCommentPrefix() + messageFormat,
-<a class="jxr_linenumber" name="L196" href="#L196">196</a> <strong class="jxr_keyword">new</strong> Object[]{releaseDescriptor.getScmReleaseLabel()} );
-<a class="jxr_linenumber" name="L197" href="#L197">197</a> }
-<a class="jxr_linenumber" name="L198" href="#L198">198</a>
-<a class="jxr_linenumber" name="L199" href="#L199">199</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> List<File> createPomFiles( ReleaseDescriptor releaseDescriptor, MavenProject project )
-<a class="jxr_linenumber" name="L200" href="#L200">200</a> {
-<a class="jxr_linenumber" name="L201" href="#L201">201</a> List<File> pomFiles = <strong class="jxr_keyword">new</strong> ArrayList<>();
-<a class="jxr_linenumber" name="L202" href="#L202">202</a>
-<a class="jxr_linenumber" name="L203" href="#L203">203</a> pomFiles.add( ReleaseUtil.getStandardPom( project ) );
-<a class="jxr_linenumber" name="L204" href="#L204">204</a>
-<a class="jxr_linenumber" name="L205" href="#L205">205</a> <strong class="jxr_keyword">if</strong> ( releaseDescriptor.isGenerateReleasePoms() && !releaseDescriptor.isSuppressCommitBeforeTagOrBranch() )
-<a class="jxr_linenumber" name="L206" href="#L206">206</a> {
-<a class="jxr_linenumber" name="L207" href="#L207">207</a> pomFiles.add( ReleaseUtil.getReleasePom( project ) );
-<a class="jxr_linenumber" name="L208" href="#L208">208</a> }
-<a class="jxr_linenumber" name="L209" href="#L209">209</a>
-<a class="jxr_linenumber" name="L210" href="#L210">210</a> <strong class="jxr_keyword">return</strong> pomFiles;
-<a class="jxr_linenumber" name="L211" href="#L211">211</a> }
-<a class="jxr_linenumber" name="L212" href="#L212">212</a>
-<a class="jxr_linenumber" name="L213" href="#L213">213</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> List<File> createPomFiles( ReleaseDescriptor releaseDescriptor,
-<a class="jxr_linenumber" name="L214" href="#L214">214</a> List<MavenProject> reactorProjects )
-<a class="jxr_linenumber" name="L215" href="#L215">215</a> {
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> List<File> pomFiles = <strong class="jxr_keyword">new</strong> ArrayList<>();
-<a class="jxr_linenumber" name="L217" href="#L217">217</a> <strong class="jxr_keyword">for</strong> ( MavenProject project : reactorProjects )
-<a class="jxr_linenumber" name="L218" href="#L218">218</a> {
-<a class="jxr_linenumber" name="L219" href="#L219">219</a> pomFiles.addAll( createPomFiles( releaseDescriptor, project ) );
-<a class="jxr_linenumber" name="L220" href="#L220">220</a> }
-<a class="jxr_linenumber" name="L221" href="#L221">221</a> <strong class="jxr_keyword">return</strong> pomFiles;
-<a class="jxr_linenumber" name="L222" href="#L222">222</a> }
-<a class="jxr_linenumber" name="L223" href="#L223">223</a> }
+<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong class="jxr_keyword">import</strong> java.util.ArrayList;
+<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong class="jxr_keyword">import</strong> java.util.Collection;
+<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong class="jxr_keyword">import</strong> java.util.List;
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>
+<a class="jxr_linenumber" name="L46" href="#L46">46</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L47" href="#L47">47</a> <em class="jxr_javadoccomment"> * Holds the basic concept of committing changes to the current working copy.</em>
+<a class="jxr_linenumber" name="L48" href="#L48">48</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L49" href="#L49">49</a> <em class="jxr_javadoccomment"> * @author <a href="<a href="mailto:brett@apache.org" target="alexandria_uri">mailto:brett@apache.org</a>">Brett Porter</a></em>
+<a class="jxr_linenumber" name="L50" href="#L50">50</a> <em class="jxr_javadoccomment"> * @author <a href="<a href="mailto:me@lcorneliussen.de" target="alexandria_uri">mailto:me@lcorneliussen.de</a>">Lars Corneliussen</a></em>
+<a class="jxr_linenumber" name="L51" href="#L51">51</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L52" href="#L52">52</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">abstract</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/maven/shared/release/phase/AbstractScmCommitPhase.html">AbstractScmCommitPhase</a>
+<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong class="jxr_keyword">extends</strong> AbstractReleasePhase
+<a class="jxr_linenumber" name="L54" href="#L54">54</a> {
+<a class="jxr_linenumber" name="L55" href="#L55">55</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> beforeBranchOrTag = false;
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>
+<a class="jxr_linenumber" name="L57" href="#L57">57</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">boolean</strong> afterBranchOrTag = false;
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>
+<a class="jxr_linenumber" name="L59" href="#L59">59</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L60" href="#L60">60</a> <em class="jxr_javadoccomment"> * Tool that gets a configured SCM repository from release configuration.</em>
+<a class="jxr_linenumber" name="L61" href="#L61">61</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong class="jxr_keyword">protected</strong> <a href="../../../../../../org/apache/maven/shared/release/scm/ScmRepositoryConfigurator.html">ScmRepositoryConfigurator</a> scmRepositoryConfigurator;
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>
+<a class="jxr_linenumber" name="L64" href="#L64">64</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L65" href="#L65">65</a> <em class="jxr_javadoccomment"> * The getter in the descriptor for the comment.</em>
+<a class="jxr_linenumber" name="L66" href="#L66">66</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L67" href="#L67">67</a> <strong class="jxr_keyword">protected</strong> String descriptorCommentGetter;
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>
+<a class="jxr_linenumber" name="L69" href="#L69">69</a> @Override
+<a class="jxr_linenumber" name="L70" href="#L70">70</a> <strong class="jxr_keyword">public</strong> ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+<a class="jxr_linenumber" name="L71" href="#L71">71</a> List<MavenProject> reactorProjects )
+<a class="jxr_linenumber" name="L72" href="#L72">72</a> <strong class="jxr_keyword">throws</strong> ReleaseExecutionException, ReleaseFailureException
+<a class="jxr_linenumber" name="L73" href="#L73">73</a> {
+<a class="jxr_linenumber" name="L74" href="#L74">74</a> ReleaseResult relResult = <strong class="jxr_keyword">new</strong> ReleaseResult();
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>
+<a class="jxr_linenumber" name="L76" href="#L76">76</a> validateConfiguration( releaseDescriptor );
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>
+<a class="jxr_linenumber" name="L78" href="#L78">78</a> runLogic( releaseDescriptor, releaseEnvironment, reactorProjects, relResult, false );
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>
+<a class="jxr_linenumber" name="L80" href="#L80">80</a> relResult.setResultCode( ReleaseResult.SUCCESS );
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>
+<a class="jxr_linenumber" name="L82" href="#L82">82</a> <strong class="jxr_keyword">return</strong> relResult;
+<a class="jxr_linenumber" name="L83" href="#L83">83</a> }
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>
+<a class="jxr_linenumber" name="L85" href="#L85">85</a> @Override
+<a class="jxr_linenumber" name="L86" href="#L86">86</a> <strong class="jxr_keyword">public</strong> ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+<a class="jxr_linenumber" name="L87" href="#L87">87</a> List<MavenProject> reactorProjects )
+<a class="jxr_linenumber" name="L88" href="#L88">88</a> <strong class="jxr_keyword">throws</strong> ReleaseExecutionException, ReleaseFailureException
+<a class="jxr_linenumber" name="L89" href="#L89">89</a> {
+<a class="jxr_linenumber" name="L90" href="#L90">90</a> ReleaseResult result = <strong class="jxr_keyword">new</strong> ReleaseResult();
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>
+<a class="jxr_linenumber" name="L92" href="#L92">92</a> validateConfiguration( releaseDescriptor );
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>
+<a class="jxr_linenumber" name="L94" href="#L94">94</a> runLogic( releaseDescriptor, releaseEnvironment, reactorProjects, result, <strong class="jxr_keyword">true</strong> );
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>
+<a class="jxr_linenumber" name="L96" href="#L96">96</a> result.setResultCode( ReleaseResult.SUCCESS );
+<a class="jxr_linenumber" name="L97" href="#L97">97</a> <strong class="jxr_keyword">return</strong> result;
+<a class="jxr_linenumber" name="L98" href="#L98">98</a> }
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">abstract</strong> <strong class="jxr_keyword">void</strong> runLogic( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> List<MavenProject> reactorProjects, ReleaseResult result, <strong class="jxr_keyword">boolean</strong> simulating )
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> <strong class="jxr_keyword">throws</strong> ReleaseScmCommandException, ReleaseExecutionException, ReleaseScmRepositoryException;
+<a class="jxr_linenumber" name="L103" href="#L103">103</a>
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> performCheckins( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> List<MavenProject> reactorProjects, String message )
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> <strong class="jxr_keyword">throws</strong> ReleaseScmRepositoryException, ReleaseExecutionException, <a href="../../../../../../org/apache/maven/shared/release/scm/ReleaseScmCommandException.html">ReleaseScmCommandException</a>
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> {
+<a class="jxr_linenumber" name="L108" href="#L108">108</a>
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> getLogger().info( <span class="jxr_string">"Checking in modified POMs..."</span> );
+<a class="jxr_linenumber" name="L110" href="#L110">110</a>
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> ScmRepository repository;
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> ScmProvider provider;
+<a class="jxr_linenumber" name="L113" href="#L113">113</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L114" href="#L114">114</a> {
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> repository = scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor,
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> releaseEnvironment.getSettings() );
+<a class="jxr_linenumber" name="L117" href="#L117">117</a>
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> repository.getProviderRepository().setPushChanges( releaseDescriptor.isPushChanges() );
+<a class="jxr_linenumber" name="L119" href="#L119">119</a>
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> repository.getProviderRepository().setWorkItem( releaseDescriptor.getWorkItem() );
+<a class="jxr_linenumber" name="L121" href="#L121">121</a>
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> provider = scmRepositoryConfigurator.getRepositoryProvider( repository );
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> }
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> <strong class="jxr_keyword">catch</strong> ( ScmRepositoryException e )
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> {
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/maven/shared/release/scm/ReleaseScmRepositoryException.html">ReleaseScmRepositoryException</a>( e.getMessage(), e.getValidationMessages() );
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> }
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> <strong class="jxr_keyword">catch</strong> ( NoSuchScmProviderException e )
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> {
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> ReleaseExecutionException( <span class="jxr_string">"Unable to configure SCM repository: "</span> + e.getMessage(), e );
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> }
+<a class="jxr_linenumber" name="L132" href="#L132">132</a>
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> <strong class="jxr_keyword">if</strong> ( releaseDescriptor.isCommitByProject() )
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> {
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> <strong class="jxr_keyword">for</strong> ( MavenProject project : reactorProjects )
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> {
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> List<File> pomFiles = createPomFiles( releaseDescriptor, project );
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> ScmFileSet fileSet = <strong class="jxr_keyword">new</strong> ScmFileSet( project.getFile().getParentFile(), pomFiles );
+<a class="jxr_linenumber" name="L139" href="#L139">139</a>
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> checkin( provider, repository, fileSet, releaseDescriptor, message );
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> }
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> }
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> {
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> List<File> pomFiles = createPomFiles( releaseDescriptor, reactorProjects );
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> ScmFileSet fileSet = <strong class="jxr_keyword">new</strong> ScmFileSet( <strong class="jxr_keyword">new</strong> File( releaseDescriptor.getWorkingDirectory() ), pomFiles );
+<a class="jxr_linenumber" name="L147" href="#L147">147</a>
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> checkin( provider, repository, fileSet, releaseDescriptor, message );
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> }
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> }
+<a class="jxr_linenumber" name="L151" href="#L151">151</a>
+<a class="jxr_linenumber" name="L152" href="#L152">152</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> checkin( ScmProvider provider, ScmRepository repository, ScmFileSet fileSet,
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> ReleaseDescriptor releaseDescriptor, String message )
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> <strong class="jxr_keyword">throws</strong> ReleaseExecutionException, <a href="../../../../../../org/apache/maven/shared/release/scm/ReleaseScmCommandException.html">ReleaseScmCommandException</a>
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> {
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> CheckInScmResult result;
+<a class="jxr_linenumber" name="L157" href="#L157">157</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> {
+<a class="jxr_linenumber" name="L159" href="#L159">159</a> result = provider.checkIn( repository, fileSet, (ScmVersion) <strong class="jxr_keyword">null</strong>, message );
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> }
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> <strong class="jxr_keyword">catch</strong> ( ScmException e )
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> {
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> ReleaseExecutionException( <span class="jxr_string">"An error is occurred in the checkin process: "</span> + e.getMessage(), e );
+<a class="jxr_linenumber" name="L164" href="#L164">164</a> }
+<a class="jxr_linenumber" name="L165" href="#L165">165</a>
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> <strong class="jxr_keyword">if</strong> ( !result.isSuccess() )
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> {
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/maven/shared/release/scm/ReleaseScmCommandException.html">ReleaseScmCommandException</a>( <span class="jxr_string">"Unable to commit files"</span>, result );
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> }
+<a class="jxr_linenumber" name="L170" href="#L170">170</a> <strong class="jxr_keyword">if</strong> ( releaseDescriptor.isRemoteTagging() )
+<a class="jxr_linenumber" name="L171" href="#L171">171</a> {
+<a class="jxr_linenumber" name="L172" href="#L172">172</a> releaseDescriptor.setScmReleasedPomRevision( result.getScmRevision() );
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> }
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> }
+<a class="jxr_linenumber" name="L175" href="#L175">175</a>
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> simulateCheckins( ReleaseDescriptor releaseDescriptor, List<MavenProject> reactorProjects,
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> ReleaseResult result, String message )
+<a class="jxr_linenumber" name="L178" href="#L178">178</a> {
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> Collection<File> pomFiles = createPomFiles( releaseDescriptor, reactorProjects );
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> logInfo( result, <span class="jxr_string">"Full run would be commit "</span> + pomFiles.size() + <span class="jxr_string">" files with message: '"</span> + message + <span class="jxr_string">"'"</span> );
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> }
+<a class="jxr_linenumber" name="L182" href="#L182">182</a>
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> validateConfiguration( ReleaseDescriptor releaseDescriptor )
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> <strong class="jxr_keyword">throws</strong> ReleaseFailureException
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> {
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> <strong class="jxr_keyword">if</strong> ( releaseDescriptor.getScmReleaseLabel() == <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> {
+<a class="jxr_linenumber" name="L188" href="#L188">188</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> ReleaseFailureException( <span class="jxr_string">"A release label is required for committing"</span> );
+<a class="jxr_linenumber" name="L189" href="#L189">189</a> }
+<a class="jxr_linenumber" name="L190" href="#L190">190</a> }
+<a class="jxr_linenumber" name="L191" href="#L191">191</a>
+<a class="jxr_linenumber" name="L192" href="#L192">192</a> <strong class="jxr_keyword">protected</strong> String createMessage( List<MavenProject> reactorProjects,
+<a class="jxr_linenumber" name="L193" href="#L193">193</a> ReleaseDescriptor releaseDescriptor )
+<a class="jxr_linenumber" name="L194" href="#L194">194</a> <strong class="jxr_keyword">throws</strong> ReleaseExecutionException
+<a class="jxr_linenumber" name="L195" href="#L195">195</a> {
+<a class="jxr_linenumber" name="L196" href="#L196">196</a> String comment;
+<a class="jxr_linenumber" name="L197" href="#L197">197</a> <strong class="jxr_keyword">boolean</strong> branch = false;
+<a class="jxr_linenumber" name="L198" href="#L198">198</a> <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"getScmReleaseCommitComment"</span>.equals( descriptorCommentGetter ) )
+<a class="jxr_linenumber" name="L199" href="#L199">199</a> {
+<a class="jxr_linenumber" name="L200" href="#L200">200</a> comment = releaseDescriptor.getScmReleaseCommitComment();
+<a class="jxr_linenumber" name="L201" href="#L201">201</a> }
+<a class="jxr_linenumber" name="L202" href="#L202">202</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"getScmDevelopmentCommitComment"</span>.equals( descriptorCommentGetter ) )
+<a class="jxr_linenumber" name="L203" href="#L203">203</a> {
+<a class="jxr_linenumber" name="L204" href="#L204">204</a> comment = releaseDescriptor.getScmDevelopmentCommitComment();
+<a class="jxr_linenumber" name="L205" href="#L205">205</a> }
+<a class="jxr_linenumber" name="L206" href="#L206">206</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"getScmBranchCommitComment"</span>.equals( descriptorCommentGetter ) )
+<a class="jxr_linenumber" name="L207" href="#L207">207</a> {
+<a class="jxr_linenumber" name="L208" href="#L208">208</a> comment = releaseDescriptor.getScmBranchCommitComment();
+<a class="jxr_linenumber" name="L209" href="#L209">209</a> branch = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L210" href="#L210">210</a> }
+<a class="jxr_linenumber" name="L211" href="#L211">211</a> <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> ( <span class="jxr_string">"getScmRollbackCommitComment"</span>.equals( descriptorCommentGetter ) )
+<a class="jxr_linenumber" name="L212" href="#L212">212</a> {
+<a class="jxr_linenumber" name="L213" href="#L213">213</a> comment = releaseDescriptor.getScmRollbackCommitComment();
+<a class="jxr_linenumber" name="L214" href="#L214">214</a> }
+<a class="jxr_linenumber" name="L215" href="#L215">215</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L216" href="#L216">216</a> {
+<a class="jxr_linenumber" name="L217" href="#L217">217</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> ReleaseExecutionException( <span class="jxr_string">"Invalid configuration in components-fragment.xml"</span> );
+<a class="jxr_linenumber" name="L218" href="#L218">218</a> }
+<a class="jxr_linenumber" name="L219" href="#L219">219</a>
+<a class="jxr_linenumber" name="L220" href="#L220">220</a> MavenProject project = ReleaseUtil.getRootProject( reactorProjects );
+<a class="jxr_linenumber" name="L221" href="#L221">221</a> comment = comment.replace( <span class="jxr_string">"@{prefix}"</span>, releaseDescriptor.getScmCommentPrefix().trim() );
+<a class="jxr_linenumber" name="L222" href="#L222">222</a> comment = comment.replace( <span class="jxr_string">"@{groupId}"</span>, project.getGroupId() );
+<a class="jxr_linenumber" name="L223" href="#L223">223</a> comment = comment.replace( <span class="jxr_string">"@{artifactId}"</span>, project.getArtifactId() );
+<a class="jxr_linenumber" name="L224" href="#L224">224</a> <strong class="jxr_keyword">if</strong> ( branch )
+<a class="jxr_linenumber" name="L225" href="#L225">225</a> {
+<a class="jxr_linenumber" name="L226" href="#L226">226</a> comment = comment.replace( <span class="jxr_string">"@{branchName}"</span>, releaseDescriptor.getScmReleaseLabel() );
+<a class="jxr_linenumber" name="L227" href="#L227">227</a> }
+<a class="jxr_linenumber" name="L228" href="#L228">228</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L229" href="#L229">229</a> {
+<a class="jxr_linenumber" name="L230" href="#L230">230</a> comment = comment.replace( <span class="jxr_string">"@{releaseLabel}"</span>, releaseDescriptor.getScmReleaseLabel() );
+<a class="jxr_linenumber" name="L231" href="#L231">231</a> }
+<a class="jxr_linenumber" name="L232" href="#L232">232</a> <strong class="jxr_keyword">return</strong> comment;
+<a class="jxr_linenumber" name="L233" href="#L233">233</a> }
+<a class="jxr_linenumber" name="L234" href="#L234">234</a>
+<a class="jxr_linenumber" name="L235" href="#L235">235</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> List<File> createPomFiles( ReleaseDescriptor releaseDescriptor, MavenProject project )
+<a class="jxr_linenumber" name="L236" href="#L236">236</a> {
+<a class="jxr_linenumber" name="L237" href="#L237">237</a> List<File> pomFiles = <strong class="jxr_keyword">new</strong> ArrayList<>();
+<a class="jxr_linenumber" name="L238" href="#L238">238</a>
+<a class="jxr_linenumber" name="L239" href="#L239">239</a> pomFiles.add( ReleaseUtil.getStandardPom( project ) );
+<a class="jxr_linenumber" name="L240" href="#L240">240</a>
+<a class="jxr_linenumber" name="L241" href="#L241">241</a> <strong class="jxr_keyword">if</strong> ( releaseDescriptor.isGenerateReleasePoms() && !releaseDescriptor.isSuppressCommitBeforeTagOrBranch() )
+<a class="jxr_linenumber" name="L242" href="#L242">242</a> {
+<a class="jxr_linenumber" name="L243" href="#L243">243</a> pomFiles.add( ReleaseUtil.getReleasePom( project ) );
+<a class="jxr_linenumber" name="L244" href="#L244">244</a> }
+<a class="jxr_linenumber" name="L245" href="#L245">245</a>
+<a class="jxr_linenumber" name="L246" href="#L246">246</a> <strong class="jxr_keyword">return</strong> pomFiles;
+<a class="jxr_linenumber" name="L247" href="#L247">247</a> }
+<a class="jxr_linenumber" name="L248" href="#L248">248</a>
+<a class="jxr_linenumber" name="L249" href="#L249">249</a> <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">static</strong> List<File> createPomFiles( ReleaseDescriptor releaseDescriptor,
+<a class="jxr_linenumber" name="L250" href="#L250">250</a> List<MavenProject> reactorProjects )
+<a class="jxr_linenumber" name="L251" href="#L251">251</a> {
+<a class="jxr_linenumber" name="L252" href="#L252">252</a> List<File> pomFiles = <strong class="jxr_keyword">new</strong> ArrayList<>();
+<a class="jxr_linenumber" name="L253" href="#L253">253</a> <strong class="jxr_keyword">for</strong> ( MavenProject project : reactorProjects )
+<a class="jxr_linenumber" name="L254" href="#L254">254</a> {
+<a class="jxr_linenumber" name="L255" href="#L255">255</a> pomFiles.addAll( createPomFiles( releaseDescriptor, project ) );
+<a class="jxr_linenumber" name="L256" href="#L256">256</a> }
+<a class="jxr_linenumber" name="L257" href="#L257">257</a> <strong class="jxr_keyword">return</strong> pomFiles;
+<a class="jxr_linenumber" name="L258" href="#L258">258</a> }
+<a class="jxr_linenumber" name="L259" href="#L259">259</a> }
</pre>
<hr/>
<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
Modified: maven/website/components/maven-release-archives/maven-release-LATEST/maven-release-manager/xref/org/apache/maven/shared/release/phase/RemoveScmTagPhase.html
==============================================================================
--- maven/website/components/maven-release-archives/maven-release-LATEST/maven-release-manager/xref/org/apache/maven/shared/release/phase/RemoveScmTagPhase.html (original)
+++ maven/website/components/maven-release-archives/maven-release-LATEST/maven-release-manager/xref/org/apache/maven/shared/release/phase/RemoveScmTagPhase.html Sun Dec 8 22:23:50 2019
@@ -46,125 +46,126 @@
<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong class="jxr_keyword">import</strong> org.apache.maven.scm.provider.ScmProvider;
<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong class="jxr_keyword">import</strong> org.apache.maven.scm.repository.ScmRepository;
<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong class="jxr_keyword">import</strong> org.apache.maven.scm.repository.ScmRepositoryException;
-<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">import</strong> org.apache.maven.shared.release.scm.ReleaseScmCommandException;
-<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong class="jxr_keyword">import</strong> org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
-<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong class="jxr_keyword">import</strong> org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
-<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong class="jxr_keyword">import</strong> org.apache.maven.shared.release.util.ReleaseUtil;
-<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.component.annotations.Requirement;
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>
-<a class="jxr_linenumber" name="L47" href="#L47">47</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L48" href="#L48">48</a> <em class="jxr_javadoccomment"> * Remove tag from SCM repository during rollback</em>
-<a class="jxr_linenumber" name="L49" href="#L49">49</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L50" href="#L50">50</a> @Component( role = ReleasePhase.<strong class="jxr_keyword">class</strong>, hint = <span class="jxr_string">"remove-scm-tag"</span> )
-<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/maven/shared/release/phase/RemoveScmTagPhase.html">RemoveScmTagPhase</a>
-<a class="jxr_linenumber" name="L52" href="#L52">52</a> <strong class="jxr_keyword">extends</strong> AbstractReleasePhase
-<a class="jxr_linenumber" name="L53" href="#L53">53</a> {
-<a class="jxr_linenumber" name="L54" href="#L54">54</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L55" href="#L55">55</a> <em class="jxr_javadoccomment"> * Tool that gets a configured SCM repository from release configuration.</em>
-<a class="jxr_linenumber" name="L56" href="#L56">56</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L57" href="#L57">57</a> @Requirement
-<a class="jxr_linenumber" name="L58" href="#L58">58</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/maven/shared/release/scm/ScmRepositoryConfigurator.html">ScmRepositoryConfigurator</a> scmRepositoryConfigurator;
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>
-<a class="jxr_linenumber" name="L60" href="#L60">60</a> @Override
-<a class="jxr_linenumber" name="L61" href="#L61">61</a> <strong class="jxr_keyword">public</strong> ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
-<a class="jxr_linenumber" name="L62" href="#L62">62</a> List<MavenProject> reactorProjects )
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong class="jxr_keyword">throws</strong> ReleaseExecutionException, ReleaseFailureException
-<a class="jxr_linenumber" name="L64" href="#L64">64</a> {
-<a class="jxr_linenumber" name="L65" href="#L65">65</a> ReleaseResult releaseResult = <strong class="jxr_keyword">new</strong> ReleaseResult();
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>
-<a class="jxr_linenumber" name="L67" href="#L67">67</a> validateConfiguration( releaseDescriptor );
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>
-<a class="jxr_linenumber" name="L69" href="#L69">69</a> logInfo( releaseResult, <span class="jxr_string">"Removing tag with the label "</span> + releaseDescriptor.getScmReleaseLabel() + <span class="jxr_string">" ..."</span> );
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>
-<a class="jxr_linenumber" name="L71" href="#L71">71</a> ReleaseDescriptor basedirAlignedReleaseDescriptor =
-<a class="jxr_linenumber" name="L72" href="#L72">72</a> ReleaseUtil.createBasedirAlignedReleaseDescriptor( releaseDescriptor, reactorProjects );
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>
-<a class="jxr_linenumber" name="L74" href="#L74">74</a> ScmRepository repository;
-<a class="jxr_linenumber" name="L75" href="#L75">75</a> ScmProvider provider;
-<a class="jxr_linenumber" name="L76" href="#L76">76</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L77" href="#L77">77</a> {
-<a class="jxr_linenumber" name="L78" href="#L78">78</a> repository =
-<a class="jxr_linenumber" name="L79" href="#L79">79</a> scmRepositoryConfigurator.getConfiguredRepository( basedirAlignedReleaseDescriptor.getScmSourceUrl(),
-<a class="jxr_linenumber" name="L80" href="#L80">80</a> releaseDescriptor,
-<a class="jxr_linenumber" name="L81" href="#L81">81</a> releaseEnvironment.getSettings() );
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>
-<a class="jxr_linenumber" name="L83" href="#L83">83</a> repository.getProviderRepository().setPushChanges( releaseDescriptor.isPushChanges() );
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>
-<a class="jxr_linenumber" name="L85" href="#L85">85</a> repository.getProviderRepository().setWorkItem( releaseDescriptor.getWorkItem() );
-<a class="jxr_linenumber" name="L86" href="#L86">86</a>
-<a class="jxr_linenumber" name="L87" href="#L87">87</a> provider = scmRepositoryConfigurator.getRepositoryProvider( repository );
-<a class="jxr_linenumber" name="L88" href="#L88">88</a> }
-<a class="jxr_linenumber" name="L89" href="#L89">89</a> <strong class="jxr_keyword">catch</strong> ( ScmRepositoryException e )
-<a class="jxr_linenumber" name="L90" href="#L90">90</a> {
-<a class="jxr_linenumber" name="L91" href="#L91">91</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/maven/shared/release/scm/ReleaseScmRepositoryException.html">ReleaseScmRepositoryException</a>( e.getMessage(), e.getValidationMessages() );
-<a class="jxr_linenumber" name="L92" href="#L92">92</a> }
-<a class="jxr_linenumber" name="L93" href="#L93">93</a> <strong class="jxr_keyword">catch</strong> ( NoSuchScmProviderException e )
-<a class="jxr_linenumber" name="L94" href="#L94">94</a> {
-<a class="jxr_linenumber" name="L95" href="#L95">95</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> ReleaseExecutionException( <span class="jxr_string">"Unable to configure SCM repository: "</span> + e.getMessage(), e );
-<a class="jxr_linenumber" name="L96" href="#L96">96</a> }
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>
-<a class="jxr_linenumber" name="L98" href="#L98">98</a> UntagScmResult untagScmResult;
-<a class="jxr_linenumber" name="L99" href="#L99">99</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L100" href="#L100">100</a> {
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> ScmFileSet fileSet = <strong class="jxr_keyword">new</strong> ScmFileSet( <strong class="jxr_keyword">new</strong> File( basedirAlignedReleaseDescriptor.getWorkingDirectory() ) );
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> String tagName = releaseDescriptor.getScmReleaseLabel();
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> String message = releaseDescriptor.getScmCommentPrefix() + <span class="jxr_string">"remove tag "</span> + tagName;
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> CommandParameters commandParameters = <strong class="jxr_keyword">new</strong> CommandParameters();
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> commandParameters.setString( CommandParameter.TAG_NAME, tagName );
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> commandParameters.setString( CommandParameter.MESSAGE, message );
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> <strong class="jxr_keyword">if</strong> ( getLogger().isDebugEnabled() )
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> {
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> getLogger().debug(
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> <span class="jxr_string">"RemoveScmTagPhase :: scmUntagParameters tagName "</span> + tagName );
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> getLogger().debug(
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> <span class="jxr_string">"RemoveScmTagPhase :: scmUntagParameters message "</span> + message );
-<a class="jxr_linenumber" name="L113" href="#L113">113</a> getLogger().debug( <span class="jxr_string">"ScmTagPhase :: fileSet "</span> + fileSet );
+<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">import</strong> org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
+<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong class="jxr_keyword">import</strong> org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
+<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong class="jxr_keyword">import</strong> org.apache.maven.shared.release.util.ReleaseUtil;
+<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.component.annotations.Requirement;
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>
+<a class="jxr_linenumber" name="L46" href="#L46">46</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L47" href="#L47">47</a> <em class="jxr_javadoccomment"> * Remove tag from SCM repository during rollback</em>
+<a class="jxr_linenumber" name="L48" href="#L48">48</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L49" href="#L49">49</a> @Component( role = ReleasePhase.<strong class="jxr_keyword">class</strong>, hint = <span class="jxr_string">"remove-scm-tag"</span> )
+<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/maven/shared/release/phase/RemoveScmTagPhase.html">RemoveScmTagPhase</a>
+<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong class="jxr_keyword">extends</strong> AbstractReleasePhase
+<a class="jxr_linenumber" name="L52" href="#L52">52</a> {
+<a class="jxr_linenumber" name="L53" href="#L53">53</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L54" href="#L54">54</a> <em class="jxr_javadoccomment"> * Tool that gets a configured SCM repository from release configuration.</em>
+<a class="jxr_linenumber" name="L55" href="#L55">55</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L56" href="#L56">56</a> @Requirement
+<a class="jxr_linenumber" name="L57" href="#L57">57</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../../org/apache/maven/shared/release/scm/ScmRepositoryConfigurator.html">ScmRepositoryConfigurator</a> scmRepositoryConfigurator;
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>
+<a class="jxr_linenumber" name="L59" href="#L59">59</a> @Override
+<a class="jxr_linenumber" name="L60" href="#L60">60</a> <strong class="jxr_keyword">public</strong> ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+<a class="jxr_linenumber" name="L61" href="#L61">61</a> List<MavenProject> reactorProjects )
+<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong class="jxr_keyword">throws</strong> ReleaseExecutionException, ReleaseFailureException
+<a class="jxr_linenumber" name="L63" href="#L63">63</a> {
+<a class="jxr_linenumber" name="L64" href="#L64">64</a> ReleaseResult releaseResult = <strong class="jxr_keyword">new</strong> ReleaseResult();
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>
+<a class="jxr_linenumber" name="L66" href="#L66">66</a> validateConfiguration( releaseDescriptor );
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>
+<a class="jxr_linenumber" name="L68" href="#L68">68</a> logInfo( releaseResult, <span class="jxr_string">"Removing tag with the label "</span> + releaseDescriptor.getScmReleaseLabel() + <span class="jxr_string">" ..."</span> );
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>
+<a class="jxr_linenumber" name="L70" href="#L70">70</a> ReleaseDescriptor basedirAlignedReleaseDescriptor =
+<a class="jxr_linenumber" name="L71" href="#L71">71</a> ReleaseUtil.createBasedirAlignedReleaseDescriptor( releaseDescriptor, reactorProjects );
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>
+<a class="jxr_linenumber" name="L73" href="#L73">73</a> ScmRepository repository;
+<a class="jxr_linenumber" name="L74" href="#L74">74</a> ScmProvider provider;
+<a class="jxr_linenumber" name="L75" href="#L75">75</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L76" href="#L76">76</a> {
+<a class="jxr_linenumber" name="L77" href="#L77">77</a> repository =
+<a class="jxr_linenumber" name="L78" href="#L78">78</a> scmRepositoryConfigurator.getConfiguredRepository( basedirAlignedReleaseDescriptor.getScmSourceUrl(),
+<a class="jxr_linenumber" name="L79" href="#L79">79</a> releaseDescriptor,
+<a class="jxr_linenumber" name="L80" href="#L80">80</a> releaseEnvironment.getSettings() );
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>
+<a class="jxr_linenumber" name="L82" href="#L82">82</a> repository.getProviderRepository().setPushChanges( releaseDescriptor.isPushChanges() );
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>
+<a class="jxr_linenumber" name="L84" href="#L84">84</a> repository.getProviderRepository().setWorkItem( releaseDescriptor.getWorkItem() );
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>
+<a class="jxr_linenumber" name="L86" href="#L86">86</a> provider = scmRepositoryConfigurator.getRepositoryProvider( repository );
+<a class="jxr_linenumber" name="L87" href="#L87">87</a> }
+<a class="jxr_linenumber" name="L88" href="#L88">88</a> <strong class="jxr_keyword">catch</strong> ( ScmRepositoryException e )
+<a class="jxr_linenumber" name="L89" href="#L89">89</a> {
+<a class="jxr_linenumber" name="L90" href="#L90">90</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/maven/shared/release/scm/ReleaseScmRepositoryException.html">ReleaseScmRepositoryException</a>( e.getMessage(), e.getValidationMessages() );
+<a class="jxr_linenumber" name="L91" href="#L91">91</a> }
+<a class="jxr_linenumber" name="L92" href="#L92">92</a> <strong class="jxr_keyword">catch</strong> ( NoSuchScmProviderException e )
+<a class="jxr_linenumber" name="L93" href="#L93">93</a> {
+<a class="jxr_linenumber" name="L94" href="#L94">94</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> ReleaseExecutionException( <span class="jxr_string">"Unable to configure SCM repository: "</span> + e.getMessage(), e );
+<a class="jxr_linenumber" name="L95" href="#L95">95</a> }
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>
+<a class="jxr_linenumber" name="L97" href="#L97">97</a> UntagScmResult untagScmResult;
+<a class="jxr_linenumber" name="L98" href="#L98">98</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L99" href="#L99">99</a> {
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> ScmFileSet fileSet = <strong class="jxr_keyword">new</strong> ScmFileSet( <strong class="jxr_keyword">new</strong> File( basedirAlignedReleaseDescriptor.getWorkingDirectory() ) );
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> String tagName = releaseDescriptor.getScmReleaseLabel();
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> String message = releaseDescriptor.getScmCommentPrefix() + <span class="jxr_string">"remove tag "</span> + tagName;
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> CommandParameters commandParameters = <strong class="jxr_keyword">new</strong> CommandParameters();
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> commandParameters.setString( CommandParameter.TAG_NAME, tagName );
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> commandParameters.setString( CommandParameter.MESSAGE, message );
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> <strong class="jxr_keyword">if</strong> ( getLogger().isDebugEnabled() )
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> {
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> getLogger().debug(
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> <span class="jxr_string">"RemoveScmTagPhase :: scmUntagParameters tagName "</span> + tagName );
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> getLogger().debug(
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> <span class="jxr_string">"RemoveScmTagPhase :: scmUntagParameters message "</span> + message );
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> getLogger().debug(
+<a class="jxr_linenumber" name="L113" href="#L113">113</a> <span class="jxr_string">"RemoveScmTagPhase :: fileSet "</span> + fileSet );
<a class="jxr_linenumber" name="L114" href="#L114">114</a> }
<a class="jxr_linenumber" name="L115" href="#L115">115</a> untagScmResult = provider.untag( repository, fileSet, commandParameters );
<a class="jxr_linenumber" name="L116" href="#L116">116</a> }
<a class="jxr_linenumber" name="L117" href="#L117">117</a> <strong class="jxr_keyword">catch</strong> ( ScmException e )
<a class="jxr_linenumber" name="L118" href="#L118">118</a> {
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> ReleaseExecutionException( <span class="jxr_string">"An error is occurred in the remove tag process: "</span>
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> ReleaseExecutionException( <span class="jxr_string">"An error has occurred in the remove tag process: "</span>
<a class="jxr_linenumber" name="L120" href="#L120">120</a> + e.getMessage(), e );
<a class="jxr_linenumber" name="L121" href="#L121">121</a> }
<a class="jxr_linenumber" name="L122" href="#L122">122</a>
<a class="jxr_linenumber" name="L123" href="#L123">123</a> <strong class="jxr_keyword">if</strong> ( !untagScmResult.isSuccess() )
<a class="jxr_linenumber" name="L124" href="#L124">124</a> {
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/maven/shared/release/scm/ReleaseScmCommandException.html">ReleaseScmCommandException</a>( <span class="jxr_string">"Unable to remove tag "</span>, untagScmResult );
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> }
-<a class="jxr_linenumber" name="L127" href="#L127">127</a>
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> releaseResult.setResultCode( ReleaseResult.SUCCESS );
-<a class="jxr_linenumber" name="L129" href="#L129">129</a>
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> <strong class="jxr_keyword">return</strong> releaseResult;
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> }
-<a class="jxr_linenumber" name="L132" href="#L132">132</a>
-<a class="jxr_linenumber" name="L133" href="#L133">133</a> @Override
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> <strong class="jxr_keyword">public</strong> ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> List<MavenProject> reactorProjects )
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> <strong class="jxr_keyword">throws</strong> ReleaseExecutionException, ReleaseFailureException
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> {
-<a class="jxr_linenumber" name="L138" href="#L138">138</a> ReleaseResult releaseResult = <strong class="jxr_keyword">new</strong> ReleaseResult();
-<a class="jxr_linenumber" name="L139" href="#L139">139</a>
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> validateConfiguration( releaseDescriptor );
-<a class="jxr_linenumber" name="L141" href="#L141">141</a>
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> logInfo( releaseResult, <span class="jxr_string">"Full run would remove tag with label: '"</span> + releaseDescriptor.getScmReleaseLabel()
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> + <span class="jxr_string">"'"</span> );
-<a class="jxr_linenumber" name="L144" href="#L144">144</a>
-<a class="jxr_linenumber" name="L145" href="#L145">145</a> releaseResult.setResultCode( ReleaseResult.SUCCESS );
-<a class="jxr_linenumber" name="L146" href="#L146">146</a>
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> <strong class="jxr_keyword">return</strong> releaseResult;
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> }
-<a class="jxr_linenumber" name="L149" href="#L149">149</a>
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> validateConfiguration( ReleaseDescriptor releaseDescriptor )
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> <strong class="jxr_keyword">throws</strong> ReleaseFailureException
-<a class="jxr_linenumber" name="L152" href="#L152">152</a> {
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> <strong class="jxr_keyword">if</strong> ( releaseDescriptor.getScmReleaseLabel() == <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> {
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> ReleaseFailureException( <span class="jxr_string">"A release label is required for removal"</span> );
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> }
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> }
-<a class="jxr_linenumber" name="L158" href="#L158">158</a>
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> }
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> getLogger().warn( String.format( <span class="jxr_string">"Unable to remove tag%nProvider message: %s%nCommand output: %s"</span>,
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> untagScmResult.getProviderMessage(), untagScmResult.getCommandOutput() ) );
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> }
+<a class="jxr_linenumber" name="L128" href="#L128">128</a>
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> releaseResult.setResultCode( ReleaseResult.SUCCESS );
+<a class="jxr_linenumber" name="L130" href="#L130">130</a>
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> <strong class="jxr_keyword">return</strong> releaseResult;
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> }
+<a class="jxr_linenumber" name="L133" href="#L133">133</a>
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> @Override
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> <strong class="jxr_keyword">public</strong> ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> List<MavenProject> reactorProjects )
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> <strong class="jxr_keyword">throws</strong> ReleaseExecutionException, ReleaseFailureException
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> {
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> ReleaseResult releaseResult = <strong class="jxr_keyword">new</strong> ReleaseResult();
+<a class="jxr_linenumber" name="L140" href="#L140">140</a>
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> validateConfiguration( releaseDescriptor );
+<a class="jxr_linenumber" name="L142" href="#L142">142</a>
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> logInfo( releaseResult, <span class="jxr_string">"Full run would remove tag with label: '"</span> + releaseDescriptor.getScmReleaseLabel()
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> + <span class="jxr_string">"'"</span> );
+<a class="jxr_linenumber" name="L145" href="#L145">145</a>
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> releaseResult.setResultCode( ReleaseResult.SUCCESS );
+<a class="jxr_linenumber" name="L147" href="#L147">147</a>
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> <strong class="jxr_keyword">return</strong> releaseResult;
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> }
+<a class="jxr_linenumber" name="L150" href="#L150">150</a>
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> validateConfiguration( ReleaseDescriptor releaseDescriptor )
+<a class="jxr_linenumber" name="L152" href="#L152">152</a> <strong class="jxr_keyword">throws</strong> ReleaseFailureException
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> {
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> <strong class="jxr_keyword">if</strong> ( releaseDescriptor.getScmReleaseLabel() == <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> {
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> ReleaseFailureException( <span class="jxr_string">"A release label is required for removal"</span> );
+<a class="jxr_linenumber" name="L157" href="#L157">157</a> }
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> }
+<a class="jxr_linenumber" name="L159" href="#L159">159</a>
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> }
</pre>
<hr/>
<div id="footer">Copyright © 2002–2019 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
Modified: maven/website/components/maven-release-archives/maven-release-LATEST/maven-release-manager/xref/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhase.html
==============================================================================
--- maven/website/components/maven-release-archives/maven-release-LATEST/maven-release-manager/xref/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhase.html (original)
+++ maven/website/components/maven-release-archives/maven-release-LATEST/maven-release-manager/xref/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhase.html Sun Dec 8 22:23:50 2019
@@ -87,13 +87,13 @@
<a class="jxr_linenumber" name="L79" href="#L79">79</a> <strong class="jxr_keyword">else</strong>
<a class="jxr_linenumber" name="L80" href="#L80">80</a> {
<a class="jxr_linenumber" name="L81" href="#L81">81</a> <em class="jxr_comment">// a normal commit</em>
-<a class="jxr_linenumber" name="L82" href="#L82">82</a> message = createMessage( releaseDescriptor );
+<a class="jxr_linenumber" name="L82" href="#L82">82</a> message = createMessage( reactorProjects, releaseDescriptor );
<a class="jxr_linenumber" name="L83" href="#L83">83</a> }
<a class="jxr_linenumber" name="L84" href="#L84">84</a> <strong class="jxr_keyword">if</strong> ( simulating )
<a class="jxr_linenumber" name="L85" href="#L85">85</a> {
<a class="jxr_linenumber" name="L86" href="#L86">86</a> Collection<File> pomFiles = createPomFiles( releaseDescriptor, reactorProjects );
<a class="jxr_linenumber" name="L87" href="#L87">87</a> logInfo( result,
-<a class="jxr_linenumber" name="L88" href="#L88">88</a> <span class="jxr_string">"Full run would be commit "</span> + pomFiles.size() + <span class="jxr_string">" files with message: '"</span> + message + <span class="jxr_string">"'"</span> );
+<a class="jxr_linenumber" name="L88" href="#L88">88</a> <span class="jxr_string">"Full run would commit "</span> + pomFiles.size() + <span class="jxr_string">" files with message: '"</span> + message + <span class="jxr_string">"'"</span> );
<a class="jxr_linenumber" name="L89" href="#L89">89</a> }
<a class="jxr_linenumber" name="L90" href="#L90">90</a> <strong class="jxr_keyword">else</strong>
<a class="jxr_linenumber" name="L91" href="#L91">91</a> {