Modified: 
websites/production/commons/content/proper/commons-release-plugin/jacoco/org.apache.commons.release.plugin.mojos/CommonsDistributionDetachmentMojo.java.html
==============================================================================
--- 
websites/production/commons/content/proper/commons-release-plugin/jacoco/org.apache.commons.release.plugin.mojos/CommonsDistributionDetachmentMojo.java.html
 (original)
+++ 
websites/production/commons/content/proper/commons-release-plugin/jacoco/org.apache.commons.release.plugin.mojos/CommonsDistributionDetachmentMojo.java.html
 Wed Jan 30 01:59:46 2019
@@ -79,16 +79,9 @@ import org.apache.maven.project.MavenPro
     /**
      * A {@link Properties} of {@link Artifact} → {@link String} containing 
the sha256 signatures
      * for the individual artifacts, where the {@link Artifact} is represented 
as:
-     * <code>groupId:artifactId:version:type=sha256</code>.
-     */
-<span class="fc" id="L84">    private final Properties artifactSha256s = new 
Properties();</span>
-
-    /**
-     * A {@link Properties} of {@link Artifact} → {@link String} containing 
the sha256 signatures
-     * for the individual artifacts, where the {@link Artifact} is represented 
as:
      * &lt;code&gt;groupId:artifactId:version:type=sha512&lt;/code&gt;.
      */
-<span class="fc" id="L91">    private final Properties artifactSha512s = new 
Properties();</span>
+<span class="fc" id="L84">    private final Properties artifactSha512s = new 
Properties();</span>
 
     /**
      * The maven project context injection so that we can get a hold of the 
variables at hand.
@@ -117,65 +110,37 @@ import org.apache.maven.project.MavenPro
 
     @Override
     public void execute() throws MojoExecutionException {
-<span class="pc bpc" id="L120" title="1 of 2 branches missed.">        if 
(!isDistModule) {</span>
-<span class="nc" id="L121">            getLog().info(</span>
+<span class="pc bpc" id="L113" title="1 of 2 branches missed.">        if 
(!isDistModule) {</span>
+<span class="nc" id="L114">            getLog().info(</span>
                     &quot;This module is marked as a non distribution or 
assembly module, and the plugin will not run.&quot;);
-<span class="nc" id="L123">            return;</span>
+<span class="nc" id="L116">            return;</span>
         }
-<span class="fc bfc" id="L125" title="All 2 branches covered.">        if 
(StringUtils.isEmpty(distSvnStagingUrl)) {</span>
-<span class="fc" id="L126">            
getLog().warn(&quot;commons.distSvnStagingUrl is not set, the 
commons-release-plugin will not run.&quot;);</span>
-<span class="fc" id="L127">            return;</span>
+<span class="fc bfc" id="L118" title="All 2 branches covered.">        if 
(StringUtils.isEmpty(distSvnStagingUrl)) {</span>
+<span class="fc" id="L119">            
getLog().warn(&quot;commons.distSvnStagingUrl is not set, the 
commons-release-plugin will not run.&quot;);</span>
+<span class="fc" id="L120">            return;</span>
         }
-<span class="fc" id="L129">        getLog().info(&quot;Detaching 
Assemblies&quot;);</span>
-<span class="fc bfc" id="L130" title="All 2 branches covered.">        for 
(Object attachedArtifact : project.getAttachedArtifacts()) {</span>
-<span class="fc" id="L131">            
putAttachedArtifactInSha256Map((Artifact) attachedArtifact);</span>
-<span class="fc" id="L132">            
putAttachedArtifactInSha512Map((Artifact) attachedArtifact);</span>
-<span class="fc bfc" id="L133" title="All 2 branches covered.">            if 
(ARTIFACT_TYPES_TO_DETACH.contains(((Artifact) attachedArtifact).getType())) 
{</span>
-<span class="fc" id="L134">                detachedArtifacts.add((Artifact) 
attachedArtifact);</span>
+<span class="fc" id="L122">        getLog().info(&quot;Detaching 
Assemblies&quot;);</span>
+<span class="fc bfc" id="L123" title="All 2 branches covered.">        for 
(Object attachedArtifact : project.getAttachedArtifacts()) {</span>
+<span class="fc" id="L124">            
putAttachedArtifactInSha512Map((Artifact) attachedArtifact);</span>
+<span class="fc bfc" id="L125" title="All 2 branches covered.">            if 
(ARTIFACT_TYPES_TO_DETACH.contains(((Artifact) attachedArtifact).getType())) 
{</span>
+<span class="fc" id="L126">                detachedArtifacts.add((Artifact) 
attachedArtifact);</span>
             }
-<span class="fc" id="L136">        }</span>
-<span class="pc bpc" id="L137" title="1 of 2 branches missed.">        if 
(detachedArtifacts.isEmpty()) {</span>
-<span class="nc" id="L138">            getLog().info(&quot;Current project 
contains no distributions. Not executing.&quot;);</span>
-<span class="nc" id="L139">            return;</span>
+<span class="fc" id="L128">        }</span>
+<span class="pc bpc" id="L129" title="1 of 2 branches missed.">        if 
(detachedArtifacts.isEmpty()) {</span>
+<span class="nc" id="L130">            getLog().info(&quot;Current project 
contains no distributions. Not executing.&quot;);</span>
+<span class="nc" id="L131">            return;</span>
         }
-<span class="fc bfc" id="L141" title="All 2 branches covered.">        for 
(Artifact artifactToRemove : detachedArtifacts) {</span>
-<span class="fc" id="L142">            
project.getAttachedArtifacts().remove(artifactToRemove);</span>
-<span class="fc" id="L143">        }</span>
-<span class="pc bpc" id="L144" title="1 of 2 branches missed.">        if 
(!workingDirectory.exists()) {</span>
-<span class="fc" id="L145">            SharedFunctions.initDirectory(getLog(), 
workingDirectory);</span>
+<span class="fc bfc" id="L133" title="All 2 branches covered.">        for 
(Artifact artifactToRemove : detachedArtifacts) {</span>
+<span class="fc" id="L134">            
project.getAttachedArtifacts().remove(artifactToRemove);</span>
+<span class="fc" id="L135">        }</span>
+<span class="pc bpc" id="L136" title="1 of 2 branches missed.">        if 
(!workingDirectory.exists()) {</span>
+<span class="fc" id="L137">            SharedFunctions.initDirectory(getLog(), 
workingDirectory);</span>
         }
-<span class="fc" id="L147">        
writeAllArtifactsInSha256PropertiesFile();</span>
-<span class="fc" id="L148">        
writeAllArtifactsInSha512PropertiesFile();</span>
-<span class="fc" id="L149">        
copyRemovedArtifactsToWorkingDirectory();</span>
-<span class="fc" id="L150">        getLog().info(&quot;&quot;);</span>
-<span class="fc" id="L151">        hashArtifacts();</span>
-<span class="fc" id="L152">    }</span>
-
-    /**
-     * Takes an attached artifact and puts the signature in the map.
-     * @param artifact is a Maven {@link Artifact} taken from the project at 
start time of mojo.
-     * @throws MojoExecutionException if an {@link IOException} occurs when 
getting the sha256 of the
-     *                                artifact.
-     */
-    private void putAttachedArtifactInSha256Map(Artifact artifact) throws 
MojoExecutionException {
-        try {
-<span class="fc" id="L162">            String artifactKey = 
getArtifactKey(artifact);</span>
-<span class="fc" id="L163">            try (FileInputStream fis = new 
FileInputStream(artifact.getFile())) {</span>
-<span class="fc" id="L164">                artifactSha256s.put(artifactKey, 
DigestUtils.sha256Hex(fis));</span>
-            }
-<span class="nc" id="L166">        } catch (IOException e) {</span>
-<span class="nc" id="L167">            throw new MojoExecutionException(</span>
-                &quot;Could not find artifact signature for: &quot;
-<span class="nc" id="L169">                    + 
artifact.getArtifactId()</span>
-                    + &quot;-&quot;
-<span class="nc" id="L171">                    + 
artifact.getClassifier()</span>
-                    + &quot;-&quot;
-<span class="nc" id="L173">                    + artifact.getVersion()</span>
-                    + &quot; type: &quot;
-<span class="nc" id="L175">                    + artifact.getType(),</span>
-                e);
-<span class="fc" id="L177">        }</span>
-<span class="fc" id="L178">    }</span>
+<span class="fc" id="L139">        
writeAllArtifactsInSha512PropertiesFile();</span>
+<span class="fc" id="L140">        
copyRemovedArtifactsToWorkingDirectory();</span>
+<span class="fc" id="L141">        getLog().info(&quot;&quot;);</span>
+<span class="fc" id="L142">        hashArtifacts();</span>
+<span class="fc" id="L143">    }</span>
 
     /**
      * Takes an attached artifact and puts the signature in the map.
@@ -185,38 +150,23 @@ import org.apache.maven.project.MavenPro
      */
     private void putAttachedArtifactInSha512Map(Artifact artifact) throws 
