From 2556d1821578b9ae5827ad966659662eb317aa41 Mon Sep 17 00:00:00 2001
From: Ciro Formisano <ciro.formisano@eng.it>
Date: Tue, 9 Jan 2018 09:45:06 +0000
Subject: [PATCH] git-svn-id:
 https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@162002
 82a268e6-3cf1-43bd-a215-b396298e98cf

---
 distro/changelog.xml | 21 ++++++++++++---------
 pom.xml              |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/distro/changelog.xml b/distro/changelog.xml
index af5ef2e..62195f8 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,19 +1,22 @@
 <ReleaseNotes>
-<Changeset component="dataminer-pool-manager.1-0-0" date="${buildDate***REMOVED***">
-  <Change>First Release</Change>
+<Changeset component="dataminer-pool-manager.2-4-0" date="${buildDate***REMOVED***">
+  <Change>Notifies the 'conflicts' on SVN</Change>
 </Changeset>
-<Changeset component="dataminer-pool-manager.2-0-0" date="${buildDate***REMOVED***">
-  <Change>Second Release</Change>
-</Changeset>
-<Changeset component="dataminer-pool-manager.2-1-0" date="${buildDate***REMOVED***">
-  <Change>New configuration file added</Change>
+<Changeset component="dataminer-pool-manager.2-3-0" date="${buildDate***REMOVED***">
+  <Change>Log information also if the verification of SVN dependencies fails</Change>
 </Changeset>
 <Changeset component="dataminer-pool-manager.2-2-0" date="${buildDate***REMOVED***">
   <Change>Improvements and bugs fixed/SVN-UTF8 compliant/Installation in Production ghost added</Change>
   <Change>Dynamic per-VRE configuration throght the information system</Change>
 </Changeset>
-<Changeset component="dataminer-pool-manager.2-3-0" date="${buildDate***REMOVED***">
-  <Change>Log information also if the verification of SVN dependencies fails</Change>
+<Changeset component="dataminer-pool-manager.2-1-0" date="${buildDate***REMOVED***">
+  <Change>New configuration file added</Change>
+</Changeset>
+<Changeset component="dataminer-pool-manager.2-0-0" date="${buildDate***REMOVED***">
+  <Change>Second Release</Change>
+</Changeset>
+<Changeset component="dataminer-pool-manager.1-0-0" date="${buildDate***REMOVED***">
+  <Change>First Release</Change>
 </Changeset>
 </ReleaseNotes>
 
diff --git a/pom.xml b/pom.xml
index f438ea0..35e33dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.gcube.dataAnalysis</groupId>
 	<artifactId>dataminer-pool-manager</artifactId>
 	<packaging>war</packaging>
-	<version>2.4.0-SNAPSHOT</version>
+	<version>2.4.0</version>
 
 	<name>dataminer-pool-manager</name>
 	<description>