From 7f27daf3a4c446c0493bcd84a5be9dcc510f46e0 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Thu, 25 Jun 2015 09:46:06 +0000
Subject: [PATCH] Fixed pom

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

diff --git a/.classpath b/.classpath
index 2914246..7d22fb2 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/tabular-data-column-widget-1.7.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/tabular-data-column-widget-1.8.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-column-widget-1.7.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/tabular-data-column-widget-1.8.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -44,5 +44,5 @@
 	</classpathentry>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA.jar" sourcepath="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA-sources.jar"/>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA-sources.jar"/>
-	<classpathentry kind="output" path="target/tabular-data-column-widget-1.7.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/tabular-data-column-widget-1.8.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/config/profile.xml b/config/profile.xml
index 2eb8e60..9b497c5 100644
--- a/config/profile.xml
+++ b/config/profile.xml
@@ -6,20 +6,20 @@
 		<Description>tabular-data-column-widget allows to perform operations on the columns of a tabular resource</Description>
 		<Class>PortletsUser</Class>
 		<Name>tabular-data-column-widget</Name>
-		<Version>1.7.0-SNAPSHOT</Version>
+		<Version>1.8.0-SNAPSHOT</Version>
 		<Packages>
 			<Software>
 				<Description>tabular-data-column-widget allows to perform operations on the columns of a tabular resource</Description>
 				<Name>tabular-data-column-widget</Name>
-				<Version>1.7.0-SNAPSHOT</Version>
+				<Version>1.8.0-SNAPSHOT</Version>
 				<MavenCoordinates>
 					<groupId>org.gcube.portlets.user</groupId>
 					<artifactId>tabular-data-column-widget</artifactId>
-					<version>1.7.0-SNAPSHOT</version>
+					<version>1.8.0-SNAPSHOT</version>
 				</MavenCoordinates>
 				<Type>library</Type>
 				<Files>
-					<File>tabular-data-column-widget-1.7.0-SNAPSHOT.jar</File>
+					<File>tabular-data-column-widget-1.8.0-SNAPSHOT.jar</File>
 				</Files>
 			</Software>
 		</Packages>
diff --git a/distro/README b/distro/README
index c6e613e..80e61f3 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.7.0-SNAPSHOT (2015-04-30)
+v. 1.8.0-SNAPSHOT (2015-07-01)
 
 
 Description
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 0e2bf2d..4c54641 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,9 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets.user.tabular-data-column-widget.1-8-0"
+		date="2015-07-01">
+		<Change>Allow the creation and use of expressions on multi column in TDM portlet[issue #81]</Change>
+		<Change>Fixed dependencies</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets.user.tabular-data-column-widget.1-7-0"
 		date="2015-04-30">
 		<Change>Update Operation for open from Ribbon [issue #3154]</Change>
diff --git a/pom.xml b/pom.xml
index 60504ae..8700bb7 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-column-widget</artifactId>
-	<version>1.7.0-SNAPSHOT</version>
+	<version>1.8.0-SNAPSHOT</version>
 
 
 	<name>tabular-data-column-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-01</release.date>
 		<wikiurl>https://gcube.wiki.gcube-system.org/gcube/index.php/Tabular_Data_Manager</wikiurl>
 		<templatesDirectory>templates</templatesDirectory>
 		<distroDirectory>distro</distroDirectory>
@@ -76,7 +76,6 @@
 				<dependency>
 					<groupId>org.gcube.common</groupId>
 					<artifactId>home-library</artifactId>
-					<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 				</dependency>
 				<!-- service-client-impl -->
 				<dependency>
@@ -107,21 +106,12 @@
 			<version>${gwtVersion}</version>
 		</dependency>
 
-
-		<!-- <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> 
-			<version>1.0.0.GA</version> <scope>test</scope> </dependency> <dependency> 
-			<groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> 
-			<version>1.0.0.GA</version> <classifier>sources</classifier> <scope>test</scope> 
-			</dependency> -->
-
 		<dependency>
 			<groupId>com.sencha.gxt</groupId>
 			<artifactId>gxt</artifactId>
 			<version>${gxtVersion}</version>
 		</dependency>
 
-
-
 		<!-- tabular-data-gwt-service -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
@@ -184,11 +174,8 @@
 			<scope>test</scope>
 		</dependency>
 
-
 	</dependencies>
 
-
-
 	<build>
 		<!-- Generate compiled stuff in the folder used for developing mode -->
 		<outputDirectory>${webappDirectory}/WEB-INF/classes</outputDirectory>
diff --git a/templates/changelog.xml b/templates/changelog.xml
index 4d333bf..b53158f 100644
--- a/templates/changelog.xml
+++ b/templates/changelog.xml
@@ -1,4 +1,9 @@
 <ReleaseNotes>
+	<Changeset component="${groupId}.${artifactId}.1-8-0"
+		date="2015-07-01">
+		<Change>Allow the creation and use of expressions on multi column in TDM portlet[issue #81]</Change>
+		<Change>Fixed dependencies</Change>
+	</Changeset>
 	<Changeset component="${groupId}.${artifactId}.1-7-0"
 		date="2015-04-30">
 		<Change>Update Operation for open from Ribbon [issue #3154]</Change>