From 5339a11602a61c787dc7137b502586fc4bcc18d7 Mon Sep 17 00:00:00 2001
From: hansp <hansvp@hotmail.com>
Date: Fri, 6 Mar 2020 11:02:46 +0100
Subject: [PATCH] release: v2.1.4rc1

---
 AUTHORS.rst                                   |  3 +-
 CHANGELOG.rst                                 | 12 ++++++
 .../upgrades/upgrade_2_1_2_to_2_1_3.py        |  2 +-
 .../upgrades/upgrade_2_1_3_to_2_1_4.py        | 38 +++++++++++++++++++
 b2share/version.py                            |  2 +-
 5 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 b2share/modules/upgrade/upgrades/upgrade_2_1_3_to_2_1_4.py

diff --git a/AUTHORS.rst b/AUTHORS.rst
index acf50b7d71..f0d60ec7c7 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -25,7 +25,7 @@ Authors
 
 - Adrian Mouat (KTH)
 - Carl Johan Håkansson (KTH)
-- Dennis Blommensteijn (SURFsara)
+- Dennis Blommesteijn (SURFsara)
 - Dinos Kousidis (CERN)
 - Emanuel Dima (EKUT)
 - Hans van Piggelen (SURFsara)
@@ -33,6 +33,7 @@ Authors
 - Hilary Hanahoe (TRUST)
 - Huw Morris (STFC)
 - Ilja Livenson (KTH)
+- Janne Karjalainen (CSC)
 - Klára Pešková (CUNI)
 - Kristian Niininen (CSC)
 - Lassi Lehtinen (CSC)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 8c909df145..ab6597ff78 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,18 @@
 B2Share changelog
 *****************
 
+2.1.4 (March 2020)
+===========================
+
+Changes since 2.1.3 include:
+
+- Many interface improvements
+- Additions to REST API output
+- New EUDAT branding layout
+- Many bug fixes
+- Removal of unused files
+
+
 2.1.3 (October 2019)
 ===========================
 
diff --git a/b2share/modules/upgrade/upgrades/upgrade_2_1_2_to_2_1_3.py b/b2share/modules/upgrade/upgrades/upgrade_2_1_2_to_2_1_3.py
index 039a15745a..1961d2c021 100644
--- a/b2share/modules/upgrade/upgrades/upgrade_2_1_2_to_2_1_3.py
+++ b/b2share/modules/upgrade/upgrades/upgrade_2_1_2_to_2_1_3.py
@@ -31,7 +31,7 @@
 from ..api import UpgradeRecipe
 
 
-migrate_2_1_1_to_2_1_2 = UpgradeRecipe('2.1.2', '2.1.3')
+migrate_2_1_2_to_2_1_3 = UpgradeRecipe('2.1.2', '2.1.3')
 
 # No changes to Elasticsearch mappings
 
diff --git a/b2share/modules/upgrade/upgrades/upgrade_2_1_3_to_2_1_4.py b/b2share/modules/upgrade/upgrades/upgrade_2_1_3_to_2_1_4.py
new file mode 100644
index 0000000000..6cca81d03f
--- /dev/null
+++ b/b2share/modules/upgrade/upgrades/upgrade_2_1_3_to_2_1_4.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+#
+# This file is part of EUDAT B2Share.
+# Copyright (C) 2018 CERN.
+#
+# B2Share is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# B2Share is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with B2Share; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+#
+# In applying this license, CERN does not
+# waive the privileges and immunities granted to it by virtue of its status
+# as an Intergovernmental Organization or submit itself to any jurisdiction.
+
+"""Upgrade recipe migrating B2SHARE from version 2.1.3 to 2.1.4."""
+
+
+from __future__ import absolute_import, print_function
+
+import pkg_resources
+
+from ..api import UpgradeRecipe
+
+
+migrate_2_1_3_to_2_1_4 = UpgradeRecipe('2.1.3', '2.1.4')
+
+# No changes to Elasticsearch mappings
+
+# There are no changes to the db schema, so no other updates are necessary
diff --git a/b2share/version.py b/b2share/version.py
index 3cb799fe78..5ba95d1a02 100644
--- a/b2share/version.py
+++ b/b2share/version.py
@@ -21,4 +21,4 @@
 """Version number."""
 
 
-__version__ = "2.1.3"
+__version__ = "2.1.4rc1"