update the release notes for M2

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@723605 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 42 insertions, 4 deletions

diff --git a/archiva-docs/src/site/apt/release-notes.apt b/archiva-docs/src/site/apt/release-notes.apt
index db487e8ec..d6fa9238c 100644
--- a/archiva-docs/src/site/apt/release-notes.apt
+++ b/archiva-docs/src/site/apt/release-notes.apt
@@ -1,10 +1,10 @@
  -----
- Release Notes for Archiva 1.2-M1
+ Release Notes for Archiva 1.2-M2
  -----
 
-Release Notes for Archiva 1.2-M1
+Release Notes for Archiva 1.2-M2
 
-  The Apache Archiva team would like to announce the release of Archiva 1.2-M1.  Archiva is {{{http://archiva.apache.org/download.html}
+  The Apache Archiva team would like to announce the release of Archiva 1.2-M2.  Archiva is {{{http://archiva.apache.org/download.html}
   available for download from the web site}}.
 
   Archiva is an application for managing one or more remote repositories, including administration, artifact handling, browsing and searching.
@@ -46,10 +46,16 @@ Release Notes for Archiva 1.2-M1
 
 * Release Notes
 
-  The Archiva 1.2-M1 feature set can be seen in the {{{tour/index.html} feature tour}}.
+  The Archiva 1.2-M2 feature set can be seen in the {{{tour/index.html} feature tour}}.
+
+* Changes in Archiva 1.2-M2
+
+  *Date TBA*
 
 * Changes in Archiva 1.2-M1
 
+  *14 November 2008*
+
 ** Bug
 
     * [MRM-514] - Archiva cannot compile and pass tests on JDK 1.6
@@ -114,6 +120,8 @@ Release Notes for Archiva 1.2-M1
 
 * Changes in Archiva 1.1.3
 
+  *9 October 2008*
+
 ** Bug
 
     * [MRM-967] - Security Issue: If repository observer role is enabled for the 'guest' user, an invalid user is able to deploy to that repository
@@ -126,6 +134,8 @@ Release Notes for Archiva 1.2-M1
 
 * Changes in Archiva 1.1.2
 
+  *11 September 2008*
+
 ** Bug
 
     * [MRM-765] - should not be possible to create a proxy connector if there are no remote repositories
@@ -174,6 +184,8 @@ Release Notes for Archiva 1.2-M1
 
 * Changes in Archiva 1.1.1
 
+  *11 August 2008*
+
 ** Bug
 
      * [MRM-584] - Newly created user cannot login
@@ -206,6 +218,8 @@ Release Notes for Archiva 1.2-M1
 
 * Changes in Archiva 1.1
 
+  *20 July 2008*
+
 ** Sub-task
 
     * [MRM-801] - Create documentation for virtual repositories
@@ -400,6 +414,8 @@ Release Notes for Archiva 1.2-M1
 
 * Changes in Archiva 1.0.2
 
+  *8 April 2008*
+
 ** Bug
 
     * [MRM-159] - should not respond with a 404 if proxying a file results in a remote error
@@ -490,6 +506,8 @@ Release Notes for Archiva 1.2-M1
 
 * Changes in Archiva 1.0.1
 
+  *4 February 2008*
+
 ** Bug
 
   * [MRM-623] - find artifact self signed certificate will expire soon
@@ -516,3 +534,23 @@ Release Notes for Archiva 1.2-M1
 
   * [MRM-619] - Update docs/site for some corrections
 
+* Archiva 1.0
+
+  *23 November 2007*
+
+  First production release.
+
+* History
+
+  Archiva was started in November 2005, building a simple framework on top of some existing repository conversion
+  tools within the Maven project. Initial development focused on repository conversion, error reporting, and indexing.
+  From January 2006 a web application was started to visualise the information and to start incorporating
+  functionality from the unmaintained maven-proxy project.
+
+  Development continued through many stops and starts. Initial versions of Archiva were built from source by contributors, 
+  and the first alpha version was not released until April 2007. Some significant changes were made to improve
+  performance and functionality in June 2007 and over the next 6 months and a series of alpha and beta releases, a concerted effort
+  was made to release the 1.0 version.
+
+  Archiva became an Apache "top level project" in March 2008.
+