From 244f7146e8c15c6cea735e1180125cbd9b0dfa9b Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Mon, 16 May 2016 13:32:19 +0000
Subject: [PATCH] updated distro updated pom: commented xerces for testing

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@128617 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .settings/org.eclipse.wst.common.component |  3 +++
 distro/changelog.xml                       |  5 +++++
 pom.xml                                    | 10 +++++-----
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index f626108..69da3c6 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -8,6 +8,9 @@
         <dependent-module archiveName="workspace-tree-widget-6.12.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-tree-widget-TRUNK/workspace-tree-widget-TRUNK">
             <dependency-type>uses</dependency-type>
         </dependent-module>
+        <dependent-module archiveName="workspace-uploader-1.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-uploader-TRUNK/workspace-uploader-TRUNK">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
 
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
         <property name="context-root" value="workspace"/>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 2a63fa0..fdc79af 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,9 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets-user.workspace-portlet.6-12-0"
+		date="2016-05-16">
+		<Change>Integrated with new workspace uploader</Change>
+		<Change>Bug fixed: Css for Dialog Cancel multiple files</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-user.workspace-portlet.6-11-0"
 		date="2016-01-13">
 		<Change>[Feature #1925] Added, new public link format:
diff --git a/pom.xml b/pom.xml
index ece03c6..e6e045a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,11 +61,11 @@
 	<dependencies>
 
 		<!-- UNCOMMENT THIS TO RUN IN DEVO MODE -->
-		<dependency>
-			<groupId>xerces</groupId>
-			<artifactId>xerces</artifactId>
-			<version>2.4.0</version>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>xerces</groupId> -->
+<!-- 			<artifactId>xerces</artifactId> -->
+<!-- 			<version>2.4.0</version> -->
+<!-- 		</dependency> -->
 
 		<!-- This dependency is needed and is need on TOP to use GWT UI BInder 
 			without old Xerces version of gCore complaining -->