From 454455dd3db12a33b382eb4aac4b4c766039c16d Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Mon, 9 Jun 2014 13:35:23 +0000
Subject: [PATCH] added exclusion for jar servlet-api

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

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 4a1dd25..0570309 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -3,6 +3,12 @@
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
     <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <dependent-module archiveName="gis-viewer-3.4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/gisViewer/gisViewer">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="gcube-gis-viewer-2.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/GCubeGisViewer/GCubeGisViewer">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
         <property name="context-root" value="species-discovery"/>
   </wb-module>
diff --git a/pom.xml b/pom.xml
index 028bc21..8f816d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,6 +145,12 @@
 			<artifactId>gis-viewer</artifactId>
 			<version>[3.0.0-SNAPSHOT, 4.0.0-SNAPSHOT)</version>
 			<scope>compile</scope>
+			<exclusions>
+				<exclusion>
+					<artifactId>servlet-api</artifactId>
+					<groupId>javax.servlet</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>