merge from archiva-1.3.x
git-svn-id: https://svn.apache.org/repos/asf/archiva/tags/archiva-1.3.6@1429743 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/archiva-docs/src/site/apt/release-notes.apt b/archiva-docs/src/site/apt/release-notes.apt
index 5ce9132..7212358 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.3.5
+ Release Notes for Archiva 1.3.6
-----
-Release Notes for Archiva 1.3.5
+Release Notes for Archiva 1.3.6
- The Apache Archiva team would like to announce the release of Archiva 1.3.5. Archiva is {{{http://archiva.apache.org/download.html}
+ The Apache Archiva team would like to announce the release of Archiva 1.3.6. 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.
@@ -24,13 +24,16 @@
* Security Vulnerabilities
- * A CSRF security vulnerability (CVE-2010-3449) is present in 1.3.2 and earlier.
-
- * An XSS security vulnerability (CVE-2011-0533) is present in 1.3.3 and earlier.
-
- * Additional CSRF (CVE-2011-1026) and XSS security (CVE-2011-1077) vulnerabilities have been reported against 1.3.4
+ * A remote code execution (CVE-2010-1870) vulnerability has been reported against 1.3.5
and earlier versions.
+ * CSRF (CVE-2011-1026) and XSS security (CVE-2011-1077) vulnerabilities have been reported against 1.3.4
+ and earlier versions.
+
+ * An XSS security vulnerability (CVE-2011-0533) is present in 1.3.3 and earlier.
+
+ * A CSRF security vulnerability (CVE-2010-3449) is present in 1.3.2 and earlier.
+
It is important that users using lower versions of Archiva upgrade to this version (or higher).
See {{{http://archiva.apache.org/security.html} Archiva Security}} for more details.
@@ -56,7 +59,15 @@
* Release Notes
- The Archiva 1.3.5 feature set can be seen in the {{{tour/index.html} feature tour}}.
+ The Archiva 1.3.6 feature set can be seen in the {{{tour/index.html} feature tour}}.
+
+* Changes in Archiva 1.3.6
+
+ Released: <<7 January 2013>>
+
+** Bug
+
+ * [MRM-1738] - defaultStack requires a stronger blacklist of parameter names in the param interceptor
* Changes in Archiva 1.3.5
diff --git a/archiva-docs/src/site/site.xml b/archiva-docs/src/site/site.xml
index 83c6f43..166cfa0 100644
--- a/archiva-docs/src/site/site.xml
+++ b/archiva-docs/src/site/site.xml
@@ -26,7 +26,7 @@
</bannerLeft>
<body>
<breadcrumbs>
- <item name="1.3.5" href="/index.html" />
+ <item name="1.3.6" href="/index.html" />
</breadcrumbs>
<menu name="Introduction">
