From 790558e3fe2e99feb694eec9a68320be31ad2c8e Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Thu, 12 Jul 2018 10:23:12 +0200
Subject: [PATCH] Release version 2.6.0

---
 CHANGELOG.md | 36 ++++++++++++++++++++++++++++++++++++
 pom.xml      |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19c6d73f7..657bd22f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,41 @@
 # Changelog
 
+## 2.6
+Features:
+* Experimental support for CouchDB 2 has been added. Note: The data migration
+  script is not compatible with CouchDB 2 and has to be run before an upgrade.
+
+Improvements:
+* Error handling and logging has been improved. It should now be easier to find
+  the cause of problems. API error responses now contain the name of the
+  `Exception` which caused the error. Further details for debugging purposes can
+  be enabled with the new `api.expose-exception-messages` setting (Do NOT
+  enable in production environments!).
+* Updated OAuth handling to restore compatibility with 3rd-party login services.
+
+Bug fixes:
+* Fixed multiple bugs caused by incorrect type handling in the database layer.
+* Fixed XFO header check behind reverse proxy (used by clients when embedding
+  external websites).
+* Fixed rounding error in learning progress calculation.
+* Fixed `security.cors.origins` setting.
+* Fixed import of data from older versions.
+
+Security:
+* Fixed DoS vulnerability in authentication handling behind reverse proxy.
+
+Configuration changes:  
+Minor changes to the web server and Tomcat proxy configuration are required
+(see [installation guide](src/site/markdown/installation.md)).
+
+**This version is brought to you by:**  
+Project management: Klaus Quibeldey-Cirkel  
+Lead programming: Daniel Gerhardt, Tom "tekay" Käsler  
+Contributions: Marius Renner, Paul-Christian Volkmer  
+Sponsoring: [AG QLS](https://www.thm.de/site/en/hochschule/service/ag-qls.html),
+[HMWK](https://wissenschaft.hessen.de/wissenschaft/it-neue-medien/kompetenznetz-e-learning-hessen)
+
+
 ## 2.5.7
 This is a maintenance release which only brings libraries up to date to fix
 potential bugs.
diff --git a/pom.xml b/pom.xml
index c1a9d4fb1..23dc860df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.thm.arsnova</groupId>
 	<artifactId>arsnova-backend</artifactId>
-	<version>2.6.0-SNAPSHOT</version>
+	<version>2.6.0</version>
 	<packaging>war</packaging>
 
 	<properties>
-- 
GitLab