From 9c9210830cf60f7f96aa58eff892816a6b7c2ccb Mon Sep 17 00:00:00 2001
From: Martin Stockhammer <martin_s@apache.org>
Date: Mon, 13 Dec 2021 22:04:46 +0100
Subject: [PATCH] Adding release information for 2.2.6

---
 .../src/site/apt/release-notes.apt.vm         | 37 ++++++++++++++++---
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/archiva-docs/src/site/apt/release-notes.apt.vm b/archiva-docs/src/site/apt/release-notes.apt.vm
index 8ff5e60b8..c9866b79d 100644
--- a/archiva-docs/src/site/apt/release-notes.apt.vm
+++ b/archiva-docs/src/site/apt/release-notes.apt.vm
@@ -28,17 +28,46 @@ Release Notes for Archiva ${project.version}
  Archiva is an application for managing one or more remote repositories,
  including administration, artifact handling, browsing and searching.
 
+ This is a security fix release. Users are advised to update their systems to the new
+ version as soon as possible.
+
+ For further information see:  {{https://archiva.apache.org/security.html}}
+
  If you have any questions, please consult:
 
   * the web site: {{https://archiva.apache.org/}}
 
   * the archiva-user mailing list: {{https://archiva.apache.org/mail-lists.html}}
 
-* New in Archiva ${project.version}
+ Apache Archiva ${project.version} is a security fix release:
+
+** Compatibility Changes
+
+  * No API changes or known side effects.
+
+** New Feature
+
+  * There are no new features in this release.
+
+** Improvements
+
+  * There are no improvements
+
+** Bug/Security Fix
+
+  * Update of the log4j2 version to mitigate the log4j2 vulnerability (CVE-2021-44228)
+
+  * Deactivated directory listings by the file servlet
+
 
- Apache Archiva ${project.version} is a bug fix release:
 
- Released: <<${releaseDate}>>
+Previous Release Notes
+
+* Release Notes for Archiva 2.2.5
+
+ Apache Archiva 2.2.5 is a bug fix release:
+
+ Released: 2020-06-19
 
 ** Compatibility Changes
 
@@ -59,8 +88,6 @@ Release Notes for Archiva ${project.version}
   * Better handling of LDAP filter 
 
 
-Previous Release Notes
-
 * Release Notes for Archiva 2.2.4
 
  Apache Archiva 2.2.4 is a bug fix release:
-- 
2.39.5