From ea4e1ad2dd6665e3e1c5719863d5ce37430f15e9 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Thu, 15 Feb 2018 16:02:17 +0000
Subject: [PATCH] Upgraded version and changelog after release 4.10.0 refs
 #10925. Merged changes made directly in release branch.

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/distributions/smartgears-distribution@163316 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/changelog.xml | 9 +++++++--
 pom.xml              | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/distro/changelog.xml b/distro/changelog.xml
index fbd8ae1..ba7f5ec 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE xml>
 <ReleaseNotes>
-	<Changeset component="org.gcube.distribution.smartgears-distribution.2-2-0" date="${buildDate}">
-		<Change>Added logback 1.11 to support Time and Size rolling of logs</Change>
+	<Changeset component="org.gcube.distribution.smartgears-distribution.2-2-1" date="${buildDate}">
+		<Change></Change>
+	</Changeset>
+	<Changeset component="org.gcube.distribution.smartgears-distribution.2-2-0" date="2017-02-15">
 		<Change>Changed log level from FATAL to ERROR #9708</Change>
 		<Change>Added document-store-lib-accounting-service in place of document-store-lib-couchbase</Change>
 	</Changeset>
+	<Changeset component="org.gcube.distribution.smartgears-distribution.2-1-3" date="2017-10-09">
+		<Change>Added logback 1.11 to support Time and Size rolling of logs</Change>
+	</Changeset>
 	<Changeset component="org.gcube.distribution.smartgears-distribution.2-1-2" date="2017-05-02">
 		<Change>common-smartgear-utils re-adedd to the distribution</Change>
 	</Changeset>
diff --git a/pom.xml b/pom.xml
index 4695d13..70bee91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
 	<groupId>org.gcube.distribution</groupId>
 	<artifactId>smartgears-distribution</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
+	<version>2.2.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>A distribution for the SmartGears Framework</name>