From f436cf7b571952b3c674020d3786a46a87b582da Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Thu, 19 Jun 2014 13:55:49 +0000
Subject: [PATCH] excluded clashes jars

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@97550 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .settings/org.eclipse.wst.common.component |  3 +++
 pom.xml                                    | 25 ++++++++++++++++------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 06252d6..e835890 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,6 +4,9 @@
     <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
+        <dependent-module archiveName="document-workflow-library-1.4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/document-workflow-library/document-workflow-library">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <dependent-module archiveName="gcube-reporting-library-3.5.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/gcube-reporting-library/gcube-reporting-library">
             <dependency-type>uses</dependency-type>
         </dependent-module>
diff --git a/pom.xml b/pom.xml
index 20e8a6e..0e6a469 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,6 +88,7 @@
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-scope-maps</artifactId>
+			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.applicationsupportlayer</groupId>
@@ -111,13 +112,13 @@
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.common.portal</groupId>
-			<artifactId>portal-manager</artifactId>			
+			<artifactId>portal-manager</artifactId>
 			<scope>${setScope}</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.sencha.gxt</groupId>
 			<artifactId>gxt</artifactId>
-			<version>2.2.5</version>			
+			<version>2.2.5</version>
 		</dependency>
 		<dependency>
 			<groupId>com.allen-sauer.gwt.log</groupId>
@@ -138,6 +139,10 @@
 					<artifactId>el-api</artifactId>
 					<groupId>javax.el</groupId>
 				</exclusion>
+				<exclusion>
+					<artifactId>javax.el-api</artifactId>
+					<groupId>javax.el</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -154,7 +159,7 @@
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>csv4j</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>		
+			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.portlets.widgets</groupId>
@@ -164,17 +169,23 @@
 		<dependency>
 			<groupId>org.gcube.portlets.admin</groupId>
 			<artifactId>document-workflow-library</artifactId>
-			<version>[1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>			
+			<version>[1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.portlets.widgets</groupId>
 			<artifactId>report-exporter-widget</artifactId>
 			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>xalan</artifactId>
+					<groupId>xalan</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>gcube-reporting-library</artifactId>
-			<version>[3.4.0-SNAPSHOT, 4.0.0-SNAPSHOT)</version>			
+			<version>[3.4.0-SNAPSHOT, 4.0.0-SNAPSHOT)</version>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.portlets.widgets</groupId>
@@ -184,7 +195,7 @@
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>workspace-application-handler</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>			
+			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.common</groupId>
@@ -204,7 +215,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.derby</groupId>
-			<artifactId>derby</artifactId>			
+			<artifactId>derby</artifactId>
 			<scope>${setScope}</scope>
 		</dependency>
 		<dependency>