From 66059aa72152f69a98bb4c2239047f4651f16e49 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Mon, 27 Oct 2014 16:09:40 +0000
Subject: [PATCH] gcube 3.5.0

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@101044 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                  | 4 ++--
 .settings/com.google.gdt.eclipse.core.prefs | 2 +-
 distro/changelog.xml                        | 5 +++++
 pom.xml                                     | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.classpath b/.classpath
index 98f2333..2b25d98 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/reports-4.11.2-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/reports-4.12.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -31,5 +31,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/reports-4.11.2-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/reports-4.12.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs
index 51e07ea..7d7b3e0 100644
--- a/.settings/com.google.gdt.eclipse.core.prefs
+++ b/.settings/com.google.gdt.eclipse.core.prefs
@@ -2,6 +2,6 @@
 <<<<<<<=.mine
 >>>>>>>=.r71295
 eclipse.preferences.version=1
-lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.11.2-SNAPSHOT
+lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.12.0-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 78c2b21..db90d8d 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,9 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets-user.report-generator-portlet.4-12-0"
+		date="2014-10-27">
+		<Change>Fixed bugs for the VME-DB case</Change>
+		<Change>Minor UX Restyle for buttons</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-user.report-generator-portlet.4-11-1"
 		date="2014-09-30">
 		<Change>Fixed remove content does not work when radio button are present in the sequence for the VME-DB case</Change>
diff --git a/pom.xml b/pom.xml
index ec4eb4d..1320421 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>reports</artifactId>
 	<packaging>war</packaging>
-	<version>4.11.2-SNAPSHOT</version>
+	<version>4.12.0-SNAPSHOT</version>
 	<name>gCube Reports Manager</name>
 	<description>
 		gCube Reports Portlet.