Merge branch 'asf-site' of github.com:apache/wicket-site into asf-site
diff --git a/content/atom.xml b/content/atom.xml
index 6cd55d9..e347639 100644
--- a/content/atom.xml
+++ b/content/atom.xml
@@ -3,7 +3,7 @@
<title>Apache Wicket</title>
<link href="http://wicket.apache.org/atom.xml" rel="self"/>
<link href="http://wicket.apache.org/"/>
- <updated>2020-11-19T22:35:06+01:00</updated>
+ <updated>2020-11-10T14:12:58+00:00</updated>
<id>http://wicket.apache.org/</id>
<author>
<name>Apache Wicket</name>
@@ -1321,4 +1321,137 @@
</content>
</entry>
+ <entry>
+ <title>Apache Wicket 8.7.0 released</title>
+ <link href="http://wicket.apache.org/news/2020/01/07/wicket-8.7.0-released.html"/>
+ <updated>2020-01-07T00:00:00+01:00</updated>
+ <id>http://wicket.apache.org/news/2020/01/07/wicket-8.7.0-released</id>
+ <content type="html"><p>The Apache Wicket PMC is proud to announce Apache Wicket 8.7.0!</p>
+
+<p>Apache Wicket is an open source Java component oriented web application
+framework that powers thousands of web applications and web sites for
+governments, stores, universities, cities, banks, email providers, and
+more. You can find more about Apache Wicket at https://wicket.apache.org</p>
+
+<p>This release marks another minor release of Wicket 8. We
+use semantic versioning for the development of Wicket, and as such no
+API breaks are present breaks are present in this release compared to
+8.0.0.</p>
+
+<h2 id="using-this-release">Using this release</h2>
+
+<p>With Apache Maven update your dependency to (and don’t forget to
+update any other dependencies on Wicket projects to the same version):</p>
+
+<figure class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
+ <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>
+ <span class="nt">&lt;artifactId&gt;</span>wicket-core<span class="nt">&lt;/artifactId&gt;</span>
+ <span class="nt">&lt;version&gt;</span>8.7.0<span class="nt">&lt;/version&gt;</span>
+<span class="nt">&lt;/dependency&gt;</span></code></pre></figure>
+
+<p>Or download and build the distribution yourself, or use our
+convenience binary package you can find here:</p>
+
+<ul>
+ <li>Download: http://wicket.apache.org/start/wicket-8.x.html#manually</li>
+</ul>
+
+<!--more-->
+
+<h2 id="upgrading-from-earlier-versions">Upgrading from earlier versions</h2>
+
+<p>If you upgrade from 8.y.z this release is a drop in replacement. If
+you come from a version prior to 8.0.0, please read our Wicket 8
+migration guide found at</p>
+
+<ul>
+ <li>http://s.apache.org/wicket8migrate</li>
+</ul>
+
+<p>Have fun!</p>
+
+<p>— The Wicket team</p>
+
+<p>========================================================================</p>
+
+<div class="language-plaintext highlighter-rouge"><div class="highlight"><pre class="highlight"><code>The signatures for the source release artefacts:
+</code></pre></div></div>
+
+<p>Signature for apache-wicket-8.7.0.zip:</p>
+
+<div class="highlight"><pre>
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE0a6YZHC1pJw+aieyh48B+qjTVuEFAl4PkkYACgkQh48B+qjT
+VuERUA//a8+ZT8QhHuNxR8YD/c8YtMTHffwvrg90TujAH0rvD0b9MksNJJFE4Wz8
+FVmVvFFpeccvEUa+Aj4CPLeQwlnToKD0Ddb6svtfSboYcKl0F97r0TUZFV3Yd/mf
+ZkfbQSsZ6wuBbk01zDPsqZdH5bi8jVxyyTgX6/Er8TpIBGD4FjAO/O3R/La30wUs
+rI+k54I/JcCMsu6GGfTX43JixUnhIzUkkQwI81AEv05f428XkEUpfQFCx5iKxQZd
+uR8OO36SEAEjCyGjoxD5tzaqU+UDPmtmTheHHsX6rrkrnAjhXP90KFt1s14Gmvqp
+gGhDRiVpJjYshhvzKBsoFOl4VxPQVc9Drv+kAS2bJnIsLMHbgmkvK8co5Mk78LwB
+ug0RFXEEOBX1jp9TDyfMRVpSzlDdn1XI4GROpB8cvptRkE22ZnsU6ew657fy+4zK
+Uzh1j0QpBF5YNQL9GkM+qkIlWbbgxUGZK+Tkfsfl3hGMA6y8NzStixZjVsdsrL3l
+tMcz/325A/QeFwvFRpKWFQzeUGwngstgJxyndcBpPEMyWSL+nCJV7lOYFvrj3HdM
++JwZfsf44F6zkLTVq5ReOuW7ig/NTqwoai39eU7cAqG5q3/KjSqNBQGxqmvqim0p
+6SAVjTWYj4lMTFmiIEpla+SvI4IK4YHpiGKRFRtUH+RvEM1NOpM=
+=HNEm
+-----END PGP SIGNATURE-----
+</pre></div>
+
+<p>Signature for apache-wicket-8.7.0.tar.gz:</p>
+
+<div class="highlight"><pre>
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE0a6YZHC1pJw+aieyh48B+qjTVuEFAl4PkkYACgkQh48B+qjT
+VuGjmw/+KufMKaI6fdWJoxZlofBXDJObylbtCE3fI0Cv8xsd0dTpTANNKbH2tlCi
+/tG2PLwqX3wk74P8YZgkPqmb7HTC1S4qNI9CsGxt3Eo2lrGAQtcGJD7Vzpv5lkHp
+bmpZGNLPCKUgZZz31271QMfj/CSgY6J2vlPWC+O83LGCKaAO1XL5w2gvoRXoZo/t
+oJJVZ+ejHvGlw/OAyEC/KP4dasqMp1K6eq2BlBM9UkZEt1JbevgkTInDlzrJTtJr
+eDIknfv3Efxjx8JNCdPVXoVQSZkp3xnE7BisaSJ74tdm5gR4LFyttBl7X3zeG4hX
+GyHE3CT3VtnEHGSSTEScewu2Tx7DrBJc1ZUNH5Lzg8/oRXY/tiPgsuG3z2Abbxr3
+IYjGFUYPMLAT5PWIwMzB9K4spPOucsG6ipnPGJsYTa3OmEIAgzJDYloinvpSmH5N
+0YxloR5KXVyH3uyn94Je6DftdDWTe3NYkkWrTwTXVdSex73WJZ5fXiZHRcmghal8
+6sOs38BCoa49WChUeMYpUuGvHcss8UOrDQjad2j3prRwUqy1Sw35nYDsAfvNt2Hh
+KxO0XHcT/jhDmHF9GSvVI4DTr1EvkW0jwOZgdKVfTzYt5xDVZjFD6EEA/7hY55P1
+F6t2ZY52dmHVv0d6CTZWEcIZbTEQTpiwWb4EF+FD+DVM2D08qUE=
+=sCFf
+-----END PGP SIGNATURE-----
+</pre></div>
+
+<p>========================================================================</p>
+
+<h3 id="this-release">This Release</h3>
+
+<h4 id="changelog-for-870">CHANGELOG for 8.7.0:</h4>
+
+<h5 id="bug">Bug</h5>
+
+<ul>
+ <li>[WICKET-6531] - Crash in Unsafe.getObject when running on the J9 VM</li>
+ <li>[WICKET-6650] - Url decode the name of the file after AjaxDownload with Location == Blob</li>
+ <li>[WICKET-6704] - JavaSerializer.serialize causes the JVM crash !</li>
+ <li>[WICKET-6705] - URL filename not decoded when downloading via AjaxDownload blob mode</li>
+ <li>[WICKET-6706] - Websocket Endpoint logs exception when user leaves page</li>
+ <li>[WICKET-6707] - Property setter parameter type is assumed to be equal to getter return type</li>
+ <li>[WICKET-6708] - FormComponent should read only the GET/POST parameters of the request, not both</li>
+ <li>[WICKET-6713] - BaseWicketTester does not reset componentInPage field</li>
+</ul>
+
+<h5 id="improvement">Improvement</h5>
+
+<ul>
+ <li>[WICKET-6714] - Please add better getResource-Support for MockServletContext</li>
+ <li>[WICKET-6720] - ConcatBundleResource#getResourceStream should not eagerly fetch resources</li>
+</ul>
+
+<h5 id="task">Task</h5>
+
+<ul>
+ <li>[WICKET-6698] - Non-security critical dependency updates</li>
+</ul>
+
+</content>
+ </entry>
+
</feed>
diff --git a/content/contribute/index.html b/content/contribute/index.html
index 330efe6..4eeee18 100644
--- a/content/contribute/index.html
+++ b/content/contribute/index.html
@@ -220,12 +220,12 @@
<tr>
<td>6.x</td>
<td>wicket-6.x</td>
- <td>supported</td>
+ <td>security fixes only</td>
</tr>
<tr>
<td>1.5.x</td>
<td>wicket-1.5.x</td>
- <td>security fixes only</td>
+ <td>discontinued</td>
</tr>
<tr>
<td><s>1.4.x</s></td>
@@ -259,8 +259,6 @@
<p>If you want to work on Wicket 7, you need to check out the <em>wicket-7.x</em> branch.</p>
-<p>If you want to work on an issue for Wicket 6, you’ll need to check out the <em>wicket-6.x</em> branch.</p>
-
<p>When you are ready with your change you can ask us to review your
changes and to integrate it into Wicket by creating a Pull Request.</p>
diff --git a/contribute/index.md b/contribute/index.md
index fe576ab..90f4371 100644
--- a/contribute/index.md
+++ b/contribute/index.md
@@ -103,12 +103,12 @@
<tr>
<td>6.x</td>
<td>wicket-6.x</td>
- <td>supported</td>
+ <td>security fixes only</td>
</tr>
<tr>
<td>1.5.x</td>
<td>wicket-1.5.x</td>
- <td>security fixes only</td>
+ <td>discontinued</td>
</tr>
<tr>
<td><s>1.4.x</s></td>
@@ -142,8 +142,6 @@
If you want to work on Wicket 7, you need to check out the _wicket-7.x_ branch.
-If you want to work on an issue for Wicket 6, you'll need to check out the _wicket-6.x_ branch.
-
When you are ready with your change you can ask us to review your
changes and to integrate it into Wicket by creating a Pull Request.
