Modified:
websites/production/commons/content/proper/commons-release-plugin/apidocs/src-html/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.html
==============================================================================
---
websites/production/commons/content/proper/commons-release-plugin/apidocs/src-html/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.html
(original)
+++
websites/production/commons/content/proper/commons-release-plugin/apidocs/src-html/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.html
Thu Apr 5 16:12:44 2018
@@ -24,202 +24,201 @@
<span class="sourceLineNo">016</span> */<a name="line.16"></a>
<span class="sourceLineNo">017</span>package
org.apache.commons.release.plugin.mojos;<a name="line.17"></a>
<span class="sourceLineNo">018</span><a name="line.18"></a>
-<span class="sourceLineNo">019</span>import java.nio.file.Files;<a
name="line.19"></a>
-<span class="sourceLineNo">020</span>import
org.apache.commons.codec.digest.DigestUtils;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import
org.apache.commons.lang3.StringUtils;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import
org.apache.commons.release.plugin.SharedFunctions;<a name="line.22"></a>
+<span class="sourceLineNo">019</span>import
org.apache.commons.codec.digest.DigestUtils;<a name="line.19"></a>
+<span class="sourceLineNo">020</span>import
org.apache.commons.lang3.StringUtils;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import
org.apache.commons.release.plugin.SharedFunctions;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import
org.apache.maven.artifact.Artifact;<a name="line.22"></a>
<span class="sourceLineNo">023</span>import
org.apache.maven.plugin.AbstractMojo;<a name="line.23"></a>
<span class="sourceLineNo">024</span>import
org.apache.maven.plugin.MojoExecutionException;<a name="line.24"></a>
<span class="sourceLineNo">025</span>import
org.apache.maven.plugins.annotations.LifecyclePhase;<a name="line.25"></a>
<span class="sourceLineNo">026</span>import
org.apache.maven.plugins.annotations.Mojo;<a name="line.26"></a>
<span class="sourceLineNo">027</span>import
org.apache.maven.plugins.annotations.Parameter;<a name="line.27"></a>
<span class="sourceLineNo">028</span>import
org.apache.maven.project.MavenProject;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import
org.apache.maven.artifact.Artifact;<a name="line.29"></a>
-<span class="sourceLineNo">030</span><a name="line.30"></a>
-<span class="sourceLineNo">031</span>import java.io.File;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import java.io.FileInputStream;<a
name="line.32"></a>
-<span class="sourceLineNo">033</span>import java.io.IOException;<a
name="line.33"></a>
-<span class="sourceLineNo">034</span>import java.io.PrintWriter;<a
name="line.34"></a>
-<span class="sourceLineNo">035</span>import java.util.ArrayList;<a
name="line.35"></a>
-<span class="sourceLineNo">036</span>import java.util.Collections;<a
name="line.36"></a>
-<span class="sourceLineNo">037</span>import java.util.HashSet;<a
name="line.37"></a>
-<span class="sourceLineNo">038</span>import java.util.List;<a
name="line.38"></a>
-<span class="sourceLineNo">039</span>import java.util.Set;<a
name="line.39"></a>
-<span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span>/**<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * The purpose of this maven mojo is to
detach the artifacts generated by the maven-assembly-plugin,<a
name="line.42"></a>
-<span class="sourceLineNo">043</span> * which for the Apache Commons Project
do not get uploaded to Nexus, and putting those artifacts<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * in the dev distribution location for
apache projects.<a name="line.44"></a>
-<span class="sourceLineNo">045</span> *<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * @author chtompki<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * @since 1.0<a name="line.47"></a>
-<span class="sourceLineNo">048</span> */<a name="line.48"></a>
-<span class="sourceLineNo">049</span>@Mojo(name = "detach-distributions",<a
name="line.49"></a>
-<span class="sourceLineNo">050</span> defaultPhase =
LifecyclePhase.VERIFY,<a name="line.50"></a>
-<span class="sourceLineNo">051</span> threadSafe = true,<a
name="line.51"></a>
-<span class="sourceLineNo">052</span> aggregator = true)<a
name="line.52"></a>
-<span class="sourceLineNo">053</span>public class
CommonsDistributionDetachmentMojo extends AbstractMojo {<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span> /**<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * A list of "artifact types" in the
maven vernacular, to<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * be detached from the deployment.
For the time being we want<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * all artifacts generated by the
maven-assembly-plugin to be detached<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * from the deployment, namely
*-src.zip, *-src.tar.gz, *-bin.zip,<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * *-bin.tar.gz, and the
corresponding .asc pgp signatures.<a name="line.60"></a>
-<span class="sourceLineNo">061</span> */<a name="line.61"></a>
-<span class="sourceLineNo">062</span> private static final
Set<String> ARTIFACT_TYPES_TO_DETACH;<a name="line.62"></a>
-<span class="sourceLineNo">063</span> static {<a name="line.63"></a>
-<span class="sourceLineNo">064</span> Set<String> hashSet = new
HashSet<>();<a name="line.64"></a>
-<span class="sourceLineNo">065</span> hashSet.add("zip");<a
name="line.65"></a>
-<span class="sourceLineNo">066</span> hashSet.add("tar.gz");<a
name="line.66"></a>
-<span class="sourceLineNo">067</span> hashSet.add("zip.asc");<a
name="line.67"></a>
-<span class="sourceLineNo">068</span> hashSet.add("tar.gz.asc");<a
name="line.68"></a>
-<span class="sourceLineNo">069</span> ARTIFACT_TYPES_TO_DETACH =
Collections.unmodifiableSet(hashSet);<a name="line.69"></a>
-<span class="sourceLineNo">070</span> }<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span> /**<a name="line.72"></a>
-<span class="sourceLineNo">073</span> * This list is supposed to hold the
maven references to the aformentioned artifacts so that we<a name="line.73"></a>
-<span class="sourceLineNo">074</span> * can upload them to svn after
they've been detached from the maven deployment.<a name="line.74"></a>
-<span class="sourceLineNo">075</span> */<a name="line.75"></a>
-<span class="sourceLineNo">076</span> private List<Artifact>
detachedArtifacts = new ArrayList<>();<a name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span> /**<a name="line.78"></a>
-<span class="sourceLineNo">079</span> * The maven project context
injection so that we can get a hold of the variables at hand.<a
name="line.79"></a>
-<span class="sourceLineNo">080</span> */<a name="line.80"></a>
-<span class="sourceLineNo">081</span> @Parameter(defaultValue =
"${project}", required = true)<a name="line.81"></a>
-<span class="sourceLineNo">082</span> private MavenProject project;<a
name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span> /**<a name="line.84"></a>
-<span class="sourceLineNo">085</span> * The working directory in
<code>target</code> that we use as a sandbox for the plugin.<a
name="line.85"></a>
-<span class="sourceLineNo">086</span> */<a name="line.86"></a>
-<span class="sourceLineNo">087</span> @Parameter(defaultValue =
"${project.build.directory}/commons-release-plugin",<a name="line.87"></a>
-<span class="sourceLineNo">088</span> property =
"commons.outputDirectory")<a name="line.88"></a>
-<span class="sourceLineNo">089</span> private File workingDirectory;<a
name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span> /**<a name="line.91"></a>
-<span class="sourceLineNo">092</span> * The subversion staging url to
which we upload all of our staged artifacts.<a name="line.92"></a>
-<span class="sourceLineNo">093</span> */<a name="line.93"></a>
-<span class="sourceLineNo">094</span> @Parameter(defaultValue = "",
property = "commons.distSvnStagingUrl")<a name="line.94"></a>
-<span class="sourceLineNo">095</span> private String distSvnStagingUrl;<a
name="line.95"></a>
-<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span> /**<a name="line.97"></a>
-<span class="sourceLineNo">098</span> * A parameter to generally avoid
running unless it is specifically turned on by the consuming module.<a
name="line.98"></a>
-<span class="sourceLineNo">099</span> */<a name="line.99"></a>
-<span class="sourceLineNo">100</span> @Parameter(defaultValue = "false",
property = "commons.release.isDistModule")<a name="line.100"></a>
-<span class="sourceLineNo">101</span> private Boolean isDistModule;<a
name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span> @Override<a name="line.103"></a>
-<span class="sourceLineNo">104</span> public void execute() throws
MojoExecutionException {<a name="line.104"></a>
-<span class="sourceLineNo">105</span> if (!isDistModule) {<a
name="line.105"></a>
-<span class="sourceLineNo">106</span> getLog().info("This module is
marked as a non distribution " +<a name="line.106"></a>
-<span class="sourceLineNo">107</span> "or assembly module,
and the plugin will not run.");<a name="line.107"></a>
-<span class="sourceLineNo">108</span> return;<a name="line.108"></a>
-<span class="sourceLineNo">109</span> }<a name="line.109"></a>
-<span class="sourceLineNo">110</span> if
(StringUtils.isEmpty(distSvnStagingUrl)) {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>
getLog().warn("commons.distSvnStagingUrl is not set, the commons-release-plugin
will not run.");<a name="line.111"></a>
-<span class="sourceLineNo">112</span> return;<a name="line.112"></a>
-<span class="sourceLineNo">113</span> }<a name="line.113"></a>
-<span class="sourceLineNo">114</span> getLog().info("Detaching
Assemblies");<a name="line.114"></a>
-<span class="sourceLineNo">115</span> for (Object attachedArtifact :
project.getAttachedArtifacts()) {<a name="line.115"></a>
-<span class="sourceLineNo">116</span> if
(ARTIFACT_TYPES_TO_DETACH.contains(((Artifact) attachedArtifact).getType()))
{<a name="line.116"></a>
-<span class="sourceLineNo">117</span>
detachedArtifacts.add((Artifact) attachedArtifact);<a name="line.117"></a>
-<span class="sourceLineNo">118</span> }<a name="line.118"></a>
-<span class="sourceLineNo">119</span> }<a name="line.119"></a>
-<span class="sourceLineNo">120</span> if (detachedArtifacts.isEmpty())
{<a name="line.120"></a>
-<span class="sourceLineNo">121</span> getLog().info("Current
project contains no distributions. Not executing.");<a name="line.121"></a>
-<span class="sourceLineNo">122</span> return;<a name="line.122"></a>
-<span class="sourceLineNo">123</span> }<a name="line.123"></a>
-<span class="sourceLineNo">124</span> for (Artifact artifactToRemove :
detachedArtifacts) {<a name="line.124"></a>
-<span class="sourceLineNo">125</span>
project.getAttachedArtifacts().remove(artifactToRemove);<a name="line.125"></a>
-<span class="sourceLineNo">126</span> }<a name="line.126"></a>
-<span class="sourceLineNo">127</span> if (!workingDirectory.exists())
{<a name="line.127"></a>
-<span class="sourceLineNo">128</span>
SharedFunctions.initDirectory(getLog(), workingDirectory);<a
name="line.128"></a>
-<span class="sourceLineNo">129</span> }<a name="line.129"></a>
-<span class="sourceLineNo">130</span>
copyRemovedArtifactsToWorkingDirectory();<a name="line.130"></a>
-<span class="sourceLineNo">131</span> getLog().info("");<a
name="line.131"></a>
-<span class="sourceLineNo">132</span> sha1AndMd5SignArtifacts();<a
name="line.132"></a>
-<span class="sourceLineNo">133</span> }<a name="line.133"></a>
-<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span> /**<a name="line.135"></a>
-<span class="sourceLineNo">136</span> * A helper method to copy the newly
detached artifacts to <code>target/commons-release-plugin</code><a
name="line.136"></a>
-<span class="sourceLineNo">137</span> * so that the {@link
CommonsDistributionStagingMojo} can find the artifacts later.<a
name="line.137"></a>
-<span class="sourceLineNo">138</span> *<a name="line.138"></a>
-<span class="sourceLineNo">139</span> * @throws MojoExecutionException if
some form of an {@link IOException} occurs, we want it<a name="line.139"></a>
-<span class="sourceLineNo">140</span> *
properly wrapped so that maven can handle it.<a name="line.140"></a>
-<span class="sourceLineNo">141</span> */<a name="line.141"></a>
-<span class="sourceLineNo">142</span> private void
copyRemovedArtifactsToWorkingDirectory() throws MojoExecutionException {<a
name="line.142"></a>
-<span class="sourceLineNo">143</span> StringBuffer
copiedArtifactAbsolutePath;<a name="line.143"></a>
-<span class="sourceLineNo">144</span> getLog().info("Copying detached
artifacts to working directory.");<a name="line.144"></a>
-<span class="sourceLineNo">145</span> for (Artifact artifact:
detachedArtifacts) {<a name="line.145"></a>
-<span class="sourceLineNo">146</span> File artifactFile =
artifact.getFile();<a name="line.146"></a>
-<span class="sourceLineNo">147</span> copiedArtifactAbsolutePath =
new StringBuffer(workingDirectory.getAbsolutePath());<a name="line.147"></a>
-<span class="sourceLineNo">148</span>
copiedArtifactAbsolutePath.append("/");<a name="line.148"></a>
-<span class="sourceLineNo">149</span>
copiedArtifactAbsolutePath.append(artifactFile.getName());<a
name="line.149"></a>
-<span class="sourceLineNo">150</span> File copiedArtifact = new
File(copiedArtifactAbsolutePath.toString());<a name="line.150"></a>
-<span class="sourceLineNo">151</span> getLog().info("Copying: " +
artifactFile.getName());<a name="line.151"></a>
-<span class="sourceLineNo">152</span>
SharedFunctions.copyFile(getLog(), artifactFile, copiedArtifact);<a
name="line.152"></a>
-<span class="sourceLineNo">153</span> }<a name="line.153"></a>
-<span class="sourceLineNo">154</span> }<a name="line.154"></a>
-<span class="sourceLineNo">155</span><a name="line.155"></a>
-<span class="sourceLineNo">156</span> /**<a name="line.156"></a>
-<span class="sourceLineNo">157</span> * A helper method that creates md5
and sha1 signature files for our detached artifacts in the<a
name="line.157"></a>
-<span class="sourceLineNo">158</span> *
<code>target/commons-release-plugin</code> directory for the
purpose of being uploade by<a name="line.158"></a>
-<span class="sourceLineNo">159</span> * the {@link
CommonsDistributionStagingMojo}.<a name="line.159"></a>
-<span class="sourceLineNo">160</span> *<a name="line.160"></a>
-<span class="sourceLineNo">161</span> * @throws MojoExecutionException if
some form of an {@link IOException} occurs, we want it<a name="line.161"></a>
-<span class="sourceLineNo">162</span> *
properly wrapped so that maven can handle it.<a name="line.162"></a>
-<span class="sourceLineNo">163</span> */<a name="line.163"></a>
-<span class="sourceLineNo">164</span> private void
sha1AndMd5SignArtifacts() throws MojoExecutionException {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> for (Artifact artifact :
detachedArtifacts) {<a name="line.165"></a>
-<span class="sourceLineNo">166</span> if
(!artifact.getFile().getName().contains("asc")) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span> try {<a
name="line.167"></a>
-<span class="sourceLineNo">168</span> String md5 =
DigestUtils.md5Hex(Files.readAllBytes(artifact.getFile().toPath()));<a
name="line.168"></a>
-<span class="sourceLineNo">169</span>
getLog().info(artifact.getFile().getName() + " md5: " + md5);<a
name="line.169"></a>
-<span class="sourceLineNo">170</span> PrintWriter md5Writer
= new PrintWriter(getMd5FilePath(workingDirectory, artifact.getFile()));<a
name="line.170"></a>
-<span class="sourceLineNo">171</span>
md5Writer.println(md5);<a name="line.171"></a>
-<span class="sourceLineNo">172</span> String sha1 =
DigestUtils.sha1Hex(Files.readAllBytes(artifact.getFile().toPath()));<a
name="line.172"></a>
-<span class="sourceLineNo">173</span>
getLog().info(artifact.getFile().getName() + " sha1: " + sha1);<a
name="line.173"></a>
-<span class="sourceLineNo">174</span> PrintWriter
sha1Writer = new PrintWriter(getSha1FilePath(workingDirectory,
artifact.getFile()));<a name="line.174"></a>
-<span class="sourceLineNo">175</span>
sha1Writer.println(sha1);<a name="line.175"></a>
-<span class="sourceLineNo">176</span> md5Writer.close();<a
name="line.176"></a>
-<span class="sourceLineNo">177</span> sha1Writer.close();<a
name="line.177"></a>
-<span class="sourceLineNo">178</span> } catch (IOException e)
{<a name="line.178"></a>
-<span class="sourceLineNo">179</span> throw new
MojoExecutionException("Could not sign file: " + artifact.getFile().getName(),
e);<a name="line.179"></a>
-<span class="sourceLineNo">180</span> }<a name="line.180"></a>
-<span class="sourceLineNo">181</span> }<a name="line.181"></a>
-<span class="sourceLineNo">182</span> }<a name="line.182"></a>
-<span class="sourceLineNo">183</span> }<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span> /**<a name="line.185"></a>
-<span class="sourceLineNo">186</span> * A helper method to create a file
path for the <code>md5</code> signature file from a given file.<a
name="line.186"></a>
-<span class="sourceLineNo">187</span> *<a name="line.187"></a>
-<span class="sourceLineNo">188</span> * @param workingDirectory is the
{@link File} for the directory in which to make the
<code>.md5</code> file.<a name="line.188"></a>
-<span class="sourceLineNo">189</span> * @param file the {@link File} whose
name we should use to create the <code>.md5</code> file.<a
name="line.189"></a>
-<span class="sourceLineNo">190</span> * @return a {@link String} that is
the absolute path to the <code>.md5</code> file.<a
name="line.190"></a>
-<span class="sourceLineNo">191</span> */<a name="line.191"></a>
-<span class="sourceLineNo">192</span> private String getMd5FilePath(File
workingDirectory, File file) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> StringBuffer buffer = new
StringBuffer(workingDirectory.getAbsolutePath());<a name="line.193"></a>
-<span class="sourceLineNo">194</span> buffer.append("/");<a
name="line.194"></a>
-<span class="sourceLineNo">195</span> buffer.append(file.getName());<a
name="line.195"></a>
-<span class="sourceLineNo">196</span> buffer.append(".md5");<a
name="line.196"></a>
-<span class="sourceLineNo">197</span> return buffer.toString();<a
name="line.197"></a>
-<span class="sourceLineNo">198</span> }<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span> /**<a name="line.200"></a>
-<span class="sourceLineNo">201</span> * A helper method to create a file
path for the <code>sha1</code> signature file from a given file.<a
name="line.201"></a>
-<span class="sourceLineNo">202</span> *<a name="line.202"></a>
-<span class="sourceLineNo">203</span> * @param workingDirectory is the
{@link File} for the directory in which to make the
<code>.sha1</code> file.<a name="line.203"></a>
-<span class="sourceLineNo">204</span> * @param file the {@link File} whose
name we should use to create the <code>.sha1</code> file.<a
name="line.204"></a>
-<span class="sourceLineNo">205</span> * @return a {@link String} that is
the absolute path to the <code>.sha1</code> file.<a
name="line.205"></a>
-<span class="sourceLineNo">206</span> */<a name="line.206"></a>
-<span class="sourceLineNo">207</span> private String getSha1FilePath(File
workingDirectory, File file) {<a name="line.207"></a>
-<span class="sourceLineNo">208</span> StringBuffer buffer = new
StringBuffer(workingDirectory.getAbsolutePath());<a name="line.208"></a>
-<span class="sourceLineNo">209</span> buffer.append("/");<a
name="line.209"></a>
-<span class="sourceLineNo">210</span> buffer.append(file.getName());<a
name="line.210"></a>
-<span class="sourceLineNo">211</span> buffer.append(".sha1");<a
name="line.211"></a>
-<span class="sourceLineNo">212</span> return buffer.toString();<a
name="line.212"></a>
-<span class="sourceLineNo">213</span> }<a name="line.213"></a>
-<span class="sourceLineNo">214</span>}<a name="line.214"></a>
+<span class="sourceLineNo">029</span><a name="line.29"></a>
+<span class="sourceLineNo">030</span>import java.io.File;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import java.io.IOException;<a
name="line.31"></a>
+<span class="sourceLineNo">032</span>import java.io.PrintWriter;<a
name="line.32"></a>
+<span class="sourceLineNo">033</span>import java.nio.file.Files;<a
name="line.33"></a>
+<span class="sourceLineNo">034</span>import java.util.ArrayList;<a
name="line.34"></a>
+<span class="sourceLineNo">035</span>import java.util.Collections;<a
name="line.35"></a>
+<span class="sourceLineNo">036</span>import java.util.HashSet;<a
name="line.36"></a>
+<span class="sourceLineNo">037</span>import java.util.List;<a
name="line.37"></a>
+<span class="sourceLineNo">038</span>import java.util.Set;<a
name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span>/**<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * The purpose of this maven mojo is to
detach the artifacts generated by the maven-assembly-plugin,<a
name="line.41"></a>
+<span class="sourceLineNo">042</span> * which for the Apache Commons Project
do not get uploaded to Nexus, and putting those artifacts<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * in the dev distribution location for
apache projects.<a name="line.43"></a>
+<span class="sourceLineNo">044</span> *<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * @author chtompki<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * @since 1.0<a name="line.46"></a>
+<span class="sourceLineNo">047</span> */<a name="line.47"></a>
+<span class="sourceLineNo">048</span>@Mojo(name = "detach-distributions",<a
name="line.48"></a>
+<span class="sourceLineNo">049</span> defaultPhase =
LifecyclePhase.VERIFY,<a name="line.49"></a>
+<span class="sourceLineNo">050</span> threadSafe = true,<a
name="line.50"></a>
+<span class="sourceLineNo">051</span> aggregator = true)<a
name="line.51"></a>
+<span class="sourceLineNo">052</span>public class
CommonsDistributionDetachmentMojo extends AbstractMojo {<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span> /**<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * A list of "artifact types" in the
maven vernacular, to<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * be detached from the deployment.
For the time being we want<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * all artifacts generated by the
maven-assembly-plugin to be detached<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * from the deployment, namely
*-src.zip, *-src.tar.gz, *-bin.zip,<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * *-bin.tar.gz, and the
corresponding .asc pgp signatures.<a name="line.59"></a>
+<span class="sourceLineNo">060</span> */<a name="line.60"></a>
+<span class="sourceLineNo">061</span> private static final
Set<String> ARTIFACT_TYPES_TO_DETACH;<a name="line.61"></a>
+<span class="sourceLineNo">062</span> static {<a name="line.62"></a>
+<span class="sourceLineNo">063</span> Set<String> hashSet = new
HashSet<>();<a name="line.63"></a>
+<span class="sourceLineNo">064</span> hashSet.add("zip");<a
name="line.64"></a>
+<span class="sourceLineNo">065</span> hashSet.add("tar.gz");<a
name="line.65"></a>
+<span class="sourceLineNo">066</span> hashSet.add("zip.asc");<a
name="line.66"></a>
+<span class="sourceLineNo">067</span> hashSet.add("tar.gz.asc");<a
name="line.67"></a>
+<span class="sourceLineNo">068</span> ARTIFACT_TYPES_TO_DETACH =
Collections.unmodifiableSet(hashSet);<a name="line.68"></a>
+<span class="sourceLineNo">069</span> }<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span> /**<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * This list is supposed to hold the
maven references to the aformentioned artifacts so that we<a name="line.72"></a>
+<span class="sourceLineNo">073</span> * can upload them to svn after
they've been detached from the maven deployment.<a name="line.73"></a>
+<span class="sourceLineNo">074</span> */<a name="line.74"></a>
+<span class="sourceLineNo">075</span> private List<Artifact>
detachedArtifacts = new ArrayList<>();<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span> /**<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * The maven project context
injection so that we can get a hold of the variables at hand.<a
name="line.78"></a>
+<span class="sourceLineNo">079</span> */<a name="line.79"></a>
+<span class="sourceLineNo">080</span> @Parameter(defaultValue =
"${project}", required = true)<a name="line.80"></a>
+<span class="sourceLineNo">081</span> private MavenProject project;<a
name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span> /**<a name="line.83"></a>
+<span class="sourceLineNo">084</span> * The working directory in
<code>target</code> that we use as a sandbox for the plugin.<a
name="line.84"></a>
+<span class="sourceLineNo">085</span> */<a name="line.85"></a>
+<span class="sourceLineNo">086</span> @Parameter(defaultValue =
"${project.build.directory}/commons-release-plugin",<a name="line.86"></a>
+<span class="sourceLineNo">087</span> property =
"commons.outputDirectory")<a name="line.87"></a>
+<span class="sourceLineNo">088</span> private File workingDirectory;<a
name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span> /**<a name="line.90"></a>
+<span class="sourceLineNo">091</span> * The subversion staging url to
which we upload all of our staged artifacts.<a name="line.91"></a>
+<span class="sourceLineNo">092</span> */<a name="line.92"></a>
+<span class="sourceLineNo">093</span> @Parameter(defaultValue = "",
property = "commons.distSvnStagingUrl")<a name="line.93"></a>
+<span class="sourceLineNo">094</span> private String distSvnStagingUrl;<a
name="line.94"></a>
+<span class="sourceLineNo">095</span><a name="line.95"></a>
+<span class="sourceLineNo">096</span> /**<a name="line.96"></a>
+<span class="sourceLineNo">097</span> * A parameter to generally avoid
running unless it is specifically turned on by the consuming module.<a
name="line.97"></a>
+<span class="sourceLineNo">098</span> */<a name="line.98"></a>
+<span class="sourceLineNo">099</span> @Parameter(defaultValue = "false",
property = "commons.release.isDistModule")<a name="line.99"></a>
+<span class="sourceLineNo">100</span> private Boolean isDistModule;<a
name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span> @Override<a name="line.102"></a>
+<span class="sourceLineNo">103</span> public void execute() throws
MojoExecutionException {<a name="line.103"></a>
+<span class="sourceLineNo">104</span> if (!isDistModule) {<a
name="line.104"></a>
+<span class="sourceLineNo">105</span> getLog().info("This module is
marked as a non distribution "<a name="line.105"></a>
+<span class="sourceLineNo">106</span> + "or assembly
module, and the plugin will not run.");<a name="line.106"></a>
+<span class="sourceLineNo">107</span> return;<a name="line.107"></a>
+<span class="sourceLineNo">108</span> }<a name="line.108"></a>
+<span class="sourceLineNo">109</span> if
(StringUtils.isEmpty(distSvnStagingUrl)) {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>
getLog().warn("commons.distSvnStagingUrl is not set, the commons-release-plugin
will not run.");<a name="line.110"></a>
+<span class="sourceLineNo">111</span> return;<a name="line.111"></a>
+<span class="sourceLineNo">112</span> }<a name="line.112"></a>
+<span class="sourceLineNo">113</span> getLog().info("Detaching
Assemblies");<a name="line.113"></a>
+<span class="sourceLineNo">114</span> for (Object attachedArtifact :
project.getAttachedArtifacts()) {<a name="line.114"></a>
+<span class="sourceLineNo">115</span> if
(ARTIFACT_TYPES_TO_DETACH.contains(((Artifact) attachedArtifact).getType()))
{<a name="line.115"></a>
+<span class="sourceLineNo">116</span>
detachedArtifacts.add((Artifact) attachedArtifact);<a name="line.116"></a>
+<span class="sourceLineNo">117</span> }<a name="line.117"></a>
+<span class="sourceLineNo">118</span> }<a name="line.118"></a>
+<span class="sourceLineNo">119</span> if (detachedArtifacts.isEmpty())
{<a name="line.119"></a>
+<span class="sourceLineNo">120</span> getLog().info("Current
project contains no distributions. Not executing.");<a name="line.120"></a>
+<span class="sourceLineNo">121</span> return;<a name="line.121"></a>
+<span class="sourceLineNo">122</span> }<a name="line.122"></a>
+<span class="sourceLineNo">123</span> for (Artifact artifactToRemove :
detachedArtifacts) {<a name="line.123"></a>
+<span class="sourceLineNo">124</span>
project.getAttachedArtifacts().remove(artifactToRemove);<a name="line.124"></a>
+<span class="sourceLineNo">125</span> }<a name="line.125"></a>
+<span class="sourceLineNo">126</span> if (!workingDirectory.exists())
{<a name="line.126"></a>
+<span class="sourceLineNo">127</span>
SharedFunctions.initDirectory(getLog(), workingDirectory);<a
name="line.127"></a>
+<span class="sourceLineNo">128</span> }<a name="line.128"></a>
+<span class="sourceLineNo">129</span>
copyRemovedArtifactsToWorkingDirectory();<a name="line.129"></a>
+<span class="sourceLineNo">130</span> getLog().info("");<a
name="line.130"></a>
+<span class="sourceLineNo">131</span> sha1AndMd5SignArtifacts();<a
name="line.131"></a>
+<span class="sourceLineNo">132</span> }<a name="line.132"></a>
+<span class="sourceLineNo">133</span><a name="line.133"></a>
+<span class="sourceLineNo">134</span> /**<a name="line.134"></a>
+<span class="sourceLineNo">135</span> * A helper method to copy the newly
detached artifacts to <code>target/commons-release-plugin</code><a
name="line.135"></a>
+<span class="sourceLineNo">136</span> * so that the {@link
CommonsDistributionStagingMojo} can find the artifacts later.<a
name="line.136"></a>
+<span class="sourceLineNo">137</span> *<a name="line.137"></a>
+<span class="sourceLineNo">138</span> * @throws MojoExecutionException if
some form of an {@link IOException} occurs, we want it<a name="line.138"></a>
+<span class="sourceLineNo">139</span> *
properly wrapped so that maven can handle it.<a name="line.139"></a>
+<span class="sourceLineNo">140</span> */<a name="line.140"></a>
+<span class="sourceLineNo">141</span> private void
copyRemovedArtifactsToWorkingDirectory() throws MojoExecutionException {<a
name="line.141"></a>
+<span class="sourceLineNo">142</span> StringBuffer
copiedArtifactAbsolutePath;<a name="line.142"></a>
+<span class="sourceLineNo">143</span> getLog().info("Copying detached
artifacts to working directory.");<a name="line.143"></a>
+<span class="sourceLineNo">144</span> for (Artifact artifact:
detachedArtifacts) {<a name="line.144"></a>
+<span class="sourceLineNo">145</span> File artifactFile =
artifact.getFile();<a name="line.145"></a>
+<span class="sourceLineNo">146</span> copiedArtifactAbsolutePath =
new StringBuffer(workingDirectory.getAbsolutePath());<a name="line.146"></a>
+<span class="sourceLineNo">147</span>
copiedArtifactAbsolutePath.append("/");<a name="line.147"></a>
+<span class="sourceLineNo">148</span>
copiedArtifactAbsolutePath.append(artifactFile.getName());<a
name="line.148"></a>
+<span class="sourceLineNo">149</span> File copiedArtifact = new
File(copiedArtifactAbsolutePath.toString());<a name="line.149"></a>
+<span class="sourceLineNo">150</span> getLog().info("Copying: " +
artifactFile.getName());<a name="line.150"></a>
+<span class="sourceLineNo">151</span>
SharedFunctions.copyFile(getLog(), artifactFile, copiedArtifact);<a
name="line.151"></a>
+<span class="sourceLineNo">152</span> }<a name="line.152"></a>
+<span class="sourceLineNo">153</span> }<a name="line.153"></a>
+<span class="sourceLineNo">154</span><a name="line.154"></a>
+<span class="sourceLineNo">155</span> /**<a name="line.155"></a>
+<span class="sourceLineNo">156</span> * A helper method that creates md5
and sha1 signature files for our detached artifacts in the<a
name="line.156"></a>
+<span class="sourceLineNo">157</span> *
<code>target/commons-release-plugin</code> directory for the
purpose of being uploade by<a name="line.157"></a>
+<span class="sourceLineNo">158</span> * the {@link
CommonsDistributionStagingMojo}.<a name="line.158"></a>
+<span class="sourceLineNo">159</span> *<a name="line.159"></a>
+<span class="sourceLineNo">160</span> * @throws MojoExecutionException if
some form of an {@link IOException} occurs, we want it<a name="line.160"></a>
+<span class="sourceLineNo">161</span> *
properly wrapped so that maven can handle it.<a name="line.161"></a>
+<span class="sourceLineNo">162</span> */<a name="line.162"></a>
+<span class="sourceLineNo">163</span> private void
sha1AndMd5SignArtifacts() throws MojoExecutionException {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> for (Artifact artifact :
detachedArtifacts) {<a name="line.164"></a>
+<span class="sourceLineNo">165</span> if
(!artifact.getFile().getName().contains("asc")) {<a name="line.165"></a>
+<span class="sourceLineNo">166</span> try {<a
name="line.166"></a>
+<span class="sourceLineNo">167</span> String md5 =
DigestUtils.md5Hex(Files.readAllBytes(artifact.getFile().toPath()));<a
name="line.167"></a>
+<span class="sourceLineNo">168</span>
getLog().info(artifact.getFile().getName() + " md5: " + md5);<a
name="line.168"></a>
+<span class="sourceLineNo">169</span> PrintWriter md5Writer
= new PrintWriter(getMd5FilePath(workingDirectory, artifact.getFile()));<a
name="line.169"></a>
+<span class="sourceLineNo">170</span>
md5Writer.println(md5);<a name="line.170"></a>
+<span class="sourceLineNo">171</span> String sha1 =
DigestUtils.sha1Hex(Files.readAllBytes(artifact.getFile().toPath()));<a
name="line.171"></a>
+<span class="sourceLineNo">172</span>
getLog().info(artifact.getFile().getName() + " sha1: " + sha1);<a
name="line.172"></a>
+<span class="sourceLineNo">173</span> PrintWriter
sha1Writer = new PrintWriter(getSha1FilePath(workingDirectory,
artifact.getFile()));<a name="line.173"></a>
+<span class="sourceLineNo">174</span>
sha1Writer.println(sha1);<a name="line.174"></a>
+<span class="sourceLineNo">175</span> md5Writer.close();<a
name="line.175"></a>
+<span class="sourceLineNo">176</span> sha1Writer.close();<a
name="line.176"></a>
+<span class="sourceLineNo">177</span> } catch (IOException e)
{<a name="line.177"></a>
+<span class="sourceLineNo">178</span> throw new
MojoExecutionException("Could not sign file: " + artifact.getFile().getName(),
e);<a name="line.178"></a>
+<span class="sourceLineNo">179</span> }<a name="line.179"></a>
+<span class="sourceLineNo">180</span> }<a name="line.180"></a>
+<span class="sourceLineNo">181</span> }<a name="line.181"></a>
+<span class="sourceLineNo">182</span> }<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span> /**<a name="line.184"></a>
+<span class="sourceLineNo">185</span> * A helper method to create a file
path for the <code>md5</code> signature file from a given file.<a
name="line.185"></a>
+<span class="sourceLineNo">186</span> *<a name="line.186"></a>
+<span class="sourceLineNo">187</span> * @param workingDirectory is the
{@link File} for the directory in which to make the
<code>.md5</code> file.<a name="line.187"></a>
+<span class="sourceLineNo">188</span> * @param file the {@link File} whose
name we should use to create the <code>.md5</code> file.<a
name="line.188"></a>
+<span class="sourceLineNo">189</span> * @return a {@link String} that is
the absolute path to the <code>.md5</code> file.<a
name="line.189"></a>
+<span class="sourceLineNo">190</span> */<a name="line.190"></a>
+<span class="sourceLineNo">191</span> private String getMd5FilePath(File
workingDirectory, File file) {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> StringBuffer buffer = new
StringBuffer(workingDirectory.getAbsolutePath());<a name="line.192"></a>
+<span class="sourceLineNo">193</span> buffer.append("/");<a
name="line.193"></a>
+<span class="sourceLineNo">194</span> buffer.append(file.getName());<a
name="line.194"></a>
+<span class="sourceLineNo">195</span> buffer.append(".md5");<a
name="line.195"></a>
+<span class="sourceLineNo">196</span> return buffer.toString();<a
name="line.196"></a>
+<span class="sourceLineNo">197</span> }<a name="line.197"></a>
+<span class="sourceLineNo">198</span><a name="line.198"></a>
+<span class="sourceLineNo">199</span> /**<a name="line.199"></a>
+<span class="sourceLineNo">200</span> * A helper method to create a file
path for the <code>sha1</code> signature file from a given file.<a
name="line.200"></a>
+<span class="sourceLineNo">201</span> *<a name="line.201"></a>
+<span class="sourceLineNo">202</span> * @param workingDirectory is the
{@link File} for the directory in which to make the
<code>.sha1</code> file.<a name="line.202"></a>
+<span class="sourceLineNo">203</span> * @param file the {@link File} whose
name we should use to create the <code>.sha1</code> file.<a
name="line.203"></a>
+<span class="sourceLineNo">204</span> * @return a {@link String} that is
the absolute path to the <code>.sha1</code> file.<a
name="line.204"></a>
+<span class="sourceLineNo">205</span> */<a name="line.205"></a>
+<span class="sourceLineNo">206</span> private String getSha1FilePath(File
workingDirectory, File file) {<a name="line.206"></a>
+<span class="sourceLineNo">207</span> StringBuffer buffer = new
StringBuffer(workingDirectory.getAbsolutePath());<a name="line.207"></a>
+<span class="sourceLineNo">208</span> buffer.append("/");<a
name="line.208"></a>
+<span class="sourceLineNo">209</span> buffer.append(file.getName());<a
name="line.209"></a>
+<span class="sourceLineNo">210</span> buffer.append(".sha1");<a
name="line.210"></a>
+<span class="sourceLineNo">211</span> return buffer.toString();<a
name="line.211"></a>
+<span class="sourceLineNo">212</span> }<a name="line.212"></a>
+<span class="sourceLineNo">213</span>}<a name="line.213"></a>
Modified:
websites/production/commons/content/proper/commons-release-plugin/apidocs/src-html/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.html
==============================================================================
---
websites/production/commons/content/proper/commons-release-plugin/apidocs/src-html/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.html
(original)
+++
websites/production/commons/content/proper/commons-release-plugin/apidocs/src-html/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.html
Thu Apr 5 16:12:44 2018
@@ -137,8 +137,8 @@
<span class="sourceLineNo">129</span> @Override<a name="line.129"></a>
<span class="sourceLineNo">130</span> public void execute() throws
MojoExecutionException, MojoFailureException {<a name="line.130"></a>
<span class="sourceLineNo">131</span> if (!isDistModule) {<a
name="line.131"></a>
-<span class="sourceLineNo">132</span> getLog().info("This module is
marked as a non distribution " +<a name="line.132"></a>
-<span class="sourceLineNo">133</span> "or assembly module,
and the plugin will not run.");<a name="line.133"></a>
+<span class="sourceLineNo">132</span> getLog().info("This module is
marked as a non distribution "<a name="line.132"></a>
+<span class="sourceLineNo">133</span> + "or assembly
module, and the plugin will not run.");<a name="line.133"></a>
<span class="sourceLineNo">134</span> return;<a name="line.134"></a>
<span class="sourceLineNo">135</span> }<a name="line.135"></a>
<span class="sourceLineNo">136</span> if
(StringUtils.isEmpty(distSvnStagingUrl)) {<a name="line.136"></a>
@@ -164,8 +164,8 @@
<span class="sourceLineNo">156</span> ScmFileSet scmFileSet = new
ScmFileSet(distCheckoutDirectory);<a name="line.156"></a>
<span class="sourceLineNo">157</span> getLog().info("Checking out
dist from: " + distSvnStagingUrl);<a name="line.157"></a>
<span class="sourceLineNo">158</span> provider.checkOut(repository,
scmFileSet);<a name="line.158"></a>
-<span class="sourceLineNo">159</span>
copyReleaseNotesToWorkingDirectory();<a name="line.159"></a>
-<span class="sourceLineNo">160</span> List<File>
filesToCommit = copyDistributionsIntoScmDirectoryStructure();<a
name="line.160"></a>
+<span class="sourceLineNo">159</span> File copiedReleaseNotes =
copyReleaseNotesToWorkingDirectory();<a name="line.159"></a>
+<span class="sourceLineNo">160</span> List<File>
filesToCommit =
copyDistributionsIntoScmDirectoryStructure(copiedReleaseNotes);<a
name="line.160"></a>
<span class="sourceLineNo">161</span> if (!dryRun) {<a
name="line.161"></a>
<span class="sourceLineNo">162</span> ScmFileSet
scmFileSetToCommit = new ScmFileSet(distCheckoutDirectory, filesToCommit);<a
name="line.162"></a>
<span class="sourceLineNo">163</span> AddScmResult addResult =
provider.add(<a name="line.163"></a>
@@ -204,107 +204,114 @@
<span class="sourceLineNo">196</span> * A utility method that takes the
<code>RELEASE-NOTES.txt</code> file from the base directory of
the<a name="line.196"></a>
<span class="sourceLineNo">197</span> * project and copies it into {@link
CommonsDistributionStagingMojo#workingDirectory}.<a name="line.197"></a>
<span class="sourceLineNo">198</span> *<a name="line.198"></a>
-<span class="sourceLineNo">199</span> * @throws MojoExecutionException if
an {@link IOException} occurrs as a wrapper so that maven<a name="line.199"></a>
-<span class="sourceLineNo">200</span> * can
properly handle the exception.<a name="line.200"></a>
-<span class="sourceLineNo">201</span> */<a name="line.201"></a>
-<span class="sourceLineNo">202</span> private void
copyReleaseNotesToWorkingDirectory() throws MojoExecutionException {<a
name="line.202"></a>
-<span class="sourceLineNo">203</span> StringBuffer
copiedReleaseNotesAbsolutePath;<a name="line.203"></a>
-<span class="sourceLineNo">204</span> getLog().info("Copying
RELEASE-NOTES.txt to working directory.");<a name="line.204"></a>
-<span class="sourceLineNo">205</span> copiedReleaseNotesAbsolutePath =
new StringBuffer(workingDirectory.getAbsolutePath());<a name="line.205"></a>
-<span class="sourceLineNo">206</span>
copiedReleaseNotesAbsolutePath.append("/scm/");<a name="line.206"></a>
-<span class="sourceLineNo">207</span>
copiedReleaseNotesAbsolutePath.append(releaseNotesFile.getName());<a
name="line.207"></a>
-<span class="sourceLineNo">208</span> File copiedReleaseNotes = new
File(copiedReleaseNotesAbsolutePath.toString());<a name="line.208"></a>
-<span class="sourceLineNo">209</span>
SharedFunctions.copyFile(getLog(), releaseNotesFile, copiedReleaseNotes);<a
name="line.209"></a>
-<span class="sourceLineNo">210</span> }<a name="line.210"></a>
-<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span> /**<a name="line.212"></a>
-<span class="sourceLineNo">213</span> * Copies the list of files at the
root of the {@link CommonsDistributionStagingMojo#workingDirectory} into<a
name="line.213"></a>
-<span class="sourceLineNo">214</span> * the directory structure of the
distribution staging repository. Specifically:<a name="line.214"></a>
-<span class="sourceLineNo">215</span> * <ul><a name="line.215"></a>
-<span class="sourceLineNo">216</span> * <li>root:</li><a
name="line.216"></a>
-<span class="sourceLineNo">217</span> * <li><ul><a
name="line.217"></a>
-<span class="sourceLineNo">218</span> *
<li>site.zip</li><a name="line.218"></a>
-<span class="sourceLineNo">219</span> *
<li>RELEASE-NOTES.txt</li><a name="line.219"></a>
-<span class="sourceLineNo">220</span> *
<li>source:</li><a name="line.220"></a>
-<span class="sourceLineNo">221</span> * <li><ul><a
name="line.221"></a>
-<span class="sourceLineNo">222</span> * <li>-src
artifacts....</li><a name="line.222"></a>
-<span class="sourceLineNo">223</span> * </ul></li><a
name="line.223"></a>
-<span class="sourceLineNo">224</span> *
<li>binaries:</li><a name="line.224"></a>
+<span class="sourceLineNo">199</span> * @return the RELEASE-NOTES.txt file
that exists in the <code>target/commons-release-notes/scm</code><a
name="line.199"></a>
+<span class="sourceLineNo">200</span> * directory for the purpose
of adding it to the scm change set in the method<a name="line.200"></a>
+<span class="sourceLineNo">201</span> * {@link
CommonsDistributionStagingMojo#copyDistributionsIntoScmDirectoryStructure(File)}.<a
name="line.201"></a>
+<span class="sourceLineNo">202</span> * @throws MojoExecutionException if
an {@link IOException} occurrs as a wrapper so that maven<a name="line.202"></a>
+<span class="sourceLineNo">203</span> * can
properly handle the exception.<a name="line.203"></a>
+<span class="sourceLineNo">204</span> */<a name="line.204"></a>
+<span class="sourceLineNo">205</span> private File
copyReleaseNotesToWorkingDirectory() throws MojoExecutionException {<a
name="line.205"></a>
+<span class="sourceLineNo">206</span> StringBuffer
copiedReleaseNotesAbsolutePath;<a name="line.206"></a>
+<span class="sourceLineNo">207</span> getLog().info("Copying
RELEASE-NOTES.txt to working directory.");<a name="line.207"></a>
+<span class="sourceLineNo">208</span> copiedReleaseNotesAbsolutePath =
new StringBuffer(workingDirectory.getAbsolutePath());<a name="line.208"></a>
+<span class="sourceLineNo">209</span>
copiedReleaseNotesAbsolutePath.append("/scm/");<a name="line.209"></a>
+<span class="sourceLineNo">210</span>
copiedReleaseNotesAbsolutePath.append(releaseNotesFile.getName());<a
name="line.210"></a>
+<span class="sourceLineNo">211</span> File copiedReleaseNotes = new
File(copiedReleaseNotesAbsolutePath.toString());<a name="line.211"></a>
+<span class="sourceLineNo">212</span>
SharedFunctions.copyFile(getLog(), releaseNotesFile, copiedReleaseNotes);<a
name="line.212"></a>
+<span class="sourceLineNo">213</span> return copiedReleaseNotes;<a
name="line.213"></a>
+<span class="sourceLineNo">214</span> }<a name="line.214"></a>
+<span class="sourceLineNo">215</span><a name="line.215"></a>
+<span class="sourceLineNo">216</span> /**<a name="line.216"></a>
+<span class="sourceLineNo">217</span> * Copies the list of files at the
root of the {@link CommonsDistributionStagingMojo#workingDirectory} into<a
name="line.217"></a>
+<span class="sourceLineNo">218</span> * the directory structure of the
distribution staging repository. Specifically:<a name="line.218"></a>
+<span class="sourceLineNo">219</span> * <ul><a name="line.219"></a>
+<span class="sourceLineNo">220</span> * <li>root:</li><a
name="line.220"></a>
+<span class="sourceLineNo">221</span> * <li><ul><a
name="line.221"></a>
+<span class="sourceLineNo">222</span> *
<li>site.zip</li><a name="line.222"></a>
+<span class="sourceLineNo">223</span> *
<li>RELEASE-NOTES.txt</li><a name="line.223"></a>
+<span class="sourceLineNo">224</span> *
<li>source:</li><a name="line.224"></a>
<span class="sourceLineNo">225</span> * <li><ul><a
name="line.225"></a>
-<span class="sourceLineNo">226</span> * <li>-bin
artifacts....</li><a name="line.226"></a>
+<span class="sourceLineNo">226</span> * <li>-src
artifacts....</li><a name="line.226"></a>
<span class="sourceLineNo">227</span> * </ul></li><a
name="line.227"></a>
-<span class="sourceLineNo">228</span> * </ul></li><a
name="line.228"></a>
-<span class="sourceLineNo">229</span> * </ul><a name="line.229"></a>
-<span class="sourceLineNo">230</span> *<a name="line.230"></a>
-<span class="sourceLineNo">231</span> * @return a {@link List} of {@link
File}'s in the directory for the purpose of adding them to the maven<a
name="line.231"></a>
-<span class="sourceLineNo">232</span> * {@link ScmFileSet}.<a
name="line.232"></a>
-<span class="sourceLineNo">233</span> * @throws MojoExecutionException if
an {@link IOException} occurrs so that Maven can handle it properly.<a
name="line.233"></a>
-<span class="sourceLineNo">234</span> */<a name="line.234"></a>
-<span class="sourceLineNo">235</span> private List<File>
copyDistributionsIntoScmDirectoryStructure() throws MojoExecutionException {<a
name="line.235"></a>
-<span class="sourceLineNo">236</span> List<File>
workingDirectoryFiles = Arrays.asList(workingDirectory.listFiles());<a
name="line.236"></a>
-<span class="sourceLineNo">237</span> String scmBinariesRoot =
buildDistBinariesRoot();<a name="line.237"></a>
-<span class="sourceLineNo">238</span> String scmSourceRoot =
buildDistSourceRoot();<a name="line.238"></a>
-<span class="sourceLineNo">239</span>
SharedFunctions.initDirectory(getLog(), new File(scmBinariesRoot));<a
name="line.239"></a>
-<span class="sourceLineNo">240</span>
SharedFunctions.initDirectory(getLog(), new File(scmSourceRoot));<a
name="line.240"></a>
-<span class="sourceLineNo">241</span> List<File>
filesForMavenScmFileSet = new ArrayList<>();<a name="line.241"></a>
-<span class="sourceLineNo">242</span> File copy;<a name="line.242"></a>
-<span class="sourceLineNo">243</span> for (File file :
workingDirectoryFiles) {<a name="line.243"></a>
-<span class="sourceLineNo">244</span> if
(file.getName().contains("src")) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span> copy = new
File(scmSourceRoot + "/" + file.getName());<a name="line.245"></a>
-<span class="sourceLineNo">246</span>
SharedFunctions.copyFile(getLog(), file, copy);<a name="line.246"></a>
-<span class="sourceLineNo">247</span>
filesForMavenScmFileSet.add(copy);<a name="line.247"></a>
-<span class="sourceLineNo">248</span> } else if
(file.getName().contains("bin")) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span> copy = new
File(scmBinariesRoot + "/" + file.getName());<a name="line.249"></a>
-<span class="sourceLineNo">250</span>
SharedFunctions.copyFile(getLog(), file, copy);<a name="line.250"></a>
-<span class="sourceLineNo">251</span>
filesForMavenScmFileSet.add(copy);<a name="line.251"></a>
-<span class="sourceLineNo">252</span> } else if
(file.getName().contains("scm")) {<a name="line.252"></a>
-<span class="sourceLineNo">253</span> getLog().debug("Not
copying scm directory over to the scm directory because it is the scm
directory.");<a name="line.253"></a>
-<span class="sourceLineNo">254</span> //do nothing because we
are copying into scm<a name="line.254"></a>
-<span class="sourceLineNo">255</span> } else {<a
name="line.255"></a>
-<span class="sourceLineNo">256</span> copy = new
File(distCheckoutDirectory.getAbsolutePath() + "/" + file.getName());<a
name="line.256"></a>
+<span class="sourceLineNo">228</span> *
<li>binaries:</li><a name="line.228"></a>
+<span class="sourceLineNo">229</span> * <li><ul><a
name="line.229"></a>
+<span class="sourceLineNo">230</span> * <li>-bin
artifacts....</li><a name="line.230"></a>
+<span class="sourceLineNo">231</span> * </ul></li><a
name="line.231"></a>
+<span class="sourceLineNo">232</span> * </ul></li><a
name="line.232"></a>
+<span class="sourceLineNo">233</span> * </ul><a name="line.233"></a>
+<span class="sourceLineNo">234</span> *<a name="line.234"></a>
+<span class="sourceLineNo">235</span> * @param copiedReleaseNotes is the
RELEASE-NOTES.txt file that exists in the<a name="line.235"></a>
+<span class="sourceLineNo">236</span> *
<code>target/commons-release-plugin/scm</code> directory.<a
name="line.236"></a>
+<span class="sourceLineNo">237</span> * @return a {@link List} of {@link
File}'s in the directory for the purpose of adding them to the maven<a
name="line.237"></a>
+<span class="sourceLineNo">238</span> * {@link ScmFileSet}.<a
name="line.238"></a>
+<span class="sourceLineNo">239</span> * @throws MojoExecutionException if
an {@link IOException} occurrs so that Maven can handle it properly.<a
name="line.239"></a>
+<span class="sourceLineNo">240</span> */<a name="line.240"></a>
+<span class="sourceLineNo">241</span> private List<File>
copyDistributionsIntoScmDirectoryStructure(File copiedReleaseNotes)<a
name="line.241"></a>
+<span class="sourceLineNo">242</span> throws MojoExecutionException
{<a name="line.242"></a>
+<span class="sourceLineNo">243</span> List<File>
workingDirectoryFiles = Arrays.asList(workingDirectory.listFiles());<a
name="line.243"></a>
+<span class="sourceLineNo">244</span> String scmBinariesRoot =
buildDistBinariesRoot();<a name="line.244"></a>
+<span class="sourceLineNo">245</span> String scmSourceRoot =
buildDistSourceRoot();<a name="line.245"></a>
+<span class="sourceLineNo">246</span>
SharedFunctions.initDirectory(getLog(), new File(scmBinariesRoot));<a
name="line.246"></a>
+<span class="sourceLineNo">247</span>
SharedFunctions.initDirectory(getLog(), new File(scmSourceRoot));<a
name="line.247"></a>
+<span class="sourceLineNo">248</span> List<File>
filesForMavenScmFileSet = new ArrayList<>();<a name="line.248"></a>
+<span class="sourceLineNo">249</span> File copy;<a name="line.249"></a>
+<span class="sourceLineNo">250</span> for (File file :
workingDirectoryFiles) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span> if
(file.getName().contains("src")) {<a name="line.251"></a>
+<span class="sourceLineNo">252</span> copy = new
File(scmSourceRoot + "/" + file.getName());<a name="line.252"></a>
+<span class="sourceLineNo">253</span>
SharedFunctions.copyFile(getLog(), file, copy);<a name="line.253"></a>
+<span class="sourceLineNo">254</span>
filesForMavenScmFileSet.add(copy);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> } else if
(file.getName().contains("bin")) {<a name="line.255"></a>
+<span class="sourceLineNo">256</span> copy = new
File(scmBinariesRoot + "/" + file.getName());<a name="line.256"></a>
<span class="sourceLineNo">257</span>
SharedFunctions.copyFile(getLog(), file, copy);<a name="line.257"></a>
<span class="sourceLineNo">258</span>
filesForMavenScmFileSet.add(copy);<a name="line.258"></a>
-<span class="sourceLineNo">259</span> }<a name="line.259"></a>
-<span class="sourceLineNo">260</span> }<a name="line.260"></a>
-<span class="sourceLineNo">261</span>
filesForMavenScmFileSet.add(releaseNotesFile);<a name="line.261"></a>
-<span class="sourceLineNo">262</span> return filesForMavenScmFileSet;<a
name="line.262"></a>
-<span class="sourceLineNo">263</span> }<a name="line.263"></a>
-<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span> /**<a name="line.265"></a>
-<span class="sourceLineNo">266</span> * Build the path for the
distribution binaries directory.<a name="line.266"></a>
-<span class="sourceLineNo">267</span> *<a name="line.267"></a>
-<span class="sourceLineNo">268</span> * @return the local absolute path
into the checkedout subversion repository that is where<a name="line.268"></a>
-<span class="sourceLineNo">269</span> * the binaries distributions
are to be copied.<a name="line.269"></a>
-<span class="sourceLineNo">270</span> */<a name="line.270"></a>
-<span class="sourceLineNo">271</span> private String
buildDistBinariesRoot() {<a name="line.271"></a>
-<span class="sourceLineNo">272</span> StringBuffer buffer = new
StringBuffer(distCheckoutDirectory.getAbsolutePath());<a name="line.272"></a>
-<span class="sourceLineNo">273</span> buffer.append("/binaries");<a
name="line.273"></a>
-<span class="sourceLineNo">274</span> return buffer.toString();<a
name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span><a name="line.276"></a>
-<span class="sourceLineNo">277</span> /**<a name="line.277"></a>
-<span class="sourceLineNo">278</span> * Build the path for the
distribution source directory.<a name="line.278"></a>
-<span class="sourceLineNo">279</span> *<a name="line.279"></a>
-<span class="sourceLineNo">280</span> * @return the local absolute path
into the checkedout subversion repository that is where<a name="line.280"></a>
-<span class="sourceLineNo">281</span> * the source distributions
are to be copied.<a name="line.281"></a>
-<span class="sourceLineNo">282</span> */<a name="line.282"></a>
-<span class="sourceLineNo">283</span> private String buildDistSourceRoot()
{<a name="line.283"></a>
-<span class="sourceLineNo">284</span> StringBuffer buffer = new
StringBuffer(distCheckoutDirectory.getAbsolutePath());<a name="line.284"></a>
-<span class="sourceLineNo">285</span> buffer.append("/source");<a
name="line.285"></a>
-<span class="sourceLineNo">286</span> return buffer.toString();<a
name="line.286"></a>
-<span class="sourceLineNo">287</span> }<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> /**<a name="line.289"></a>
-<span class="sourceLineNo">290</span> * This method is the setter for the
{@link CommonsDistributionStagingMojo#basedir} field, specifically<a
name="line.290"></a>
-<span class="sourceLineNo">291</span> * for the usage in the unit tests.<a
name="line.291"></a>
-<span class="sourceLineNo">292</span> *<a name="line.292"></a>
-<span class="sourceLineNo">293</span> * @param basedir is the {@link File}
to be used as the project's root directory when this mojo<a name="line.293"></a>
-<span class="sourceLineNo">294</span> * is invoked.<a
name="line.294"></a>
-<span class="sourceLineNo">295</span> */<a name="line.295"></a>
-<span class="sourceLineNo">296</span> protected void setBasedir(File
basedir) {<a name="line.296"></a>
-<span class="sourceLineNo">297</span> this.basedir = basedir;<a
name="line.297"></a>
-<span class="sourceLineNo">298</span> }<a name="line.298"></a>
-<span class="sourceLineNo">299</span>}<a name="line.299"></a>
+<span class="sourceLineNo">259</span> } else if
(file.getName().contains("scm")) {<a name="line.259"></a>
+<span class="sourceLineNo">260</span> getLog().debug("Not
copying scm directory over to the scm directory because it is the scm
directory.");<a name="line.260"></a>
+<span class="sourceLineNo">261</span> //do nothing because we
are copying into scm<a name="line.261"></a>
+<span class="sourceLineNo">262</span> } else {<a
name="line.262"></a>
+<span class="sourceLineNo">263</span> copy = new
File(distCheckoutDirectory.getAbsolutePath() + "/" + file.getName());<a
name="line.263"></a>
+<span class="sourceLineNo">264</span>
SharedFunctions.copyFile(getLog(), file, copy);<a name="line.264"></a>
+<span class="sourceLineNo">265</span>
filesForMavenScmFileSet.add(copy);<a name="line.265"></a>
+<span class="sourceLineNo">266</span> }<a name="line.266"></a>
+<span class="sourceLineNo">267</span> }<a name="line.267"></a>
+<span class="sourceLineNo">268</span>
filesForMavenScmFileSet.add(copiedReleaseNotes);<a name="line.268"></a>
+<span class="sourceLineNo">269</span> return filesForMavenScmFileSet;<a
name="line.269"></a>
+<span class="sourceLineNo">270</span> }<a name="line.270"></a>
+<span class="sourceLineNo">271</span><a name="line.271"></a>
+<span class="sourceLineNo">272</span> /**<a name="line.272"></a>
+<span class="sourceLineNo">273</span> * Build the path for the
distribution binaries directory.<a name="line.273"></a>
+<span class="sourceLineNo">274</span> *<a name="line.274"></a>
+<span class="sourceLineNo">275</span> * @return the local absolute path
into the checkedout subversion repository that is where<a name="line.275"></a>
+<span class="sourceLineNo">276</span> * the binaries distributions
are to be copied.<a name="line.276"></a>
+<span class="sourceLineNo">277</span> */<a name="line.277"></a>
+<span class="sourceLineNo">278</span> private String
buildDistBinariesRoot() {<a name="line.278"></a>
+<span class="sourceLineNo">279</span> StringBuffer buffer = new
StringBuffer(distCheckoutDirectory.getAbsolutePath());<a name="line.279"></a>
+<span class="sourceLineNo">280</span> buffer.append("/binaries");<a
name="line.280"></a>
+<span class="sourceLineNo">281</span> return buffer.toString();<a
name="line.281"></a>
+<span class="sourceLineNo">282</span> }<a name="line.282"></a>
+<span class="sourceLineNo">283</span><a name="line.283"></a>
+<span class="sourceLineNo">284</span> /**<a name="line.284"></a>
+<span class="sourceLineNo">285</span> * Build the path for the
distribution source directory.<a name="line.285"></a>
+<span class="sourceLineNo">286</span> *<a name="line.286"></a>
+<span class="sourceLineNo">287</span> * @return the local absolute path
into the checkedout subversion repository that is where<a name="line.287"></a>
+<span class="sourceLineNo">288</span> * the source distributions
are to be copied.<a name="line.288"></a>
+<span class="sourceLineNo">289</span> */<a name="line.289"></a>
+<span class="sourceLineNo">290</span> private String buildDistSourceRoot()
{<a name="line.290"></a>
+<span class="sourceLineNo">291</span> StringBuffer buffer = new
StringBuffer(distCheckoutDirectory.getAbsolutePath());<a name="line.291"></a>
+<span class="sourceLineNo">292</span> buffer.append("/source");<a
name="line.292"></a>
+<span class="sourceLineNo">293</span> return buffer.toString();<a
name="line.293"></a>
+<span class="sourceLineNo">294</span> }<a name="line.294"></a>
+<span class="sourceLineNo">295</span><a name="line.295"></a>
+<span class="sourceLineNo">296</span> /**<a name="line.296"></a>
+<span class="sourceLineNo">297</span> * This method is the setter for the
{@link CommonsDistributionStagingMojo#basedir} field, specifically<a
name="line.297"></a>
+<span class="sourceLineNo">298</span> * for the usage in the unit tests.<a
name="line.298"></a>
+<span class="sourceLineNo">299</span> *<a name="line.299"></a>
+<span class="sourceLineNo">300</span> * @param basedir is the {@link File}
to be used as the project's root directory when this mojo<a name="line.300"></a>
+<span class="sourceLineNo">301</span> * is invoked.<a
name="line.301"></a>
+<span class="sourceLineNo">302</span> */<a name="line.302"></a>
+<span class="sourceLineNo">303</span> protected void setBasedir(File
basedir) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span> this.basedir = basedir;<a
name="line.304"></a>
+<span class="sourceLineNo">305</span> }<a name="line.305"></a>
+<span class="sourceLineNo">306</span>}<a name="line.306"></a>
Modified:
websites/production/commons/content/proper/commons-release-plugin/apidocs/src-html/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojo.html
==============================================================================
---
websites/production/commons/content/proper/commons-release-plugin/apidocs/src-html/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojo.html
(original)
+++
websites/production/commons/content/proper/commons-release-plugin/apidocs/src-html/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojo.html
Thu Apr 5 16:12:44 2018
@@ -103,8 +103,8 @@
<span class="sourceLineNo">095</span> @Override<a name="line.95"></a>
<span class="sourceLineNo">096</span> public void execute() throws
MojoExecutionException, MojoFailureException {<a name="line.96"></a>
<span class="sourceLineNo">097</span> if (!isDistModule) {<a
name="line.97"></a>
-<span class="sourceLineNo">098</span> getLog().info("This module is
marked as a non distribution " +<a name="line.98"></a>
-<span class="sourceLineNo">099</span> "or assembly module,
and the plugin will not run.");<a name="line.99"></a>
+<span class="sourceLineNo">098</span> getLog().info("This module is
marked as a non distribution "<a name="line.98"></a>
+<span class="sourceLineNo">099</span> + "or assembly
module, and the plugin will not run.");<a name="line.99"></a>
<span class="sourceLineNo">100</span> return;<a name="line.100"></a>
<span class="sourceLineNo">101</span> }<a name="line.101"></a>
<span class="sourceLineNo">102</span> if
(StringUtils.isEmpty(distSvnStagingUrl)) {<a name="line.102"></a>
Modified:
websites/production/commons/content/proper/commons-release-plugin/changes-report.html
==============================================================================
---
websites/production/commons/content/proper/commons-release-plugin/changes-report.html
(original)
+++
websites/production/commons/content/proper/commons-release-plugin/changes-report.html
Thu Apr 5 16:12:44 2018
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia at 05 March 2018
+ | Generated by Apache Maven Doxia at 05 April 2018
| Rendered using Apache Maven Fluido Skin 1.3.0
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -8,7 +8,7 @@
<meta charset="iso-8859-1" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="author" content="Apache Commons Developers" />
- <meta name="Date-Revision-yyyymmdd" content="20180305" />
+ <meta name="Date-Revision-yyyymmdd" content="20180405" />
<meta http-equiv="Content-Language" content="en" />
<title>Commons Release Plugin – Apache Commons Release Plugin
Changes</title>
@@ -36,8 +36,8 @@
<a class="brand"
href="http://commons.apache.org/proper/commons-release-plugin/">Apache Commons
Release Plugin ™</a>
<ul class="nav">
- <li id="publishDate">Last Published: 05 March 2018</li>
- <li class="divider">|</li> <li id="projectVersion">Version: 1.1</li>
+ <li id="publishDate">Last Published: 05 April 2018</li>
+ <li class="divider">|</li> <li id="projectVersion">Version:
1.3-SNAPSHOT</li>
</ul>
<div class="pull-right"> <ul class="nav">
<li>
@@ -102,7 +102,7 @@
<a href="project-info.html" title="Project Information">
Project Information</a>
</li>
-
<li class="expanded">
+
<li class="expanded">
<a href="project-reports.html" title="Project Reports">
Project Reports</a>
<ul>
@@ -131,6 +131,10 @@
Rat Report</a>
</li>
<li class="none">
+ <a href="japicmp.html" title="japicmp">
+ japicmp</a>
+ </li>
+ <li class="none">
<a href="checkstyle.html" title="Checkstyle">
Checkstyle</a>
</li>
@@ -271,52 +275,67 @@
<th>Date</th>
<th>Description</th></tr>
<tr class="b">
+<td><a href="#a1.2">1.2</a></td>
+<td>2018-04-02</td>
+<td>Version 1.2</td></tr>
+<tr class="a">
<td><a href="#a1.1">1.1</a></td>
<td>2018-02-28</td>
<td>1.1</td></tr>
-<tr class="a">
+<tr class="b">
<td><a href="#a1.0">1.0</a></td>
<td>2018-01-10</td>
<td>Initial release</td></tr></table></div>
<div class="section">
-<h3 id="a1.1">Release 1.1 – 2018-02-28</h3>
+<h3 id="a1.2">Release 1.2 – 2018-04-02</h3>
<table border="0" class="bodyTable">
-<tr class="b">
+<tr class="a">
<th>Type</th>
<th>Changes</th>
<th>By</th></tr>
+<tr class="b">
+<td><img src="images/fix.gif" alt="Fix" title="Fix" /></td>
+<td>Adding ./target/commons-release-plugin/scm/RELEASE-NOTES.txt to svn as
opposed to ./RELEASE-NOTES.txt. Fixes <a class="externalLink"
href="http://issues.apache.org/jira/browse/COMMONSSITE-107">COMMONSSITE-107</a>.</td>
+<td><a href="team-list.html#chtompki">chtompki</a></td></tr></table></div>
+<div class="section">
+<h3 id="a1.1">Release 1.1 – 2018-02-28</h3>
+<table border="0" class="bodyTable">
<tr class="a">
+<th>Type</th>
+<th>Changes</th>
+<th>By</th></tr>
+<tr class="b">
<td><img src="images/fix.gif" alt="Fix" title="Fix" /></td>
<td>Sha1 signature files now reflect actual signatures. Fixes <a
class="externalLink"
href="http://issues.apache.org/jira/browse/COMMONSSITE-104">COMMONSSITE-104</a>.</td>
<td><a href="team-list.html#chtompki">chtompki</a></td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/add.gif" alt="Add" title="Add" /></td>
<td>Making the project more multi-module compatible. Fixes <a
class="externalLink"
href="http://issues.apache.org/jira/browse/COMMONSSITE-98">COMMONSSITE-98</a>.</td>
<td><a href="team-list.html#chtompki">chtompki</a></td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/fix.gif" alt="Fix" title="Fix" /></td>
<td>Commons Release Plugin doesn't work with Commons Release Plugin. Fixes <a
class="externalLink"
href="http://issues.apache.org/jira/browse/COMMONSSITE-102">COMMONSSITE-102</a>.</td>
<td><a href="team-list.html#chtompki">chtompki</a></td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/fix.gif" alt="Fix" title="Fix" /></td>
<td>Make -Dcommons.release.dryRun=true our commit toggle. Fixes <a
class="externalLink"
href="http://issues.apache.org/jira/browse/COMMONSSITE-101">COMMONSSITE-101</a>.</td>
<td><a href="team-list.html#chtompki">chtompki</a></td></tr></table></div>
<div class="section">
<h3 id="a1.0">Release 1.0 – 2018-01-10</h3>
<table border="0" class="bodyTable">
-<tr class="a">
+<tr class="b">
<th>Type</th>
<th>Changes</th>
<th>By</th></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/add.gif" alt="Add" title="Add" /></td>
<td>Create commons-release-component project skeleton. Fixes <a
class="externalLink"
href="http://issues.apache.org/jira/browse/COMMONSSITE-96">COMMONSSITE-96</a>.</td>
<td><a href="team-list.html#chtompki">chtompki</a></td></tr>
-<tr class="a">
+<tr class="b">
<td><img src="images/add.gif" alt="Add" title="Add" /></td>
<td>Prepare Standard Build integrations, travis, jacoco, checkstyle, etc.
Fixes <a class="externalLink"
href="http://issues.apache.org/jira/browse/COMMONSSITE-99">COMMONSSITE-99</a>.</td>
<td><a href="team-list.html#chtompki">chtompki</a></td></tr>
-<tr class="b">
+<tr class="a">
<td><img src="images/add.gif" alt="Add" title="Add" /></td>
<td>Documentation for commons-release-plugin. Fixes <a class="externalLink"
href="http://issues.apache.org/jira/browse/COMMONSSITE-97">COMMONSSITE-97</a>.</td>
<td><a
href="team-list.html#chtompki">chtompki</a></td></tr></table></div></div>
Modified:
websites/production/commons/content/proper/commons-release-plugin/checkstyle.html
==============================================================================
---
websites/production/commons/content/proper/commons-release-plugin/checkstyle.html
(original)
+++
websites/production/commons/content/proper/commons-release-plugin/checkstyle.html
Thu Apr 5 16:12:44 2018
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia at 05 March 2018
+ | Generated by Apache Maven Doxia at 05 April 2018
| Rendered using Apache Maven Fluido Skin 1.3.0
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="iso-8859-1" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180305" />
+ <meta name="Date-Revision-yyyymmdd" content="20180405" />
<meta http-equiv="Content-Language" content="en" />
<title>Commons Release Plugin – Checkstyle Results</title>
@@ -35,8 +35,8 @@
<a class="brand"
href="http://commons.apache.org/proper/commons-release-plugin/">Apache Commons
Release Plugin ™</a>
<ul class="nav">
- <li id="publishDate">Last Published: 05 March 2018</li>
- <li class="divider">|</li> <li id="projectVersion">Version: 1.1</li>
+ <li id="publishDate">Last Published: 05 April 2018</li>
+ <li class="divider">|</li> <li id="projectVersion">Version:
1.3-SNAPSHOT</li>
</ul>
<div class="pull-right"> <ul class="nav">
<li>
@@ -101,7 +101,7 @@
<a href="project-info.html" title="Project Information">
Project Information</a>
</li>
-
<li class="expanded">
+
<li class="expanded">
<a href="project-reports.html" title="Project Reports">
Project Reports</a>
<ul>
@@ -129,6 +129,10 @@
<a href="rat-report.html" title="Rat Report">
Rat Report</a>
</li>
+ <li class="none">
+ <a href="japicmp.html" title="japicmp">
+ japicmp</a>
+ </li>
<li class="none active">
<a href="checkstyle.html" title="Checkstyle">
Checkstyle</a>
@@ -275,7 +279,7 @@
<td>13</td>
<td>0</td>
<td>0</td>
-<td>5</td></tr></table></div>
+<td>0</td></tr></table></div>
<div class="section">
<h2><a name="Files"></a>Files</h2>
<table border="0" class="bodyTable">
@@ -283,95 +287,9 @@
<th>File</th>
<th><img src="images/icon_info_sml.gif" alt="" /> I</th>
<th><img src="images/icon_warning_sml.gif" alt="" /> W</th>
-<th><img src="images/icon_error_sml.gif" alt="" /> E</th></tr>
-<tr class="b">
-<td><a
href="#org.apache.commons.release.plugin.mojos.CommonsDistributionDetachmentMojo.java">org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.java</a></td>
-<td>0</td>
-<td>0</td>
-<td>2</td></tr>
-<tr class="a">
-<td><a
href="#org.apache.commons.release.plugin.mojos.CommonsDistributionDetachmentMojoTest.java">org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojoTest.java</a></td>
-<td>0</td>
-<td>0</td>
-<td>1</td></tr>
-<tr class="b">
-<td><a
href="#org.apache.commons.release.plugin.mojos.CommonsDistributionStagingMojo.java">org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java</a></td>
-<td>0</td>
-<td>0</td>
-<td>1</td></tr>
-<tr class="a">
-<td><a
href="#org.apache.commons.release.plugin.mojos.CommonsSiteCompressionMojo.java">org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojo.java</a></td>
-<td>0</td>
-<td>0</td>
-<td>1</td></tr></table></div>
+<th><img src="images/icon_error_sml.gif" alt=""
/> E</th></tr></table></div>
<div class="section">
-<h2><a name="Details"></a>Details</h2>
-<div class="section">
-<h3
id="org.apache.commons.release.plugin.mojos.CommonsDistributionDetachmentMojo.java">org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.java</h3>
-<table border="0" class="bodyTable">
-<tr class="b">
-<th>Severity</th>
-<th>Category</th>
-<th>Rule</th>
-<th>Message</th>
-<th>Line</th></tr>
-<tr class="a">
-<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
-<td>imports</td>
-<td>UnusedImports</td>
-<td>Unused import - java.io.FileInputStream.</td>
-<td><a
href="./xref/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.html#L32">32</a></td></tr>
-<tr class="b">
-<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
-<td>whitespace</td>
-<td>OperatorWrap</td>
-<td>'+' should be on a new line.</td>
-<td><a
href="./xref/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.html#L106">106</a></td></tr></table></div>
-<div class="section">
-<h3
id="org.apache.commons.release.plugin.mojos.CommonsDistributionDetachmentMojoTest.java">org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojoTest.java</h3>
-<table border="0" class="bodyTable">
-<tr class="a">
-<th>Severity</th>
-<th>Category</th>
-<th>Rule</th>
-<th>Message</th>
-<th>Line</th></tr>
-<tr class="b">
-<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
-<td>regexp</td>
-<td>RegexpSingleline</td>
-<td>Line has trailing spaces.</td>
-<td><a
href="./xref/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojoTest.html#L37">37</a></td></tr></table></div>
-<div class="section">
-<h3
id="org.apache.commons.release.plugin.mojos.CommonsDistributionStagingMojo.java">org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java</h3>
-<table border="0" class="bodyTable">
-<tr class="a">
-<th>Severity</th>
-<th>Category</th>
-<th>Rule</th>
-<th>Message</th>
-<th>Line</th></tr>
-<tr class="b">
-<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
-<td>whitespace</td>
-<td>OperatorWrap</td>
-<td>'+' should be on a new line.</td>
-<td><a
href="./xref/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.html#L132">132</a></td></tr></table></div>
-<div class="section">
-<h3
id="org.apache.commons.release.plugin.mojos.CommonsSiteCompressionMojo.java">org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojo.java</h3>
-<table border="0" class="bodyTable">
-<tr class="a">
-<th>Severity</th>
-<th>Category</th>
-<th>Rule</th>
-<th>Message</th>
-<th>Line</th></tr>
-<tr class="b">
-<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
-<td>whitespace</td>
-<td>OperatorWrap</td>
-<td>'+' should be on a new line.</td>
-<td><a
href="./xref/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojo.html#L98">98</a></td></tr></table></div></div>
+<h2><a name="Details"></a>Details</h2></div>
</td>
</tr>
</table>
Modified:
websites/production/commons/content/proper/commons-release-plugin/checkstyle.rss
==============================================================================
---
websites/production/commons/content/proper/commons-release-plugin/checkstyle.rss
(original)
+++
websites/production/commons/content/proper/commons-release-plugin/checkstyle.rss
Thu Apr 5 16:12:44 2018
@@ -26,7 +26,7 @@ under the License.
<copyright>©2018 The Apache Software Foundation</copyright>
<item>
<title>File: 13,
- Errors: 5,
+ Errors: 0,
Warnings: 0,
Infos: 0
</title>
@@ -83,7 +83,7 @@ under the License.
0
</td>
<td>
- 1
+ 0
</td>
</tr>
<tr>
@@ -97,7 +97,7 @@ under the License.
0
</td>
<td>
- 2
+ 0
</td>
</tr>
<tr>
@@ -125,7 +125,7 @@ under the License.
0
</td>
<td>
- 1
+ 0
</td>
</tr>
<tr>
@@ -153,7 +153,7 @@ under the License.
0
</td>
<td>
- 1
+ 0
</td>
</tr>
<tr>
Modified:
websites/production/commons/content/proper/commons-release-plugin/clirr-report.html
==============================================================================
---
websites/production/commons/content/proper/commons-release-plugin/clirr-report.html
(original)
+++
websites/production/commons/content/proper/commons-release-plugin/clirr-report.html
Thu Apr 5 16:12:44 2018
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia at 05 March 2018
+ | Generated by Apache Maven Doxia at 05 April 2018
| Rendered using Apache Maven Fluido Skin 1.3.0
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="iso-8859-1" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180305" />
+ <meta name="Date-Revision-yyyymmdd" content="20180405" />
<meta http-equiv="Content-Language" content="en" />
<title>Commons Release Plugin – Clirr Results</title>
@@ -35,8 +35,8 @@
<a class="brand"
href="http://commons.apache.org/proper/commons-release-plugin/">Apache Commons
Release Plugin ™</a>
<ul class="nav">
- <li id="publishDate">Last Published: 05 March 2018</li>
- <li class="divider">|</li> <li id="projectVersion">Version: 1.1</li>
+ <li id="publishDate">Last Published: 05 April 2018</li>
+ <li class="divider">|</li> <li id="projectVersion">Version:
1.3-SNAPSHOT</li>
</ul>
<div class="pull-right"> <ul class="nav">
<li>
@@ -101,7 +101,7 @@
<a href="project-info.html" title="Project Information">
Project Information</a>
</li>
-
<li class="expanded">
+
<li class="expanded">
<a href="project-reports.html" title="Project Reports">
Project Reports</a>
<ul>
@@ -130,6 +130,10 @@
Rat Report</a>
</li>
<li class="none">
+ <a href="japicmp.html" title="japicmp">
+ japicmp</a>
+ </li>
+ <li class="none">
<a href="checkstyle.html" title="Checkstyle">
Checkstyle</a>
</li>
@@ -264,8 +268,8 @@
<h2><a name="Clirr_Results"></a>Clirr Results</h2>
<p>The following document contains the results of <a class="externalLink"
href="http://clirr.sourceforge.net/">Clirr</a>.</p>
<ul>
-<li>Current Version: 1.1</li>
-<li>Comparison Version: 1.0</li></ul></div>
+<li>Current Version: 1.3-SNAPSHOT</li>
+<li>Comparison Version: 1.2</li></ul></div>
<div class="section">
<h2><a name="Summary"></a>Summary</h2>
<table border="0" class="bodyTable">