From ab246de596a6fa9cc3bfdc90188adabad38f4831 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Mon, 3 Apr 2017 14:45:29 +0200
Subject: [PATCH] Release version 2.5.0

---
 CHANGELOG.md             | 29 +++++++++++++++++++++++++++++
 pom.xml                  |  2 +-
 sonar-project.properties |  2 +-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8724d3a6c..4788f6cf2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,34 @@
 # Changelog
 
+## 2.5
+Major features:
+* Evaluation of free text answers
+* The flashcards UI has been overhauled. They are now handled separately from
+  questions.
+* Question duplication and import from other sessions
+
+Minor features and changes:
+* The number of comments is now shown in presentation mode
+* New use case including only comments
+* Export of answer statistics to CSV format
+* Export of questions to arsnova.click format
+* Export/import of flashcards to/from arsnova.cards format
+* Proxy support for WebSocket connections
+* Reduced the amount of API requests sent
+* Usability improvements and bug fixes
+
+With this release we have completely overhauled our [documentation](README.md).
+Additionally, we now provide
+[Docker images](https://github.com/thm-projects/arsnova-docker/).
+
+**This version is brought to you by:**  
+Project management: Klaus Quibeldey-Cirkel  
+Lead programming: Andreas Gärtner, Daniel Gerhardt, Tom "tekay" Käsler  
+Contributions: Robin Drangmeister, Daniel "dhx" Haag, Dennis Schönhof  
+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.4.5
 Bug fixes:
 * Fixed button visibility problems in Chrome 57+.
diff --git a/pom.xml b/pom.xml
index 1db006269..e53e356c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.thm.arsnova</groupId>
 	<artifactId>arsnova-mobile</artifactId>
-	<version>2.5.0-SNAPSHOT</version>
+	<version>2.5.0</version>
 	<packaging>war</packaging>
 	<name>ARSnova Mobile</name>
 
diff --git a/sonar-project.properties b/sonar-project.properties
index 718880e1c..1da9cf8b7 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,7 +1,7 @@
 # Required metadata
 sonar.projectKey=de.thm.arsnova:arsnova-mobile
 sonar.projectName=arsnova-mobile
-sonar.projectVersion=2.5-SNAPSHOT
+sonar.projectVersion=2.5
 
 # Comma-separated paths to directories with sources (required)
 sonar.sources=src/main/webapp/app