You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/01/23 16:08:16 UTC
svn commit: r1234840 - in /wicket/common/site/trunk: _site/atom.xml
_site/contribute/build.html contribute/build.md
Author: mgrigorov
Date: Mon Jan 23 15:08:15 2012
New Revision: 1234840
URL: http://svn.apache.org/viewvc?rev=1234840&view=rev
Log:
Update the docs - how to build from Git
Modified:
wicket/common/site/trunk/_site/atom.xml
wicket/common/site/trunk/_site/contribute/build.html
wicket/common/site/trunk/contribute/build.md
Modified: wicket/common/site/trunk/_site/atom.xml
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/atom.xml?rev=1234840&r1=1234839&r2=1234840&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/atom.xml (original)
+++ wicket/common/site/trunk/_site/atom.xml Mon Jan 23 15:08:15 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-01-23T10:47:18+02:00</updated>
+ <updated>2012-01-23T16:40:34+02:00</updated>
<id>http://wicket.apache.org/</id>
<author>
<name>Apache Wicket</name>
Modified: wicket/common/site/trunk/_site/contribute/build.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/contribute/build.html?rev=1234840&r1=1234839&r2=1234840&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/contribute/build.html (original)
+++ wicket/common/site/trunk/_site/contribute/build.html Mon Jan 23 15:08:15 2012
@@ -158,7 +158,7 @@
<ol>
<li>Getting your Wicket version</li>
-<li>Building Wicket 1.x</li>
+<li>Building Wicket</li>
<li>Coping with test failures</li>
@@ -169,13 +169,13 @@
<h2 id='getting_your_wicket_version'>Getting your Wicket version</h2>
-<p>When you build from SVN you should check out the whole of trunk or the selected branch as the project consists of various modules that may depend on one another. For the current (6.x) development branch, you will need to check out:</p>
-<div class='highlight'><pre><code class='console'><span class='go'>svn co http://svn.apache.org/repos/asf/wicket/trunk wicket</span>
+<p>Clone the master branch from Apache Git Wicket repository</p>
+<div class='highlight'><pre><code class='console'><span class='gp'>$</span> git clone http://git-wip-us.apache.org/repos/asf/wicket.git
</code></pre>
</div>
<p>This will give you a directory structure like the following directory tree:</p>
<div class='highlight'><pre><code class='console'><span class='go'>wicket</span>
-<span class='go'>wicket/wicket</span>
+<span class='go'>wicket/wicket-core</span>
<span class='go'>wicket/wicket-extensions</span>
<span class='go'>wicket/wicket-spring</span>
<span class='go'>wicket/wicket-auth-roles</span>
@@ -184,6 +184,13 @@
<span class='go'>...</span>
</code></pre>
</div>
+<p>To check out a different branch use:</p>
+<div class='highlight'><pre><code class='console'><span class='gp'>$</span> <span class='nb'>cd </span>wicket
+<span class='gp'>$</span> git checkout -b release/wicket-x.y.z origin/release/wicket-x.y.z
+<span class='gp'>#</span> verify the branch with:
+<span class='gp'>$</span> git branch
+</code></pre>
+</div>
<p>In this document we focus at the maven project descriptor located in the top level directory, which enforces default settings for all Wicket projects such as plug-in settings, versioning of the Wicket projects, managing the various dependencies and more.</p>
<p>The artifacts in this project are there only for having a consistent build. This top-level project doesn’t have sources for itself.</p>
Modified: wicket/common/site/trunk/contribute/build.md
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/contribute/build.md?rev=1234840&r1=1234839&r2=1234840&view=diff
==============================================================================
--- wicket/common/site/trunk/contribute/build.md (original)
+++ wicket/common/site/trunk/contribute/build.md Mon Jan 23 15:08:15 2012
@@ -11,7 +11,7 @@ of Maven.
This document contains the following sections.
1. Getting your Wicket version
-2. Building Wicket 1.x
+2. Building Wicket
3. Coping with test failures
4. Using your own built artifacts
@@ -22,20 +22,17 @@ Mergere website.
## Getting your Wicket version ##
-When you build from SVN you should check out the whole of trunk or the
-selected branch as the project consists of various modules that may depend on
-one another. For the current (6.x) development branch, you will need to check
-out:
+Clone the master branch from Apache Git Wicket repository
{% highlight console %}
-svn co http://svn.apache.org/repos/asf/wicket/trunk wicket
+$ git clone http://git-wip-us.apache.org/repos/asf/wicket.git
{% endhighlight %}
This will give you a directory structure like the following directory tree:
{% highlight console %}
wicket
-wicket/wicket
+wicket/wicket-core
wicket/wicket-extensions
wicket/wicket-spring
wicket/wicket-auth-roles
@@ -44,6 +41,14 @@ wicket/wicket-spring-annot
...
{% endhighlight %}
+To check out a different branch use:
+{% highlight console %}
+$ cd wicket
+$ git checkout -b release/wicket-x.y.z release/wicket-x.y.z
+# verify the branch with:
+$ git branch
+{% endhighlight %}
+
In this document we focus at the maven project descriptor located in the top
level directory, which enforces default settings for all Wicket projects such
as plug-in settings, versioning of the Wicket projects, managing the various