From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Tue, 14 May 2019 07:38:41 +0000 (+0200)
Subject: SONARCLOUD-644 fix conflict on javax.email
X-Git-Tag: 7.8~236
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=400a31228db020658b475ed3bc1b3fb2a09c14b1;p=sonarqube.git

SONARCLOUD-644 fix conflict on javax.email
---

diff --git a/build.gradle b/build.gradle
index b2192f7ae44..2109a921608 100644
--- a/build.gradle
+++ b/build.gradle
@@ -147,7 +147,7 @@ subprojects {
       dependency 'io.jsonwebtoken:jjwt-api:0.10.5'
       dependency 'io.jsonwebtoken:jjwt-impl:0.10.5'
       dependency 'io.jsonwebtoken:jjwt-jackson:0.10.5'
-      dependency 'javax.mail:mail:1.4.4'
+      dependency 'com.sun.mail:javax.mail:1.5.6'
       dependency 'javax.annotation:javax.annotation-api:1.3.1'
       dependency 'javax.servlet:javax.servlet-api:3.0.1'
       dependency 'javax.xml.bind:jaxb-api:2.3.0'
@@ -240,6 +240,12 @@ subprojects {
     }
   }
 
+  // global exclusions
+  configurations.all {
+    // do not conflict with com.sun.mail:javax.mail
+    exclude group: 'javax.mail', module: 'mail'
+  }
+
   sourceCompatibility = 1.8
   tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
diff --git a/sonar-testing-harness/build.gradle b/sonar-testing-harness/build.gradle
index eb2762a0e76..63878c08a84 100644
--- a/sonar-testing-harness/build.gradle
+++ b/sonar-testing-harness/build.gradle
@@ -9,15 +9,14 @@ dependencies {
 
   compile 'com.google.code.gson:gson'
   compile 'com.googlecode.json-simple:json-simple'
+  compile 'com.sun.mail:javax.mail'
   compile 'commons-io:commons-io'
-  compile 'javax.mail:mail'
   compile 'junit:junit'
   compile 'org.assertj:assertj-core'
   compile 'org.hamcrest:hamcrest-all'
   compile 'org.jsoup:jsoup'
 
   compileOnly 'com.google.code.findbugs:jsr305'
-
 }
 
 artifactoryPublish.skip = false