From 14ef428094e4a9814bd25dae14d9f22db2d7f570 Mon Sep 17 00:00:00 2001
From: Gabriel Studer <gabriel.studer@unibas.ch>
Date: Mon, 9 Nov 2020 18:03:06 +0100
Subject: [PATCH] Update version to 2.2.0

---
 CHANGELOG.txt           | 2 +-
 CMakeLists.txt          | 2 +-
 docker/Dockerfile       | 2 +-
 singularity/Singularity | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 6d7accf18..021d4604e 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,4 +1,4 @@
-Changes in Release 2.x.x
+Changes in Release 2.2.0
 --------------------------------------------------------------------------------
 
  * Introduced CreateMeanlDDTHA function to evaluate the consistency of a
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8809e1176..e64a83ad5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ cmake_policy(SET CMP0060 NEW)
 project(OpenStructure CXX C)
 set (CMAKE_EXPORT_COMPILE_COMMANDS 1)
 set (OST_VERSION_MAJOR 2)
-set (OST_VERSION_MINOR 1)
+set (OST_VERSION_MINOR 2)
 set (OST_VERSION_PATCH 0)
 set (OST_VERSION_STRING ${OST_VERSION_MAJOR}.${OST_VERSION_MINOR}.${OST_VERSION_PATCH} )
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake_support)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7691651ae..a2a6abeae 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:18.04
 
 # ARGUMENTS
 ###########
-ARG OPENSTRUCTURE_VERSION="2.1.0"
+ARG OPENSTRUCTURE_VERSION="2.2.0"
 ARG SRC_FOLDER="/usr/local/src"
 ARG CPUS_FOR_MAKE=2
 ARG MSMS_VERSION="2.6.1"
diff --git a/singularity/Singularity b/singularity/Singularity
index 9aa517663..935e5c62c 100644
--- a/singularity/Singularity
+++ b/singularity/Singularity
@@ -1,5 +1,5 @@
 BootStrap: docker
-From: registry.scicore.unibas.ch/schwede/openstructure:2.1.0-bionic
+From: registry.scicore.unibas.ch/schwede/openstructure:2.2.0
 %post
 ##############################################################################
 # POST
-- 
GitLab