escluso javax.mail dai pom

consiglionazionaledellericerche · Sep 2, 2016 · 2419da5 · 2419da5
1 parent 3135bfd
commit 2419da5
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/SIGLA/pom.xml b/SIGLA/pom.xml
@@ -581,6 +581,12 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-email</artifactId>
       <version>1.3.3</version>
+      <exclusions>
+      	<exclusion>
+      		<artifactId>mail</artifactId>
+      		<groupId>javax.mail</groupId>
+      	</exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>xml-security</groupId>

diff --git a/sigla-ejb/pom.xml b/sigla-ejb/pom.xml
@@ -49,6 +49,12 @@
 			<classifier>wildfly</classifier>
 			<type>ejb</type>
 			<scope>provided</scope>
+			<exclusions>
+				<exclusion>
+					<artifactId>mail</artifactId>
+					<groupId>javax.mail</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>it.cnr</groupId>
@@ -74,13 +80,6 @@
 			<version>9.0.2.0.0</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>javax.mail</groupId>
-			<artifactId>mail</artifactId>
-			<version>1.4.1</version>
-			<type>jar</type>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>javax.servlet.jsp</groupId>
 			<artifactId>jsp-api</artifactId>
@@ -260,6 +259,10 @@
 					<artifactId>geronimo-jms_1.1_spec</artifactId>
 					<groupId>org.apache.geronimo.specs</groupId>
 				</exclusion>
+				<exclusion>
+					<artifactId>mail</artifactId>
+					<groupId>javax.mail</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -312,6 +315,12 @@
             <artifactId>jaxb2-basics-runtime</artifactId>
             <version>0.5.3</version>
 			<scope>provided</scope>
-        </dependency>						
+        </dependency>
+ 		<dependency>
+ 			<groupId>com.sun.mail</groupId>
+ 			<artifactId>javax.mail</artifactId>
+ 			<version>1.5.5</version>
+ 			<scope>provided</scope>
+ 		</dependency>
 	</dependencies>
 </project>
diff --git a/sigla-ws-client/pom.xml b/sigla-ws-client/pom.xml
@@ -169,6 +169,7 @@
 			<groupId>javax.mail</groupId>
 			<artifactId>mail</artifactId>
 			<version>1.4.7</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>