MojoExecutionException {
         try {
-<span class="fc" id="L188">            String artifactKey = 
getArtifactKey(artifact);</span>
-<span class="fc" id="L189">            try (FileInputStream fis = new 
FileInputStream(artifact.getFile())) {</span>
-<span class="fc" id="L190">                artifactSha512s.put(artifactKey, 
DigestUtils.sha512Hex(fis));</span>
+<span class="fc" id="L153">            String artifactKey = 
getArtifactKey(artifact);</span>
+<span class="fc" id="L154">            try (FileInputStream fis = new 
FileInputStream(artifact.getFile())) {</span>
+<span class="fc" id="L155">                artifactSha512s.put(artifactKey, 
DigestUtils.sha512Hex(fis));</span>
             }
-<span class="nc" id="L192">        } catch (IOException e) {</span>
-<span class="nc" id="L193">            throw new MojoExecutionException(</span>
+<span class="nc" id="L157">        } catch (IOException e) {</span>
+<span class="nc" id="L158">            throw new MojoExecutionException(</span>
                 &quot;Could not find artifact signature for: &quot;
-<span class="nc" id="L195">                    + 
artifact.getArtifactId()</span>
+<span class="nc" id="L160">                    + 
artifact.getArtifactId()</span>
                     + &quot;-&quot;
-<span class="nc" id="L197">                    + 
artifact.getClassifier()</span>
+<span class="nc" id="L162">                    + 
artifact.getClassifier()</span>
                     + &quot;-&quot;
-<span class="nc" id="L199">                    + artifact.getVersion()</span>
+<span class="nc" id="L164">                    + artifact.getVersion()</span>
                     + &quot; type: &quot;
-<span class="nc" id="L201">                    + artifact.getType(),</span>
+<span class="nc" id="L166">                    + artifact.getType(),</span>
                 e);
-<span class="fc" id="L203">        }</span>
-<span class="fc" id="L204">    }</span>
-
-    /**
-     * Writes to ./target/commons-release-plugin/sha256.properties the 
artifact sha256's.
-     *
-     * @throws MojoExecutionException if we can't write the file due to an 
{@link IOException}.
-     */
-    private void writeAllArtifactsInSha256PropertiesFile() throws 
MojoExecutionException {
-<span class="fc" id="L212">        File propertiesFile = new 
File(workingDirectory, &quot;sha256.properties&quot;);</span>
-<span class="fc" id="L213">        getLog().info(&quot;Writting &quot; + 
propertiesFile);</span>
-<span class="fc" id="L214">        try (FileOutputStream fileWriter = new 
FileOutputStream(propertiesFile)) {</span>
-<span class="fc" id="L215">            artifactSha256s.store(fileWriter, 
&quot;Release SHA-256s&quot;);</span>
-<span class="nc" id="L216">        } catch (IOException e) {</span>
-<span class="nc" id="L217">            throw new 
MojoExecutionException(&quot;Failure to write SHA-256's&quot;, e);</span>
-<span class="fc" id="L218">        }</span>
-<span class="fc" id="L219">    }</span>
+<span class="fc" id="L168">        }</span>
+<span class="fc" id="L169">    }</span>
 
     /**
      * Writes to ./target/commons-release-plugin/sha512.properties the 
artifact sha512's.
@@ -224,14 +174,14 @@ import org.apache.maven.project.MavenPro
      * @throws MojoExecutionException if we can't write the file due to an 
{@link IOException}.
      */
     private void writeAllArtifactsInSha512PropertiesFile() throws 
MojoExecutionException {
-<span class="fc" id="L227">        File propertiesFile = new 
File(workingDirectory, &quot;sha512.properties&quot;);</span>
-<span class="fc" id="L228">        getLog().info(&quot;Writting &quot; + 
propertiesFile);</span>
-<span class="fc" id="L229">        try (FileOutputStream fileWriter = new 
FileOutputStream(propertiesFile)) {</span>
-<span class="fc" id="L230">            artifactSha512s.store(fileWriter, 
&quot;Release SHA-512s&quot;);</span>
-<span class="nc" id="L231">        } catch (IOException e) {</span>
-<span class="nc" id="L232">            throw new 
MojoExecutionException(&quot;Failure to write SHA-512's&quot;, e);</span>
-<span class="fc" id="L233">        }</span>
-<span class="fc" id="L234">    }</span>
+<span class="fc" id="L177">        File propertiesFile = new 
File(workingDirectory, &quot;sha512.properties&quot;);</span>
+<span class="fc" id="L178">        getLog().info(&quot;Writting &quot; + 
propertiesFile);</span>
+<span class="fc" id="L179">        try (FileOutputStream fileWriter = new 
FileOutputStream(propertiesFile)) {</span>
+<span class="fc" id="L180">            artifactSha512s.store(fileWriter, 
&quot;Release SHA-512s&quot;);</span>
+<span class="nc" id="L181">        } catch (IOException e) {</span>
+<span class="nc" id="L182">            throw new 
MojoExecutionException(&quot;Failure to write SHA-512's&quot;, e);</span>
+<span class="fc" id="L183">        }</span>
+<span class="fc" id="L184">    }</span>
 
     /**
      * A helper method to copy the newly detached artifacts to 
&lt;code&gt;target/commons-release-plugin&lt;/code&gt;
@@ -241,20 +191,19 @@ import org.apache.maven.project.MavenPro
      *                                properly wrapped so that Maven can 
handle it.
      */
     private void copyRemovedArtifactsToWorkingDirectory() throws 
MojoExecutionException {
-        StringBuffer copiedArtifactAbsolutePath;
-<span class="fc" id="L245">        final String wdAbsolutePath = 
workingDirectory.getAbsolutePath();</span>
-<span class="fc" id="L246">        getLog().info(</span>
-<span class="fc" id="L247">                &quot;Copying &quot; + 
detachedArtifacts.size() + &quot; detached artifacts to working directory 
&quot; + wdAbsolutePath);</span>
-<span class="fc bfc" id="L248" title="All 2 branches covered.">        for 
(Artifact artifact: detachedArtifacts) {</span>
-<span class="fc" id="L249">            File artifactFile = 
artifact.getFile();</span>
-<span class="fc" id="L250">            copiedArtifactAbsolutePath = new 
StringBuffer(wdAbsolutePath);</span>
-<span class="fc" id="L251">            
copiedArtifactAbsolutePath.append(&quot;/&quot;);</span>
-<span class="fc" id="L252">            
copiedArtifactAbsolutePath.append(artifactFile.getName());</span>
-<span class="fc" id="L253">            File copiedArtifact = new 
File(copiedArtifactAbsolutePath.toString());</span>
-<span class="fc" id="L254">            getLog().info(&quot;Copying: &quot; + 
artifactFile.getName());</span>
-<span class="fc" id="L255">            SharedFunctions.copyFile(getLog(), 
artifactFile, copiedArtifact);</span>
-<span class="fc" id="L256">        }</span>
-<span class="fc" id="L257">    }</span>
+<span class="fc" id="L194">        final String wdAbsolutePath = 
workingDirectory.getAbsolutePath();</span>
+<span class="fc" id="L195">        getLog().info(</span>
+<span class="fc" id="L196">                &quot;Copying &quot; + 
detachedArtifacts.size() + &quot; detached artifacts to working directory 
&quot; + wdAbsolutePath);</span>
+<span class="fc bfc" id="L197" title="All 2 branches covered.">        for 
(Artifact artifact: detachedArtifacts) {</span>
+<span class="fc" id="L198">            File artifactFile = 
artifact.getFile();</span>
+<span class="fc" id="L199">            StringBuilder 
copiedArtifactAbsolutePath = new StringBuilder(wdAbsolutePath);</span>
+<span class="fc" id="L200">            
copiedArtifactAbsolutePath.append(&quot;/&quot;);</span>
+<span class="fc" id="L201">            
copiedArtifactAbsolutePath.append(artifactFile.getName());</span>
+<span class="fc" id="L202">            File copiedArtifact = new 
File(copiedArtifactAbsolutePath.toString());</span>
+<span class="fc" id="L203">            getLog().info(&quot;Copying: &quot; + 
artifactFile.getName());</span>
+<span class="fc" id="L204">            SharedFunctions.copyFile(getLog(), 
artifactFile, copiedArtifact);</span>
+<span class="fc" id="L205">        }</span>
+<span class="fc" id="L206">    }</span>
 
     /**
      *  A helper method that creates sha256  and sha512 signature files for 
our detached artifacts in the
@@ -265,46 +214,24 @@ import org.apache.maven.project.MavenPro
      *                                properly wrapped so that Maven can 
handle it.
      */
     private void hashArtifacts() throws MojoExecutionException {
-<span class="fc bfc" id="L268" title="All 2 branches covered.">        for 
(Artifact artifact : detachedArtifacts) {</span>
-<span class="fc bfc" id="L269" title="All 2 branches covered.">            if 
(!artifact.getFile().getName().contains(&quot;asc&quot;)) {</span>
-<span class="fc" id="L270">                String artifactKey = 
getArtifactKey(artifact);</span>
+<span class="fc bfc" id="L217" title="All 2 branches covered.">        for 
(Artifact artifact : detachedArtifacts) {</span>
+<span class="fc bfc" id="L218" title="All 2 branches covered.">            if 
(!artifact.getFile().getName().contains(&quot;asc&quot;)) {</span>
+<span class="fc" id="L219">                String artifactKey = 
getArtifactKey(artifact);</span>
                 try {
                     String digest;
-                    // SHA-256
-<span class="fc" id="L274">                    digest = 
artifactSha256s.getProperty(artifactKey.toString());</span>
-<span class="fc" id="L275">                    
getLog().info(artifact.getFile().getName() + &quot; sha256: &quot; + 
digest);</span>
-<span class="fc" id="L276">                    try (PrintWriter printWriter = 
new PrintWriter(</span>
-<span class="fc" id="L277">                            
getSha256FilePath(workingDirectory, artifact.getFile()))) {</span>
-<span class="fc" id="L278">                        
printWriter.println(digest);</span>
-                    }
                     // SHA-512
-<span class="fc" id="L281">                    digest = 
artifactSha512s.getProperty(artifactKey.toString());</span>
-<span class="fc" id="L282">                    
getLog().info(artifact.getFile().getName() + &quot; sha512: &quot; + 
digest);</span>
-<span class="fc" id="L283">                    try (PrintWriter printWriter = 
new PrintWriter(</span>
-<span class="fc" id="L284">                            
getSha512FilePath(workingDirectory, artifact.getFile()))) {</span>
-<span class="fc" id="L285">                        
printWriter.println(digest);</span>
+<span class="fc" id="L223">                    digest = 
artifactSha512s.getProperty(artifactKey.toString());</span>
+<span class="fc" id="L224">                    
getLog().info(artifact.getFile().getName() + &quot; sha512: &quot; + 
digest);</span>
+<span class="fc" id="L225">                    try (PrintWriter printWriter = 
new PrintWriter(</span>
+<span class="fc" id="L226">                            
getSha512FilePath(workingDirectory, artifact.getFile()))) {</span>
+<span class="fc" id="L227">                        
printWriter.println(digest);</span>
                     }
-<span class="nc" id="L287">                } catch (IOException e) {</span>
-<span class="nc" id="L288">                    throw new 
MojoExecutionException(&quot;Could not sign file: &quot; + 
artifact.getFile().getName(), e);</span>
-<span class="fc" id="L289">                }</span>
+<span class="nc" id="L229">                } catch (IOException e) {</span>
+<span class="nc" id="L230">                    throw new 
MojoExecutionException(&quot;Could not sign file: &quot; + 
artifact.getFile().getName(), e);</span>
+<span class="fc" id="L231">                }</span>
             }
-<span class="fc" id="L291">        }</span>
-<span class="fc" id="L292">    }</span>
-
-    /**
-     * A helper method to create a file path for the 
&lt;code&gt;sha256&lt;/code&gt; signature file from a given file.
-     *
-     * @param directory is the {@link File} for the directory in which to make 
the &lt;code&gt;.sha256&lt;/code&gt; file.
-     * @param file the {@link File} whose name we should use to create the 
&lt;code&gt;.sha256&lt;/code&gt; file.
-     * @return a {@link String} that is the absolute path to the 
&lt;code&gt;.sha256&lt;/code&gt; file.
-     */
-    private String getSha256FilePath(File directory, File file) {
-<span class="fc" id="L302">        StringBuffer buffer = new 
StringBuffer(directory.getAbsolutePath());</span>
-<span class="fc" id="L303">        buffer.append(&quot;/&quot;);</span>
-<span class="fc" id="L304">        buffer.append(file.getName());</span>
-<span class="fc" id="L305">        buffer.append(&quot;.sha256&quot;);</span>
-<span class="fc" id="L306">        return buffer.toString();</span>
-    }
+<span class="fc" id="L233">        }</span>
+<span class="fc" id="L234">    }</span>
 
     /**
      * A helper method to create a file path for the 
&lt;code&gt;sha512&lt;/code&gt; signature file from a given file.
@@ -314,11 +241,11 @@ import org.apache.maven.project.MavenPro
      * @return a {@link String} that is the absolute path to the 
&lt;code&gt;.sha512&lt;/code&gt; file.
      */
     private String getSha512FilePath(File directory, File file) {
-<span class="fc" id="L317">        StringBuffer buffer = new 
StringBuffer(directory.getAbsolutePath());</span>
-<span class="fc" id="L318">        buffer.append(&quot;/&quot;);</span>
-<span class="fc" id="L319">        buffer.append(file.getName());</span>
-<span class="fc" id="L320">        buffer.append(&quot;.sha512&quot;);</span>
-<span class="fc" id="L321">        return buffer.toString();</span>
+<span class="fc" id="L244">        StringBuilder buffer = new 
StringBuilder(directory.getAbsolutePath());</span>
+<span class="fc" id="L245">        buffer.append(&quot;/&quot;);</span>
+<span class="fc" id="L246">        buffer.append(file.getName());</span>
+<span class="fc" id="L247">        buffer.append(&quot;.sha512&quot;);</span>
+<span class="fc" id="L248">        return buffer.toString();</span>
     }
 
     /**
@@ -329,14 +256,14 @@ import org.apache.maven.project.MavenPro
      * @return the generated key
      */
     private String getArtifactKey(Artifact artifact) {
-<span class="fc" id="L332">        StringBuffer artifactKey = new 
StringBuffer();</span>
-<span class="fc" id="L333">        
artifactKey.append(artifact.getArtifactId()).append('-')</span>
-<span class="fc" id="L334">                
.append(artifact.getVersion()).append('-');</span>
-<span class="pc bpc" id="L335" title="1 of 2 branches missed.">        if 
(artifact.hasClassifier()) {</span>
-<span class="nc" id="L336">            
artifactKey.append(artifact.getClassifier()).append('-');</span>
+<span class="fc" id="L259">        StringBuilder artifactKey = new 
StringBuilder();</span>
+<span class="fc" id="L260">        
artifactKey.append(artifact.getArtifactId()).append('-')</span>
+<span class="fc" id="L261">                
.append(artifact.getVersion()).append('-');</span>
+<span class="pc bpc" id="L262" title="1 of 2 branches missed.">        if 
(artifact.hasClassifier()) {</span>
+<span class="nc" id="L263">            
artifactKey.append(artifact.getClassifier()).append('-');</span>
         }
-<span class="fc" id="L338">        
artifactKey.append(artifact.getType());</span>
-<span class="fc" id="L339">        return artifactKey.toString();</span>
+<span class="fc" id="L265">        
artifactKey.append(artifact.getType());</span>
+<span class="fc" id="L266">        return artifactKey.toString();</span>
     }
 }
-</pre><div class="footer"><span class="right">Created with <a 
href="http://www.jacoco.org/jacoco";>JaCoCo</a> 
0.8.0.201801022044</span></div></body></html>
\ No newline at end of file
+</pre><div class="footer"><span class="right">Created with <a 
href="http://www.jacoco.org/jacoco";>JaCoCo</a> 
0.8.2.201808211720</span></div></body></html>
\ No newline at end of file

Modified: 
websites/production/commons/content/proper/commons-release-plugin/jacoco/org.apache.commons.release.plugin.mojos/CommonsDistributionStagingMojo.html
==============================================================================
--- 
websites/production/commons/content/proper/commons-release-plugin/jacoco/org.apache.commons.release.plugin.mojos/CommonsDistributionStagingMojo.html
 (original)
+++ 
websites/production/commons/content/proper/commons-release-plugin/jacoco/org.apache.commons.release.plugin.mojos/CommonsDistributionStagingMojo.html
 Wed Jan 30 01:59:46 2019
@@ -1 +1 @@
-<?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE html PUBLIC "-//W3C//DTD 
XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";><html 
xmlns="http://www.w3.org/1999/xhtml"; lang="en"><head><meta 
http-equiv="Content-Type" content="text/html;charset=UTF-8"/><link 
rel="stylesheet" href="../jacoco-resources/report.css" type="text/css"/><link 
rel="shortcut icon" href="../jacoco-resources/report.gif" 
type="image/gif"/><title>CommonsDistributionStagingMojo</title><script 
type="text/javascript" src="../jacoco-resources/sort.js"></script></head><body 
onload="initialSort(['breadcrumb'])"><div class="breadcrumb" 
id="breadcrumb"><span class="info"><a href="../jacoco-sessions.html" 
class="el_session">Sessions</a></span><a href="../index.html" 
class="el_report">Apache Commons Release Plugin</a> &gt; <a href="index.html" 
class="el_package">org.apache.commons.release.plugin.mojos</a> &gt; <span 
class="el_class">CommonsDistributionStagingMojo</span></div><h1>CommonsDistribution
 StagingMojo</h1><table class="coverage" cellspacing="0" 
id="coveragetable"><thead><tr><td class="sortable" id="a" 
onclick="toggleSort(this)">Element</td><td class="down sortable bar" id="b" 
onclick="toggleSort(this)">Missed Instructions</td><td class="sortable ctr2" 
id="c" onclick="toggleSort(this)">Cov.</td><td class="sortable bar" id="d" 
onclick="toggleSort(this)">Missed Branches</td><td class="sortable ctr2" id="e" 
onclick="toggleSort(this)">Cov.</td><td class="sortable ctr1" id="f" 
onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="g" 
onclick="toggleSort(this)">Cxty</td><td class="sortable ctr1" id="h" 
onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="i" 
onclick="toggleSort(this)">Lines</td><td class="sortable ctr1" id="j" 
onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="k" 
onclick="toggleSort(this)">Methods</td></tr></thead><tfoot><tr><td>Total</td><td
 class="bar">250 of 798</td><td class="ctr2">68%</td><td class="bar">13 of
  36</td><td class="ctr2">63%</td><td class="ctr1">11</td><td 
class="ctr2">27</td><td class="ctr1">38</td><td class="ctr2">144</td><td 
class="ctr1">0</td><td class="ctr2">9</td></tr></tfoot><tbody><tr><td 
id="a6"><a href="CommonsDistributionStagingMojo.java.html#L166" 
class="el_method">execute()</a></td><td class="bar" id="b0"><img 
src="../jacoco-resources/redbar.gif" width="62" height="10" title="174" 
alt="174"/><img src="../jacoco-resources/greenbar.gif" width="57" height="10" 
title="161" alt="161"/></td><td class="ctr2" id="c8">48%</td><td class="bar" 
id="d0"><img src="../jacoco-resources/redbar.gif" width="67" height="10" 
title="9" alt="9"/><img src="../jacoco-resources/greenbar.gif" width="52" 
height="10" title="7" alt="7"/></td><td class="ctr2" id="e3">43%</td><td 
class="ctr1" id="f0">7</td><td class="ctr2" id="g0">9</td><td class="ctr1" 
id="h0">23</td><td class="ctr2" id="i0">53</td><td class="ctr1" 
id="j0">0</td><td class="ctr2" id="k0">1</td></tr><tr><td id="a0"><a href="Com
 monsDistributionStagingMojo.java.html#L383" 
class="el_method">buildReadmeAndHeaderHtmlFiles()</a></td><td class="bar" 
id="b1"><img src="../jacoco-resources/redbar.gif" width="15" height="10" 
title="42" alt="42"/><img src="../jacoco-resources/greenbar.gif" width="29" 
height="10" title="83" alt="83"/></td><td class="ctr2" id="c6">66%</td><td 
class="bar" id="d4"/><td class="ctr2" id="e4">n/a</td><td class="ctr1" 
id="f4">0</td><td class="ctr2" id="g4">1</td><td class="ctr1" id="h1">8</td><td 
class="ctr2" id="i1">26</td><td class="ctr1" id="j1">0</td><td class="ctr2" 
id="k1">1</td></tr><tr><td id="a2"><a 
href="CommonsDistributionStagingMojo.java.html#L311" 
class="el_method">copyDistributionsIntoScmDirectoryStructureAndAddToSvn(File, 
ScmProvider, ScmRepository)</a></td><td class="bar" id="b2"><img 
src="../jacoco-resources/redbar.gif" width="6" height="10" title="18" 
alt="18"/><img src="../jacoco-resources/greenbar.gif" width="43" height="10" 
title="121" alt="121"/></td><td class="ctr2" id
 ="c5">87%</td><td class="bar" id="d2"><img 
src="../jacoco-resources/redbar.gif" width="7" height="10" title="1" 
alt="1"/><img src="../jacoco-resources/greenbar.gif" width="52" height="10" 
title="7" alt="7"/></td><td class="ctr2" id="e0">87%</td><td class="ctr1" 
id="f2">1</td><td class="ctr2" id="g2">5</td><td class="ctr1" id="h3">3</td><td 
class="ctr2" id="i2">24</td><td class="ctr1" id="j2">0</td><td class="ctr2" 
id="k2">1</td></tr><tr><td id="a5"><a 
href="CommonsDistributionStagingMojo.java.html#L349" 
class="el_method">copySiteToScmDirectory()</a></td><td class="bar" id="b3"><img 
src="../jacoco-resources/redbar.gif" width="5" height="10" title="16" 
alt="16"/><img src="../jacoco-resources/greenbar.gif" width="8" height="10" 
title="25" alt="25"/></td><td class="ctr2" id="c7">60%</td><td class="bar" 
id="d3"><img src="../jacoco-resources/redbar.gif" width="7" height="10" 
title="1" alt="1"/><img src="../jacoco-resources/greenbar.gif" width="7" 
height="10" title="1" alt="1"/></td><td cl
 ass="ctr2" id="e2">50%</td><td class="ctr1" id="f3">1</td><td class="ctr2" 
id="g3">2</td><td class="ctr1" id="h2">4</td><td class="ctr2" id="i4">9</td><td 
class="ctr1" id="j3">0</td><td class="ctr2" id="k3">1</td></tr><tr><td 
id="a3"><a href="CommonsDistributionStagingMojo.java.html#L431" 
class="el_method">copyHeaderAndReadmeToSubdirectories(File, File)</a></td><td 
class="bar" id="b4"><img src="../jacoco-resources/greenbar.gif" width="28" 
height="10" title="80" alt="80"/></td><td class="ctr2" id="c0">100%</td><td 
class="bar" id="d5"/><td class="ctr2" id="e5">n/a</td><td class="ctr1" 
id="f5">0</td><td class="ctr2" id="g5">1</td><td class="ctr1" id="h4">0</td><td 
class="ctr2" id="i3">16</td><td class="ctr1" id="j4">0</td><td class="ctr2" 
id="k4">1</td></tr><tr><td id="a7"><a 
href="CommonsDistributionStagingMojo.java.html#L246" 
class="el_method">listNotHiddenFilesAndDirectories(File, List)</a></td><td 
class="bar" id="b5"><img src="../jacoco-resources/greenbar.gif" width="16" 
height="10
 " title="45" alt="45"/></td><td class="ctr2" id="c1">100%</td><td class="bar" 
id="d1"><img src="../jacoco-resources/redbar.gif" width="15" height="10" 
title="2" alt="2"/><img src="../jacoco-resources/greenbar.gif" width="60" 
height="10" title="8" alt="8"/></td><td class="ctr2" id="e1">80%</td><td 
class="ctr1" id="f1">2</td><td class="ctr2" id="g1">6</td><td class="ctr1" 
id="h5">0</td><td class="ctr2" id="i5">8</td><td class="ctr1" id="j5">0</td><td 
class="ctr2" id="k5">1</td></tr><tr><td id="a4"><a 
href="CommonsDistributionStagingMojo.java.html#L269" 
class="el_method">copyReleaseNotesToWorkingDirectory()</a></td><td class="bar" 
id="b6"><img src="../jacoco-resources/greenbar.gif" width="9" height="10" 
title="26" alt="26"/></td><td class="ctr2" id="c2">100%</td><td class="bar" 
id="d6"/><td class="ctr2" id="e6">n/a</td><td class="ctr1" id="f6">0</td><td 
class="ctr2" id="g6">1</td><td class="ctr1" id="h6">0</td><td class="ctr2" 
id="i6">5</td><td class="ctr1" id="j6">0</td><td class="ctr
 2" id="k6">1</td></tr><tr><td id="a8"><a 
href="CommonsDistributionStagingMojo.java.html#L457" 
class="el_method">setBaseDir(File)</a></td><td class="bar" id="b7"><img 
src="../jacoco-resources/greenbar.gif" width="1" height="10" title="4" 
alt="4"/></td><td class="ctr2" id="c3">100%</td><td class="bar" id="d7"/><td 
class="ctr2" id="e7">n/a</td><td class="ctr1" id="f7">0</td><td class="ctr2" 
id="g7">1</td><td class="ctr1" id="h7">0</td><td class="ctr2" id="i7">2</td><td 
class="ctr1" id="j7">0</td><td class="ctr2" id="k7">1</td></tr><tr><td 
id="a1"><a href="CommonsDistributionStagingMojo.java.html#L65" 
class="el_method">CommonsDistributionStagingMojo()</a></td><td class="bar" 
id="b8"><img src="../jacoco-resources/greenbar.gif" width="1" height="10" 
title="3" alt="3"/></td><td class="ctr2" id="c4">100%</td><td class="bar" 
id="d8"/><td class="ctr2" id="e8">n/a</td><td class="ctr1" id="f8">0</td><td 
class="ctr2" id="g8">1</td><td class="ctr1" id="h8">0</td><td class="ctr2" 
id="i8">1</td><td
  class="ctr1" id="j8">0</td><td class="ctr2" 
id="k8">1</td></tr></tbody></table><div class="footer"><span 
class="right">Created with <a href="http://www.jacoco.org/jacoco";>JaCoCo</a> 
0.8.0.201801022044</span></div></body></html>
\ No newline at end of file
+<?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE html PUBLIC "-//W3C//DTD 
XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";><html 
xmlns="http://www.w3.org/1999/xhtml"; lang="en"><head><meta 
http-equiv="Content-Type" content="text/html;charset=UTF-8"/><link 
rel="stylesheet" href="../jacoco-resources/report.css" type="text/css"/><link 
rel="shortcut icon" href="../jacoco-resources/report.gif" 
type="image/gif"/><title>CommonsDistributionStagingMojo</title><script 
type="text/javascript" src="../jacoco-resources/sort.js"></script></head><body 
onload="initialSort(['breadcrumb'])"><div class="breadcrumb" 
id="breadcrumb"><span class="info"><a href="../jacoco-sessions.html" 
class="el_session">Sessions</a></span><a href="../index.html" 
class="el_report">Apache Commons Release Plugin</a> &gt; <a href="index.html" 
class="el_package">org.apache.commons.release.plugin.mojos</a> &gt; <span 
class="el_class">CommonsDistributionStagingMojo</span></div><h1>CommonsDistribution
 StagingMojo</h1><table class="coverage" cellspacing="0" 
id="coveragetable"><thead><tr><td class="sortable" id="a" 
onclick="toggleSort(this)">Element</td><td class="down sortable bar" id="b" 
onclick="toggleSort(this)">Missed Instructions</td><td class="sortable ctr2" 
id="c" onclick="toggleSort(this)">Cov.</td><td class="sortable bar" id="d" 
onclick="toggleSort(this)">Missed Branches</td><td class="sortable ctr2" id="e" 
onclick="toggleSort(this)">Cov.</td><td class="sortable ctr1" id="f" 
onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="g" 
onclick="toggleSort(this)">Cxty</td><td class="sortable ctr1" id="h" 
onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="i" 
onclick="toggleSort(this)">Lines</td><td class="sortable ctr1" id="j" 
onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="k" 
onclick="toggleSort(this)">Methods</td></tr></thead><tfoot><tr><td>Total</td><td
 class="bar">250 of 833</td><td class="ctr2">69%</td><td class="bar">13 of
  36</td><td class="ctr2">63%</td><td class="ctr1">11</td><td 
class="ctr2">28</td><td class="ctr1">38</td><td class="ctr2">149</td><td 
class="ctr1">0</td><td class="ctr2">10</td></tr></tfoot><tbody><tr><td 
id="a6"><a href="CommonsDistributionStagingMojo.java.html#L193" 
class="el_method">execute()</a></td><td class="bar" id="b0"><img 
src="../jacoco-resources/redbar.gif" width="63" height="10" title="174" 
alt="174"/><img src="../jacoco-resources/greenbar.gif" width="56" height="10" 
title="156" alt="156"/></td><td class="ctr2" id="c9">47%</td><td class="bar" 
id="d0"><img src="../jacoco-resources/redbar.gif" width="67" height="10" 
title="9" alt="9"/><img src="../jacoco-resources/greenbar.gif" width="52" 
height="10" title="7" alt="7"/></td><td class="ctr2" id="e3">43%</td><td 
class="ctr1" id="f0">7</td><td class="ctr2" id="g0">9</td><td class="ctr1" 
id="h0">23</td><td class="ctr2" id="i0">52</td><td class="ctr1" 
id="j0">0</td><td class="ctr2" id="k0">1</td></tr><tr><td id="a0"><a href="Co
 mmonsDistributionStagingMojo.java.html#L409" 
class="el_method">buildReadmeAndHeaderHtmlFiles()</a></td><td class="bar" 
id="b1"><img src="../jacoco-resources/redbar.gif" width="15" height="10" 
title="42" alt="42"/><img src="../jacoco-resources/greenbar.gif" width="30" 
height="10" title="83" alt="83"/></td><td class="ctr2" id="c7">66%</td><td 
class="bar" id="d4"/><td class="ctr2" id="e4">n/a</td><td class="ctr1" 
id="f4">0</td><td class="ctr2" id="g4">1</td><td class="ctr1" id="h1">8</td><td 
class="ctr2" id="i1">26</td><td class="ctr1" id="j1">0</td><td class="ctr2" 
id="k1">1</td></tr><tr><td id="a2"><a 
href="CommonsDistributionStagingMojo.java.html#L337" 
class="el_method">copyDistributionsIntoScmDirectoryStructureAndAddToSvn(File, 
ScmProvider, ScmRepository)</a></td><td class="bar" id="b2"><img 
src="../jacoco-resources/redbar.gif" width="6" height="10" title="18" 
alt="18"/><img src="../jacoco-resources/greenbar.gif" width="44" height="10" 
title="121" alt="121"/></td><td class="ctr2" i
 d="c6">87%</td><td class="bar" id="d2"><img 
src="../jacoco-resources/redbar.gif" width="7" height="10" title="1" 
alt="1"/><img src="../jacoco-resources/greenbar.gif" width="52" height="10" 
title="7" alt="7"/></td><td class="ctr2" id="e0">87%</td><td class="ctr1" 
id="f2">1</td><td class="ctr2" id="g2">5</td><td class="ctr1" id="h3">3</td><td 
class="ctr2" id="i2">24</td><td class="ctr1" id="j2">0</td><td class="ctr2" 
id="k2">1</td></tr><tr><td id="a5"><a 
href="CommonsDistributionStagingMojo.java.html#L375" 
class="el_method">copySiteToScmDirectory()</a></td><td class="bar" id="b3"><img 
src="../jacoco-resources/redbar.gif" width="5" height="10" title="16" 
alt="16"/><img src="../jacoco-resources/greenbar.gif" width="8" height="10" 
title="24" alt="24"/></td><td class="ctr2" id="c8">60%</td><td class="bar" 
id="d3"><img src="../jacoco-resources/redbar.gif" width="7" height="10" 
title="1" alt="1"/><img src="../jacoco-resources/greenbar.gif" width="7" 
height="10" title="1" alt="1"/></td><td c
 lass="ctr2" id="e2">50%</td><td class="ctr1" id="f3">1</td><td class="ctr2" 
id="g3">2</td><td class="ctr1" id="h2">4</td><td class="ctr2" id="i4">9</td><td 
class="ctr1" id="j3">0</td><td class="ctr2" id="k3">1</td></tr><tr><td 
id="a3"><a href="CommonsDistributionStagingMojo.java.html#L457" 
class="el_method">copyHeaderAndReadmeToSubdirectories(File, File)</a></td><td 
class="bar" id="b4"><img src="../jacoco-resources/greenbar.gif" width="29" 
height="10" title="80" alt="80"/></td><td class="ctr2" id="c0">100%</td><td 
class="bar" id="d5"/><td class="ctr2" id="e5">n/a</td><td class="ctr1" 
id="f5">0</td><td class="ctr2" id="g5">1</td><td class="ctr1" id="h4">0</td><td 
class="ctr2" id="i3">16</td><td class="ctr1" id="j4">0</td><td class="ctr2" 
id="k4">1</td></tr><tr><td id="a7"><a 
href="CommonsDistributionStagingMojo.java.html#L272" 
class="el_method">listNotHiddenFilesAndDirectories(File, List)</a></td><td 
class="bar" id="b5"><img src="../jacoco-resources/greenbar.gif" width="16" 
height="1
 0" title="45" alt="45"/></td><td class="ctr2" id="c1">100%</td><td class="bar" 
id="d1"><img src="../jacoco-resources/redbar.gif" width="15" height="10" 
title="2" alt="2"/><img src="../jacoco-resources/greenbar.gif" width="60" 
height="10" title="8" alt="8"/></td><td class="ctr2" id="e1">80%</td><td 
class="ctr1" id="f1">2</td><td class="ctr2" id="g1">6</td><td class="ctr1" 
id="h5">0</td><td class="ctr2" id="i5">8</td><td class="ctr1" id="j5">0</td><td 
class="ctr2" id="k5">1</td></tr><tr><td id="a8"><a 
href="CommonsDistributionStagingMojo.java.html#L491" 
class="el_method">setAuthentication(ScmProviderRepository)</a></td><td 
class="bar" id="b6"><img src="../jacoco-resources/greenbar.gif" width="14" 
height="10" title="41" alt="41"/></td><td class="ctr2" id="c2">100%</td><td 
class="bar" id="d6"/><td class="ctr2" id="e6">n/a</td><td class="ctr1" 
id="f6">0</td><td class="ctr2" id="g6">1</td><td class="ctr1" id="h6">0</td><td 
class="ctr2" id="i6">6</td><td class="ctr1" id="j6">0</td><td clas
 s="ctr2" id="k6">1</td></tr><tr><td id="a4"><a 
href="CommonsDistributionStagingMojo.java.html#L295" 
class="el_method">copyReleaseNotesToWorkingDirectory()</a></td><td class="bar" 
id="b7"><img src="../jacoco-resources/greenbar.gif" width="9" height="10" 
title="26" alt="26"/></td><td class="ctr2" id="c3">100%</td><td class="bar" 
id="d7"/><td class="ctr2" id="e7">n/a</td><td class="ctr1" id="f7">0</td><td 
class="ctr2" id="g7">1</td><td class="ctr1" id="h7">0</td><td class="ctr2" 
id="i7">5</td><td class="ctr1" id="j7">0</td><td class="ctr2" 
id="k7">1</td></tr><tr><td id="a9"><a 
href="CommonsDistributionStagingMojo.java.html#L483" 
class="el_method">setBaseDir(File)</a></td><td class="bar" id="b8"><img 
src="../jacoco-resources/greenbar.gif" width="1" height="10" title="4" 
alt="4"/></td><td class="ctr2" id="c4">100%</td><td class="bar" id="d8"/><td 
class="ctr2" id="e8">n/a</td><td class="ctr1" id="f8">0</td><td class="ctr2" 
id="g8">1</td><td class="ctr1" id="h8">0</td><td class="ctr2" id="
 i8">2</td><td class="ctr1" id="j8">0</td><td class="ctr2" 
id="k8">1</td></tr><tr><td id="a1"><a 
href="CommonsDistributionStagingMojo.java.html#L73" 
class="el_method">CommonsDistributionStagingMojo()</a></td><td class="bar" 
id="b9"><img src="../jacoco-resources/greenbar.gif" width="1" height="10" 
title="3" alt="3"/></td><td class="ctr2" id="c5">100%</td><td class="bar" 
id="d9"/><td class="ctr2" id="e9">n/a</td><td class="ctr1" id="f9">0</td><td 
class="ctr2" id="g9">1</td><td class="ctr1" id="h9">0</td><td class="ctr2" 
id="i9">1</td><td class="ctr1" id="j9">0</td><td class="ctr2" 
id="k9">1</td></tr></tbody></table><div class="footer"><span 
class="right">Created with <a href="http://www.jacoco.org/jacoco";>JaCoCo</a> 
0.8.2.201808211720</span></div></body></html>
\ No newline at end of file

Modified: 
websites/production/commons/content/proper/commons-release-plugin/jacoco/org.apache.commons.release.plugin.mojos/CommonsDistributionStagingMojo.java.html
==============================================================================
--- 
websites/production/commons/content/proper/commons-release-plugin/jacoco/org.apache.commons.release.plugin.mojos/CommonsDistributionStagingMojo.java.html
 (original)
+++ 
websites/production/commons/content/proper/commons-release-plugin/jacoco/org.apache.commons.release.plugin.mojos/CommonsDistributionStagingMojo.java.html
 Wed Jan 30 01:59:46 2019
@@ -25,6 +25,7 @@ import org.apache.maven.plugin.AbstractM
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
@@ -37,9 +38,15 @@ import org.apache.maven.scm.command.chec
 import org.apache.maven.scm.manager.BasicScmManager;
 import org.apache.maven.scm.manager.ScmManager;
 import org.apache.maven.scm.provider.ScmProvider;
+import org.apache.maven.scm.provider.ScmProviderRepository;
 import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
 import org.apache.maven.scm.provider.svn.svnexe.SvnExeScmProvider;
 import org.apache.maven.scm.repository.ScmRepository;
+import org.apache.maven.settings.Server;
+import org.apache.maven.settings.Settings;
+import org.apache.maven.settings.crypto.DefaultSettingsDecryptionRequest;
+import org.apache.maven.settings.crypto.SettingsDecrypter;
+import org.apache.maven.settings.crypto.SettingsDecryptionResult;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -49,6 +56,7 @@ import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * This class checks out the dev distribution location, copies the 
distributions into that directory
@@ -62,7 +70,7 @@ import java.util.List;
         defaultPhase = LifecyclePhase.DEPLOY,
         threadSafe = true,
         aggregator = true)
