From ca9269fc21c99a1c7532dd69ddd4182b738463a5 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Mon, 27 Oct 2014 10:01:30 +0000
Subject: [PATCH] Updated for Release 3.5.0

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@101005 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath              |  6 +++---
 pom.xml                 |  4 ++--
 templates/changelog.xml | 20 ++++++++++++++++++--
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/.classpath b/.classpath
index 43476d5..2995c7f 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/tabular-data-manager-2.4.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/tabular-data-manager-2.5.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/tabular-data-manager-2.4.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/tabular-data-manager-2.5.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -45,5 +45,5 @@
 	</classpathentry>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt-2.5.1/validation-api-1.0.0.GA.jar" sourcepath="/home/giancarlo/gwt-2.5.1/validation-api-1.0.0.GA-sources.jar"/>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt-2.5.1/validation-api-1.0.0.GA-sources.jar"/>
-	<classpathentry kind="output" path="target/tabular-data-manager-2.4.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/tabular-data-manager-2.5.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/pom.xml b/pom.xml
index 088cc9d..f80365b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>tabular-data-manager</artifactId>
-	<version>2.4.0-SNAPSHOT</version>
+	<version>2.5.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 
 
@@ -41,7 +41,7 @@
 	<properties>
 		<distroDirectory>${project.basedir}/distro</distroDirectory>
 		<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
-		<release.date>2014-09-12</release.date>
+		<release.date>2014-10-31</release.date>
 		<wikiurl>https://gcube.wiki.gcube-system.org/gcube/index.php/Tabular_Data_Service</wikiurl>
 		<templatesDirectory>templates</templatesDirectory>
 		<distroDirectory>distro</distroDirectory>
diff --git a/templates/changelog.xml b/templates/changelog.xml
index 2925e4b..bf5331b 100644
--- a/templates/changelog.xml
+++ b/templates/changelog.xml
@@ -1,7 +1,23 @@
 <ReleaseNotes>
-	<Changeset component="${groupId}.${artifactId}.2-4-0"
-		date="Next">
+	<Changeset component="${groupId}.${artifactId}.2-5-0"
+		date="2014-10-31">
 		<Change>Added Export JSON</Change>	
+		<Change>Added multi tabular resources management</Change>
+		<Change>Added Main Box</Change>	
+		<Change>Added flows support</Change>
+		<Change>Added template share</Change>
+		<Change>Added Resources management</Change>
+		<Change>Added Statistical Widget</Change>
+		<Change>Added Map creation</Change>
+		<Change>Added Resume UI state</Change>
+		<Change>Fixed Final and Lock errors</Change>
+		<Change>Fixed template diplay</Change>
+		<Change>Fixed JAXP jdk.xml.entityExpansionLimit error</Change>
+		<Change>Updated monitor</Change>
+		<Change>Updated Commons Event</Change>
+		<Change>Updated Toolbox</Change>
+		<Change>Updated Ribbon</Change>
+		<Change>Updated GwtService</Change>
 	</Changeset>
 	<Changeset component="${groupId}.${artifactId}.2-4-0"
 		date="2014-09-12">