From 2fff4d09bb499b2bcdf413bea0ad8aebeace76a4 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Thu, 25 Jun 2015 10:29:16 +0000
Subject: [PATCH] Minor Update

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget@115532 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath              |  6 +++---
 config/profile.xml      |  8 ++++----
 distro/README           |  2 +-
 distro/changelog.xml    |  5 +++++
 pom.xml                 | 11 ++++++-----
 templates/changelog.xml |  5 +++++
 6 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/.classpath b/.classpath
index 7539881..6e3e0a9 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/tabular-data-expression-widget-1.6.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/tabular-data-expression-widget-1.7.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-expression-widget-1.6.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/tabular-data-expression-widget-1.7.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -32,5 +32,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/tabular-data-expression-widget-1.6.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/tabular-data-expression-widget-1.7.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/config/profile.xml b/config/profile.xml
index ce28c85..5ee4877 100644
--- a/config/profile.xml
+++ b/config/profile.xml
@@ -6,20 +6,20 @@
 		<Description>tabular-data-expression-widget allows to create expression on tabular resource</Description>
 		<Class>PortletsUser</Class>
 		<Name>tabular-data-expression-widget</Name>
-		<Version>1.6.0-SNAPSHOT</Version>
+		<Version>1.7.0-SNAPSHOT</Version>
 		<Packages>
 			<Software>
 				<Description>tabular-data-expression-widget allows to create expression on tabular resource</Description>
 				<Name>tabular-data-expression-widget</Name>
-				<Version>1.6.0-SNAPSHOT</Version>
+				<Version>1.7.0-SNAPSHOT</Version>
 				<MavenCoordinates>
 					<groupId>org.gcube.portlets.user</groupId>
 					<artifactId>tabular-data-expression-widget</artifactId>
-					<version>1.6.0-SNAPSHOT</version>
+					<version>1.7.0-SNAPSHOT</version>
 				</MavenCoordinates>
 				<Type>library</Type>
 				<Files>
-					<File>tabular-data-expression-widget-1.6.0-SNAPSHOT.jar</File>
+					<File>tabular-data-expression-widget-1.7.0-SNAPSHOT.jar</File>
 				</Files>
 			</Software>
 		</Packages>
diff --git a/distro/README b/distro/README
index 0409fdb..cf63d56 100644
--- a/distro/README
+++ b/distro/README
@@ -13,7 +13,7 @@ Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
 Version and Release Date
 ------------------------
 
-v. 1.6.0-SNAPSHOT (2015-04-30)
+v. 1.7.0-SNAPSHOT (2015-07-03)
 
 
 Description
diff --git a/distro/changelog.xml b/distro/changelog.xml
index dec4a9d..9bd9605 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,9 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets-user.tabular-data-expression-widget.1-7-0"
+		date="2015-07-03">
+		<Change>Fixel Layout</Change>
+		<Change>Added support to expressions on multi column[issue #81]</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-user.tabular-data-expression-widget.1-6-0"
 		date="2015-04-30">
 		<Change>Updated panel for open from Ribbon</Change>
diff --git a/pom.xml b/pom.xml
index 9b6532e..98a70e3 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-expression-widget</artifactId>
-	<version>1.6.0-SNAPSHOT</version>
+	<version>1.7.0-SNAPSHOT</version>
 
 
 	<name>tabular-data-expression-widget</name>
@@ -38,7 +38,7 @@
 	<properties>
 		<distroDirectory>${project.basedir}/distro</distroDirectory>
 		<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
-		<release.date>2015-04-30</release.date>
+		<release.date>2015-07-03</release.date>
 		<wikiurl>https://gcube.wiki.gcube-system.org/gcube/index.php/Tabular_Data_Manager</wikiurl>
 		<templatesDirectory>templates</templatesDirectory>
 		<distroDirectory>distro</distroDirectory>
@@ -119,6 +119,7 @@
 			<version>[1.0.2-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
+
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>custom-portal-handler</artifactId>
@@ -142,7 +143,7 @@
 			<groupId>org.gcube.data.analysis.tabulardata</groupId>
 			<artifactId>service-client-impl</artifactId>
 			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
-			<scope>provided</scope> 
+			<scope>provided</scope>
 		</dependency>
 
 		<!-- tabular-data-gwt-service -->
@@ -150,7 +151,7 @@
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>tabular-data-gwt-service</artifactId>
 			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
-			<scope>provided</scope> 
+			<scope>provided</scope>
 		</dependency>
 
 		<!-- tabular-data-widget-common-event -->
@@ -166,7 +167,7 @@
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>tabular-data-monitor-widget</artifactId>
 			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
-			<scope>provided</scope> 
+			<scope>provided</scope>
 		</dependency>
 
 
diff --git a/templates/changelog.xml b/templates/changelog.xml
index dec4a9d..9bd9605 100644
--- a/templates/changelog.xml
+++ b/templates/changelog.xml
@@ -1,4 +1,9 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets-user.tabular-data-expression-widget.1-7-0"
+		date="2015-07-03">
+		<Change>Fixel Layout</Change>
+		<Change>Added support to expressions on multi column[issue #81]</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-user.tabular-data-expression-widget.1-6-0"
 		date="2015-04-30">
 		<Change>Updated panel for open from Ribbon</Change>