Author: dashorst
Date: Thu Oct 4 09:26:26 2012
New Revision: 1393969
URL: http://svn.apache.org/viewvc?rev=1393969&view=rev
Log:
Update to the download page
Modified:
wicket/common/site/trunk/_site/atom.xml
wicket/common/site/trunk/_site/start/download.html
wicket/common/site/trunk/start/download.md
Modified: wicket/common/site/trunk/_site/atom.xml
URL:
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/atom.xml?rev=1393969&r1=1393968&r2=1393969&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/atom.xml (original)
+++ wicket/common/site/trunk/_site/atom.xml Thu Oct 4 09:26:26 2012
@@ -4,7 +4,7 @@
<title>Apache Wicket</title>
<link href="http://wicket.apache.org/atom.xml"; rel="self"/>
<link href="http://wicket.apache.org/"/>
- <updated>2012-10-04T10:54:01+02:00</updated>
+ <updated>2012-10-04T11:26:05+02:00</updated>
<id>http://wicket.apache.org/</id>
<author>
<name>Apache Wicket</name>
Modified: wicket/common/site/trunk/_site/start/download.html
URL:
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/start/download.html?rev=1393969&r1=1393968&r2=1393969&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/start/download.html (original)
+++ wicket/common/site/trunk/_site/start/download.html Thu Oct 4 09:26:26 2012
@@ -168,7 +168,7 @@
<div id="contentbody">
<h1>Download Wicket releases</h1>
- <p>Apache Wicket 6.1.0 is the current stable
release.</p>
+ <p>Apache Wicket 6.1.0 is the current stable release.
Most users get Apache Wicket using <a href='#maven'>Apache Maven’s
dependency management</a>, which incidentally is the most convenient way of
obtaining the latest and greatest Wicket.</p>
<h2 id='download'>Download</h2>
@@ -177,16 +177,20 @@
<ul>
<li><strong>Latest stable release</strong>: <a
href='http://www.apache.org/dyn/closer.cgi/wicket/6.1.0'>6.1.0</a></li>
-<li><strong>Last 6.0.x release</strong>: <a
href='http://archive.apache.org/dist/wicket/6.1.0'>6.1.0</a></li>
+<li><strong>Latest 6.x release</strong>: <a
href='http://archive.apache.org/dist/wicket/6.1.0'>6.1.0</a></li>
-<li><strong>Last 1.5.x release</strong>: <a
href='http://archive.apache.org/dist/wicket/1.5.8'>1.5.8</a></li>
+<li><strong>Latest 1.5.x release</strong>: <a
href='http://archive.apache.org/dist/wicket/1.5.8'>1.5.8</a></li>
-<li><strong>Last 1.4.x release</strong>: <a
href='http://archive.apache.org/dist/wicket/1.4.21'>1.4.21</a></li>
+<li><strong>Latest 1.4.x release</strong> (no longer maintained): <a
href='http://archive.apache.org/dist/wicket/1.4.21'>1.4.21</a></li>
<li><strong>Archived releases</strong>: <a
href='http://archive.apache.org/dist/wicket'>http://archive.apache.org/dist/wicket</a></li>
</ul>
-<p>We recommend you <a href='quickstart.html'>start</a> with our latest stable
release. If you are migrating an existing application from Wicket 1.4 to 1.5,
you may find the <a
href='http://cwiki.apache.org/WICKET/migration-to-wicket-15.html'>migration
guide</a> invaluable.</p>
+<p>We recommend you <a href='quickstart.html'>start</a> with our latest stable
release.</p>
+
+<h3 id='requirements'>Requirements</h3>
+
+<h4 id='java_version'>Java version</h4>
<ul>
<li>Apache Wicket 6.x requires JDK 6.0 or newer</li>
@@ -196,9 +200,33 @@
<li>Apache Wicket 1.4.x requires JDK 1.5 or newer</li>
</ul>
-<p>You cannot use Wicket without adding an SLF4J logging implementation to
your classpath. Most people use <a
href='http://logging.apache.org/log4j'>log4j</a>. If you do, just include
<strong>slf4j-log4j12.jar</strong> on your classpath to get Wicket to use log4j
too. If you want to use commons-logging or JDK14 logging or something else,
please see the <a href='http://www.slf4j.org/faq.html'>SLF4J site</a> for more
information.</p>
+<h4 id='mixing_wicket_versions'>Mixing Wicket versions</h4>
+
+<p>You cannot mix different Wicket versions in your project. You should always
use the artifacts from a particular release train.</p>
+
+<p>For example it is <strong>NOT</strong> possible to use Wicket Extensions
1.5 in a Wicket 6 project. The same goes for 3rd party libraries: make sure you
always use a compatible version of your 3rd party library.</p>
+
+<h4 id='logging'>Logging</h4>
+
+<p>You cannot use Wicket without adding an SLF4J logging implementation to
your classpath. Most people use <a
href='http://logging.apache.org/log4j'>log4j</a>.</p>
+
+<p>If you do, just include <strong>slf4j-log4j12.jar</strong> on your
classpath to get Wicket to use log4j too. If you want to use commons-logging or
JDK14 logging or something else, please see the <a
href='http://www.slf4j.org/faq.html'>SLF4J site</a> for more information.</p>
+
+<h2 id='migrating_from_earlier_versions'>Migrating from earlier versions</h2>
+
+<p>If you are migrating an existing application from earlier versions of
Wicket you may find our migration guides invaluable:</p>
+
+<ul>
+<li>Migrating from <a
href='https://cwiki.apache.org/WICKET/migrate-13.html'>Wicket 1.2 to Wicket
1.3</a></li>
+
+<li>Migrating from <a
href='https://cwiki.apache.org/WICKET/migrating-to-wicket-14.html'>Wicket 1.3
to Wicket 1.4</a></li>
+
+<li>Migrating from <a
href='https://cwiki.apache.org/WICKET/migration-to-wicket-15.html'>Wicket 1.4
to Wicket 1.5</a></li>
+
+<li>Migrating from <a
href='https://cwiki.apache.org/WICKET/migration-to-wicket-60.html'>Wicket 1.5
to Wicket 6</a></li>
+</ul>
-<h2 id='maven_2'>Maven 2</h2>
+<h2 id='maven'>Maven</h2>
<p>Add the following snippet to your Maven project descriptor
(<code>pom.xml</code>):</p>
<div class='highlight'><pre><code class='xml'><span
class='nt'><dependency></span>
Modified: wicket/common/site/trunk/start/download.md
URL:
http://svn.apache.org/viewvc/wicket/common/site/trunk/start/download.md?rev=1393969&r1=1393968&r2=1393969&view=diff
==============================================================================
--- wicket/common/site/trunk/start/download.md (original)
+++ wicket/common/site/trunk/start/download.md Thu Oct 4 09:26:26 2012
@@ -3,35 +3,54 @@ layout: default
title: Download Wicket releases
---
-Apache Wicket {{site.wicket.version}} is the current stable release.
+Apache Wicket {{site.wicket.version}} is the current stable release. Most
users get Apache Wicket using [Apache Maven's dependency management](#maven),
which incidentally is the most convenient way of obtaining the latest and
greatest Wicket.
## Download
New projects should use [Wicket
{{site.wicket.version}}](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version}})
as their base.
-* **Latest stable release**:
[{{site.wicket.version}}](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version}})
-* **Last 6.0.x release**:
[{{site.wicket.version_60}}](http://archive.apache.org/dist/wicket/{{site.wicket.version_60}})
-* **Last 1.5.x release**:
[{{site.wicket.version_15}}](http://archive.apache.org/dist/wicket/{{site.wicket.version_15}})
-* **Last 1.4.x release**:
[{{site.wicket.version_14}}](http://archive.apache.org/dist/wicket/{{site.wicket.version_14}})
-* **Archived releases**: <http://archive.apache.org/dist/wicket>
-
-We recommend you [start](quickstart.html) with our latest stable release. If
you
-are migrating an existing application from Wicket 1.4 to 1.5, you may find
-the [migration
guide](http://cwiki.apache.org/WICKET/migration-to-wicket-15.html)
-invaluable.
-
-* Apache Wicket 6.x requires JDK 6.0 or newer
-* Apache Wicket 1.5.x requires JDK 1.5 or newer
-* Apache Wicket 1.4.x requires JDK 1.5 or newer
+ * **Latest stable release**:
[{{site.wicket.version}}](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version}})
+ * **Latest 6.x release**:
[{{site.wicket.version_60}}](http://archive.apache.org/dist/wicket/{{site.wicket.version_60}})
+ * **Latest 1.5.x release**:
[{{site.wicket.version_15}}](http://archive.apache.org/dist/wicket/{{site.wicket.version_15}})
+ * **Latest 1.4.x release** (no longer maintained):
[{{site.wicket.version_14}}](http://archive.apache.org/dist/wicket/{{site.wicket.version_14}})
+ * **Archived releases**: <http://archive.apache.org/dist/wicket>
+
+We recommend you [start](quickstart.html) with our latest stable release.
+
+### Requirements
+
+#### Java version
+
+ * Apache Wicket 6.x requires JDK 6.0 or newer
+ * Apache Wicket 1.5.x requires JDK 1.5 or newer
+ * Apache Wicket 1.4.x requires JDK 1.5 or newer
+
+#### Mixing Wicket versions
+
+You cannot mix different Wicket versions in your project. You should always
use the artifacts from a particular release train.
+
+For example it is **NOT** possible to use Wicket Extensions 1.5 in a Wicket 6
project. The same goes for 3rd party libraries: make sure you always use a
compatible version of your 3rd party library.
+
+#### Logging
You cannot use Wicket without adding an SLF4J logging implementation to
your classpath. Most people use [log4j](http://logging.apache.org/log4j).
+
If you do, just include **slf4j-log4j12.jar** on your classpath to get Wicket
to use log4j too. If you want to use commons-logging or JDK14 logging or
something else, please see the [SLF4J site](http://www.slf4j.org/faq.html)
for more information.
-## Maven 2
+
+## Migrating from earlier versions
+If you are migrating an existing application from earlier versions of Wicket
you may find our migration guides invaluable:
+
+ * Migrating from [Wicket 1.2 to Wicket
1.3](https://cwiki.apache.org/WICKET/migrate-13.html)
+ * Migrating from [Wicket 1.3 to Wicket
1.4](https://cwiki.apache.org/WICKET/migrating-to-wicket-14.html)
+ * Migrating from [Wicket 1.4 to Wicket
1.5](https://cwiki.apache.org/WICKET/migration-to-wicket-15.html)
+ * Migrating from [Wicket 1.5 to Wicket
6](https://cwiki.apache.org/WICKET/migration-to-wicket-60.html)
+
+## Maven
Add the following snippet to your Maven project descriptor (`pom.xml`):