-<span class="fc" id="L65">public class CommonsDistributionStagingMojo extends 
AbstractMojo {</span>
+<span class="fc" id="L73">public class CommonsDistributionStagingMojo extends 
AbstractMojo {</span>
 
     /** The name of file generated from the README.vm velocity template to be 
checked into the dist svn repo. */
     private static final String README_FILE_NAME = &quot;README.html&quot;;
@@ -143,6 +151,13 @@ import java.util.List;
     private String commonsRcVersion;
 
     /**
+     * The ID of the server (specified in settings.xml) which should be used 
for dist authentication.
+     * This will be used in preference to {@link #username}/{@link #password}.
+     */
+    @Parameter(property = &quot;commons.distServer&quot;)
+    private String distServer;
+
+    /**
      * The username for the distribution subversion repository. This is 
typically your Apache id.
      */
     @Parameter(property = &quot;user.name&quot;)
@@ -155,6 +170,18 @@ import java.util.List;
     private String password;
 
     /**
+     * Maven {@link Settings}.
+     */
+    @Parameter(defaultValue = &quot;${settings}&quot;, readonly = true, 
required = true)
+    private Settings settings;
+
+    /**
+     * Maven {@link SettingsDecrypter} component.
+     */
+    @Component
+    private SettingsDecrypter settingsDecrypter;
+
+    /**
      * A subdirectory of the dist directory into which we are going to stage 
the release candidate. We
      * build this up in the {@link CommonsDistributionStagingMojo#execute()} 
method. And, for example,
      * the directory should look like 
&lt;code&gt;https://https://dist.apache.org/repos/dist/dev/commons/text/1.4-RC1&lt;/code&gt;.
@@ -163,78 +190,77 @@ import java.util.List;
 
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
-<span class="fc bfc" id="L166" title="All 2 branches covered.">        if 
(!isDistModule) {</span>
-<span class="fc" id="L167">            getLog().info(&quot;This module is 
marked as a non distribution &quot;</span>
+<span class="fc bfc" id="L193" title="All 2 branches covered.">        if 
(!isDistModule) {</span>
+<span class="fc" id="L194">            getLog().info(&quot;This module is 
marked as a non distribution &quot;</span>
                     + &quot;or assembly module, and the plugin will not 
run.&quot;);
-<span class="fc" id="L169">            return;</span>
+<span class="fc" id="L196">            return;</span>
         }
-<span class="pc bpc" id="L171" title="1 of 2 branches missed.">        if 
(StringUtils.isEmpty(distSvnStagingUrl)) {</span>
-<span class="nc" id="L172">            
getLog().warn(&quot;commons.distSvnStagingUrl is not set, the 
commons-release-plugin will not run.&quot;);</span>
-<span class="nc" id="L173">            return;</span>
+<span class="pc bpc" id="L198" title="1 of 2 branches missed.">        if 
(StringUtils.isEmpty(distSvnStagingUrl)) {</span>
+<span class="nc" id="L199">            
getLog().warn(&quot;commons.distSvnStagingUrl is not set, the 
commons-release-plugin will not run.&quot;);</span>
+<span class="nc" id="L200">            return;</span>
         }
-<span class="pc bpc" id="L175" title="1 of 2 branches missed.">        if 
(!workingDirectory.exists()) {</span>
-<span class="nc" id="L176">            getLog().info(&quot;Current project 
contains no distributions. Not executing.&quot;);</span>
-<span class="nc" id="L177">            return;</span>
+<span class="pc bpc" id="L202" title="1 of 2 branches missed.">        if 
(!workingDirectory.exists()) {</span>
+<span class="nc" id="L203">            getLog().info(&quot;Current project 
contains no distributions. Not executing.&quot;);</span>
+<span class="nc" id="L204">            return;</span>
         }
-<span class="fc" id="L179">        getLog().info(&quot;Preparing to stage 
distributions&quot;);</span>
+<span class="fc" id="L206">        getLog().info(&quot;Preparing to stage 
distributions&quot;);</span>
         try {
-<span class="fc" id="L181">            ScmManager scmManager = new 
BasicScmManager();</span>
-<span class="fc" id="L182">            
scmManager.setScmProvider(&quot;svn&quot;, new SvnExeScmProvider());</span>
-<span class="fc" id="L183">            ScmRepository repository = 
scmManager.makeScmRepository(distSvnStagingUrl);</span>
-<span class="fc" id="L184">            ScmProvider provider = 
scmManager.getProviderByRepository(repository);</span>
-<span class="fc" id="L185">            SvnScmProviderRepository 
providerRepository = (SvnScmProviderRepository) 
repository.getProviderRepository();</span>
-<span class="fc" id="L186">            
providerRepository.setUser(username);</span>
-<span class="fc" id="L187">            
providerRepository.setPassword(password);</span>
-<span class="fc" id="L188">            distVersionRcVersionDirectory =</span>
+<span class="fc" id="L208">            ScmManager scmManager = new 
BasicScmManager();</span>
+<span class="fc" id="L209">            
scmManager.setScmProvider(&quot;svn&quot;, new SvnExeScmProvider());</span>
+<span class="fc" id="L210">            ScmRepository repository = 
scmManager.makeScmRepository(distSvnStagingUrl);</span>
+<span class="fc" id="L211">            ScmProvider provider = 
scmManager.getProviderByRepository(repository);</span>
+<span class="fc" id="L212">            SvnScmProviderRepository 
providerRepository = (SvnScmProviderRepository) 
repository.getProviderRepository();</span>
+<span class="fc" id="L213">            
setAuthentication(providerRepository);</span>
+<span class="fc" id="L214">            distVersionRcVersionDirectory =</span>
                     new File(distCheckoutDirectory, commonsReleaseVersion + 
&quot;-&quot; + commonsRcVersion);
-<span class="pc bpc" id="L190" title="1 of 2 branches missed.">            if 
(!distCheckoutDirectory.exists()) {</span>
-<span class="fc" id="L191">                
SharedFunctions.initDirectory(getLog(), distCheckoutDirectory);</span>
+<span class="pc bpc" id="L216" title="1 of 2 branches missed.">            if 
(!distCheckoutDirectory.exists()) {</span>
+<span class="fc" id="L217">                
SharedFunctions.initDirectory(getLog(), distCheckoutDirectory);</span>
             }
-<span class="fc" id="L193">            ScmFileSet scmFileSet = new 
ScmFileSet(distCheckoutDirectory);</span>
-<span class="fc" id="L194">            getLog().info(&quot;Checking out dist 
from: &quot; + distSvnStagingUrl);</span>
-<span class="fc" id="L195">            final CheckOutScmResult checkOutResult 
= provider.checkOut(repository, scmFileSet);</span>
-<span class="pc bpc" id="L196" title="1 of 2 branches missed.">            if 
(!checkOutResult.isSuccess()) {</span>
-<span class="nc" id="L197">                throw new 
MojoExecutionException(&quot;Failed to checkout files from SCM: &quot;</span>
-<span class="nc" id="L198">                        + 
checkOutResult.getProviderMessage() + &quot; [&quot; + 
checkOutResult.getCommandOutput() + &quot;]&quot;);</span>
+<span class="fc" id="L219">            ScmFileSet scmFileSet = new 
ScmFileSet(distCheckoutDirectory);</span>
+<span class="fc" id="L220">            getLog().info(&quot;Checking out dist 
from: &quot; + distSvnStagingUrl);</span>
+<span class="fc" id="L221">            final CheckOutScmResult checkOutResult 
= provider.checkOut(repository, scmFileSet);</span>
+<span class="pc bpc" id="L222" title="1 of 2 branches missed.">            if 
(!checkOutResult.isSuccess()) {</span>
+<span class="nc" id="L223">                throw new 
MojoExecutionException(&quot;Failed to checkout files from SCM: &quot;</span>
+<span class="nc" id="L224">                        + 
checkOutResult.getProviderMessage() + &quot; [&quot; + 
checkOutResult.getCommandOutput() + &quot;]&quot;);</span>
             }
-<span class="fc" id="L200">            File copiedReleaseNotes = 
copyReleaseNotesToWorkingDirectory();</span>
-<span class="fc" id="L201">            
copyDistributionsIntoScmDirectoryStructureAndAddToSvn(copiedReleaseNotes,</span>
+<span class="fc" id="L226">            File copiedReleaseNotes = 
copyReleaseNotesToWorkingDirectory();</span>
+<span class="fc" id="L227">            
copyDistributionsIntoScmDirectoryStructureAndAddToSvn(copiedReleaseNotes,</span>
                     provider, repository);
-<span class="fc" id="L203">            List&lt;File&gt; filesToAdd = new 
ArrayList&lt;&gt;();</span>
-<span class="fc" id="L204">            
listNotHiddenFilesAndDirectories(distCheckoutDirectory, filesToAdd);</span>
-<span class="pc bpc" id="L205" title="1 of 2 branches missed.">            if 
(!dryRun) {</span>
-<span class="nc" id="L206">                ScmFileSet fileSet = new 
ScmFileSet(distCheckoutDirectory, filesToAdd);</span>
-<span class="nc" id="L207">                AddScmResult addResult = 
provider.add(</span>
+<span class="fc" id="L229">            List&lt;File&gt; filesToAdd = new 
ArrayList&lt;&gt;();</span>
+<span class="fc" id="L230">            
listNotHiddenFilesAndDirectories(distCheckoutDirectory, filesToAdd);</span>
+<span class="pc bpc" id="L231" title="1 of 2 branches missed.">            if 
(!dryRun) {</span>
+<span class="nc" id="L232">                ScmFileSet fileSet = new 
ScmFileSet(distCheckoutDirectory, filesToAdd);</span>
+<span class="nc" id="L233">                AddScmResult addResult = 
provider.add(</span>
                         repository,
                         fileSet
                 );
-<span class="nc bnc" id="L211" title="All 2 branches missed.">                
if (!addResult.isSuccess()) {</span>
-<span class="nc" id="L212">                    throw new 
MojoExecutionException(&quot;Failed to add files to SCM: &quot; + 
addResult.getProviderMessage()</span>
-<span class="nc" id="L213">                            + &quot; [&quot; + 
addResult.getCommandOutput() + &quot;]&quot;);</span>
+<span class="nc bnc" id="L237" title="All 2 branches missed.">                
if (!addResult.isSuccess()) {</span>
+<span class="nc" id="L238">                    throw new 
MojoExecutionException(&quot;Failed to add files to SCM: &quot; + 
addResult.getProviderMessage()</span>
+<span class="nc" id="L239">                            + &quot; [&quot; + 
addResult.getCommandOutput() + &quot;]&quot;);</span>
                 }
-<span class="nc" id="L215">                getLog().info(&quot;Staging 
release: &quot; + project.getArtifactId() + &quot;, version: &quot; + 
project.getVersion());</span>
-<span class="nc" id="L216">                CheckInScmResult checkInResult = 
provider.checkIn(</span>
+<span class="nc" id="L241">                getLog().info(&quot;Staging 
release: &quot; + project.getArtifactId() + &quot;, version: &quot; + 
project.getVersion());</span>
+<span class="nc" id="L242">                CheckInScmResult checkInResult = 
provider.checkIn(</span>
                         repository,
                         fileSet,
-<span class="nc" id="L219">                        &quot;Staging release: 
&quot; + project.getArtifactId() + &quot;, version: &quot; + 
project.getVersion()</span>
+<span class="nc" id="L245">                        &quot;Staging release: 
&quot; + project.getArtifactId() + &quot;, version: &quot; + 
project.getVersion()</span>
                 );
-<span class="nc bnc" id="L221" title="All 2 branches missed.">                
if (!checkInResult.isSuccess()) {</span>
-<span class="nc" id="L222">                    getLog().error(&quot;Committing 
dist files failed: &quot; + checkInResult.getCommandOutput());</span>
-<span class="nc" id="L223">                    throw new 
MojoExecutionException(</span>
-<span class="nc" id="L224">                            &quot;Committing dist 
files failed: &quot; + checkInResult.getCommandOutput()</span>
+<span class="nc bnc" id="L247" title="All 2 branches missed.">                
if (!checkInResult.isSuccess()) {</span>
+<span class="nc" id="L248">                    getLog().error(&quot;Committing 
dist files failed: &quot; + checkInResult.getCommandOutput());</span>
+<span class="nc" id="L249">                    throw new 
MojoExecutionException(</span>
+<span class="nc" id="L250">                            &quot;Committing dist 
files failed: &quot; + checkInResult.getCommandOutput()</span>
                     );
                 }
-<span class="nc" id="L227">                getLog().info(&quot;Committed 
revision &quot; + checkInResult.getScmRevision());</span>
-<span class="nc" id="L228">            } else {</span>
-<span class="fc" id="L229">                getLog().info(&quot;[Dry run] Would 
have committed to: &quot; + distSvnStagingUrl);</span>
-<span class="fc" id="L230">                getLog().info(</span>
-<span class="fc" id="L231">                        &quot;[Dry run] Staging 
release: &quot; + project.getArtifactId() + &quot;, version: &quot; + 
project.getVersion());</span>
+<span class="nc" id="L253">                getLog().info(&quot;Committed 
revision &quot; + checkInResult.getScmRevision());</span>
+<span class="nc" id="L254">            } else {</span>
+<span class="fc" id="L255">                getLog().info(&quot;[Dry run] Would 
have committed to: &quot; + distSvnStagingUrl);</span>
+<span class="fc" id="L256">                getLog().info(</span>
+<span class="fc" id="L257">                        &quot;[Dry run] Staging 
release: &quot; + project.getArtifactId() + &quot;, version: &quot; + 
project.getVersion());</span>
             }
-<span class="nc" id="L233">        } catch (ScmException e) {</span>
-<span class="nc" id="L234">            getLog().error(&quot;Could not commit 
files to dist: &quot; + distSvnStagingUrl, e);</span>
-<span class="nc" id="L235">            throw new 
MojoExecutionException(&quot;Could not commit files to dist: &quot; + 
distSvnStagingUrl, e);</span>
-<span class="fc" id="L236">        }</span>
-<span class="fc" id="L237">    }</span>
+<span class="nc" id="L259">        } catch (ScmException e) {</span>
+<span class="nc" id="L260">            getLog().error(&quot;Could not commit 
files to dist: &quot; + distSvnStagingUrl, e);</span>
+<span class="nc" id="L261">            throw new 
MojoExecutionException(&quot;Could not commit files to dist: &quot; + 
distSvnStagingUrl, e);</span>
+<span class="fc" id="L262">        }</span>
+<span class="fc" id="L263">    }</span>
 
     /**
      * Lists all directories and files to a flat list.
@@ -243,16 +269,16 @@ import java.util.List;
      */
     private void listNotHiddenFilesAndDirectories(File directory, 
List&lt;File&gt; files) {
         // Get all the files and directories from a directory.
-<span class="fc" id="L246">        File[] fList = directory.listFiles();</span>
-<span class="fc bfc" id="L247" title="All 2 branches covered.">        for 
(File file : fList) {</span>
-<span class="pc bpc" id="L248" title="1 of 4 branches missed.">            if 
(file.isFile() &amp;&amp; !file.isHidden()) {</span>
-<span class="fc" id="L249">                files.add(file);</span>
-<span class="pc bpc" id="L250" title="1 of 4 branches missed.">            } 
else if (file.isDirectory() &amp;&amp; !file.isHidden()) {</span>
-<span class="fc" id="L251">                files.add(file);</span>
-<span class="fc" id="L252">                
listNotHiddenFilesAndDirectories(file, files);</span>
+<span class="fc" id="L272">        File[] fList = directory.listFiles();</span>
+<span class="fc bfc" id="L273" title="All 2 branches covered.">        for 
(File file : fList) {</span>
+<span class="pc bpc" id="L274" title="1 of 4 branches missed.">            if 
(file.isFile() &amp;&amp; !file.isHidden()) {</span>
+<span class="fc" id="L275">                files.add(file);</span>
+<span class="pc bpc" id="L276" title="1 of 4 branches missed.">            } 
else if (file.isDirectory() &amp;&amp; !file.isHidden()) {</span>
+<span class="fc" id="L277">                files.add(file);</span>
+<span class="fc" id="L278">                
listNotHiddenFilesAndDirectories(file, files);</span>
             }
         }
-<span class="fc" id="L255">    }</span>
+<span class="fc" id="L281">    }</span>
 
     /**
      * A utility method that takes the 
&lt;code&gt;RELEASE-NOTES.txt&lt;/code&gt; file from the base directory of the
@@ -266,11 +292,11 @@ import java.util.List;
      *                                can properly handle the exception.
      */
     private File copyReleaseNotesToWorkingDirectory() throws 
MojoExecutionException {
-<span class="fc" id="L269">        SharedFunctions.initDirectory(getLog(), 
distVersionRcVersionDirectory);</span>
-<span class="fc" id="L270">        getLog().info(&quot;Copying 
RELEASE-NOTES.txt to working directory.&quot;);</span>
-<span class="fc" id="L271">        File copiedReleaseNotes = new 
File(distVersionRcVersionDirectory, releaseNotesFile.getName());</span>
-<span class="fc" id="L272">        SharedFunctions.copyFile(getLog(), 
releaseNotesFile, copiedReleaseNotes);</span>
-<span class="fc" id="L273">        return copiedReleaseNotes;</span>
+<span class="fc" id="L295">        SharedFunctions.initDirectory(getLog(), 
distVersionRcVersionDirectory);</span>
+<span class="fc" id="L296">        getLog().info(&quot;Copying 
RELEASE-NOTES.txt to working directory.&quot;);</span>
+<span class="fc" id="L297">        File copiedReleaseNotes = new 
File(distVersionRcVersionDirectory, releaseNotesFile.getName());</span>
+<span class="fc" id="L298">        SharedFunctions.copyFile(getLog(), 
releaseNotesFile, copiedReleaseNotes);</span>
+<span class="fc" id="L299">        return copiedReleaseNotes;</span>
     }
 
     /**
@@ -308,34 +334,34 @@ import java.util.List;
                                                                              
ScmProvider provider,
                                                                              
ScmRepository repository)
             throws MojoExecutionException {
-<span class="fc" id="L311">        List&lt;File&gt; workingDirectoryFiles = 
Arrays.asList(workingDirectory.listFiles());</span>
-<span class="fc" id="L312">        List&lt;File&gt; filesForMavenScmFileSet = 
new ArrayList&lt;&gt;();</span>
-<span class="fc" id="L313">        File scmBinariesRoot = new 
File(distVersionRcVersionDirectory, &quot;binaries&quot;);</span>
-<span class="fc" id="L314">        File scmSourceRoot = new 
File(distVersionRcVersionDirectory, &quot;source&quot;);</span>
-<span class="fc" id="L315">        SharedFunctions.initDirectory(getLog(), 
scmBinariesRoot);</span>
-<span class="fc" id="L316">        SharedFunctions.initDirectory(getLog(), 
scmSourceRoot);</span>
+<span class="fc" id="L337">        List&lt;File&gt; workingDirectoryFiles = 
Arrays.asList(workingDirectory.listFiles());</span>
+<span class="fc" id="L338">        List&lt;File&gt; filesForMavenScmFileSet = 
new ArrayList&lt;&gt;();</span>
+<span class="fc" id="L339">        File scmBinariesRoot = new 
File(distVersionRcVersionDirectory, &quot;binaries&quot;);</span>
+<span class="fc" id="L340">        File scmSourceRoot = new 
File(distVersionRcVersionDirectory, &quot;source&quot;);</span>
+<span class="fc" id="L341">        SharedFunctions.initDirectory(getLog(), 
scmBinariesRoot);</span>
+<span class="fc" id="L342">        SharedFunctions.initDirectory(getLog(), 
scmSourceRoot);</span>
         File copy;
-<span class="fc bfc" id="L318" title="All 2 branches covered.">        for 
(File file : workingDirectoryFiles) {</span>
-<span class="fc bfc" id="L319" title="All 2 branches covered.">            if 
(file.getName().contains(&quot;src&quot;)) {</span>
-<span class="fc" id="L320">                copy = new File(scmSourceRoot,  
file.getName());</span>
-<span class="fc" id="L321">                SharedFunctions.copyFile(getLog(), 
file, copy);</span>
-<span class="fc" id="L322">                
filesForMavenScmFileSet.add(file);</span>
-<span class="fc bfc" id="L323" title="All 2 branches covered.">            } 
else if (file.getName().contains(&quot;bin&quot;)) {</span>
-<span class="fc" id="L324">                copy = new File(scmBinariesRoot,  
file.getName());</span>
-<span class="fc" id="L325">                SharedFunctions.copyFile(getLog(), 
file, copy);</span>
-<span class="fc" id="L326">                
filesForMavenScmFileSet.add(file);</span>
-<span class="pc bpc" id="L327" title="1 of 2 branches missed.">            } 
else if (StringUtils.containsAny(file.getName(), &quot;scm&quot;, 
&quot;sha256.properties&quot;, &quot;sha512.properties&quot;)) {</span>
-<span class="fc" id="L328">                getLog().debug(&quot;Not copying 
scm directory over to the scm directory because it is the scm 
directory.&quot;);</span>
+<span class="fc bfc" id="L344" title="All 2 branches covered.">        for 
(File file : workingDirectoryFiles) {</span>
+<span class="fc bfc" id="L345" title="All 2 branches covered.">            if 
(file.getName().contains(&quot;src&quot;)) {</span>
+<span class="fc" id="L346">                copy = new File(scmSourceRoot,  
file.getName());</span>
+<span class="fc" id="L347">                SharedFunctions.copyFile(getLog(), 
file, copy);</span>
+<span class="fc" id="L348">                
filesForMavenScmFileSet.add(file);</span>
+<span class="fc bfc" id="L349" title="All 2 branches covered.">            } 
else if (file.getName().contains(&quot;bin&quot;)) {</span>
+<span class="fc" id="L350">                copy = new File(scmBinariesRoot,  
file.getName());</span>
+<span class="fc" id="L351">                SharedFunctions.copyFile(getLog(), 
file, copy);</span>
+<span class="fc" id="L352">                
filesForMavenScmFileSet.add(file);</span>
+<span class="pc bpc" id="L353" title="1 of 2 branches missed.">            } 
else if (StringUtils.containsAny(file.getName(), &quot;scm&quot;, 
&quot;sha256.properties&quot;, &quot;sha512.properties&quot;)) {</span>
+<span class="fc" id="L354">                getLog().debug(&quot;Not copying 
scm directory over to the scm directory because it is the scm 
directory.&quot;);</span>
                 //do nothing because we are copying into scm
             } else {
-<span class="nc" id="L331">                copy = new 
File(distCheckoutDirectory.getAbsolutePath(),  file.getName());</span>
-<span class="nc" id="L332">                SharedFunctions.copyFile(getLog(), 
file, copy);</span>
-<span class="nc" id="L333">                
filesForMavenScmFileSet.add(file);</span>
+<span class="nc" id="L357">                copy = new 
File(distCheckoutDirectory.getAbsolutePath(),  file.getName());</span>
+<span class="nc" id="L358">                SharedFunctions.copyFile(getLog(), 
file, copy);</span>
+<span class="nc" id="L359">                
filesForMavenScmFileSet.add(file);</span>
             }
-<span class="fc" id="L335">        }</span>
-<span class="fc" id="L336">        
filesForMavenScmFileSet.addAll(buildReadmeAndHeaderHtmlFiles());</span>
-<span class="fc" id="L337">        
filesForMavenScmFileSet.addAll(copySiteToScmDirectory());</span>
-<span class="fc" id="L338">        return filesForMavenScmFileSet;</span>
+<span class="fc" id="L361">        }</span>
+<span class="fc" id="L362">        
filesForMavenScmFileSet.addAll(buildReadmeAndHeaderHtmlFiles());</span>
+<span class="fc" id="L363">        
filesForMavenScmFileSet.addAll(copySiteToScmDirectory());</span>
+<span class="fc" id="L364">        return filesForMavenScmFileSet;</span>
     }
 
     /**
@@ -346,19 +372,19 @@ import java.util.List;
      * @throws MojoExecutionException if the site copying fails for some 
reason.
      */
     private List&lt;File&gt; copySiteToScmDirectory() throws 
MojoExecutionException {
-<span class="pc bpc" id="L349" title="1 of 2 branches missed.">        if 
(!siteDirectory.exists()) {</span>
-<span class="nc" id="L350">            getLog().error(&quot;\&quot;mvn 
site\&quot; was not run before this goal, or a siteDirectory did not 
exist.&quot;);</span>
-<span class="nc" id="L351">            throw new MojoExecutionException(</span>
+<span class="pc bpc" id="L375" title="1 of 2 branches missed.">        if 
(!siteDirectory.exists()) {</span>
+<span class="nc" id="L376">            getLog().error(&quot;\&quot;mvn 
site\&quot; was not run before this goal, or a siteDirectory did not 
exist.&quot;);</span>
+<span class="nc" id="L377">            throw new MojoExecutionException(</span>
                     &quot;\&quot;mvn site\&quot; was not run before this goal, 
or a siteDirectory did not exist.&quot;
             );
         }
+<span class="fc" id="L381">        File siteInScm = new 
File(distVersionRcVersionDirectory, &quot;site&quot;);</span>
         try {
-<span class="fc" id="L356">            
FileUtils.copyDirectoryToDirectory(siteDirectory, 
distVersionRcVersionDirectory);</span>
-<span class="nc" id="L357">        } catch (IOException e) {</span>
-<span class="nc" id="L358">            throw new 
MojoExecutionException(&quot;Site copying failed&quot;, e);</span>
-<span class="fc" id="L359">        }</span>
-<span class="fc" id="L360">        File siteInScm = new 
File(distVersionRcVersionDirectory, &quot;site&quot;);</span>
-<span class="fc" id="L361">        return new 
ArrayList&lt;&gt;(FileUtils.listFiles(siteInScm, null, true));</span>
+<span class="fc" id="L383">            FileUtils.copyDirectory(siteDirectory, 
siteInScm);</span>
+<span class="nc" id="L384">        } catch (IOException e) {</span>
+<span class="nc" id="L385">            throw new 
MojoExecutionException(&quot;Site copying failed&quot;, e);</span>
+<span class="fc" id="L386">        }</span>
+<span class="fc" id="L387">        return new 
ArrayList&lt;&gt;(FileUtils.listFiles(siteInScm, null, true));</span>
     }
 
     /**
@@ -380,40 +406,40 @@ import java.util.List;
      *                                files fails.
      */
     private List&lt;File&gt; buildReadmeAndHeaderHtmlFiles() throws 
MojoExecutionException {
-<span class="fc" id="L383">        List&lt;File&gt; headerAndReadmeFiles = new 
ArrayList&lt;&gt;();</span>
-<span class="fc" id="L384">        File headerFile = new 
File(distVersionRcVersionDirectory, HEADER_FILE_NAME);</span>
+<span class="fc" id="L409">        List&lt;File&gt; headerAndReadmeFiles = new 
ArrayList&lt;&gt;();</span>
+<span class="fc" id="L410">        File headerFile = new 
File(distVersionRcVersionDirectory, HEADER_FILE_NAME);</span>
         //
         // HEADER file
         //
-<span class="fc" id="L388">        try (Writer headerWriter = new 
OutputStreamWriter(new FileOutputStream(headerFile), &quot;UTF-8&quot;)) 
{</span>
-<span class="fc" id="L389">            
HeaderHtmlVelocityDelegate.builder().build().render(headerWriter);</span>
-<span class="nc" id="L390">        } catch (IOException e) {</span>
-<span class="nc" id="L391">            final String message = &quot;Could not 
build HEADER html file &quot; + headerFile;</span>
-<span class="nc" id="L392">            getLog().error(message, e);</span>
-<span class="nc" id="L393">            throw new 
MojoExecutionException(message, e);</span>
-<span class="fc" id="L394">        }</span>
-<span class="fc" id="L395">        headerAndReadmeFiles.add(headerFile);</span>
+<span class="fc" id="L414">        try (Writer headerWriter = new 
OutputStreamWriter(new FileOutputStream(headerFile), &quot;UTF-8&quot;)) 
{</span>
+<span class="fc" id="L415">            
HeaderHtmlVelocityDelegate.builder().build().render(headerWriter);</span>
+<span class="nc" id="L416">        } catch (IOException e) {</span>
+<span class="nc" id="L417">            final String message = &quot;Could not 
build HEADER html file &quot; + headerFile;</span>
+<span class="nc" id="L418">            getLog().error(message, e);</span>
+<span class="nc" id="L419">            throw new 
MojoExecutionException(message, e);</span>
+<span class="fc" id="L420">        }</span>
+<span class="fc" id="L421">        headerAndReadmeFiles.add(headerFile);</span>
         //
         // README file
         //
-<span class="fc" id="L399">        File readmeFile = new 
File(distVersionRcVersionDirectory, README_FILE_NAME);</span>
-<span class="fc" id="L400">        try (Writer readmeWriter = new 
OutputStreamWriter(new FileOutputStream(readmeFile), &quot;UTF-8&quot;)) 
{</span>
+<span class="fc" id="L425">        File readmeFile = new 
File(distVersionRcVersionDirectory, README_FILE_NAME);</span>
+<span class="fc" id="L426">        try (Writer readmeWriter = new 
OutputStreamWriter(new FileOutputStream(readmeFile), &quot;UTF-8&quot;)) 
{</span>
             // @formatter:off
-<span class="fc" id="L402">            ReadmeHtmlVelocityDelegate 
readmeHtmlVelocityDelegate = ReadmeHtmlVelocityDelegate.builder()</span>
-<span class="fc" id="L403">                    
.withArtifactId(project.getArtifactId())</span>
-<span class="fc" id="L404">                    
.withVersion(project.getVersion())</span>
-<span class="fc" id="L405">                    
.withSiteUrl(project.getUrl())</span>
-<span class="fc" id="L406">                    .build();</span>
+<span class="fc" id="L428">            ReadmeHtmlVelocityDelegate 
readmeHtmlVelocityDelegate = ReadmeHtmlVelocityDelegate.builder()</span>
+<span class="fc" id="L429">                    
.withArtifactId(project.getArtifactId())</span>
+<span class="fc" id="L430">                    
.withVersion(project.getVersion())</span>
+<span class="fc" id="L431">                    
.withSiteUrl(project.getUrl())</span>
+<span class="fc" id="L432">                    .build();</span>
             // @formatter:on
-<span class="fc" id="L408">            
readmeHtmlVelocityDelegate.render(readmeWriter);</span>
-<span class="nc" id="L409">        } catch (IOException e) {</span>
-<span class="nc" id="L410">            final String message = &quot;Could not 
build README html file &quot; + readmeFile;</span>
-<span class="nc" id="L411">            getLog().error(message, e);</span>
-<span class="nc" id="L412">            throw new 
MojoExecutionException(message, e);</span>
-<span class="fc" id="L413">        }</span>
-<span class="fc" id="L414">        headerAndReadmeFiles.add(readmeFile);</span>
-<span class="fc" id="L415">        
headerAndReadmeFiles.addAll(copyHeaderAndReadmeToSubdirectories(headerFile, 
readmeFile));</span>
-<span class="fc" id="L416">        return headerAndReadmeFiles;</span>
+<span class="fc" id="L434">            
readmeHtmlVelocityDelegate.render(readmeWriter);</span>
+<span class="nc" id="L435">        } catch (IOException e) {</span>
+<span class="nc" id="L436">            final String message = &quot;Could not 
build README html file &quot; + readmeFile;</span>
+<span class="nc" id="L437">            getLog().error(message, e);</span>
+<span class="nc" id="L438">            throw new 
MojoExecutionException(message, e);</span>
+<span class="fc" id="L439">        }</span>
+<span class="fc" id="L440">        headerAndReadmeFiles.add(readmeFile);</span>
+<span class="fc" id="L441">        
headerAndReadmeFiles.addAll(copyHeaderAndReadmeToSubdirectories(headerFile, 
readmeFile));</span>
+<span class="fc" id="L442">        return headerAndReadmeFiles;</span>
     }
 
     /**
@@ -428,22 +454,22 @@ import java.util.List;
      */
     private List&lt;File&gt; copyHeaderAndReadmeToSubdirectories(File 
headerFile, File readmeFile)
             throws MojoExecutionException {
-<span class="fc" id="L431">        List&lt;File&gt; symbolicLinkFiles = new 
ArrayList&lt;&gt;();</span>
-<span class="fc" id="L432">        File sourceRoot = new 
File(distVersionRcVersionDirectory, &quot;source&quot;);</span>
-<span class="fc" id="L433">        File binariesRoot = new 
File(distVersionRcVersionDirectory, &quot;binaries&quot;);</span>
-<span class="fc" id="L434">        File sourceHeaderFile = new 
File(sourceRoot, HEADER_FILE_NAME);</span>
-<span class="fc" id="L435">        File sourceReadmeFile = new 
File(sourceRoot, README_FILE_NAME);</span>
-<span class="fc" id="L436">        File binariesHeaderFile = new 
File(binariesRoot, HEADER_FILE_NAME);</span>
-<span class="fc" id="L437">        File binariesReadmeFile = new 
File(binariesRoot, README_FILE_NAME);</span>
-<span class="fc" id="L438">        SharedFunctions.copyFile(getLog(), 
headerFile, sourceHeaderFile);</span>
-<span class="fc" id="L439">        
symbolicLinkFiles.add(sourceHeaderFile);</span>
-<span class="fc" id="L440">        SharedFunctions.copyFile(getLog(), 
readmeFile, sourceReadmeFile);</span>
-<span class="fc" id="L441">        
symbolicLinkFiles.add(sourceReadmeFile);</span>
-<span class="fc" id="L442">        SharedFunctions.copyFile(getLog(), 
headerFile, binariesHeaderFile);</span>
-<span class="fc" id="L443">        
symbolicLinkFiles.add(binariesHeaderFile);</span>
-<span class="fc" id="L444">        SharedFunctions.copyFile(getLog(), 
readmeFile, binariesReadmeFile);</span>
-<span class="fc" id="L445">        
symbolicLinkFiles.add(binariesReadmeFile);</span>
-<span class="fc" id="L446">        return symbolicLinkFiles;</span>
+<span class="fc" id="L457">        List&lt;File&gt; symbolicLinkFiles = new 
ArrayList&lt;&gt;();</span>
+<span class="fc" id="L458">        File sourceRoot = new 
File(distVersionRcVersionDirectory, &quot;source&quot;);</span>
+<span class="fc" id="L459">        File binariesRoot = new 
File(distVersionRcVersionDirectory, &quot;binaries&quot;);</span>
+<span class="fc" id="L460">        File sourceHeaderFile = new 
File(sourceRoot, HEADER_FILE_NAME);</span>
+<span class="fc" id="L461">        File sourceReadmeFile = new 
File(sourceRoot, README_FILE_NAME);</span>
+<span class="fc" id="L462">        File binariesHeaderFile = new 
File(binariesRoot, HEADER_FILE_NAME);</span>
+<span class="fc" id="L463">        File binariesReadmeFile = new 
File(binariesRoot, README_FILE_NAME);</span>
+<span class="fc" id="L464">        SharedFunctions.copyFile(getLog(), 
headerFile, sourceHeaderFile);</span>
+<span class="fc" id="L465">        
symbolicLinkFiles.add(sourceHeaderFile);</span>
+<span class="fc" id="L466">        SharedFunctions.copyFile(getLog(), 
readmeFile, sourceReadmeFile);</span>
+<span class="fc" id="L467">        
symbolicLinkFiles.add(sourceReadmeFile);</span>
+<span class="fc" id="L468">        SharedFunctions.copyFile(getLog(), 
headerFile, binariesHeaderFile);</span>
+<span class="fc" id="L469">        
symbolicLinkFiles.add(binariesHeaderFile);</span>
+<span class="fc" id="L470">        SharedFunctions.copyFile(getLog(), 
readmeFile, binariesReadmeFile);</span>
+<span class="fc" id="L471">        
symbolicLinkFiles.add(binariesReadmeFile);</span>
+<span class="fc" id="L472">        return symbolicLinkFiles;</span>
     }
 
     /**
@@ -454,7 +480,20 @@ import java.util.List;
      *                is invoked.
      */
     protected void setBaseDir(File baseDir) {
-<span class="fc" id="L457">        this.baseDir = baseDir;</span>
-<span class="fc" id="L458">    }</span>
+<span class="fc" id="L483">        this.baseDir = baseDir;</span>
+<span class="fc" id="L484">    }</span>
+
+    /**
+     * Set authentication information on the specified {@link 
ScmProviderRepository}.
+     * @param providerRepository target
+     */
+    private void setAuthentication(ScmProviderRepository providerRepository) {
+<span class="fc" id="L491">        Optional&lt;Server&gt; server =</span>
+<span class="fc" id="L492">            
Optional.ofNullable(distServer).map(settings::getServer).map(DefaultSettingsDecryptionRequest::new)</span>
+<span class="fc" id="L493">                
.map(settingsDecrypter::decrypt).map(SettingsDecryptionResult::getServer);</span>
+
+<span class="fc" id="L495">        
providerRepository.setUser(server.map(Server::getUsername).orElse(username));</span>
+<span class="fc" id="L496">        
providerRepository.setPassword(server.map(Server::getPassword).orElse(password));</span>
+<span class="fc" id="L497">    }</span>
 }
-</pre><div class="footer"><span class="right">Created with <a 
href="http://www.jacoco.org/jacoco";>JaCoCo</a> 
0.8.0.201801022044</span></div></body></html>
\ No newline at end of file
+</pre><div class="footer"><span class="right">Created with <a 
href="http://www.jacoco.org/jacoco";>JaCoCo</a> 
0.8.2.201808211720</span></div></body></html>
\ No newline at end of file


Reply via email to