Author: lukaszlenart
Date: Fri Feb 3 14:17:33 2017
New Revision: 1006140
Log:
Updates production
Modified:
websites/production/struts/content/downloads.html
websites/production/struts/content/submitting-patches.html
Modified: websites/production/struts/content/downloads.html
==============================================================================
--- websites/production/struts/content/downloads.html (original)
+++ websites/production/struts/content/downloads.html Fri Feb 3 14:17:33 2017
@@ -222,6 +222,17 @@
<tbody>
<tr>
<td class="no-wrap">
+ Struts 2.5.8
+ </td>
+ <td class="no-wrap">19 December 2016</td>
+ <td>
+ </td>
+ <td>
+ <a href="/docs/version-notes-258.html">Version notes</a>
+ </td>
+ </tr>
+ <tr>
+ <td class="no-wrap">
Struts 2.5.5
</td>
<td class="no-wrap">21 October 2016</td>
Modified: websites/production/struts/content/submitting-patches.html
==============================================================================
--- websites/production/struts/content/submitting-patches.html (original)
+++ websites/production/struts/content/submitting-patches.html Fri Feb 3
14:17:33 2017
@@ -131,7 +131,7 @@
<p>and done!</p>
<p>Please remember that <code class="highlighter-rouge">master</code> branch
should be used only for small fast commits, if you are working on a large
-change it is better to do it on dedicated branch or even via GitHub.</p>
+change it is better to do it on dedicated branch or even via GitHub (which is
preferred).</p>
<h2 id="non-committers">Non-committers</h2>
@@ -165,14 +165,61 @@ go ahead and create one just right now!
in top right corner. This will fork the Apache Strutsâ repository and will
create your private (but public) repository
with the source code.</p>
-<p>Next step is to clone your repo locally, information how to do this you
will find on right sidebar of your repo
-under <code class="highlighter-rouge">SSH clone URL</code> headline.</p>
+<p>Next step is to clone your the original repo locally</p>
-<p>Now you are ready to work with the Apache Strutsâ code base. Perform your
changes, commit them and
-next push to GitHub! Remember: commit in Git is different than commit in
Subversion!</p>
+<div class="highlighter-rouge"><pre class="highlight"><code>git
g...@github.com:apache/struts.git
+</code></pre>
+</div>
+
+<p>This will be an <code class="highlighter-rouge">origin</code>, you cannot
push changes to the <code class="highlighter-rouge">origin</code> but donât
worry, you will use your fork.</p>
+
+<p>Now is time to add your fork as a remote</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>git remote add
fork g...@github.com:myusername/struts.git
+</code></pre>
+</div>
+
+<p>Right now you should have two remotes defined for the repo, <code
class="highlighter-rouge">origin</code> and <code
class="highlighter-rouge">fork</code>, use below command to confirm that</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>git remote -v
+</code></pre>
+</div>
+
+<p>Now you are ready to work with the Apache Strutsâ code base. Start with
switching to <code class="highlighter-rouge">master</code> branch (if not
already on it)</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>git checkout master
+</code></pre>
+</div>
+
+<p>now is time to fetch any changes from remote repository</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>git fetch
+git pull
+</code></pre>
+</div>
+
+<p>you should create a branch to keep your changes and it must be done off the
<code class="highlighter-rouge">master</code> branch</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>git checkout -b
my-branch
+</code></pre>
+</div>
-<p>With your changes pushed to GitHub you can prepare a Pull Request (short:
PR). Go to the Apache Struts
-mirror - <a
href="https://github.com/apache/struts";>https://github.com/apache/struts</a> -
then to
+<p>Do you changes and commit them to <code
class="highlighter-rouge">my-branch</code>, when youâre done you can push the
changes to GitHub, to your fork.</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>git push -u fork
my-branch
+</code></pre>
+</div>
+
+<p>If you still need to change something, please remember to comit and push
changes, but this time you can use just</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>git push
+</code></pre>
+</div>
+
+<p>as <code class="highlighter-rouge">my-branch</code> was already connected
with remote branch.</p>
+
+<p>The final step is to open a Pull Request (short: PR) against the original
Apache Struts repo, go to Github.
+Go to the Apache Struts mirror - <a
href="https://github.com/apache/struts";>https://github.com/apache/struts</a> -
then to
<a href="https://github.com/apache/struts/pulls";>Pull request</a> and hit
<a href="https://github.com/apache/struts/compare/";>New Pull Request</a>
button.</p>
@@ -181,6 +228,27 @@ your fork and branch to compare the diff
<p>Finally hit <code class="highlighter-rouge">Create Pull Request</code>
button and you are done!</p>
+<p>After your PR got accepted and merged you must clean up your local repo,
please witch branch to <code class="highlighter-rouge">master</code></p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>git checkout master
+</code></pre>
+</div>
+
+<p>and fetch updates from remote</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>git fetch -p
+git pull
+</code></pre>
+</div>
+
+<p>and now you can delete your local branch</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>git branch -d
my-branch
+</code></pre>
+</div>
+
+<p>and you are ready to start working on another feature/issue.</p>
+
<h3 id="how-to-merge-pull-requests">How to merge Pull Requests</h3>
<p>This section is for committers only who want to merge incoming Pull
Requests. Please remember that the repo at GitHub
