merge release notes from branch

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

2 files changed, 60 insertions, 30 deletions

diff --git a/archiva-docs/src/site/apt/release-notes.apt b/archiva-docs/src/site/apt/release-notes.apt
index 5431145a2..f8e8db067 100644
--- a/archiva-docs/src/site/apt/release-notes.apt
+++ b/archiva-docs/src/site/apt/release-notes.apt
@@ -1,12 +1,11 @@
  -----
- Release Notes for Archiva 1.1.1
+ Release Notes for Archiva 1.2-SNAPSHOT
  -----
 
-Release Notes for Archiva 1.1.1
+Release Notes for Archiva 1.2-SNAPSHOT
 
-  The Apache Archiva team would like to announce the release of Archiva 1.1.1.
-
-  Archiva 1.1.1 is {{{http://archiva.apache.org/download.html} available for download from the web site}}.
+  The Apache Archiva team would like to announce the release of Archiva 1.2.  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.
 
@@ -16,46 +15,77 @@ Release Notes for Archiva 1.1.1
 
     * the archiva-user mailing list: {{http://archiva.apache.org/mail-lists.html}}
 
-* New in Archiva 1.1
+* New in Archiva 1.2
 
-** Artifact Uploads
+~~TODO
 
-   To simplify adding artifacts to a repository, an upload form has been put in place that allows you to put an artifact and POM into
-   the repository without the need for the Maven <<<deploy-file>>> command.
+* Release Notes
 
-** RSS
+  The Archiva 1.2 feature set can be seen in the {{{tour/index.html} feature tour}}.
 
-   RSS is now available for getting a feed of new artifacts being added to a given repository. Two types of feeds are generated by Archiva:
-   new artifacts in a repository and new versions of a specific artifact. Details are available in {{{userguide/rss.html}Rss Feeds}}.
+* Changes in Archiva 1.2
 
-** Virtual Repositories
+~~TODO
 
-   Virtual repositories or repository groups allows downloading from a group of repositories via one url. For more details of this feature,
-   see {{{userguide/virtual-repositories.html}Virtual Repositories}}.
+* Changes in Archiva 1.1.3
 
-** Timeouts
+** Bug
 
-   Connections to remote repositories can now have a configurable timeout value
+    * [MRM-967] - Security Issue: If repository observer role is enabled for the 'guest' user, an invalid user is able to deploy to that repository
 
-** New Runtime Bundle
+    * [MRM-397] - background of the Archiva logo is not transparent in repositories page
 
-   The application is now distributed using Jetty 6.1 and it's documented configuration, rather than the previous
-   Plexus application server bundle. It continues to use the Java Service Wrapper (v3.2.3) for application monitoring,
-   though the configuration has been improved, particularly with regard to separating the application configuration from the installation.
+    * [MRM-580] - does not give error message when one defines an illegal directory for a managed repository
 
-** Using Spring
+    * [MRM-954] - Footer doesn't stretch across repositoryGroups page
 
-   Archiva now uses the Spring Framework as it's underlying container instead of Plexus. This results in a boost in performance and
-   stability for the web application in particular.
+* Changes in Archiva 1.1.2
 
-** Using Apache Jackrabbit WebDAV Servlet
+** Bug
 
-   Archiva now uses Apache Jackrabbit's WebDAV servlet for serving repository content instead of plexus-webdav. The change results in reduced
-   codebase complexity, increased standards compliance, better webdav client support and a small peformance boost.
+    * [MRM-765] - should not be possible to create a proxy connector if there are no remote repositories
 
-* Release Notes
+    * [MRM-807] - Deployed dll won't be indexed
+
+    * [MRM-834] - Wrong repository url when archiva is used behind Apache with mof_proxy
+
+    * [MRM-841] - Introducing a new scannable artifact file type requires restart in order for some consumers to work
+
+    * [MRM-880] - Archiva does not start up on Solaris 64-Bit
+
+    * [MRM-881] - Failing to startup due to invalid bean definition
+
+    * [MRM-893] - Illegal browse operation allow
+
+    * [MRM-902] - If path has leading slash when being checked againts whitelists and blacklists causes matching failure
+
+    * [MRM-903] - Repository scanning should not stop when encounters error
+
+    * [MRM-905] - EL Expression failed with empty/not functions
+
+    * [MRM-911] - Archiva checks user's credentials before guest's rights on the repository
+
+    * [MRM-912] - rss urls seem to use fixed webcontext "archiva" instead of actual webcontext
+
+    * [MRM-915] - NPE with rss links
+
+    * [MRM-926] - NPE with search page
+
+    * [MRM-932] - Error 500 when clicking the Next or Previous icon of the results of a search, if user is trying to search for java classes, packages or methods.
+
+    * [MRM-934] - For bytecode search, only 1 version of the artifact is returned even if there are more than 1 version of that artifact which matched the search
+
+    * [MRM-943] - results search option should only be available on results page
+
+** Improvement
+
+    * [MRM-839] - change RSS URLs
+
+    * [MRM-848] - Pre-configured repositories initially appear to be empty
+
+    * [MRM-874] - POM snippet for plugins should be <plugin> not <dependency>
 
-  The Archiva 1.1 feature set can be seen in the {{{tour/index.html} feature tour}}.
+  The full list of changes can be found {{{http://jira.codehaus.org/secure/ReleaseNote.jspa?version=14491&styleName=Text&projectId=10980} in JIRA}}.
 
 * Changes in Archiva 1.1.1
 
diff --git a/archiva-docs/src/site/site.xml b/archiva-docs/src/site/site.xml
index 08c18d35c..14c1f9b1b 100644
--- a/archiva-docs/src/site/site.xml
+++ b/archiva-docs/src/site/site.xml
@@ -21,7 +21,7 @@
 <project>
   <body>
     <breadcrumbs>
-      <item name="1.1.1" href="/docs/1.1.1" />
+      <item name="1.2-SNAPSHOT" href="/docs/1.2-SNAPSHOT" />
     </breadcrumbs>
 
     <menu name="Introduction">