From c5389a353e40ea2c21ecfa8aaadaaaaacbf5ae73 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Wed, 6 Jul 2016 11:50:52 +0200
Subject: [PATCH] Release version 2.1.2

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41723efe..64567f23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 2.1.2
+This release fixes a security vulnerability caused by the CORS implementation.
+Support for cross-origin requests has been removed. Use ARSnova version 2.2 or
+newer for proper CORS. (Reported by Rainer Rillke at Wikimedia)
+
+Additional changes:
+* Libraries have been upgraded to fix potential bugs
+
 ## 2.0.4
 This release fixes a security vulnerability caused by the CORS implementation.
 Support for cross-origin requests has been removed. Use ARSnova version 2.2 or
diff --git a/pom.xml b/pom.xml
index 5cb41197..87f3972d 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.1.2-SNAPSHOT</version>
+	<version>2.1.2</version>
 	<packaging>war</packaging>
 
 	<properties>
-- 
GitLab